From 0f659d20128acdc7e883491e6a7f45258f4b2474 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Sun, 8 Apr 2018 12:03:25 +1200 Subject: [PATCH] Revert --- src/pregmod/sePlayerBirth.tw | 2 +- src/utility/extendedFamilyWidgets.tw | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw index 8fa48492b48..2f205d26ecd 100644 --- a/src/pregmod/sePlayerBirth.tw +++ b/src/pregmod/sePlayerBirth.tw @@ -84,7 +84,7 @@ While sitting at your desk planning your day, @@.lime;your water breaks,@@ thoro it quite empty. At least $assistantName knows where you are should anything go wrong. <</if>> <<else>> - <<if $Concubine != 0 && !canWalk($Concubine)>><<set _concubinePresent = 2>><<else>><<set _concubinePresent = 1>><</if>> + <<if $Concubine != 0>><<if !canWalk($Concubine)>><<set _concubinePresent = 2>><<else>><<set _concubinePresent = 1>><</if>><</if>> You barely make it half-way down the hall before you feel the first of your many children drop into position at the entrance to your birth canal. You try to keep going, but as it forces its way through your pelvis, spreading it wider, you're forced to the ground. Fortunately the penthouse is littered with supply rooms and closets, so you drag your laboring body into the nearest one instead. $assistantName discretely directs <<if $Nurse != 0>> @@.pink;$Nurse.slaveName@@ to you with everything she'll need to deliver your children.<<if _concubinePresent == 1>> @@.pink;$Concubine.slaveName@@ bursts in after her and circles around behind you before wrapping her arms around your contraction wracked middle. She'll be here to comfort you while you labor.<</if>> diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw index b82a2a9b840..a94d1bc7818 100644 --- a/src/utility/extendedFamilyWidgets.tw +++ b/src/utility/extendedFamilyWidgets.tw @@ -865,12 +865,7 @@ <<widget "listOfSlavesWithSameParent">> <<if $activeSlave[$args[0]] != 0>> <<set _printSeperator = false>> -<<if $activeSlave[$args[0]] == $PC[$args[0]]>>You<<set _printSeperator = true>><</if>> -<<for _j = 0; _j < $slaves.length; _j++>> - <<if $slaves[_j][$args[0]] == $activeSlave[$args[0]] && _printSeperator>> | >> - <<set _printSeperator = true>> <<print $slaves[_j].slaveName>> - <</if>> -<</for>> +<<if $activeSlave[$args[0]] == $PC[$args[0]]>>You<<set _printSeperator = true>><</if>><<for _j = 0; _j < $slaves.length; _j++>><<if $slaves[_j][$args[0]] == $activeSlave[$args[0]]>><<if _printSeperator>> | <</if>><<set _printSeperator = true>><<print $slaves[_j].slaveName>><</if>><</for>> <</if>> <</widget>> @@ -892,12 +887,7 @@ <<widget "listOfSlavesWithParent">> <<if $args[1] != 0>> <<set _printSeperator = false>> -<<if $args[1] == $PC[$args[0]]>>You<<set _printSeperator = true>><</if>> -<<<for _j = 0; _j < $slaves.length; _j++>> - <<if $slaves[_j][$args[0]] == $args[1] && _printSeperator>> |>> - <<set _printSeperator = true>> <<print $slaves[_j].slaveName>> - <</if>> -<</for>> +<<if $activeSlave[$args[0]] == $PC[$args[0]]>>You<<set _printSeperator = true>><</if>><<for _j = 0; _j < $slaves.length; _j++>><<if $slaves[_j][$args[0]] == $activeSlave[$args[0]]>><<if _printSeperator>> | <</if>><<set _printSeperator = true>><<print $slaves[_j].slaveName>><</if>><</for>> <</if>> <</widget>> -- GitLab