diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js index 0195c7edecc689c377dc6e50dd050c4853dbe37f..588bdad618ac4b68ba82f2275f6d6c97c87f1b69 100644 --- a/src/endWeek/saRest.js +++ b/src/endWeek/saRest.js @@ -5,16 +5,16 @@ window.saRest = /** @param {App.Entity.SlaveState} slave */ function saRest(slav var He = capFirstChar(he), His = capFirstChar(his); var V = State.variables; - var t = " takes the week off."; + var t = ` takes the week off.`; if (slave.fuckdoll > 0) { - t += " ${He} has nothing to do but "; + t += ` ${He} has nothing to do but `; if (slave.amp == 0) { - t += "lie "; + t += `lie `; } else { - t += "stand "; + t += `stand `; } - t += "in place."; + t += `in place.`; } if (slave.health > 90) { diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index 89c54131d0ca2e37bc9eb31ad94933077030432c..b3ac44e544ac9e8583c382ce3e34fd06f4cd6b95 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -295,6 +295,17 @@ is receiving treatment in $clinicName. <</if>> <br> $He <<= saRest($slaves[$i])>> + <<if ($slaves[$i].health <= 40)>> + $He stays in the clinic as $he is still sick. + <<elseif ($Nurse != 0) && ($slaves[$i].chem > 15) && ($clinicUpgradeFilters == 1)>> + $He stays in the clinic as unhealthy chemicals are still being flushed from $his system. + <<elseif ($Nurse != 0) && ($slaves[$i].pregKnown == 1) && ($clinicSpeedGestation >= 0 || $slaves[$i].pregControl == "speed up")>> + $He stays in the clinic to hurry $his pregnancy along safely. + <<elseif ($Nurse != 0) && ($slaves[$i].pregAdaptation*1000 < $slaves[$i].bellyPreg || $slaves[$i].preg > $slaves[$i].pregData.normalBirth/1.33)>> + $He stays in the clinic waiting for the child to be born. + <<elseif ($Nurse != 0) && ($clinicInflateBelly > 0) && ($slaves[$i].bellyImplant >= 0) && ($slaves[$i].bellyImplant <= ($arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000))>> + $He stays in the clinic as $his implants can still recieve more filling. + <</if>> <br> <<= saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">> diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw index 60a8cefd1e6d88a738e112908b2c16b90094af4c..99afc421274f960b4cac927a68bda290f47c6de4 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -300,6 +300,15 @@ is resting in $spaName. <</if>> <br> _He2 <<= saRest($slaves[$i])>> + <<if ($slaves[$i].fetish == "mindbroken")>> + $He remains in the Spa, completely mindbroken. + <<elseif($slaves[$i].sexualFlaw != "none") || ($slaves[$i].behavioralFlaw != "none")>> + $He remains in the Spa, stubborn in $his flaw. + <<elseif ($slaves[$i].trust < 60) || ($slaves[$i].devotion < 60)>> + $He remains in the Spa, as $he is still learning to accept life as a slave. + <<elseif ($slaves[$i].health < 20)>> + $He remains in the Spa, as $his health is still low. + <</if>> <br> <<= saChoosesOwnClothes($slaves[$i])>> <<include "SA rules">>