From 62b4c9ea35c1ed5aee30da0f7e49eff0028d8ddd Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Mon, 1 Jun 2020 01:21:53 -0400
Subject: [PATCH] Added tabs to nursery, nurseryUtils bugfixes
---
src/facilities/nursery/nursery.tw | 693 +++++++++---------
.../nursery/widgets/utils/nurseryUtils.js | 42 +-
2 files changed, 376 insertions(+), 359 deletions(-)
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 81e3288defd..8df8a04c40c 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -55,7 +55,7 @@
<<case "Youth Preferentialist">>
is making young children the center of attention, their rooms supplied with plenty of toys, blankets, and surrogate mothers at their beck and call.
<<case "Body Purist">>
- is decorated to be very clean cut and sterilized with perfect corners and curves; symbolic of the human figure. Nurserymaids are encouraged to show off their natural assets to show the children what the appropriate body should be.
+ is decorated to be very clean cut and sterilized with perfect corners and curves; symbolic of the human figure. Nursery maids are encouraged to show off their natural assets to show the children what the appropriate body should be.
<<case "Slimness Enthusiast">>
constantly encourages the kids to try and keep their slim and cute physiques. They are given perfectly metered meals to make this possible. /* TODO: tie this in to food system */
<<case "Hedonistic">>
@@ -97,381 +97,398 @@
<</if>>
</p>
-
-<<set _Tmult0 = Math.trunc($nurseryNannies*1000*$upgradeMultiplierArcology)>>
-<br>It can support $nurseryNannies nann<<if $nurseryNannies != 1>>ies<<else>>y<</if>>.
-There <<if _NL == 1>>is<<else>>are<</if>> _NL nann<<if _NL != 1>>ies<<else>>y<</if>> in $nurseryName.
-<<if $nurseryBabies > 0 && _NL < 1 && (!$Matron)>>
- <div class="note">
- You must have a Matron or at least one nanny to be able to influence the children's upbringing
- </div>
-<</if>>
-<<if $nurseryNannies < 5>>
- <div class="choices">
- [[Expand the nursery|Nursery][cashX(forceNeg(_Tmult0), "capEx"), $nurseryNannies += 1, $PC.skill.engineering += .1]]
- <span class="note">
- Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs
- </span>
- </div>
-<<else>>
- <span class="note">
- $nurseryNameCaps can support a maximum of 5 slaves
- </span>
-<</if>>
-
-<div class="choices">
- <<if _NL > 0>>
- <<removeFacilityWorkers "nursery" "rest" "rest">>
- <</if>>
+<div class="tabbar">
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'nannies')" id="tab nannies">Nannies</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'pregnantSlaves')" id="tab nannies">Pregnant Slaves</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'children')" id="tab nannies">Children</button>
</div>
-<div>
- <<if $Matron>>
- <<if $MatronIgnoresFlaws != 1>>
- $Matron.slaveName will attempt to fix flaws in nannies serving under $him.
- <div class="choices">
- [[Ignore flaws|Nursery][$MatronIgnoresFlaws = 1]]
+<div id="nannies" class="tabcontent">
+ <div id="content">
+ <<set _Tmult0 = Math.trunc($nurseryNannies*1000*$upgradeMultiplierArcology)>>
+ <br>It can support $nurseryNannies nann<<if $nurseryNannies != 1>>ies<<else>>y<</if>>.
+ There <<if _NL == 1>>is<<else>>are<</if>> _NL nann<<if _NL != 1>>ies<<else>>y<</if>> in $nurseryName.
+ <<if $nurseryBabies > 0 && _NL < 1 && (!$Matron)>>
+ <div class="note">
+ You must have a Matron or at least one nanny to be able to influence the children's upbringing
</div>
- <<else>>
- $Matron.slaveName has been instructed to ignore flaws in the nannies serving under $him.
+ <</if>>
+ <<if $nurseryNannies < 5>>
<div class="choices">
- [[Fix flaws|Nursery][$MatronIgnoresFlaws = 0]]
+ [[Expand the nursery|Nursery][cashX(forceNeg(_Tmult0), "capEx"), $nurseryNannies += 1, $PC.skill.engineering += .1]]
+ <span class="note">
+ Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs
+ </span>
</div>
+ <<else>>
+ <span class="note">
+ $nurseryNameCaps can support a maximum of 5 slaves
+ </span>
<</if>>
- <</if>>
-</div>
-<p>
- <<print App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.nursery)>>
-</p>
+ <div class="choices">
+ <<if _NL > 0>>
+ <<removeFacilityWorkers "nursery" "rest" "rest">>
+ <</if>>
+ </div>
-<br><br>It can support $nursery child<<if $nursery != 1>>ren<</if>>. There <<if $nurseryBabies == 1>>is<<else>>are<</if>> currently $nurseryBabies room<<if $nurseryBabies != 1>>s<</if>> in use in $nurseryName.
-<<if $nursery < 50>>
- <div class="choices">
- [[Add another room|Nursery][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "nursery"), $nursery += 5]]
- <span class="note">
- Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>> and will increase upkeep costs
- </span>
- <<if $freeCribs == 0>>
- All of the rooms are currently occupied by growing children.
- <</if>>
- </div>
-<<else>>
- <span class="note">
- $nurseryNameCaps can support a maximum of 50 children
- </span>
-<</if>>
+ <div>
+ <<if $Matron>>
+ <<if $MatronIgnoresFlaws != 1>>
+ $Matron.slaveName will attempt to fix flaws in nannies serving under $him.
+ <div class="choices">
+ [[Ignore flaws|Nursery][$MatronIgnoresFlaws = 1]]
+ </div>
+ <<else>>
+ $Matron.slaveName has been instructed to ignore flaws in the nannies serving under $him.
+ <div class="choices">
+ [[Fix flaws|Nursery][$MatronIgnoresFlaws = 0]]
+ </div>
+ <</if>>
+ <</if>>
+ </div>
-<<if $nursery > 1 && $reservedChildrenNursery < $freeCribs>>
- <div class="choices">
- [[Remove a room|Nursery][cashX(forceNeg(Math.trunc(1000*$upgradeMultiplierArcology)), "nursery"), $nursery -= 5]]
- <span class="note">
- Costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and will reduce upkeep costs
- </span>
+ <p>
+ <<print App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.nursery)>>
+ </p>
</div>
-<</if>>
+</div>
-<br><br>
-Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $nursery rooms, <<print $freeCribs>> <<if $freeCribs == 1>>is<<else>>are<</if>> unoccupied. Of those, $reservedChildrenNursery room<<if $reservedChildrenNursery == 1>> is<<else>>s are<</if>> reserved.
+<div id="pregnantSlaves" class="tabcontent">
+ <div id="content">
+ <br><br>
+ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $nursery rooms, <<print $freeCribs>> <<if $freeCribs == 1>>is<<else>>are<</if>> unoccupied. Of those, $reservedChildrenNursery room<<if $reservedChildrenNursery == 1>> is<<else>>s are<</if>> reserved.
-<<if (0 < _SL)>>
- <<set $sortNurseryList = $sortNurseryList || 'Unsorted'>>
- <br>
- <span class="note">
- Sorting:
- </span>
- ''<span id="qlNurserySort">$sortNurseryList</span>.''
- <<link "Sort by Name">>
- <<set $sortNurseryList = 'Name'>>
- <<replace "#qlNurserySort">>$sortNurseryList<</replace>>
- <<script>>
- sortNurseryPossiblesByName();
- <</script>>
- <</link>> |
- <<link "Sort by Reserved Nursery Spots">>
- <<set $sortNurseryList = 'Reserved Nursery Spots'>>
- <<replace "#qlNurserySort">>$sortNurseryList<</replace>>
- <<script>>
- sortNurseryPossiblesByReservedSpots();
- <</script>>
- <</link>> |
- <<link "Sort by Pregnancy Week">>
- <<set $sortNurseryList = 'Pregnancy Week'>>
- <<replace "#qlNurserySort">>$sortNurseryList<</replace>>
- <<script>>
- sortNurseryPossiblesByPregnancyWeek();
- <</script>>
- <</link>> |
- <<link "Sort by Number of Children">>
- <<set $sortNurseryList = 'Number of Children'>>
- <<replace "#qlNurserySort">>$sortNurseryList<</replace>>
+ <<if (0 < _SL)>>
+ <<set $sortNurseryList = $sortNurseryList || 'Unsorted'>>
+ <br>
+ <span class="note">
+ Sorting:
+ </span>
+ ''<span id="qlNurserySort">$sortNurseryList</span>.''
+ <<link "Sort by Name">>
+ <<set $sortNurseryList = 'Name'>>
+ <<replace "#qlNurserySort">>$sortNurseryList<</replace>>
+ <<script>>
+ sortNurseryPossiblesByName();
+ <</script>>
+ <</link>> |
+ <<link "Sort by Reserved Nursery Spots">>
+ <<set $sortNurseryList = 'Reserved Nursery Spots'>>
+ <<replace "#qlNurserySort">>$sortNurseryList<</replace>>
+ <<script>>
+ sortNurseryPossiblesByReservedSpots();
+ <</script>>
+ <</link>> |
+ <<link "Sort by Pregnancy Week">>
+ <<set $sortNurseryList = 'Pregnancy Week'>>
+ <<replace "#qlNurserySort">>$sortNurseryList<</replace>>
+ <<script>>
+ sortNurseryPossiblesByPregnancyWeek();
+ <</script>>
+ <</link>> |
+ <<link "Sort by Number of Children">>
+ <<set $sortNurseryList = 'Number of Children'>>
+ <<replace "#qlNurserySort">>$sortNurseryList<</replace>>
+ <<script>>
+ sortNurseryPossiblesByPregnancyCount();
+ <</script>>
+ <</link>>
+ <br>
+ <</if>>
+ <div id="qlNursery">
+ <<for _u = 0; _u < _SL; _u++>>
+ <<setLocalPronouns $slaves[_u]>>
+ <<if $slaves[_u].preg > 0 && $slaves[_u].broodmother == 0 && $slaves[_u].pregKnown == 1 && $slaves[_u].eggType == "human">>
+ <<if $slaves[_u].assignment == "work in the dairy" && $dairyPregSetting > 0>>
+ <<else>>
+ <<set _slaveId = "slave-" + $slaves[_u].ID>>
+ <<set _WL = $slaves[_u].womb.length>>
+ <<set _reservedNursery = WombReserveCount($slaves[_u], "nursery")>>
+ <<set _reservedIncubator = WombReserveCount($slaves[_u], "incubator")>>
+ <<set _pregWeek = $slaves[_u].pregWeek>>
+ <<set _slaveName = SlaveFullName($slaves[_u])>>
+ <div class="possible" @id="_slaveId" @data-preg-count="_WL" @data-reserved-spots="_reservedNursery" @data-preg-week="_pregWeek" @data-name="_slaveName">
+ <<print "[[_slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage()]]">> is <<= numberWithPluralOne($slaves[_u].pregWeek, "week")>> 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 whose,<</if>>
+ <<elseif $slaves[_u].pregSource == -1>>your
+ <<elseif $slaves[_u].pregSource == -2>>a citizen's
+ <<elseif $slaves[_u].pregSource == -3>>your Master's
+ <<elseif $slaves[_u].pregSource == -4>>another arcology owner's
+ <<elseif $slaves[_u].pregSource == -5>>your client's
+ <<elseif $slaves[_u].pregSource == -6>>the Societal Elite's
+ <<elseif $slaves[_u].pregSource == -7>>the lab's
+ <<elseif $slaves[_u].pregSource == -9>>the Futanari Sisters'
+ <<else>>
+ <<set _t = $slaveIndices[$slaves[_u].pregSource]>>
+ <<if def _t>>
+ <<print $slaves[_t].slaveName>>'s
+ <</if>>
+ <</if>>
+ <<if _WL > 1>>_WL babies<<else>>baby<</if>>.
+ <<if _reservedNursery > 0>>
+ <<set _childrenReservedNursery = 1>>
+ <<if _WL == 1>>
+ $His child will be placed in $nurseryName.
+ <<elseif _reservedNursery < _WL>>
+ _reservedNursery of $his children will be placed in $nurseryName.
+ <<elseif _WL == 2>>
+ Both of $his children will be placed in $nurseryName.
+ <<else>>
+ All _reservedNursery of $his children will be placed in $nurseryName.
+ <</if>>
+ <<if (_reservedIncubator + _reservedNursery < _WL) && ($reservedChildrenNursery < $freeCribs)>>
+ <br>
+ <<print "[[Keep another child|Nursery][WombAddToGenericReserve($slaves[" + _u + "], 'nursery', 1)]]">>
+ <<if _reservedNursery > 0>>
+ | <<print "[[Keep one less child|Nursery][WombCleanGenericReserve($slaves[" + _u + "], 'nursery', 1)]]">>
+ <</if>>
+ <<if _reservedNursery > 1>>
+ | <<print "[[Keep none of " + $his + " children|Nursery][WombCleanGenericReserve($slaves[" + _u + "], 'nursery', 9999)]]">>
+ <</if>>
+ <<if ($reservedChildrenNursery + _WL - _reservedNursery) <= $freeCribs>>
+ | <<print "[[Keep the rest of " + $his + " children|Nursery][WombAddToGenericReserve($slaves[" + _u + "], 'nursery', 9999)]]">>
+ <</if>>
+ <<elseif (_reservedNursery == _WL) || ($reservedChildrenNursery == $freeCribs) || (_reservedIncubator + _reservedNursery == _WL)>>
+ <br>
+ <<print "[[Keep one less child|Nursery][WombCleanGenericReserve($slaves[" + _u + "], 'nursery', 1)]]">>
+ <<if _reservedNursery > 1>>
+ | <<print "[[Keep none of " + $his + " children|Nursery][WombCleanGenericReserve($slaves[" + _u + "], 'nursery', 9999)]]">>
+ <</if>>
+ <</if>>
+ <<elseif ($reservedChildrenNursery < $freeCribs) && ($freeCribs > _WL)>>
+ <<if _WL - _reservedIncubator == 0>>
+ <span class="note">
+ $His children are already reserved for $incubatorName
+ </span>
+ <br>
+ <<print "[[Keep " + $his + " " + ((_WL > 1) ? "children" : "child") + " here instead|Nursery][WombChangeReserveType($slaves[" + _u + "], 'incubator', 'nursery')]]">>
+ <<else>>
+ You have <<if $freeCribs == 1>>an<</if>> @@.lime;available room<<if $freeCribs > 1>>s<</if>>.@@
+ <br>
+ <<print "[[Keep "+ ((_WL > 1) ? "a" : "the") +" child|Nursery][WombAddToGenericReserve($slaves[" + _u + "], 'nursery', 1)]]">>
+ <<if (_WL > 1) && ($reservedChildrenNursery + _WL - _reservedNursery) <= $freeCribs>>
+ | <<print "[[Keep all of " + $his + " children|Nursery][WombAddToGenericReserve($slaves[" + _u + "], 'nursery', 9999)]]">>
+ <</if>>
+ <</if>>
+ <<elseif $reservedChildrenNursery == $freeCribs>>
+ <br>
+ You have @@.red;no room for $his offspring.@@
+ <</if>>
+ <<set _eligibility = 1>>
+ </div>
+ <</if>>
+ <</if>>
+ <</for>>
+ </div>
<<script>>
- sortNurseryPossiblesByPregnancyCount();
+ $('div#qlNursery').ready(sortNurseryPossiblesByPreviousSort);
<</script>>
- <</link>>
- <br>
-<</if>>
-<div id="qlNursery">
- <<for _u = 0; _u < _SL; _u++>>
- <<setLocalPronouns $slaves[_u]>>
- <<if $slaves[_u].preg > 0 && $slaves[_u].broodmother == 0 && $slaves[_u].pregKnown == 1 && $slaves[_u].eggType == "human">>
- <<if $slaves[_u].assignment == "work in the dairy" && $dairyPregSetting > 0>>
- <<else>>
- <<set _slaveId = "slave-" + $slaves[_u].ID>>
- <<set _WL = $slaves[_u].womb.length>>
- <<set _reservedNursery = WombReserveCount($slaves[_u], "nursery")>>
- <<set _reservedIncubator = WombReserveCount($slaves[_u], "incubator")>>
- <<set _pregWeek = $slaves[_u].pregWeek>>
- <<set _slaveName = SlaveFullName($slaves[_u])>>
- <div class="possible" @id="_slaveId" @data-preg-count="_WL" @data-reserved-spots="_reservedNursery" @data-preg-week="_pregWeek" @data-name="_slaveName">
- <<print "[[_slaveName|Long Slave Description][$activeSlave = $slaves[" + _u + "], $nextLink = passage()]]">> is <<= numberWithPluralOne($slaves[_u].pregWeek, "week")>> 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 whose,<</if>>
- <<elseif $slaves[_u].pregSource == -1>>your
- <<elseif $slaves[_u].pregSource == -2>>a citizen's
- <<elseif $slaves[_u].pregSource == -3>>your Master's
- <<elseif $slaves[_u].pregSource == -4>>another arcology owner's
- <<elseif $slaves[_u].pregSource == -5>>your client's
- <<elseif $slaves[_u].pregSource == -6>>the Societal Elite's
- <<elseif $slaves[_u].pregSource == -7>>the lab's
- <<elseif $slaves[_u].pregSource == -9>>the Futanari Sisters'
+ <<if _eligibility == 0>>
+ <div class="note">
+ You have no pregnant slaves bearing eligible children.
+ </div>
+ <</if>>
+ <<if $PC.pregKnown == 1 && ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || ($PC.pregSource != -1 && $PC.pregSource != -6))>>
+ <<set _WL = $PC.womb.length>>
+ <<set _reservedIncubator = WombReserveCount($PC, "incubator")>>
+ <<set _reservedNursery = WombReserveCount($PC, "nursery")>>
+ <br>''@@.pink;You're pregnant@@'' and going to have
+ <<if _WL == 1>>
+ a baby.
<<else>>
- <<set _t = $slaveIndices[$slaves[_u].pregSource]>>
- <<if def _t>>
- <<print $slaves[_t].slaveName>>'s
- <</if>>
+ <<print pregNumberName(_WL, 1)>>
<</if>>
- <<if _WL > 1>>_WL babies<<else>>baby<</if>>.
- <<if _reservedNursery > 0>>
- <<set _childrenReservedNursery = 1>>
- <<if _WL == 1>>
- $His child will be placed in $nurseryName.
- <<elseif _reservedNursery < _WL>>
- _reservedNursery of $his children will be placed in $nurseryName.
- <<elseif _WL == 2>>
- Both of $his children will be placed in $nurseryName.
- <<else>>
- All _reservedNursery of $his children will be placed in $nurseryName.
+ <<if _reservedNursery > 0>>
+ <<set _childrenReservedNursery = 1>>
+ <<if _WL == 1>>
+ Your child will be placed in $nurseryName.
+ <<elseif _reservedNursery < _WL>>
+ _reservedNursery of your children will be placed in $nurseryName.
+ <<elseif _WL == 2>>
+ Both of your children will be placed in $nurseryName.
+ <<else>>
+ All _reservedNursery of your children will be placed in $nurseryName.
+ <</if>>
+ <<if (_reservedNursery < _WL) && ($reservedChildrenNursery < $freeCribs) && (_reservedNursery - _reservedIncubator > 0)>>
+ <br>
+ <<print "[[Keep another child|Nursery][WombAddToGenericReserve($PC, 'nursery', 1)]]">>
+ <<if _reservedNursery > 0>>
+ | <<print "[[Keep one less child|Nursery][WombCleanGenericReserve($PC, 'nursery', 1)]]">>
<</if>>
- <<if (_reservedIncubator + _reservedNursery < _WL) && ($reservedChildrenNursery < $freeCribs)>>
- <br>
- <<print "[[Keep another child|Nursery][WombAddToGenericReserve($slaves[" + _u + "], 'nursery', 1)]]">>
- <<if _reservedNursery > 0>>
- | <<print "[[Keep one less child|Nursery][WombCleanGenericReserve($slaves[" + _u + "], 'nursery', 1)]]">>
- <</if>>
- <<if _reservedNursery > 1>>
- | <<print "[[Keep none of " + $his + " children|Nursery][WombCleanGenericReserve($slaves[" + _u + "], 'nursery', 9999)]]">>
- <</if>>
- <<if ($reservedChildrenNursery + _WL - _reservedNursery) <= $freeCribs>>
- | <<print "[[Keep the rest of " + $his + " children|Nursery][WombAddToGenericReserve($slaves[" + _u + "], 'nursery', 9999)]]">>
- <</if>>
- <<elseif (_reservedNursery == _WL) || ($reservedChildrenNursery == $freeCribs) || (_reservedIncubator + _reservedNursery == _WL)>>
- <br>
- <<print "[[Keep one less child|Nursery][WombCleanGenericReserve($slaves[" + _u + "], 'nursery', 1)]]">>
- <<if _reservedNursery > 1>>
- | <<print "[[Keep none of " + $his + " children|Nursery][WombCleanGenericReserve($slaves[" + _u + "], 'nursery', 9999)]]">>
- <</if>>
+ <<if _reservedNursery > 1>>
+ | <<print "[[Keep none of your children|Nursery][WombCleanGenericReserve($PC, 'nursery', 9999)]]">>
<</if>>
- <<elseif ($reservedChildrenNursery < $freeCribs) && ($freeCribs > _WL)>>
- <<if _WL - _reservedIncubator == 0>>
- <span class="note">
- $His children are already reserved for $incubatorName
- </span>
- <br>
- <<print "[[Keep " + $his + " " + ((_WL > 1) ? "children" : "child") + " here instead|Nursery][WombChangeReserveType($slaves[" + _u + "], 'incubator', 'nursery')]]">>
- <<else>>
- You have <<if $freeCribs == 1>>an<</if>> @@.lime;available room<<if $freeCribs > 1>>s<</if>>.@@
- <br>
- <<print "[[Keep "+ ((_WL > 1) ? "a" : "the") +" child|Nursery][WombAddToGenericReserve($slaves[" + _u + "], 'nursery', 1)]]">>
- <<if (_WL > 1) && ($reservedChildrenNursery + _WL - _reservedNursery) <= $freeCribs>>
- | <<print "[[Keep all of " + $his + " children|Nursery][WombAddToGenericReserve($slaves[" + _u + "], 'nursery', 9999)]]">>
- <</if>>
+ <<if ($reservedChildrenNursery + _WL - _reservedNursery) <= $freeCribs>>
+ | <<print "[[Keep the rest of your children|Nursery][WombAddGenericReserve($PC, 'nursery', 9999)]]">>
<</if>>
- <<elseif $reservedChildrenNursery == $freeCribs>>
+ <<elseif (_reservedNursery == _WL) || ($reservedChildrenNursery == $freeCribs) || (_reservedNursery - _reservedIncubator >= 0)>>
<br>
- You have @@.red;no room for $his offspring.@@
+ <<print "[[Keep one less child|Nursery][WombCleanGenericReserve($PC, 'nursery', 1)]]">>
+ <<if _reservedNursery > 1>>
+ | <<print "[[Keep none of your children|Nursery][WombCleanGenericReserve($PC, 'nursery', 9999)]]">>
+ <</if>>
<</if>>
- <<set _eligibility = 1>>
- </div>
+ <<elseif $reservedChildrenNursery < $freeCribs>>
+ <<if _WL - _reservedIncubator == 0>>
+ <span class="note">
+ Your child<<if _WL > 0>>ren are<<else>>is<</if>> already reserved for $incubatorName
+ </span>
+ <<print "[[Keep your "+ ((_WL > 1) ? "children" : "child") +" here instead|Nursery][WombChangeReserveType($PC, 'incubator', 'nursery')]]">>
+ <<else>>
+ You have <<if $freeCribs == 1>>an<</if>> @@.lime;available room<<if $freeCribs > 1>>s<</if>>.@@
+ <br>
+ <<print "[[Keep "+ ((_WL > 1) ? "a" : "your") +" child|Nursery][WombAddToGenericReserve($PC, 'nursery', 1)]]">>
+ <<if (_WL > 1) && ($reservedChildrenNursery + _WL - _reservedNursery) <= $freeCribs>>
+ | [[Keep all of your children|Nursery][WombAddToGenericReserve($PC, 'nursery', 9999)]]
+ <</if>>
+ <</if>>
+ <<elseif $reservedChildrenNursery == $freeCribs>>
+ <br>
+ You have @@.red;no room for your offspring.@@
<</if>>
<</if>>
- <</for>>
-</div>
-<<script>>
- $('div#qlNursery').ready(sortNurseryPossiblesByPreviousSort);
-<</script>>
-<<if _eligibility == 0>>
- <div class="note">
- You have no pregnant slaves bearing eligible children.
+ <<if $reservedChildrenNursery || _childrenReservedNursery == 1>> /* the oops I made it go negative somehow button */
+ <br>
+ <<link "Clear all reserved children">>
+ <<for _u = 0; _u < _SL; _u++>>
+ <<run WombCleanGenericReserve($slaves[_u], "nursery", 9999)>>
+ <</for>>
+ <<run WombCleanGenericReserve($PC, "nursery", 9999)>>
+ <<goto "Nursery">>
+ <</link>>
+ <</if>>
</div>
-<</if>>
-<<if $PC.pregKnown == 1 && ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || ($PC.pregSource != -1 && $PC.pregSource != -6))>>
- <<set _WL = $PC.womb.length>>
- <<set _reservedIncubator = WombReserveCount($PC, "incubator")>>
- <<set _reservedNursery = WombReserveCount($PC, "nursery")>>
- <br>''@@.pink;You're pregnant@@'' and going to have
- <<if _WL == 1>>
- a baby.
+</div>
+
+<div id="children" class="tabcontent">
+ <div id="content">
+ <p>
+ Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery">>
+ [[Minimum Legal Age|Nursery][$targetAgeNursery = $minimumSlaveAge]] |
+ [[Average Age of Fertility|Nursery][$targetAgeNursery = $fertilityAge]] |
+ [[Average Age of Potency|Nursery][$targetAgeNursery = $potencyAge]] |
+ [[Legal Adulthood|Nursery][$targetAgeNursery = 18]]
+ <span class="note">
+ Setting will not be applied to rooms in use.
+ </span>
+ </p>
+
+ <br><br>It can support $nursery child<<if $nursery != 1>>ren<</if>>. There <<if $nurseryBabies == 1>>is<<else>>are<</if>> currently $nurseryBabies room<<if $nurseryBabies != 1>>s<</if>> in use in $nurseryName.
+ <<if $nursery < 50>>
+ <div class="choices">
+ [[Add another room|Nursery][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "nursery"), $nursery += 5]]
+ <span class="note">
+ Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>> and will increase upkeep costs
+ </span>
+ <<if $freeCribs == 0>>
+ All of the rooms are currently occupied by growing children.
+ <</if>>
+ </div>
<<else>>
- <<print pregNumberName(_WL, 1)>>
+ <span class="note">
+ $nurseryNameCaps can support a maximum of 50 children
+ </span>
<</if>>
- <<if _reservedNursery > 0>>
- <<set _childrenReservedNursery = 1>>
- <<if _WL == 1>>
- Your child will be placed in $nurseryName.
- <<elseif _reservedNursery < _WL>>
- _reservedNursery of your children will be placed in $nurseryName.
- <<elseif _WL == 2>>
- Both of your children will be placed in $nurseryName.
- <<else>>
- All _reservedNursery of your children will be placed in $nurseryName.
+
+ <<if $nursery > 1 && $reservedChildrenNursery < $freeCribs>>
+ <div class="choices">
+ [[Remove a room|Nursery][cashX(forceNeg(Math.trunc(1000*$upgradeMultiplierArcology)), "nursery"), $nursery -= 5]]
+ <span class="note">
+ Costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and will reduce upkeep costs
+ </span>
+ </div>
<</if>>
- <<if (_reservedNursery < _WL) && ($reservedChildrenNursery < $freeCribs) && (_reservedNursery - _reservedIncubator > 0)>>
- <br>
- <<print "[[Keep another child|Nursery][WombAddToGenericReserve($PC, 'nursery', 1)]]">>
- <<if _reservedNursery > 0>>
- | <<print "[[Keep one less child|Nursery][WombCleanGenericReserve($PC, 'nursery', 1)]]">>
- <</if>>
- <<if _reservedNursery > 1>>
- | <<print "[[Keep none of your children|Nursery][WombCleanGenericReserve($PC, 'nursery', 9999)]]">>
- <</if>>
- <<if ($reservedChildrenNursery + _WL - _reservedNursery) <= $freeCribs>>
- | <<print "[[Keep the rest of your children|Nursery][WombAddGenericReserve($PC, 'nursery', 9999)]]">>
- <</if>>
- <<elseif (_reservedNursery == _WL) || ($reservedChildrenNursery == $freeCribs) || (_reservedNursery - _reservedIncubator >= 0)>>
- <br>
- <<print "[[Keep one less child|Nursery][WombCleanGenericReserve($PC, 'nursery', 1)]]">>
- <<if _reservedNursery > 1>>
- | <<print "[[Keep none of your children|Nursery][WombCleanGenericReserve($PC, 'nursery', 9999)]]">>
+
+ <h3>Rules</h3>
+ <hr style="margin:0">
+ <<if $extremeUnderage>>
+ <<if $nurserySex>>
+ $nurseryNameCaps staff are ''allowed'' to molest the children. [[Forbid|Nursery][$nurserySex = 0]]
+ <<else>>
+ $nurseryNameCaps staff are ''not allowed'' to molest the children. [[Allow|Nursery][$nurserySex = 1]]
<</if>>
<</if>>
- <<elseif $reservedChildrenNursery < $freeCribs>>
- <<if _WL - _reservedIncubator == 0>>
+ <br>
+
+ <<if $nurseryWeight>>
+ <<if $nurseryWeightSetting>>
+ Food intake ''is'' being managed; children will be raised at a healthy weight.
+ [[End managing|Nursery][$nurseryWeightSetting = 0]]
+ <<else>>
+ Food intake ''is not'' being managed; children may end up malnourished.
+ [[Begin managing|Nursery][$nurseryWeightSetting = 1]]
+ <</if>>
+ <<else>>
+ The amount of food the children eat ''is not'' being monitored, meaning they may end up becoming malnourished.
+ [[Monitor the amount of food the children eat|Nursery][cashX(forceNeg(Math.trunc(1000*$upgradeMultiplierArcology)), "nursery"), $nurseryWeight = 1]]
<span class="note">
- Your child<<if _WL > 0>>ren are<<else>>is<</if>> already reserved for $incubatorName
+ Requires a Matron or at least one nanny and costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and will increase upkeep costs
</span>
- <<print "[[Keep your "+ ((_WL > 1) ? "children" : "child") +" here instead|Nursery][WombChangeReserveType($PC, 'incubator', 'nursery')]]">>
- <<else>>
- You have <<if $freeCribs == 1>>an<</if>> @@.lime;available room<<if $freeCribs > 1>>s<</if>>.@@
- <br>
- <<print "[[Keep "+ ((_WL > 1) ? "a" : "your") +" child|Nursery][WombAddToGenericReserve($PC, 'nursery', 1)]]">>
- <<if (_WL > 1) && ($reservedChildrenNursery + _WL - _reservedNursery) <= $freeCribs>>
- | [[Keep all of your children|Nursery][WombAddToGenericReserve($PC, 'nursery', 9999)]]
- <</if>>
<</if>>
- <<elseif $reservedChildrenNursery == $freeCribs>>
- <br>
- You have @@.red;no room for your offspring.@@
- <</if>>
-<</if>>
-<<if $reservedChildrenNursery || _childrenReservedNursery == 1>> /* the oops I made it go negative somehow button */
- <br>
- <<link "Clear all reserved children">>
- <<for _u = 0; _u < _SL; _u++>>
- <<run WombCleanGenericReserve($slaves[_u], "nursery", 9999)>>
- <</for>>
- <<run WombCleanGenericReserve($PC, "nursery", 9999)>>
- <<goto "Nursery">>
- <</link>>
-<</if>>
+ <br>
-<p>
- Target age for release: <<textbox "$targetAgeNursery" $targetAgeNursery "Nursery">>
- [[Minimum Legal Age|Nursery][$targetAgeNursery = $minimumSlaveAge]] |
- [[Average Age of Fertility|Nursery][$targetAgeNursery = $fertilityAge]] |
- [[Average Age of Potency|Nursery][$targetAgeNursery = $potencyAge]] |
- [[Legal Adulthood|Nursery][$targetAgeNursery = 18]]
- <span class="note">
- Setting will not be applied to rooms in use.
- </span>
-</p>
+ <<if $nurseryMuscles>>
+ <<if $nurseryMusclesSetting>>
+ Exercise ''is'' being managed; children will be raised with average fitness.
+ [[End managing|Nursery][$nurseryMusclesSetting = 0]]
+ <<else>>
+ Children ''are not'' getting any exercise; they may end up quite weak and frail.
+ [[Begin managing|Nursery][$nurseryMusclesSetting = 1]]
+ <</if>>
+ <<else>>
+ The children ''are not'' getting any exercise, meaning they will likely end up becoming fairly weak and frail.
+ [[Allow the children to remain active|Nursery][cashX(forceNeg(Math.trunc(1000*$upgradeMultiplierArcology)), "nursery"), $nurseryMuscles = 1]]
+ <span class="note">
+ Requires a Matron or at least one nanny and costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and will increase upkeep costs
+ </span>
+ <</if>>
+ <br>
-<b>Rules</b>
-<hr style="margin:0">
-<<if $extremeUnderage>>
- <<if $nurserySex>>
- $nurseryNameCaps staff are ''allowed'' to molest the children. [[Forbid|Nursery][$nurserySex = 0]]
- <<else>>
- $nurseryNameCaps staff are ''not allowed'' to molest the children. [[Allow|Nursery][$nurserySex = 1]]
- <</if>>
-<</if>>
-<br>
+ <<if $nurseryUpgradeHormones>>
+ <<if $nurseryHormonesSetting>>
+ Artificial hormone levels ''are'' being managed; children may experience precocious puberty.
+ [[Disable|Nursery][$nurseryHormonesSetting = 0]]
+ <<else>>
+ Artificial hormones ''are not'' being given; children will undergo normal puberty.
+ [[Activate|Nursery][$nurseryHormonesSetting = 1]]
+ <</if>>
+ <<else>>
+ The children ''are not'' being given any artificial hormones.
+ [[Give the children growth hormones|Nursery][cashX(forceNeg(Math.trunc(1000*$upgradeMultiplierArcology)), "nursery"), $nurseryUpgradeHormones = 1, $nurseryHormonesSetting = 0]]
+ <span class="note">
+ Requires a Matron or at least one nanny and costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and will increase upkeep costs
+ </span>
+ <</if>>
+ <br>
-<<if $nurseryWeight>>
- <<if $nurseryWeightSetting>>
- Food intake ''is'' being managed; children will be raised at a healthy weight.
- [[End managing|Nursery][$nurseryWeightSetting = 0]]
- <<else>>
- Food intake ''is not'' being managed; children may end up malnourished.
- [[Begin managing|Nursery][$nurseryWeightSetting = 1]]
- <</if>>
-<<else>>
- The amount of food the children eat ''is not'' being monitored, meaning they may end up becoming malnourished.
- [[Monitor the amount of food the children eat|Nursery][cashX(forceNeg(Math.trunc(1000*$upgradeMultiplierArcology)), "nursery"), $nurseryWeight = 1]]
- <span class="note">
- Requires a Matron or at least one nanny and costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and will increase upkeep costs
- </span>
-<</if>>
-<br>
+ <<if $nurseryBabies > 0>>
+ <h3>
+ Children in $nurseryName
+ </h3>
-<<if $nurseryMuscles>>
- <<if $nurseryMusclesSetting>>
- Exercise ''is'' being managed; children will be raised with average fitness.
- [[End managing|Nursery][$nurseryMusclesSetting = 0]]
- <<else>>
- Children ''are not'' getting any exercise; they may end up quite weak and frail.
- [[Begin managing|Nursery][$nurseryMusclesSetting = 1]]
- <</if>>
-<<else>>
- The children ''are not'' getting any exercise, meaning they will likely end up becoming fairly weak and frail.
- [[Allow the children to remain active|Nursery][cashX(forceNeg(Math.trunc(1000*$upgradeMultiplierArcology)), "nursery"), $nurseryMuscles = 1]]
- <span class="note">
- Requires a Matron or at least one nanny and costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and will increase upkeep costs
- </span>
-<</if>>
-<br>
-
-<<if $nurseryUpgradeHormones>>
- <<if $nurseryHormonesSetting>>
- Artificial hormone levels ''are'' being managed; children may experience precocious puberty.
- [[Disable|Nursery][$nurseryHormonesSetting = 0]]
- <<else>>
- Artificial hormones ''are not'' being given; children will undergo normal puberty.
- [[Activate|Nursery][$nurseryHormonesSetting = 1]]
- <</if>>
-<<else>>
- The children ''are not'' being given any artificial hormones.
- [[Give the children growth hormones|Nursery][cashX(forceNeg(Math.trunc(1000*$upgradeMultiplierArcology)), "nursery"), $nurseryUpgradeHormones = 1, $nurseryHormonesSetting = 0]]
- <span class="note">
- Requires a Matron or at least one nanny and costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and will increase upkeep costs
- </span>
-<</if>>
-<br>
+ <<= App.Facilities.Nursery.childList()>>
+ <</if>>
-<<if $nurseryBabies > 0>>
- <div style="font-weight:bold">
- Children in $nurseryName
+ /*
+ FIXME: not sure if this works
+ <<set $newSlavePool = []>>
+ <<for _nur = 0; _nur < $cribs.length; _nur++>>
+ <<if $cribs[_nur].growTime <= 0>>
+ <<set $nurseryOldID = $cribs[_nur].ID>> /* single slave case *//*
+ <<set _tempObject = {object: $cribs[_nur], ID: $cribs[_nur].ID}>>
+ <<set $newSlavePool.push(clone(_tempObject))>>
+ <<run $cribs.splice(_nur, 1)>>
+ <<set _nur-->>
+ <</if>>
+ <</for>>
+ <<if $newSlavePool.length == 1>>
+ <<set $readySlave = $newSlavePool[0].object>>
+ <<set $newSlavePool = 0>>
+ <</if>>
+ */
</div>
-
- <<= App.Facilities.Nursery.childList()>>
-<</if>>
-
-/*
-FIXME: not sure if this works
-<<set $newSlavePool = []>>
-<<for _nur = 0; _nur < $cribs.length; _nur++>>
- <<if $cribs[_nur].growTime <= 0>>
- <<set $nurseryOldID = $cribs[_nur].ID>> /* single slave case *//*
- <<set _tempObject = {object: $cribs[_nur], ID: $cribs[_nur].ID}>>
- <<set $newSlavePool.push(clone(_tempObject))>>
- <<run $cribs.splice(_nur, 1)>>
- <<set _nur-->>
- <</if>>
-<</for>>
-<<if $newSlavePool.length == 1>>
- <<set $readySlave = $newSlavePool[0].object>>
- <<set $newSlavePool = 0>>
-<</if>>
-*/
+</div>
<p>
Rename $nurseryName: <<textbox "$nurseryName" $nurseryName "Nursery">>
diff --git a/src/facilities/nursery/widgets/utils/nurseryUtils.js b/src/facilities/nursery/widgets/utils/nurseryUtils.js
index 2d0c5df4ebb..1024be2a255 100644
--- a/src/facilities/nursery/widgets/utils/nurseryUtils.js
+++ b/src/facilities/nursery/widgets/utils/nurseryUtils.js
@@ -468,7 +468,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
child.slaveName = setup.chattelReligionistSlaveNames.random();
child.birthName = child.slaveName;
- `${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
+ r += `${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
<</replace>>
<</link>>`;
}
@@ -478,7 +478,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
child.slaveName = setup.romanSlaveNames.random();
child.birthName = child.slaveName;
- `${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
+ r += `${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
<</replace>>
<</link>>`;
} else if (arcology.FSAztecRevivalist !== "unset") {
@@ -487,7 +487,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
child.slaveName = setup.aztecSlaveNames.random();
child.birthName = child.slaveName;
- `${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
+ r += `${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
<</replace>>
<</link>>`;
} else if (arcology.FSEgyptianRevivalist !== "unset") {
@@ -496,7 +496,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
child.slaveName = setup.ancientEgyptianSlaveNames.random();
child.birthName = child.slaveName;
- `${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
+ r += `${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
<</replace>>
<</link>>`;
} else if (arcology.FSEdoRevivalist !== "unset") {
@@ -505,7 +505,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
child.slaveName = setup.edoSlaveNames.random();
child.birthName = child.slaveName;
- `${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
+ r += `${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
<</replace>>
<</link>>`;
}
@@ -515,7 +515,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
DegradingName(child);
child.birthName = child.slaveName;
- `${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
+ r += `${V.assistant.name} registers the new ${girl} as "${child.slaveName}" in your registry.
<</replace>>
<</link>>`;
}
@@ -527,7 +527,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
parentNames(mother, child);
child.birthName = child.slaveName;
- `After some careful consideration, ${mother.slaveName} picks a name ${he2} thinks you might find attractive; from now on ${his2} daughter will be known as "${child.slaveName}".
+ r += `After some careful consideration, ${mother.slaveName} picks a name ${he2} thinks you might find attractive; from now on ${his2} daughter will be known as "${child.slaveName}".
<</replace>>
<</link>>`;
} else if (mother.relationship === -3 && mother.devotion >= -20) {
@@ -536,7 +536,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
parentNames(mother, child);
child.birthName = child.slaveName;
- `After some careful consideration, ${mother.slaveName} picks a name suitable for your daughter; from now on ${he2} will be known as "${child.slaveName}".
+ r += `After some careful consideration, ${mother.slaveName} picks a name suitable for your daughter; from now on ${he2} will be known as "${child.slaveName}".
<</replace>>
<</link>>`;
} else if (jsDef(V.Bodyguard) && mother.ID === V.Bodyguard.ID) {
@@ -545,7 +545,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
parentNames(mother, child);
child.birthName = child.slaveName;
- `After some careful consideration, ${mother.slaveName} decides on "${child.slaveName}" for ${his2} daughter. ${He2} hopes you'll find it fitting ${his} station.
+ r += `After some careful consideration, ${mother.slaveName} decides on "${child.slaveName}" for ${his2} daughter. ${He2} hopes you'll find it fitting ${his} station.
<</replace>>
<</link>>`;
} else if (jsDef(V.Headgirl) && mother.ID === V.Headgirl.ID) {
@@ -554,7 +554,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
parentNames(mother, child);
child.birthName = child.slaveName;
- `After some careful consideration, ${mother.slaveName} decides on "${child.slaveName}" for ${his2} daughter, and hopes it will be a name your other slaves will learn to respect.
+ r += `After some careful consideration, ${mother.slaveName} decides on "${child.slaveName}" for ${his2} daughter, and hopes it will be a name your other slaves will learn to respect.
<</replace>>
<</link>>`;
} else if (mother.devotion > 50 && mother.trust > 50) {
@@ -563,7 +563,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
parentNames(mother, child);
child.birthName = child.slaveName;
- `After some careful consideration, ${mother.slaveName} picks a name ${he2} hopes you'll like; from now on ${his2} daughter will be known as "${child.slaveName}".
+ r += `After some careful consideration, ${mother.slaveName} picks a name ${he2} hopes you'll like; from now on ${his2} daughter will be known as "${child.slaveName}".
<</replace>>
<</link>>`;
}
@@ -576,7 +576,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
parentNames(father, child);
child.birthName = child.slaveName;
- `After some careful consideration, ${father.slaveName} picks a name ${he2} thinks you might find attractive; from now on ${his2} daughter will be known as "${child.slaveName}".
+ r += `After some careful consideration, ${father.slaveName} picks a name ${he2} thinks you might find attractive; from now on ${his2} daughter will be known as "${child.slaveName}".
<</replace>>
<</link>>`;
} else if (father.relationship === -3 && father.devotion >= -20) {
@@ -585,7 +585,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
parentNames(father, child);
child.birthName = child.slaveName;
- `After some careful consideration, ${father.slaveName} picks a name suitable for your daughter; from now on ${he} will be known as "${child.slaveName}".
+ r += `After some careful consideration, ${father.slaveName} picks a name suitable for your daughter; from now on ${he} will be known as "${child.slaveName}".
<</replace>>
<</link>>`;
} else if (jsDef(V.Bodyguard) && father.ID === V.Bodyguard.ID) {
@@ -594,7 +594,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
parentNames(father, child);
child.birthName = child.slaveName;
- `After some careful consideration, ${father.slaveName} decides on "${child.slaveName}" for ${his2} daughter. ${He2} hopes you'll find it fitting ${his} station.
+ r += `After some careful consideration, ${father.slaveName} decides on "${child.slaveName}" for ${his2} daughter. ${He2} hopes you'll find it fitting ${his} station.
<</replace>>
<</link>>`;
} else if (jsDef(V.Headgirl) && father.ID === V.Headgirl.ID) {
@@ -603,7 +603,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
parentNames(father, child);
child.birthName = child.slaveName;
- `After some careful consideration, ${father.slaveName} decides on "${child.slaveName}" for ${his2} daughter, and hopes it will be a name your other slaves will learn to respect.
+ r += `After some careful consideration, ${father.slaveName} decides on "${child.slaveName}" for ${his2} daughter, and hopes it will be a name your other slaves will learn to respect.
<</replace>>
<</link>>`;
} else if (father.devotion > 50 && father.trust > 50) {
@@ -612,7 +612,7 @@ App.Facilities.Nursery.nameChild = function nameChild(child) {
<<replace "#naming">>`;
parentNames(father, child);
child.birthName = child.slaveName;
- `After some careful consideration, ${father.slaveName} picks a name ${he2} hopes you'll like; from now on ${his2} daughter will be known as "${child.slaveName}".
+ r += `After some careful consideration, ${father.slaveName} picks a name ${he2} hopes you'll like; from now on ${his2} daughter will be known as "${child.slaveName}".
<</replace>>
<</link>>`;
}
@@ -729,12 +729,12 @@ App.Facilities.Nursery.nurserySort = function nurserySort() {
r = ``,
eligibility = 0,
sortNurseryList = V.sortNurseryList || "Unsorted",
- childrenReservedNursery = false, // TODO: rename this to avoid confusion
+ nurseryHasReservedChildren = false,
reservedChildrenNursery = FetusGlobalReserveCount("nursery");
r += `<br><i>Sorting:</i> <b><span id="qlNurserySort">${sortNurseryList}</span>.</b> `;
r += `${App.UI.passageLink("Sort by Name", "Nursery", `${sortNurseryList = "Name"}, ${App.UI.replace(`#qlNurserySort`, sortNurseryList)}, ${byName()}`)} | `;
- r += `${App.UI.passageLink("Sort by Reserved Nursery Spots", "Nursery", `${sortNurseryList = "Reserved Nursery Spots"}, ${App.UI.replace(`#qlNurserySort`), sortNurseryList}, ${byReservedSpots()}`)} | `;
+ r += `${App.UI.passageLink("Sort by Reserved Nursery Spots", "Nursery", `${sortNurseryList = "Reserved Nursery Spots"}, ${App.UI.replace(`#qlNurserySort`)} ${sortNurseryList}, ${byReservedSpots()}`)} | `;
r += `${App.UI.passageLink("Sort by Pregnancy Week", "Nursery", `${sortNurseryList = "Pregnancy Week"}, ${App.UI.replace(`#qlNurserySort`, sortNurseryList)}, ${byPregnancyWeek()}`)} | `;
r += `${App.UI.passageLink("Sort by Number of Children", "Nursery", `${sortNurseryList = "Number of Children"}, ${App.UI.replace(`#qlNurserySort`, sortNurseryList)}, ${byPregnancyCount()}`)}`;
r += `<br>`;
@@ -802,7 +802,7 @@ App.Facilities.Nursery.nurserySort = function nurserySort() {
r += ` ${WL > 1 ? `babies` : `baby`}. `;
if (reservedNursery > 0) {
- childrenReservedNursery = true;
+ nurseryHasReservedChildren = true;
if (WL === 1) {
r += `${His} child will be placed in ${V.nurseryName}. `;
} else if (reservedNursery < WL) {
@@ -876,7 +876,7 @@ App.Facilities.Nursery.nurserySort = function nurserySort() {
r += `<br><b><span class="pink">You're pregnant</span></b> and going to have ${WL === 1 ? `a baby. ` : pregNumberName(WL, 1)} `;
if (reservedNursery > 0) {
- childrenReservedNursery = 1;
+ nurseryHasReservedChildren = 1;
if (WL === 1) {
r += `Your child will be placed in ${V.nurseryName}.`;
} else if (reservedNursery < WL) {
@@ -926,7 +926,7 @@ App.Facilities.Nursery.nurserySort = function nurserySort() {
}
}
- if (reservedChildrenNursery || childrenReservedNursery) {
+ if (reservedChildrenNursery || nurseryHasReservedChildren) {
r += `<br>`;
r += App.UI.passageLink("Clear all reserved children", "Nursery", `${V.slaves.forEach(WombCleanGenericReserve(slave, "nursery", 9999))}, ${WombCleanGenericReserve(PC, "nursery", 9999)}`);
}
--
GitLab