diff --git a/devTools/FC.d.ts b/devTools/FC.d.ts
index 4f056f82d3c9d940f28e8ab3a8c71838f89930fd..252710a8cd1e87976f79e3566559453970c861b3 100644
--- a/devTools/FC.d.ts
+++ b/devTools/FC.d.ts
@@ -22,6 +22,10 @@ interface Window {
}
declare namespace App {
+ namespace Art {}
+
+ namespace Corporate {}
+
namespace Data {
namespace Pronouns {
class Definition {
@@ -35,9 +39,17 @@ declare namespace App {
}
}
+ namespace Debug {}
+ namespace Desc {}
+
namespace Entity {
+ namespace Utils {}
}
+ namespace Facilities {}
+
+ namespace Interact {}
+
namespace RA {
class NumericTarget {
cond: string;
@@ -221,6 +233,17 @@ declare namespace App {
}
}
+ namespace SecExp {}
+ namespace SF {}
+
+ namespace UI {
+ namespace DOM {}
+ namespace View {}
+ }
+
+ namespace Update {}
+ namespace Utils {}
+
namespace Medicine {
namespace Surgery {
/**
diff --git a/src/endWeek/saGetMilked.js b/src/endWeek/saGetMilked.js
index 7c39a5350ab681a7f9e6777fc49ab70d8cdfda63..c7cabdb48d1b776afec97b9ca42897e5257b0c62 100644
--- a/src/endWeek/saGetMilked.js
+++ b/src/endWeek/saGetMilked.js
@@ -559,7 +559,7 @@ window.saGetMilked = (function saGetMilked() {
r += ` ${His} poor health impedes semen production.`;
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
r += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
@@ -572,12 +572,12 @@ window.saGetMilked = (function saGetMilked() {
} else if (slave.health.illness === 5) {
r += ` a terrible illness`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
r += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
r += ` being tired`;
}
r += `.</span>`;
diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index 15a8066a29270355c33194a45f25b7caeadbd098..efb18a52696a15c3cbc58a687501e8550582fd6f 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -56,7 +56,7 @@ window.saRest = function saRest(slave) {
}
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
t += ` Since ${he} is<span class="red">`;
if (slave.health.illness === 1) {
t += ` feeling under the weather`;
@@ -69,12 +69,12 @@ window.saRest = function saRest(slave) {
} else if (slave.health.illness === 5) {
t += ` terribly ill`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
t += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
t += ` exhausted`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
t += ` tired`;
}
t += `,</span> ${he} greatly appreciates being allowed to rest.`;
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index e78fd73f4d123a6430869e4593a150ff9b49bb20..213d877a50e549cb0faadab46f6fa895e79e30a6 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -63,7 +63,7 @@ window.saServant = function saServant(slave) {
t += `so happy to serve your other slaves that ${he} often sees to their needs before they know they have them, and greatly <span class="yellowgreen">reduces the upkeep</span> of your slaves.`;
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
t += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
t += ` feeling under the weather`;
@@ -76,12 +76,12 @@ window.saServant = function saServant(slave) {
} else if (slave.health.illness === 5) {
t += ` a terrible illness`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
t += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
t += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
t += ` being tired`;
}
t += `.</span>`;
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 40870d8afcfe47ae984a43154bb0482352e63671..42ff739024048a69d8ad4b2e851de34db9d3ba94 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -364,7 +364,7 @@ window.saServeThePublic = (function saServeThePublic() {
}
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
r += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
@@ -377,12 +377,12 @@ window.saServeThePublic = (function saServeThePublic() {
} else if (slave.health.illness === 5) {
r += ` a terrible illness`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
r += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
r += ` being tired`;
}
r += `.</span>`;
diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index ac5e7ef92978e2f2e9df61dd048cb35bbbfb8583..2259c017701c90cf7972dabd99baf9eb60c6a2cd 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -48,7 +48,7 @@ window.saStayConfined = function saStayConfined(slave) {
t += ` The stress of confinement <span class="red">damages ${his} health.</span>`;
healthDamage(slave, 10);
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
t += ` ${He} is<span class="red">`;
if (slave.health.illness === 1) {
t += ` feeling under the weather`;
@@ -61,12 +61,12 @@ window.saStayConfined = function saStayConfined(slave) {
} else if (slave.health.illness === 5) {
t += ` terribly ill`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
t += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
t += ` exhausted`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
t += ` tired`;
}
t += `,</span> so ${his} misery only grows.`;
diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js
index 77a9c4080d389a48405e73537066de2dac73e64d..bab08437462921d9e6b3a58307b70ea5f2deaefc 100644
--- a/src/endWeek/saTakeClasses.js
+++ b/src/endWeek/saTakeClasses.js
@@ -96,7 +96,7 @@ window.saTakeClasses = (function saServeThePublic() {
}
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
r += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
@@ -109,12 +109,12 @@ window.saTakeClasses = (function saServeThePublic() {
} else if (slave.health.illness === 5) {
r += ` a terrible illness`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
r += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
r += ` being tired`;
}
r += `.</span>`;
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 86f2552a27e44e3543e7d02c95b9c3c398aa4138..5610dd838aefd0b81ca4e544f275e1cf094b46c6 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -426,7 +426,7 @@ window.saWhore = (function saWhore() {
}
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
r += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
@@ -439,12 +439,12 @@ window.saWhore = (function saWhore() {
} else if (slave.health.illness === 5) {
r += ` a terrible illness`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
r += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
r += ` being tired`;
}
r += `.</span>`;
diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js
index 066f8ff1761cb289e556cf1032739587fefc0941..f0bbfbc3b6d600ec6d5eb668172955aff702b2e3 100644
--- a/src/endWeek/saWorkAGloryHole.js
+++ b/src/endWeek/saWorkAGloryHole.js
@@ -128,7 +128,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
healthDamage(slave, Math.max(Math.trunc((slave.sexAmount - 400) / 25) + jsRandom(-2, 2), 1));
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
r += ` ${He} is<span class="red">`;
if (slave.health.illness === 1) {
r += ` feeling under the weather`;
@@ -141,12 +141,12 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
} else if (slave.health.illness === 5) {
r += ` terribly ill`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 90) {
r += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
r += ` exhausted`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
r += ` tired`;
}
r += `,</span> but no one cared.`;
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index 7c48f7cab7d8b44f8b61db49c869e928ae5d57e1..d6d94657d269a8f4922ec48ac2baf1aad69a3e16 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -86,7 +86,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
t += `. `;
}
- if (slave.health.illness > 0 || slave.health.tired > 50) {
+ if (slave.health.illness > 0 || slave.health.tired > 60) {
t += ` ${He} performed worse this week due to<span class="red">`;
if (slave.health.illness === 1) {
t += ` feeling under the weather`;
@@ -99,12 +99,12 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
} else if (slave.health.illness === 5) {
t += ` a terrible illness`;
}
- if (slave.health.illness > 0 && slave.health.tired > 50) {
+ if (slave.health.illness > 0 && slave.health.tired > 60) {
t += ` and`;
}
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
t += ` exhaustion`;
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
t += ` being tired`;
}
t += `.</span> `;
@@ -392,7 +392,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
if (slave.preg > 10) {
// TODO: write this
}
- if (slave.health.tired > 50) {
+ if (slave.health.tired > 60) {
t += `${He} is so tired that the energy in ${his} shows is basically nonexistent, affecting ${his} profits. `;
}
if (slave.chem > 10) {
diff --git a/src/facilities/spa/spaFramework.js b/src/facilities/spa/spaFramework.js
index a990c3103a50c49bfa421c093035f68bc6d553dc..c1e5f8eccc1147af18818ecef7b49b26469fc25a 100644
--- a/src/facilities/spa/spaFramework.js
+++ b/src/facilities/spa/spaFramework.js
@@ -41,7 +41,20 @@ App.Entity.Facilities.SpaAssigneeJob = class extends App.Entity.Facilities.Facil
checkRequirements(slave) {
let r = super.checkRequirements(slave);
- if (slave.fetish !== "mindbroken" && (slave.devotion < -20 || (slave.health.condition >= 50 && slave.health.tired < 20 && slave.trust > 60 && slave.devotion > 60 && slave.sexualFlaw === "none" && slave.behavioralFlaw === "none")) {
+ if (
+ slave.fetish !== "mindbroken" &&
+ (
+ slave.devotion < -20 ||
+ (
+ slave.health.condition >= 50 &&
+ slave.health.tired < 20 &&
+ slave.trust > 60 &&
+ slave.devotion > 60 &&
+ slave.sexualFlaw === "none" &&
+ slave.behavioralFlaw === "none"
+ )
+ )
+ ) {
r.push(`${slave.slaveName} will not benefit from time at ${this.facility.name}.`);
}
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 68951645c8519742e669686cc6ca5594418a6637..ea9d144efaf56176c8acbba7e9a1eb32a02d6b89 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -769,18 +769,26 @@ window.SlaveSummaryUncached = (function() {
}
function short_tired(slave, c) {
- if (slave.health.tired > 80) {
- makeSpan(c, "Ti", ["red", "strong"], true, slave.health.tired);
- } else if (slave.health.tired > 50) {
- makeSpan(c, "Ti", "yellow", true, slave.health.tired);
+ if (slave.health.tired > 90) {
+ makeSpan(c, "Exh", ["red", "strong"], true, slave.health.tired);
+ } else if (slave.health.tired > 60) {
+ makeSpan(c, "Tir+", "yellow", true, slave.health.tired);
+ } else if (slave.health.tired > 30) {
+ makeSpan(c, "Tir", "yellow", true, slave.health.tired);
+ } else if (slave.health.tired < 0) {
+ makeSpan(c, "Ene", "green", true, slave.health.tired);
}
}
function long_tired(slave, c) {
- if (slave.health.tired > 80) {
+ if (slave.health.tired > 90) {
makeSpan(c, "Exhausted", ["red", "strong"], true, slave.health.tired);
- } else if (slave.health.tired > 50) {
+ } else if (slave.health.tired > 60) {
+ makeSpan(c, "Fatigued", "yellow", true, slave.health.tired);
+ } else if (slave.health.tired > 30) {
makeSpan(c, "Tired", "yellow", true, slave.health.tired);
+ } else if (slave.health.tired < 0) {
+ makeSpan(c, "Energetic", "green", true, slave.health.tired);
}
}