diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index 7a7633203d6c5a0a7f1fff15a1fd937e17e2cdb6..f64cc5c6caaaff0b0c77831d5edfd5d73aa42022 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -100,7 +100,7 @@ window.saStayConfined = function saStayConfined(slave) {
t += ` ${He} is now willing to <span class="devotion accept">do as ${he}'s told,</span>`;
}
- t += ` so <span class="noteworthy">`;
+ t += ` <span class="noteworthy">`;
if (slave.assignment === "be confined in the cellblock") {
State.temporary.brokenSlaves++;
State.temporary.DL--;
@@ -109,17 +109,19 @@ window.saStayConfined = function saStayConfined(slave) {
if (V.assignmentRecords[slave.ID]) {
let oldJob = V.assignmentRecords[slave.ID];
assignJobSafely(slave, oldJob);
- if (slave.assignment === "rest") {
+ if (slave.choosesOwnAssignment === 1) {
+ t += ` and $he is resting before choosing another task.`;
+ } else if (slave.assignment === "rest") {
if (oldJob !== "rest") {
- t += ` since ${he} was unable to return to ${his} old task to ${oldJob}, ${his} assignment has defaulted to rest.`;
+ t += ` and since ${he} was unable to return to ${his} old task to ${oldJob}, ${his} assignment has defaulted to rest.`;
} else {
- t += ` ${he} has returned to rest.`;
+ t += ` so ${he} has returned to rest.`;
}
} else {
- t += ` ${he} goes back to ${oldJob}.`;
+ t += ` so ${he} goes back to ${oldJob}.`;
}
} else {
- t += ` ${his} assignment has defaulted to rest.`;
+ t += ` so ${his} assignment has defaulted to rest.`;
removeJob(slave, slave.assignment);
}
diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js
index a344ef0ddb4127a2697f6e5f9e2c8dc565664677..5e388369b7c518664dce2e1b57a805aa6d4d9ec3 100644
--- a/src/endWeek/saTakeClasses.js
+++ b/src/endWeek/saTakeClasses.js
@@ -412,21 +412,23 @@ window.saTakeClasses = (function saServeThePublic() {
if ((slave.skill.entertainment > 30) || (V.schoolroomUpgradeSkills === 0 && slave.skill.entertainment > 10)) {
if ((slave.skill.anal > 30) || (V.schoolroomUpgradeSkills === 0 && slave.skill.anal > 10)) {
if ((slave.skill.vaginal > 30) || (V.schoolroomUpgradeSkills === 0 && slave.skill.vaginal > 10) || (slave.vagina < 0)) {
- r += ` so <span class="noteworthy">`;
+ r += ` <span class="noteworthy">`;
if (V.assignmentRecords[slave.ID]) {
let oldJob = V.assignmentRecords[slave.ID];
assignJobSafely(slave, oldJob);
- if (slave.assignment === "rest") {
+ if (slave.choosesOwnAssignment === 1) {
+ t += ` and $he is resting before choosing another task.`;
+ } else if (slave.assignment === "rest") {
if (oldJob !== "rest") {
- r += ` since ${he} was unable to return to ${his} old task to ${oldJob}, ${his} assignment has defaulted to rest.`;
+ r += ` and since ${he} was unable to return to ${his} old task to ${oldJob}, ${his} assignment has defaulted to rest.`;
} else {
- r += ` ${he} has returned to rest.`;
+ r += ` so ${he} has returned to rest.`;
}
} else {
- r += ` ${he} goes back to ${oldJob}.`;
+ r += ` so ${he} goes back to ${oldJob}.`;
}
} else {
- r += ` ${his} assignment has defaulted to rest.`;
+ r += ` so ${his} assignment has defaulted to rest.`;
removeJob(slave, slave.assignment);
}
r += `</span>`;
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 264c91569645c65321c6a105a94cff490a7889a1..ecbc64d10b4f6ee4fa078d39ce963dbf78e90071 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -299,22 +299,24 @@
<<elseif ($Nurse != 0) && ($clinicInflateBelly > 0) && ($slaves[$i].bellyImplant >= 0) && ($slaves[$i].bellyImplant <= ($arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000))>>
<<else>>
<p>
- <span class="slave-name">$slaves[$i].slaveName</span> has been cured<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>> and purified<</if>>, so
+ <span class="slave-name">$slaves[$i].slaveName</span> has been cured<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>> and purified<</if>>,
<span class="noteworthy">
<<if $assignmentRecords[$slaves[$i].ID]>>
<<set _oldJob = $assignmentRecords[$slaves[$i].ID]>>
<<= assignJobSafely($slaves[$i], _oldJob)>>
- <<if $slaves[$i].assignment === "rest">>
+ <<if $slaves[$i].choosesOwnAssignment === 1>>
+ and $he is resting before choosing another task.
+ <<elseif $slaves[$i].assignment === "rest">>
<<if _oldJob != "rest">>
- since $he was unable to return to $his old task to <<print _oldJob>>, $his assignment has defaulted to rest.
+ and since $he was unable to return to $his old task to <<print _oldJob>>, $his assignment has defaulted to rest.
<<else>>
- $he has returned to rest.
+ so $he has returned to rest.
<</if>>
<<else>>
- $he goes back to <<print $slaves[$i].assignment>>.
+ so $he goes back to <<print $slaves[$i].assignment>>.
<</if>>
<<else>>
- $his assignment has defaulted to rest.
+ so $his assignment has defaulted to rest.
<<= removeJob($slaves[$i], "get treatment in the clinic")>>
<</if>>
</span>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 1e6d097b5a71c57d3d3ded86b0b9382879d7aee1..252b5d1c427087443b638988a6bda9304da3519e 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -178,22 +178,24 @@
<<if ($slaves[$i].skill.anal > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.anal > 10))>>
<<if ($slaves[$i].skill.vaginal > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.vaginal > 10)) || ($slaves[$i].vagina < 0)>>
<p>
- <span class="slave-name">$slaves[$i].slaveName</span> can learn little from further classes, so
+ <span class="slave-name">$slaves[$i].slaveName</span> can learn little from further classes,
<span class="noteworthy">
<<if $assignmentRecords[$slaves[$i].ID]>>
<<set _oldJob = $assignmentRecords[$slaves[$i].ID]>>
<<= assignJobSafely($slaves[$i], _oldJob)>>
- <<if $slaves[$i].assignment === "rest">>
+ <<if $slaves[$i].choosesOwnAssignment === 1>>
+ and $he is resting before choosing another task.
+ <<elseif $slaves[$i].assignment === "rest">>
<<if _oldJob != "rest">>
- since $he was unable to return to $his old task to <<print _oldJob>>, $his assignment has defaulted to rest.
+ and since $he was unable to return to $his old task to <<print _oldJob>>, $his assignment has defaulted to rest.
<<else>>
- $he has returned to rest.
+ so $he has returned to rest.
<</if>>
<<else>>
- $he goes back to <<print $slaves[$i].assignment>>.
+ so $he goes back to <<print $slaves[$i].assignment>>.
<</if>>
<<else>>
- _his2 assignment has defaulted to rest.
+ so _his2 assignment has defaulted to rest.
<<= removeJob($slaves[$i], "learn in the schoolroom")>>
<</if>>
</span>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 989461e326404f3d160a221a4d3b22650721aeca..40326adbf1d99702c29b91fa16b674eb377f3e2c 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -289,22 +289,24 @@
<</switch>>
<<if ($slaves[$i].health.condition >= 50) && ($slaves[$i].health.tired < 20) && ($slaves[$i].trust > 60) && ($slaves[$i].devotion > 60) && ($slaves[$i].fetish != "mindbroken") && ($slaves[$i].sexualFlaw == "none") && ($slaves[$i].behavioralFlaw == "none")>>
<p>
- <span class="slave-name">$slaves[$i].slaveName</span>is feeling well enough to leave $spaName, so
+ <span class="slave-name">$slaves[$i].slaveName</span> is feeling well enough to leave $spaName,
<span class="noteworthy">
<<if $assignmentRecords[$slaves[$i].ID]>>
<<set _oldJob = $assignmentRecords[$slaves[$i].ID]>>
<<= assignJobSafely($slaves[$i], _oldJob)>>
- <<if $slaves[$i].assignment === "rest">>
+ <<if $slaves[$i].choosesOwnAssignment === 1>>
+ and $he is resting before choosing another task.
+ <<elseif $slaves[$i].assignment === "rest">>
<<if _oldJob != "rest">>
- so $he was unable to return to $his old task to <<print _oldJob>>, $his assignment has defaulted to rest.
+ and since $he was unable to return to $his old task to <<print _oldJob>>, $his assignment has defaulted to rest.
<<else>>
- $he has returned to rest.
+ so $he has returned to rest.
<</if>>
<<else>>
- $he goes back to <<print $slaves[$i].assignment>>.
+ so $he goes back to <<print $slaves[$i].assignment>>.
<</if>>
<<else>>
- $his assignment has defaulted to rest.
+ so $his assignment has defaulted to rest.
<<= removeJob($slaves[$i], "rest in the spa")>>
<</if>>
</span>