From a00616391c22f4b98475facda4ee05a01c261f10 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 26 Mar 2020 01:43:56 -0400
Subject: [PATCH] more tweaks
---
src/endWeek/healthFunctions.js | 2 +-
src/endWeek/saWorkAGloryHole.js | 2 +-
src/uncategorized/saRules.tw | 8 ++++++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 3b6619f008d..cc474286996 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 685bf4e037e..68a36ff3007 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 0f89b59cb3e..d40965ef8d1 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
--
GitLab