diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index fa68975f0b9038b52116dc1bf2cb3bb2a7b4f4cf..f74dc045285dc4de0d4ef46186e7dc0a474d4c68 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -341,6 +341,8 @@ window.willWorkToDeath = function willWorkToDeath(slave) {
return true;
} else if (slave.fetish === "mindbroken") {
return true;
+ } else if (V.Madam !== 0 && (slave.assignment === "work in the brothel" || (slave.assignment === "whore" && V.brothel > 0 && V.universalRulesFacilityWork === 1 && V.brothelSpots > 0))) {
+ return true;
}
return false;
};
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 008de40707c9a17c1ce3767313ba500eb88df3c5..f569e44a8474c1a783b73583b8f0d43225437b27 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -324,6 +324,66 @@ window.saWhore = (function saWhore() {
*/
function physicalEffects(slave) {
let injury = 0;
+
+ 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`;
+ } else if (slave.healtdh.illness === 2) {
+ r += ` somewhat ill`;
+ } else if (slave.health.illness === 3) {
+ r += ` sick`;
+ } else if (slave.health.illness === 4) {
+ r += ` very sick`;
+ } else if (slave.health.illness === 5) {
+ r += ` terribly ill`;
+ }
+ if (slave.health.illness > 0 && slave.health.tired > 90) {
+ r += ` and`;
+ }
+ if (slave.health.tired > 90) {
+ r += ` exhausted`;
+ } else if (slave.health.tired > 60) {
+ r += ` fatigued`;
+ }
+ r += `,</span> hindering ${his} ability to attract and please customers.`;
+ }
+ if (slave.assignment === "work in the brothel") {
+ if (slaveResting(slave)) {
+ r += ` ${He} spends reduced hours working ${V.brothelName} in order to <span class="green">offset ${his} lack of rest.</span>`;
+ } else if (slave.tired + 15 >= 90 && !willWorkToDeath(slave)) {
+ r += ` ${He} attempts to refuse customers due to ${his} exhaustion, but can do little to stop it or the resulting `;
+ if (V.Madam !== 0) {
+ r += `<span class="trust dec">severe punishment</span> by ${Madam.slaveName}. ${His} <span class="devotion dec">outbursts</span> are kept in check by your watchful Madam, preventing the customers from ever becoming aware of them while keeping ${him} productive.`;
+ } else {
+ r += `<span class="trust dec">severe punishment.</span> ${He} <span class="devotion dec">purposefully underperforms,</span> choosing ${his} overall well-being over the consequences, <span class="reputation dec">aggravating customers and damaging the establishment's image.</span>`;
+ repX(forceNeg(50), "disobedience", slave);
+ }
+ slave.devotion -= 10;
+ slave.trust -= 5;
+ } else {
+ r += ` It takes effort to be a productive whore and ${he} ends ${his} shifts <span class="red">eager for sleep.</span>`;
+ }
+ tired(slave);
+ } else if (slave.assignment === "whore") {
+ if (slaveResting(slave)) {
+ r += ` ${He} spends reduced hours plying ${his} trade in order to <span class="green">offset ${his} lack of rest.</span>`;
+ } else if (slave.tired + 15 >= 90 && !willWorkToDeath(slave)) {
+ r += ` ${He} attempts to refuse to whore due to ${his} exhaustion, but can do little to avoid it or the resulting `;
+ if (V.brothel > 0 && V.universalRulesFacilityWork === 1 && V.brothelSpots > 0 && V.Madam !== 0) {
+ r += `<span class="trust dec">severe punishment</span> by ${Madam.slaveName}. ${His} <span class="devotion dec">outbursts</span> are kept in check by your watchful Madam, preventing the customers from ever becoming aware of them and keeping ${him} productive.`;
+ } else {
+ r += `<span class="trust dec">severe punishment.</span> ${He} <span class="devotion dec">purposefully underperforms,</span> choosing ${his} overall well-being over the consequences, <span class="reputation dec">causing a scene and damaging the image of your whores.</span>`;
+ repX(forceNeg(100), "disobedience", slave);
+ }
+ slave.devotion -= 10;
+ slave.trust -= 5;
+ } else {
+ r += ` It takes effort to be an effective prostitute and ${he} ends ${his} shifts <span class="red">eager for sleep.</span>`;
+ }
+ tired(slave);
+ }
+
if (slave.assignment !== window.Job.BROTHEL) {
if (slave.curatives > 0 || slave.inflationType === "curative") {
r += ` The drugs `;
@@ -408,30 +468,6 @@ window.saWhore = (function saWhore() {
}
}
- 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`;
- } else if (slave.health.illness === 2) {
- r += ` a minor illness`;
- } else if (slave.health.illness === 3) {
- r += ` being sick`;
- } else if (slave.health.illness === 4) {
- r += ` being very sick`;
- } else if (slave.health.illness === 5) {
- r += ` a terrible illness`;
- }
- if (slave.health.illness > 0 && slave.health.tired > 60) {
- r += ` and`;
- }
- if (slave.health.tired > 90) {
- r += ` exhaustion`;
- } else if (slave.health.tired > 60) {
- r += ` being tired`;
- }
- r += `.</span>`;
- }
-
if (canDoVaginal(slave)) {
if (slave.vagina === 0) {
if (slave.aphrodisiacs > 1 || slave.inflationType === "aphrodisiac") {
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 633796f47d79c9a3af0086591d8522015d04d7bb..56dae4cf8b9885188f6e3a204f01c385aeb2656d 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -1960,7 +1960,7 @@ window.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDemandRef
let targetBudget; // Finding the right budget target
let fuckMin; // minimum amount of fucks
let fuckDev = 3; // standard deviation of fucks
- const initialHealthPenalty = healthPenalty(s);
+ const initialHealthPenalty = restEffects(s, 15);
s.effectiveWhoreClass = effectiveWhoreClass(s);
s.maxWhoreClass = s.effectiveWhoreClass;
income *= initialHealthPenalty;