From 30fe8ebf41cc0884a3d8d44adf7cebb6355046a0 Mon Sep 17 00:00:00 2001 From: DCoded <dcoded@live.com> Date: Sat, 6 Oct 2018 23:43:33 -0400 Subject: [PATCH] Fix --- src/uncategorized/slaveInteract.tw | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index efebf74812a..68d0035f231 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1204,7 +1204,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1 <<else>> All $activeSlave.reservedChildren of $his children will be placed in $incubatorName. <</if>> - <<if (($activeSlave.reservedChildren - $activeSlave.reservedChildrenNursery) > 0) && ($activeSlave.reservedChildren < $activeSlave.pregType) && ($reservedChildren < $freeTanks)>> + <<if (($activeSlave.reservedChildren + $activeSlave.reservedChildrenNursery < $activeSlave.pregType) && ($reservedChildren < $freeTanks)) || ($activeSlave.reservedChildren > 0)>> <<link "Keep another child" "Slave Interact">><<set $activeSlave.reservedChildren += 1, $reservedChildren += 1>><</link>> <<if $activeSlave.reservedChildren > 0>> | <<link "Keep one less child" "Slave Interact">><<set $activeSlave.reservedChildren -= 1, $reservedChildren -= 1>><</link>> @@ -1215,7 +1215,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1 <<if ($reservedChildren + $activeSlave.pregType - $activeSlave.reservedChildren) <= $freeTanks>> | <<link "Keep the rest of $his children" "Slave Interact">><<set $reservedChildren += ($activeSlave.pregType - $activeSlave.reservedChildren), $activeSlave.reservedChildren += ($activeSlave.pregType - $activeSlave.reservedChildren), $reservedChildrenNursery -= $activeSlave.reservedChildrenNursery, $activeSlave.reservedChildrenNursery = 0>><</link>> <</if>> - <<elseif ($activeSlave.reservedChildren == $activeSlave.pregType) || ($reservedChildren == $freeTanks)>> + <<elseif ($activeSlave.reservedChildren == $activeSlave.pregType) || ($reservedChildren == $freeTanks) || ($activeSlave.reservedChildren - $activeSlave.reservedChildrenNursery >= 0)>> <<link "Keep one less child" "Slave Interact">><<set $activeSlave.reservedChildren -= 1, $reservedChildren -= 1>><</link>> <<if $activeSlave.reservedChildren > 1>> | <<link "Keep none of $his children" "Slave Interact">><<set $reservedChildren -= $activeSlave.reservedChildren, $activeSlave.reservedChildren = 0>><</link>> @@ -1255,7 +1255,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1 <<else>> All $activeSlave.reservedChildrenNursery of $his children will be placed in $nurseryName. <</if>> - <<if (($activeSlave.reservedChildrenNursery - $activeSlave.reservedChildren) > 0) && ($activeSlave.reservedChildrenNursery < $activeSlave.pregType) && ($reservedChildrenNursery < $freeCribs)>> + <<if (($activeSlave.reservedChildren + $activeSlave.reservedChildrenNursery < $activeSlave.pregType) && ($reservedChildrenNursery < $freeCribs)) || ($activeSlave.reservedChildrenNursery > 0)>> <<link "Keep another child" "Slave Interact">><<set $activeSlave.reservedChildrenNursery += 1, $reservedChildrenNursery += 1>><</link>> <<if $activeSlave.reservedChildrenNursery > 0>> | <<link "Keep one less child" "Slave Interact">><<set $activeSlave.reservedChildrenNursery -= 1, $reservedChildrenNursery -= 1>><</link>> -- GitLab