From 8a3f10b6d757eed3c47d2d35390905be47871402 Mon Sep 17 00:00:00 2001 From: fcanon <fcanon@nowhere.na> Date: Mon, 29 May 2017 19:25:38 -0400 Subject: [PATCH] add "keep all of her children" and "keep none of her children" links to incubator facility and slave interact --- src/pregmod/incubator.tw | 22 +++++++++++++++++----- src/uncategorized/slaveInteract.tw | 29 +++++++++++++++++++++-------- 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index b338ca2f24c..d385ed9be96 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -30,13 +30,13 @@ $incubatorNameCaps is a clean, cold hall designed to be lined with tanks and the [[Add another incubation tank|Incubator][$cash -= Math.trunc(60000*$upgradeMultiplierArcology), $incubator += 1]] //Costs ¤<<print Math.trunc(60000*$upgradeMultiplierArcology)>> and will increase upkeep costs// <br><br> -Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $incubator tanks, <<print $freeTanks>> <<if $freeTanks == 1>>is<<else>>are<</if>> available. Of those, $reservedChildren <<if $reservedChildren == 1>>tank is<<else>>tanks are<</if>> reserved. +Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $incubator tanks, <<print $freeTanks>> <<if $freeTanks == 1>>is<<else>>are<</if>> unoccupied. Of those, $reservedChildren <<if $reservedChildren == 1>>tank is<<else>>tanks are<</if>> reserved. <<for _u = 0; _u < _SL; _u++>> <<if $slaves[_u].pregType < 50 && $slaves[_u].preg > 3 && $slaves[_u].eggType == "human">> <<if $slaves[_u].assignment == "work in the dairy" && $dairyPregSetting > 0>> <<else>> <br><<print "[[$slaves[" + _u + "].slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage()]]">> is $slaves[_u].preg weeks pregnant with - <<if $slaves[_u].pregSource == 0 || $slaves[_u].preg <= 5>>someone's<<if $slaves[_u].preg <= 5>>, though it is too early to tell who's,<</if>> + <<if $slaves[_u].pregSource == 0 || $slaves[_u].preg <= 5>>someone's<<if $slaves[_u].preg <= 5>>, though it is too early to tell whose,<</if>> <<elseif $slaves[_u].pregSource == -1>>your <<elseif $slaves[_u].pregSource == -2>>a citizen's <<else>> @@ -56,14 +56,26 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <<if $slaves[_u].reservedChildren > 0>> | <<print "[[Keep one less child|Incubator][$slaves[" + _u + "].reservedChildren -= 1, $reservedChildren -= 1]]">> <</if>> - <<elseif ($slaves[_u].reservedChildren == $slaves[_u].pregType) || ($reservedChildren == ($incubator-$tanks.length))>> + <<if $slaves[_u].reservedChildren > 1>> + | <<print "[[Keep none of her children|Incubator][$reservedChildren -= $slaves[" + _u + "].reservedChildren, $slaves[" + _u + "].reservedChildren = 0]]">> + <</if>> + <<if ($reservedChildren + $slaves[_u].pregType - $slaves[_u].reservedChildren) <= $freeTanks>> + | <<print "[[Keep the rest of her children|Incubator][$reservedChildren += ($slaves[" + _u + "].pregType - $slaves[" + _u + "].reservedChildren), $slaves[" + _u + "].reservedChildren += ($slaves[" + _u + "].pregType - $slaves[" + _u + "].reservedChildren)]]">> + <</if>> + <<elseif ($slaves[_u].reservedChildren == $slaves[_u].pregType) || ($reservedChildren == $freeTanks)>> <br> <<print "[[Keep one less child|Incubator][$slaves[" + _u + "].reservedChildren -= 1, $reservedChildren -= 1]]">> + <<if $slaves[_u].reservedChildren > 1>> + | <<print "[[Keep none of her children|Incubator][$reservedChildren -= $slaves[" + _u + "].reservedChildren, $slaves[" + _u + "].reservedChildren = 0]]">> + <</if>> <</if>> <<elseif $reservedChildren < $freeTanks>> - You have an @@.lime;available aging tank.@@ + You have <<if $freeTanks == 1>>an<</if>> @@.lime;available aging tank<<if $freeTanks > 1>>s<</if>>.@@ <br> - <<print "[[Keep a child|Incubator][$slaves[" + _u + "].reservedChildren += 1, $reservedChildren += 1]]">> + <<print "[[Keep "+ (($slaves[_u].pregType > 1) ? "a" : "the") +" child|Incubator][$slaves[" + _u + "].reservedChildren += 1, $reservedChildren += 1]]">> + <<if ($slaves[_u].pregType > 1) && ($reservedChildren + $slaves[_u].pregType - $slaves[_u].reservedChildren) <= $freeTanks>> + | <<print "[[Keep all of her children|Incubator][$reservedChildren += $slaves["+ _u + "].pregType, $slaves[" + _u + "].reservedChildren += $slaves["+ _u +"].pregType]]">> + <</if>> <<elseif $reservedChildren == $freeTanks>> <br> You have @@.red;no room for her offspring.@@ diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 7fb5930ba9a..8919629d14d 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -1039,20 +1039,33 @@ __Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><< <<if $activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0>> <<else>> <br> + <<set $freeTanks = ($incubator-$tanks.length)>> <<if $activeSlave.reservedChildren > 0>> $activeSlave.reservedChildren of her children will be placed in $incubatorName. - <<if ($activeSlave.reservedChildren < $activeSlave.pregType) && ($reservedChildren < ($incubator-$incubatorSlaves))>> - <<print "[[Keep another child|Slave Interact][$activeSlave.reservedChildren += 1, $reservedChildren += 1]]">> + <<if ($activeSlave.reservedChildren < $activeSlave.pregType) && ($reservedChildren < $freeTanks)>> + [[Keep another child|Slave Interact][$activeSlave.reservedChildren += 1, $reservedChildren += 1]] <<if $activeSlave.reservedChildren > 0>> | [[Keep one less child|Slave Interact][$activeSlave.reservedChildren -= 1, $reservedChildren -= 1]] <</if>> - <<elseif ($activeSlave.reservedChildren == $activeSlave.pregType) || ($reservedChildren == ($incubator-$tanks.length))>> - [[Keep one less child|Slave Interact][$activeSlave.reservedChildren -= 1, $reservedChildren--]] + <<if $activeSlave.reservedChildren > 1>> + | [[Keep none of her children|Slave Interact][$reservedChildren -= $activeSlave.reservedChildren, $activeSlave.reservedChildren = 0]] + <</if>> + <<if ($reservedChildren + $activeSlave.pregType - $activeSlave.reservedChildren) <= $freeTanks>> + | [[Keep the rest of her children|Slave Interact][$reservedChildren += ($activeSlave.pregType - $activeSlave.reservedChildren), $activeSlave.reservedChildren += ($activeSlave.pregType - $activeSlave.reservedChildren)]] + <</if>> + <<elseif ($activeSlave.reservedChildren == $activeSlave.pregType) || ($reservedChildren == $freeTanks)>> + [[Keep one less child|Slave Interact][$activeSlave.reservedChildren -= 1, $reservedChildren -= 1]] + <<if $activeSlave.reservedChildren > 1>> + | [[Keep none of her children|Slave Interact][$reservedChildren -= $activeSlave.reservedChildren, $activeSlave.reservedChildren = 0]] + <</if>> + <</if>> + <<elseif $reservedChildren < $freeTanks>> + She is pregnant and you have <<if $freeTanks == 1>>an<</if>> @@.lime;available aging tank<<if $freeTanks > 1>>s<</if>>.@@ + <<print "[[Keep "+ (($activeSlave.pregType > 1) ? "a" : "the") +" child|Slave Interact][$activeSlave.reservedChildren += 1, $reservedChildren += 1]]">> + <<if ($activeSlave.pregType > 1) && ($reservedChildren + $activeSlave.pregType) <= $freeTanks>> + | [[Keep all of her children|Slave Interact][$reservedChildren += $activeSlave.pregType, $activeSlave.reservedChildren += $activeSlave.pregType]] <</if>> - <<elseif $reservedChildren < ($incubator-$incubatorSlaves)>> - She is pregnant and you have an available aging tank. - [[Keep a child|Slave Interact][$activeSlave.reservedChildren += 1, $reservedChildren += 1]] - <<elseif $reservedChildren == ($incubator-$incubatorSlaves)>> + <<elseif $reservedChildren == $freeTanks>> You have no available tanks for her children. <</if>> <</if>> -- GitLab