From 8f3d188cd63fd343264a92df1b58fbd94679860e Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Thu, 23 Jan 2020 13:09:19 -0500 Subject: [PATCH] schoolroom report --- src/uncategorized/schoolroomReport.tw | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw index b939302ffeb..085dd4552ea 100644 --- a/src/uncategorized/schoolroomReport.tw +++ b/src/uncategorized/schoolroomReport.tw @@ -173,8 +173,27 @@ <<if ($slaves[$i].skill.entertainment > 30) || (($schoolroomUpgradeSkills == 0) && ($slaves[$i].skill.entertainment > 10))>> <<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)>> - <br><br>''__@@.pink;$slaves[$i].slaveName@@__'' can learn little from further classes, so @@.yellow;_his2 assignment has defaulted to rest.@@ - <<= removeJob($slaves[$i], "learn in the schoolroom")>> + <p> + <span class="slave-name">$slaves[$i].slaveName</span> can learn little from further classes, so + <span class="yellow"> + <<if $assignmentRecords[$slaves[$i].ID]>> + <<set _oldJob = $assignmentRecords[$slaves[$i].ID]>> + <<= assignJobSafely($slaves[$i], _oldJob)>> + <<if $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. + <<else>> + $he has returned to rest. + <</if>> + <<else>> + $he goes back to <<print $slaves[$i].assignment>>. + <</if>> + <<else>> + _his2 assignment has defaulted to rest. + <<= removeJob($slaves[$i], "learn in the schoolroom")>> + <</if>> + </span> + </p> <<set _restedSlaves++, _dI--, _DL-->> <<continue>> <</if>> -- GitLab