From 59a8e39b14d9fe2ea15bd0ed353bf38fed4f8de7 Mon Sep 17 00:00:00 2001
From: DCoded <dsoloha@live.com>
Date: Fri, 24 May 2019 22:19:15 -0400
Subject: [PATCH] Nursery child reservation fix
---
src/uncategorized/slaveInteract.tw | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index a9cb225757c..17e96b1ed28 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1342,9 +1342,9 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
All _reservedNursery of $his children will be placed in $nurseryName.
<</if>>
<<if ((_reservedIncubator + _reservedNursery < _WL) && ($reservedChildrenNursery < $freeCribs))>>
- <<link "Keep another child" "Slave Interact">><<set WombAddToGenericReserve($activeSlave, "nursery", 1)>><</link>>
+ <<link "Keep another child" "Slave Interact">><<set WombAddToGenericReserve($activeSlave, "nursery", 1)>><<set $slaves[$slaveIndices[$activeSlave.ID]] = $activeSlave>><<set $reservedChildren = FetusGlobalReserveCount("nursery")>><</link>>
<<if _reservedNursery > 0>>
- | <<link "Keep one less child" "Slave Interact">><<set WombCleanGenericReserve($activeSlave, "nursery", 1)>><</link>>
+ | <<link "Keep one less child" "Slave Interact">><<set WombCleanGenericReserve($activeSlave, "nursery", 1)>><<set $slaves[$slaveIndices[$activeSlave.ID]] = $activeSlave>><<set $reservedChildren = FetusGlobalReserveCount("nursery")>><</link>>
<</if>>
<<if _reservedNursery > 1>>
| <<link "Keep none of $his children" "Slave Interact">><<set WombCleanGenericReserve($activeSlave, "nursery", 9999)>><</link>>
@@ -1353,16 +1353,16 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
| <<link "Keep the rest of $his children" "Slave Interact">><<set WombAddToGenericReserve($activeSlave, "nursery", 9999)>><</link>>
<</if>>
<<elseif (_reservedNursery == _WL) || ($reservedChildrenNursery == $freeCribs) || (_reservedNursery - _reservedIncubator >= 0)>>
- <<link "Keep one less child" "Slave Interact">><<set WombCleanGenericReserve($activeSlave, "nursery", 1)>><</link>>
+ <<link "Keep one less child" "Slave Interact">><<set WombCleanGenericReserve($activeSlave, "nursery", 1)>><<set $slaves[$slaveIndices[$activeSlave.ID]] = $activeSlave>><<set $reservedChildren = FetusGlobalReserveCount("nursery")>><</link>>
<<if _reservedNursery > 1>>
- | <<link "Keep none of $his children" "Slave Interact">><<set WombCleanGenericReserve($activeSlave, "nursery", 9999)>><</link>>
+ | <<link "Keep none of $his children" "Slave Interact">><<set WombCleanGenericReserve($activeSlave, "nursery", 9999)>><<set $slaves[$slaveIndices[$activeSlave.ID]] = $activeSlave>><<set $reservedChildren = FetusGlobalReserveCount("nursery")>><</link>>
<</if>>
<</if>>
<<elseif $reservedChildrenNursery < $freeCribs>>
$He is pregnant and you have <<if $freeCribs == 1>>an<</if>> @@.lime;available room<<if $freeCribs > 1>>s<</if>>@@ in $nurseryName.
- <<print "[[Keep "+ ((_WL > 1) ? "a" : "the") +" child|Slave Interact][WombAddToGenericReserve($activeSlave, 'nursery', 1)]]">>
+ <<print "[[Keep _cCount child|Slave Interact][WombAddToGenericReserve($activeSlave, 'nursery', 1)]]">>
<<if (_WL > 1) && ($reservedChildrenNursery + _WL) <= $freeCribs>>
- | <<link "Keep all of $his children" "Slave Interact">><<set WombAddToGenericReserve($activeSlave, "nursery", 9999)>><</link>>
+ | <<link "Keep all of $his children" "Slave Interact">><<set WombAddToGenericReserve($activeSlave, "nursery", 9999)>><<set $slaves[$slaveIndices[$activeSlave.ID]] = $activeSlave>><<set $reservedChildren = FetusGlobalReserveCount("nursery")>><</link>>
<</if>>
<<elseif $reservedChildrenNursery == $freeCribs>>
You have no available rooms for $his children.
--
GitLab