diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw index deb2e94389c330889440dd33bfef530cd371586c..f8c789d6f1c916eac537de5425dd533bdbe53e51 100644 --- a/src/facilities/nursery/nursery.tw +++ b/src/facilities/nursery/nursery.tw @@ -240,10 +240,11 @@ Reserve an eligible mother-to-be's child to be placed in a crib upon birth. Of $ <<elseif $reservedChildrenNursery < $freeCribs>> <<if $slaves[_u].pregType - $slaves[_u].reservedChildren == 0>> //$His children are already reserved for $incubatorName// + <<print "[[Keep "+ (($slaves[_u].pregType > 1) ? "a" : "the") +" child here instead|Nursery][$slaves[" + _u + "].reservedChildrenNursery += $slaves[" + _u + "].pregType, $slaves[" + _u + "].reservedChildren = 0">> <<else>> You have <<if $freeCribs == 1>>an<</if>> @@.lime;available crib<<if $freeCribs > 1>>s<</if>>.@@ <br> - <<print "[[Keep "+ (($slaves[_u].pregType > 1) ? "a" : "the") +" child|Nursery][$slaves[" + _u + "].reservedChildrenNursery += 1, $reservedChildrenNursery += 1]]">> + <<print "[[Keep "+ (($slaves[_u].pregType > 1) ? "a" : "the") +" child|Nursery][$slaves[" + _u + "].reservedChildrenNursery += 1">> <<if ($slaves[_u].pregType > 1) && ($reservedChildrenNursery + $slaves[_u].pregType - $slaves[_u].reservedChildrenNursery) <= $freeCribs>> | <<print "[[Keep all of her children|Nursery][$reservedChildrenNursery += $slaves["+ _u + "].pregType, $slaves[" + _u + "].reservedChildrenNursery += $slaves["+ _u +"].pregType, $slaves[" + _u + "].reservedChildren = 0]]">> <</if>> @@ -296,7 +297,7 @@ Reserve an eligible mother-to-be's child to be placed in a crib upon birth. Of $ <<else>> All $PC.reservedChildrenNursery of your children will be placed in $nurseryName. <</if>> - <<if ($PC.reservedChildrenNursery < $PC.pregType) && ($reservedChildrenNursery < $freeCribs)>> + <<if ($PC.reservedChildrenNursery < $PC.pregType) && ($reservedChildrenNursery < $freeCribs) && ($PC.reservedChildrenNursery - $PC.reservedChildren > 0)>> <br> <<print "[[Keep another child|Nursery][$PC.reservedChildrenNursery += 1, $reservedChildrenNursery += 1]]">> <<if $PC.reservedChildrenNursery > 0>> @@ -308,7 +309,7 @@ Reserve an eligible mother-to-be's child to be placed in a crib upon birth. Of $ <<if ($reservedChildrenNursery + $PC.pregType - $PC.reservedChildrenNursery) <= $freeCribs>> | <<print "[[Keep the rest of your children|Nursery][$reservedChildrenNursery += ($PC.pregType - $PC.reservedChildrenNursery), $PC.reservedChildrenNursery += ($PC.pregType - $PC.reservedChildrenNursery)]]">> <</if>> - <<elseif ($PC.reservedChildrenNursery == $PC.pregType) || ($reservedChildrenNursery == $freeCribs)>> + <<elseif ($PC.reservedChildrenNursery == $PC.pregType) || ($reservedChildrenNursery == $freeCribs) || ($PC.reservedChildrenNursery - $PC.reservedChildren >= 0)>> <br> <<print "[[Keep one less child|Nursery][$PC.reservedChildrenNursery -= 1, $reservedChildrenNursery -= 1]]">> <<if $PC.reservedChildrenNursery > 1>> @@ -316,11 +317,16 @@ Reserve an eligible mother-to-be's child to be placed in a crib upon birth. Of $ <</if>> <</if>> <<elseif $reservedChildrenNursery < $freeCribs>> - You have <<if $freeCribs == 1>>an<</if>> @@.lime;available crib<<if $freeCribs > 1>>s<</if>>.@@ - <br> - <<print "[[Keep "+ (($PC.pregType > 1) ? "a" : "your") +" child|Nursery][$PC.reservedChildrenNursery += 1, $reservedChildrenNursery += 1]]">> - <<if ($PC.pregType > 1) && ($reservedChildrenNursery + $PC.pregType - $PC.reservedChildrenNursery) <= $freeCribs>> - | <<print "[[Keep all of your children|Nursery][$reservedChildrenNursery += $PC.pregType, $PC.reservedChildrenNursery += $PC.pregType]]">> + <<if $PC.pregType - $PC.reservedChildren == 0>> + //Your child<<if $PC.pregType > 0>>ren are<<else>>is<</if>> already reserved for $incubatorName// + <<print "[[Keep "+ (($PC.pregType > 1) ? "a" : "your") +" child here instead|Nursery][$PC.reservedChildrenNursery += 1, $PC.reservedChildren = 0]]">> + <<else>> + You have <<if $freeCribs == 1>>an<</if>> @@.lime;available crib<<if $freeCribs > 1>>s<</if>>.@@ + <br> + <<print "[[Keep "+ (($PC.pregType > 1) ? "a" : "your") +" child|Nursery][$PC.reservedChildrenNursery += 1, $reservedChildrenNursery += 1]]">> + <<if ($PC.pregType > 1) && ($reservedChildrenNursery + $PC.pregType - $PC.reservedChildrenNursery) <= $freeCribs>> + | <<print "[[Keep all of your children|Nursery][$reservedChildrenNursery += $PC.pregType, $PC.reservedChildrenNursery += $PC.pregType]]">> + <</if>> <</if>> <<elseif $reservedChildrenNursery == $freeCribs>> <br> diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index e34b3e7086bb549a228cadb4f41ba58fe807ae94..cc496513b1f0527d3cdda46b2ee2688d7ecd1e55 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -123,6 +123,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <<elseif ($reservedChildren < $freeTanks)>> <<if $slaves[_u].pregType - $slaves[_u].reservedChildrenNursery == 0>> //$His children are already reserved for $nurseryName// + <<print "[[Keep "+ (($slaves[_u].pregType > 1) ? "a" : "the") +" child here instead|Incubator][$slaves[" + _u + "].reservedChildren += $slaves[" + _u + "].pregType, $slaves[" + _u + "].reservedChildrenNursery = 0">> <<else>> You have <<if $freeTanks == 1>>an<</if>> @@.lime;available aging tank<<if $freeTanks > 1>>s<</if>>.@@ <br> @@ -179,7 +180,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <<else>> All $PC.reservedChildren of your children will be placed in $incubatorName. <</if>> - <<if ($PC.reservedChildren < $PC.pregType) && ($reservedChildren < $freeTanks)>> + <<if ($PC.reservedChildren < $PC.pregType) && ($reservedChildren < $freeTanks) && ($PC.reservedChildren - $PC.reservedChildrenNursery > 0)>> <br> <<print "[[Keep another child|Incubator][$PC.reservedChildren += 1, $reservedChildren += 1]]">> <<if $PC.reservedChildren > 0>> @@ -191,7 +192,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <<if ($reservedChildren + $PC.pregType - $PC.reservedChildren) <= $freeTanks>> | <<print "[[Keep the rest of your children|Incubator][$reservedChildren += ($PC.pregType - $PC.reservedChildren), $PC.reservedChildren += ($PC.pregType - $PC.reservedChildren)]]">> <</if>> - <<elseif ($PC.reservedChildren == $PC.pregType) || ($reservedChildren == $freeTanks)>> + <<elseif ($PC.reservedChildren == $PC.pregType) || ($reservedChildren == $freeTanks) || ($PC.reservedChildren - $PC.reservedChildrenNursery >= 0)>> <br> <<print "[[Keep one less child|Incubator][$PC.reservedChildren -= 1, $reservedChildren -= 1]]">> <<if $PC.reservedChildren > 1>> @@ -199,11 +200,16 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $ <</if>> <</if>> <<elseif $reservedChildren < $freeTanks>> - You have <<if $freeTanks == 1>>an<</if>> @@.lime;available aging tank<<if $freeTanks > 1>>s<</if>>.@@ - <br> - <<print "[[Keep "+ (($PC.pregType > 1) ? "a" : "your") +" child|Incubator][$PC.reservedChildren += 1, $reservedChildren += 1]]">> - <<if ($PC.pregType > 1) && ($reservedChildren + $PC.pregType - $PC.reservedChildren) <= $freeTanks>> - | <<print "[[Keep all of your children|Incubator][$reservedChildren += $PC.pregType, $PC.reservedChildren += $PC.pregType]]">> + <<if $PC.pregType - $PC.reservedChildren == 0>> + //Your child<<if $PC.pregType > 0>>ren are<<else>>is<</if>> already reserved for $incubatorName// + <<print "[[Keep "+ (($PC.pregType > 1) ? "a" : "your") +" child here instead|Incubator][$PC.reservedChildren += 1, $PC.reservedChildrenNursery = 0]]">> + <<else>> + You have <<if $freeTanks == 1>>an<</if>> @@.lime;available aging tank<<if $freeTanks > 1>>s<</if>>.@@ + <br> + <<print "[[Keep "+ (($PC.pregType > 1) ? "a" : "your") +" child|Incubator][$PC.reservedChildren += 1, $reservedChildren += 1]]">> + <<if ($PC.pregType > 1) && ($reservedChildren + $PC.pregType - $PC.reservedChildren) <= $freeTanks>> + | <<print "[[Keep all of your children|Incubator][$reservedChildren += $PC.pregType, $PC.reservedChildren += $PC.pregType]]">> + <</if>> <</if>> <<elseif $reservedChildren == $freeTanks>> <br> diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw index b95652b9b192aae0d867e671e3b6140aae8e977d..17dd1d700434f627ce5f6d367bd6a3472d686aac 100644 --- a/src/uncategorized/managePenthouse.tw +++ b/src/uncategorized/managePenthouse.tw @@ -72,9 +72,8 @@ __Penthouse Facilities__ The penthouse includes a fully appointed spa where slaves can rest and recuperate. <</if>> -<br> - <<if $cheatMode == 1>> +<br> <<if $nursery == 0>> [[Build a nursery to raise children from birth|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $nursery = 5, $PC.engineering += 1]] @@.red;ALPHA CONTENT@@ //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//