From 77708f1d4d883810034e85075af319a1ea99aab4 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Fri, 5 Oct 2018 21:34:41 -0400
Subject: [PATCH] Misc changes
---
src/facilities/nursery/nursery.tw | 13 +++++++++----
src/pregmod/incubator.tw | 8 ++++----
src/uncategorized/futureSociety.tw | 6 ------
src/uncategorized/managePenthouse.tw | 2 +-
src/utility/miscWidgets.tw | 1 -
5 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 4cc51c02814..0f395183829 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -91,7 +91,12 @@ $nurseryNameCaps
<</if>>
<</if>>
-<br>It can support $nurseryNannies nannies. Currently there <<if $nurserySlaves == 1>>is<<else>>are<</if>> $nurserySlaves nann<<if $nurserySlaves != 1>>ies<<else>>y<</if>> at $nurseryName. //$nurseryNameCaps can support a maximum of 5 slaves//
+<br>It can support $nurseryNannies nannies. Currently there <<if $nurserySlaves == 1>>is<<else>>are<</if>> $nurserySlaves nann<<if $nurserySlaves != 1>>ies<<else>>y<</if>> at $nurseryName.
+<<if $nurseryNannies < 5>>
+ [[Expand the nursery|Nursery][$cash -= 1000*$upgradeMultiplierArcology, $nurseryNannies += 1]] //Costs <<print cashFormat(1000*$upgradeMultiplierArcology)>>//
+<<else>>
+ //$nurseryNameCaps can support a maximum of 5 slaves//
+<</if>>
<br><br>
<<if $Matron != 0>>
@@ -244,9 +249,9 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
<<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">>
+ <<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]]">>
+ | <<print "[[Keep all of " + $his + " children|Nursery][$reservedChildrenNursery += $slaves["+ _u + "].pregType, $slaves[" + _u + "].reservedChildrenNursery += $slaves["+ _u +"].pregType, $slaves[" + _u + "].reservedChildren = 0]]">>
<</if>>
<</if>>
<<elseif $reservedChildrenNursery == $freeCribs>>
@@ -325,7 +330,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
<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]]">>
+ | [[Keep all of your children|Nursery][$reservedChildrenNursery += $PC.pregType, $PC.reservedChildrenNursery += $PC.pregType]]
<</if>>
<</if>>
<<elseif $reservedChildrenNursery == $freeCribs>>
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index cc496513b1f..b752ba2dc86 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -123,13 +123,13 @@ 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">>
+ <<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>
<<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, $slaves[" + _u + "].reservedChildrenNursery = 0]]">>
+ | <<print "[[Keep all of " + $his + " children|Incubator][$reservedChildren += $slaves["+ _u + "].pregType, $slaves[" + _u + "].reservedChildren += $slaves["+ _u +"].pregType, $slaves[" + _u + "].reservedChildrenNursery = 0]]">>
<</if>>
<</if>>
<<elseif $reservedChildren == $freeTanks>>
@@ -202,13 +202,13 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
<<elseif $reservedChildren < $freeTanks>>
<<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]]">>
+ <<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]]">>
+ | [[Keep all of your children|Incubator][$reservedChildren += $PC.pregType, $PC.reservedChildren += $PC.pregType]]
<</if>>
<</if>>
<<elseif $reservedChildren == $freeTanks>>
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index c76e8ab71a3..af3c7bf344b 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -1224,9 +1224,3 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<br>$masterSuiteNameCaps is decorated in $masterSuiteDecoration style.
<<SetFacilityDecoration "masterSuiteDecoration">>
<</if>>
-
-<<if $nursery > 0>>
-<<run ValidateFacilityDecoration("nurseryDecoration")>>
-<br>$nurseryNameCaps is decorated in $nurseryDecoration style.
-<<SetFacilityDecoration "nurseryDecoration">>
-<</if>>
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index 17dd1d70043..f4e83c4c8f0 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -75,7 +75,7 @@ __Penthouse Facilities__
<<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@@
+ [[Build a nursery to raise children from birth|Manage Penthouse][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $nursery = 5, $nurseryNannies = 1, $PC.engineering += 1]] @@.red;ALPHA CONTENT@@
//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
<<else>>
The penthouse has a nursery built where infants can be brought up.
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index c0cf5aa6f68..7329f043eb6 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -829,7 +829,6 @@ This experience
<<if $servantsQuarters > 0>><<run ValidateFacilityDecoration("servantsQuartersDecoration")>><</if>>
<<if $arcade > 0>><<run ValidateFacilityDecoration("arcadeDecoration")>><</if>>
<<if $masterSuite > 0>><<run ValidateFacilityDecoration("masterSuiteDecoration")>><</if>>
-<<if $nursery > 0>><<run ValidateFacilityDecoration("nurseryDecoration")>><</if>>
<</widget>>
--
GitLab