From a990d6017ff7124c1704f93e505d75b2be9efc9d Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Sun, 7 Oct 2018 12:33:32 -0400
Subject: [PATCH] Fixes and Polishes
---
src/facilities/nursery/nursery.tw | 12 ++++++------
src/js/assignJS.tw | 2 +-
src/pregmod/widgets/assignmentFilterWidget.tw | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 427ab8a5b7a..9d9d3e027c0 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -72,7 +72,7 @@ $nurseryNameCaps
<<elseif $Matron != 0>>
$Matron.slaveName is alone in $nurseryName, and has nothing to do but keep the place clean and look after the children.
<<else>>
- $nurseryNameCaps is empty and quiet. <<link "Decommission the Nursery" "Main">><<set $nursery = 0, $nurseryNannies = 0, $nurseryDecoration = "standard", $cribs = [], $reservedChildrenNursery = 0>><<for _i = 0, _i < $slaves.length, _i++>><<set $slaves[_i].reservedChildrenNursery = 0>><</for>><</link>>
+ $nurseryNameCaps is empty and quiet. <<link "Decommission the Nursery" "Main">><<set $nursery = 0, $nurseryNannies = 0, $nurseryDecoration = "standard", $cribs = [], $reservedChildrenNursery = 0>><<for _i = 0; _i < $slaves.length; _i++>><<set $slaves[_i].reservedChildrenNursery = 0>><</for>><</link>>
<</if>>
<<if $nurserySlaves > 0>>
@@ -83,7 +83,7 @@ $nurseryNameCaps
<<= assignJob($Matron, "rest")>>
<</if>>
<<for $nurserySlaves > 0>>
- <<= assignJob($slaves[$slaveIndices[$NurseryiIDs[0]]], "nanny")>>
+ <<= assignJob($slaves[$slaveIndices[$NurseryiIDs[0]]], "rest")>>
<</for>>
<</link>>
<<if _NewPop > $dormitory>>
@@ -143,7 +143,7 @@ $nurseryNameCaps
<br>It can support $nursery child<<if $nursery > 1>>ren<</if>>. Currently $nurseryBabies rooms are in use.
<<if $nursery < 50>>
- [[Add another room|Nursery][$cash -= Math.trunc(500*$upgradeMultiplierArcology), $nursery += 5]] //Costs <<print cashFormat(Math.trunc(500*$upgradeMultiplierArcology))>> and will increase upkeep costs//
+ [[Add another room|Nursery][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $nursery += 5]] //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
<<if $freeCribs == 0>>
All of the rooms are currently occupied by growing children.
<</if>>
@@ -151,7 +151,7 @@ $nurseryNameCaps
//$nurseryNameCaps can support a maximum of 50 children//
<</if>>
<<if $nursery > 1 && $reservedChildrenNursery < $freeCribs>>
- [[Remove a room|Nursery][$cash -= Math.trunc(100*$upgradeMultiplierArcology), $nursery -= 5]] //Costs <<print cashFormat(Math.trunc(100*$upgradeMultiplierArcology))>> and will reduce upkeep costs//
+ [[Remove a room|Nursery][$cash -= Math.trunc(1000*$upgradeMultiplierArcology), $nursery -= 5]] //Costs <<print cashFormat(Math.trunc(1000*$upgradeMultiplierArcology))>> and will reduce upkeep costs//
<</if>>
<<if $nurseryBabies > 0>> /* not really sure what the best way to add in a window for the children would be */
@@ -227,7 +227,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
<<else>>
All $slaves[_u].reservedChildrenNursery of her children will be placed in $nurseryName.
<</if>>
- <<if ($slaves[_u].reservedChildren + $slaves[_u].reservedChildrenNursery < $slaves[_u].pregType) && ($reservedChildrenNursery < $freeTanks)>>
+ <<if ($slaves[_u].reservedChildren + $slaves[_u].reservedChildrenNursery < $slaves[_u].pregType) && ($reservedChildrenNursery < $freeCribs)>>
<br>
<<print "[[Keep another child|Nursery][$slaves[" + _u + "].reservedChildrenNursery += 1, $reservedChildrenNursery += 1]]">>
<<if $slaves[_u].reservedChildrenNursery > 0>>
@@ -250,7 +250,7 @@ Reserve an eligible mother-to-be's child to be placed in a room upon birth. Of $
<<if $slaves[_u].pregType - $slaves[_u].reservedChildren == 0>>
//$His children are already reserved for $incubatorName//
<br>
- <<print "[[Keep " + $his + " " + (($slaves[_u].pregType > 1) ? "children" : "child") + " here instead|Incubator][$slaves[" + _u + "].reservedChildrenNursery += $slaves[" + _u + "].pregType, $slaves[" + _u + "].reservedChildren = 0]]">>
+ <<print "[[Keep " + $his + " " + (($slaves[_u].pregType > 1) ? "children" : "child") + " here instead|Nursery][$slaves[" + _u + "].reservedChildrenNursery += $slaves[" + _u + "].pregType, $slaves[" + _u + "].reservedChildren = 0]]">>
<<else>>
You have <<if $freeCribs == 1>>an<</if>> @@.lime;available room<<if $freeCribs > 1>>s<</if>>.@@
<br>
diff --git a/src/js/assignJS.tw b/src/js/assignJS.tw
index 6132187cf48..5eef7f8e313 100644
--- a/src/js/assignJS.tw
+++ b/src/js/assignJS.tw
@@ -429,7 +429,7 @@ window.removeJob = function removeJob(slave, assignment) {
case "work as a nanny":
case "nursery":
- slave.assignment = "nanny";
+ slave.assignment = "rest";
V.NurseryiIDs.delete(slave.ID);
V.nurserySlaves--;
break;
diff --git a/src/pregmod/widgets/assignmentFilterWidget.tw b/src/pregmod/widgets/assignmentFilterWidget.tw
index 6ab787586c5..fccf033c776 100644
--- a/src/pregmod/widgets/assignmentFilterWidget.tw
+++ b/src/pregmod/widgets/assignmentFilterWidget.tw
@@ -12,7 +12,7 @@
*/
<<widget "resetAssignmentFilter">>
- <<set $slaves.map(function(y){y.assignmentVisible = 1})>><<set $slaves.filter(function(x){return x.assignment.includes("in the") || x.assignment.includes("be the") || x.assignment.includes("live with") || (x.assignment.includes("be your") && x.assignment != "be your Head Girl") || x.assignment == "work as a servant"}).map(function(y){y.assignmentVisible = 0})>>
+ <<set $slaves.map(function(y){y.assignmentVisible = 1})>><<set $slaves.filter(function(x){return x.assignment.includes("in the") || x.assignment.includes("be the") || x.assignment.includes("live with") || (x.assignment.includes("be your") && x.assignment != "be your Head Girl") || x.assignment.includes("work as a ")}).map(function(y){y.assignmentVisible = 0})>>
<</widget>>
<<widget "showallAssignmentFilter">>
--
GitLab