From 325d20c08ef93becf82e88df63eb1140ae2dd2ce Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Wed, 22 Jan 2020 23:31:19 -0500 Subject: [PATCH] cleanup fix --- src/uncategorized/clinicReport.tw | 22 +++++++++++++++------- src/uncategorized/spaReport.tw | 22 +++++++++++++++------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw index 70782f890ff..9564c3af648 100644 --- a/src/uncategorized/clinicReport.tw +++ b/src/uncategorized/clinicReport.tw @@ -298,13 +298,21 @@ <<elseif ($Nurse != 0) && ($slaves[$i].pregAdaptation*1000 < $slaves[$i].bellyPreg || $slaves[$i].preg > $slaves[$i].pregData.normalBirth/1.33)>> <<elseif ($Nurse != 0) && ($clinicInflateBelly > 0) && ($slaves[$i].bellyImplant >= 0) && ($slaves[$i].bellyImplant <= ($arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000))>> <<else>> - <<if $slaves[$i].assignmentOld>> - <p><span class="slave-name">$slaves[$i].slaveName</span> has been cured<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>> and purified<</if>>, so <span class="yellow">$he goes back to <<print $slaves[$i].assignmentOld>>.</span></p> - <<= assignJob($slaves[$i], $slaves[$i].assignmentOld)>> - <<else>> - <p><span class="slave-name">$slaves[$i].slaveName</span> has been cured<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>> and purified<</if>>, so <span class="yellow">$his assignment has defaulted to rest.<span></p> - <<= removeJob($slaves[$i], "get treatment in the clinic")>> - <</if>> + <p> + <span class="slave-name"> + $slaves[$i].slaveName + </span> + has been cured<<if ($Nurse != 0) && ($clinicUpgradeFilters == 1)>>and purified<</if>>, so + <span class="yellow"> + <<if $slaves[$i].assignmentOld>> + $he goes back to <<print $slaves[$i].assignmentOld>>. + <<= assignJob($slaves[$i], $slaves[$i].assignmentOld)>> + <<else>> + $his assignment has defaulted to rest. + <<= removeJob($slaves[$i], "get treatment in the clinic")>> + <</if>> + </span> + </p> <<set _restedSlaves++, _dI--, _DL-->> <<continue>> <</if>> diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw index adae032cb53..36ba5b16611 100644 --- a/src/uncategorized/spaReport.tw +++ b/src/uncategorized/spaReport.tw @@ -288,13 +288,21 @@ <<set $slaves[$i].rules.living = "luxurious">> <</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")>> - <<if $slaves[$i].assignmentOld>> - <p><span class="slave-name">$slaves[$i].slaveName</span> is feeling well enough to leave $spaName, so <span class="yellow">$he goes back to <<print $slaves[$i].assignmentOld>>.</span></p> - <<= assignJob($slaves[$i], $slaves[$i].assignmentOld)>> - <<else>> - <p><span class="slave-name">$slaves[$i].slaveName</span> is feeling well enough to leave $spaName, so span class="yellow">$his assignment has defaulted to rest.</span></p> - <<= removeJob($slaves[$i], "rest in the spa")>> - <</if>> + <p> + <span class="slave-name"> + $slaves[$i].slaveName + </span> + is feeling well enough to leave $spaName, so + <span class="yellow"> + <<if $slaves[$i].assignmentOld>> + $he goes back to <<print $slaves[$i].assignmentOld>>. + <<= assignJob($slaves[$i], $slaves[$i].assignmentOld)>> + <<else>> + $his assignment has defaulted to rest. + <<= removeJob($slaves[$i], "rest in the spa")>> + <</if>> + </span> + </p> <<set _restedSlaves++, _DL--, _dI-->> <<continue>> <</if>> -- GitLab