diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js index 3b6619f008dfbd37fc85288345b63f8a2fb21247..cc4742869967f046644f0b34dd1f98564e5f5e46 100644 --- a/src/endWeek/healthFunctions.js +++ b/src/endWeek/healthFunctions.js @@ -602,7 +602,7 @@ window.tired = function tired(slave) { // day of rest if (slave.rules.rest === "mandatory") { if (["work a glory hole", "work as a farmhand", "serve in the club", "serve the public", "whore", "work in the brothel", "be a subordinate slave", "be a servant", "work as a servant", "please you", "serve in the master suite"].includes(slave.assignment) || (V.dairyRestraintsSetting < 2 && slave.assignment === "work in the dairy")) { - restRules -= 10; + restRules -= 20; } } diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js index 685bf4e037ea4883492f4a0d2d7b77dcf7813eaa..68a36ff3007414bf0e0697fe830bdc2a2246b375 100644 --- a/src/endWeek/saWorkAGloryHole.js +++ b/src/endWeek/saWorkAGloryHole.js @@ -172,7 +172,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() { if (slaveResting(slave)) { r += ` ${He} spends reduced hours serving ${his} glory hole in order to offset ${his} lack of rest.`; } else if (slave.tired + 20 >= 90 && !willWorkToDeath(slave)) { - r += ` ${He} attempts to refuse work due to ${his} exhaustion, but can do little to stop it or the resulting <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 appearance.</span>`; + r += ` ${He} attempts to refuse work due to ${his} exhaustion, but can do little to stop it or the resulting <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>`; slave.devotion -= 10; slave.trust -= 5; repX(forceNeg(50), "gloryhole", slave); diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw index 0f89b59cb3e5d96bd17efa56b7d295a3c6d8687e..d40965ef8d1f2526d59ce5057818301976f15195 100644 --- a/src/uncategorized/saRules.tw +++ b/src/uncategorized/saRules.tw @@ -5674,6 +5674,14 @@ <</if>> <</if>> + /* rules rest block only applies to certain jobs for now - may consider dropping the condition during finalization */ + <<if ["work a glory hole"].includes($slaves[$i].assignment)>> + <<if $slaves[$i].rules.rest == "mandatory">> + <<elseif $slaveUsedRest>> + <<unset $slaveUsedRest>> + <</if>> + <</if>> + <<if ($slaves[$i].devotion <= 20)>> <<if ($slaves[$i].rules.living == "spare")>> The spare living conditions @@.hotpink;get $him used@@ to the routine of