diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 96a9923798e92ec448b7d857e252afa901c3ba98..fc4f860a0da28034b587bd75b74b05906e23f530 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -495,13 +495,16 @@ window.tired = function tired(slave) {
} else {
assignment += 15;
}
- } else if (["serve in the master suite", "please you", "be a servant"].includes(slave.assignment)) { // Easy assignments
- if (slave.tired > 75) {
- assignment += 2;
+ } else if (["serve in the master suite", "please you", "be a servant", "work as a servant"].includes(slave.assignment)) { // Easy assignments
+ if (slaveResting(slave)) {
+ assignment -= 20;
+ V.slaveUsedRest = 1;
+ } else if (slave.tired + 11 >= 90 && !willWorkToDeath(slave)) {
+ assignment += 1;
} else if (slave.devotion > 20) {
- assignment += 5;
+ assignment += 7;
} else {
- assignment += 10;
+ assignment += 11;
}
} else if (["learn in the schoolroom", "take classes"].includes(slave.assignment)) { // Trivial assignments
if (slave.tired > 80) {
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 8143d0ae3478179afd9eac0f7e3d99f74eec920b..64c32ac4452141fc62d303717ea34ca2e07f5813 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -429,6 +429,51 @@
<</if>>
<</if>>
+ <<if $slaves[$i].rules.rest == "mandatory">>
+ <<if ($slaves[$i].devotion <= 20)>>
+ Getting a day off each week @@.mediumaquamarine;builds feelings of liberty@@ a slave shouldn't have.
+ <<set $slaves[$i].trust += 3>>
+ <<else>>
+ $He appreciates having a weekly day off and takes it as a sign that $he has a @@.mediumaquamarine;caring <<= WrittenMaster()>>.@@
+ <<set $slaves[$i].trust += 1>>
+ <</if>>
+ <<elseif $slaveUsedRest>>
+ <<if $slaves[$i].rules.rest == "permissive">>
+ <<if ($slaves[$i].devotion <= 20)>>
+ $He's permitted to rest whenever $he feels even the slightest bit tired; @@.mediumaquamarine;a privilege not lost on $him.@@
+ <<set $slaves[$i].trust += 2>>
+ <<else>>
+ $He @@.hotpink;likes@@ that you @@.mediumaquamarine;care enough@@ to let him rest when he gets tired.
+ <<set $slaves[$i].devotion += 1>>
+ <<set $slaves[$i].trust += 1>>
+ <</if>>
+ <<elseif $slaves[$i].rules.rest == "restrictive">>
+ <<if ($slaves[$i].devotion <= -20)>>
+ $He's permitted to rest when fatigue sets in, but not enough to shake $his tiredness; $he feels this @@.gold;deprivation@@ is intentional.
+ <<set $slaves[$i].trust -= 1>>
+ <<elseif ($slaves[$i].devotion <= 20)>>
+ $He's permitted to rest when fatigue sets in, and @@.hotpink;understands@@ this is less for $his wellbeing and more to prevent $him from become unproductive.
+ <<set $slaves[$i].devotion += 1>>
+ <<else>>
+ $He's permitted to rest when fatigue sets in and is @@.mediumaquamarine;thankful@@ you would allow $him the privilege so that $he may serve you better.
+ <<set $slaves[$i].trust += 1>>
+ <</if>>
+ <<elseif $slaves[$i].rules.rest == "cruel">>
+ <<if ($slaves[$i].devotion <= -20)>>
+ $He's @@.gold;terrified@@ that the only reason $he is given any time to rest at all is just to prolong your torment of $him.
+ <<set $slaves[$i].trust -= 3>>
+ <<elseif ($slaves[$i].devotion <= 20)>>
+ You work $him to the bone and only allow $him rest when on the verge of collapsing. $He @@.gold;fears@@ this @@.mediumorchid;cruelty@@ is just the beginning.
+ <<set $slaves[$i].trust -= 3>>
+ <<set $slaves[$i].devotion -= 3>>
+ <<else>>
+ Only being allowed rest when on the verge of collapsing @@.mediumorchid;shakes $his faith@@ in you a little.
+ <<set $slaves[$i].devotion -= 2>>
+ <</if>>
+ <</if>>
+ <<unset $slaveUsedRest>>
+ <</if>>
+
<<if ($universalRulesConsent == 0)>>
<<if ($slaves[$i].devotion <= 20)>>
<<if ($slaves[$i].trust > -10)>>
@@ -943,6 +988,51 @@
rest,@@ but not enough for a slut lacking time management.
<</if>>
+ <<if $slaves[$i].rules.rest == "mandatory">>
+ <<if ($slaves[$i].devotion <= 20)>>
+ Getting a day off each week @@.mediumaquamarine;builds feelings of liberty@@ a slave shouldn't have.
+ <<set $slaves[$i].trust += 3>>
+ <<else>>
+ $He appreciates having a weekly day off and takes it as a sign that $he has a @@.mediumaquamarine;caring <<= WrittenMaster()>>.@@
+ <<set $slaves[$i].trust += 1>>
+ <</if>>
+ <<elseif $slaveUsedRest>>
+ <<if $slaves[$i].rules.rest == "permissive">>
+ <<if ($slaves[$i].devotion <= 20)>>
+ $He's permitted to rest whenever $he feels even the slightest bit tired; @@.mediumaquamarine;a privilege not lost on $him.@@
+ <<set $slaves[$i].trust += 2>>
+ <<else>>
+ $He @@.hotpink;likes@@ that you @@.mediumaquamarine;care enough@@ to let him rest when he gets tired.
+ <<set $slaves[$i].devotion += 1>>
+ <<set $slaves[$i].trust += 1>>
+ <</if>>
+ <<elseif $slaves[$i].rules.rest == "restrictive">>
+ <<if ($slaves[$i].devotion <= -20)>>
+ $He's permitted to rest when fatigue sets in, but not enough to shake $his tiredness; $he feels this @@.gold;deprivation@@ is intentional.
+ <<set $slaves[$i].trust -= 1>>
+ <<elseif ($slaves[$i].devotion <= 20)>>
+ $He's permitted to rest when fatigue sets in, and @@.hotpink;understands@@ this is less for $his wellbeing and more to prevent $him from become unproductive.
+ <<set $slaves[$i].devotion += 1>>
+ <<else>>
+ $He's permitted to rest when fatigue sets in and is @@.mediumaquamarine;thankful@@ you would allow $him the privilege so that $he may serve you better.
+ <<set $slaves[$i].trust += 1>>
+ <</if>>
+ <<elseif $slaves[$i].rules.rest == "cruel">>
+ <<if ($slaves[$i].devotion <= -20)>>
+ $He's @@.gold;terrified@@ that the only reason $he is given any time to rest at all is just to prolong your torment of $him.
+ <<set $slaves[$i].trust -= 3>>
+ <<elseif ($slaves[$i].devotion <= 20)>>
+ You work $him to the bone and only allow $him rest when on the verge of collapsing. $He @@.gold;fears@@ this @@.mediumorchid;cruelty@@ is just the beginning.
+ <<set $slaves[$i].trust -= 3>>
+ <<set $slaves[$i].devotion -= 3>>
+ <<else>>
+ Only being allowed rest when on the verge of collapsing @@.mediumorchid;shakes $his faith@@ in you a little.
+ <<set $slaves[$i].devotion -= 2>>
+ <</if>>
+ <</if>>
+ <<unset $slaveUsedRest>>
+ <</if>>
+
<<if ($universalRulesConsent == 0)>>
<<if ($slaves[$i].devotion <= 20)>>
<<if ($slaves[$i].trust > -10)>>
@@ -5794,8 +5884,7 @@
<</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 ["be a servant", "get milked", "please you", "serve the public", "whore", "work a glory hole"].includes($slaves[$i].assignment)>>
<<if $slaves[$i].rules.rest == "mandatory">>
<<if ($slaves[$i].devotion <= 20)>>
Getting a day off each week @@.mediumaquamarine;builds feelings of liberty@@ a slave shouldn't have.