diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw index a81ea6ab44c99e3cedec3859a05c3a78b4ec8607..4edeaa68476a757be63724707df37fa443911e17 100644 --- a/src/pregmod/incubator.tw +++ b/src/pregmod/incubator.tw @@ -8,7 +8,7 @@ <<set $incubatorNameCaps = $incubatorName.replace("the ", "The ")>> <</if>> -<<set _readySlaves = 0, $readySlave = 0, $incubatorSlaves = $tanks.length, $freeTanks = $incubator - $incubatorSlaves, _SL = $slaves.length, _eligibility = 0, $reservedChildren = FetusGlobalReserveCount("incubator"), $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>> +<<set $readySlaves = 0, $readySlave = 0, $incubatorSlaves = $tanks.length, $freeTanks = $incubator - $incubatorSlaves, _SL = $slaves.length, _eligibility = 0, $reservedChildren = FetusGlobalReserveCount("incubator"), $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>> <br><br> $incubatorNameCaps is a clean, cold hall designed to be lined with tanks and their connected monitoring systems. @@ -407,7 +407,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu <</if>> <</if>> <<if $tanks[$i].growTime <= 0>> - <<set _readySlaves = 1>> + <<set $readySlaves = 1>> <br>$He is ready to be released from $his tank. <<else>> <<set _weekDisplay = Math.round($tanks[$i].growTime/$incubatorUpgradeSpeed)>> @@ -600,7 +600,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu <</if>> <</if>> -<<if _readySlaves == 1>> +<<if $readySlaves == 1>> <<if $incubatorBulkRelease == 1>> <<set $newSlavePool = []>> <<for _inc = 0; _inc < $tanks.length; _inc++>> diff --git a/src/pregmod/incubatorReport.tw b/src/pregmod/incubatorReport.tw index 0899a17ff49fe704886bb85c38073407b387011f..d536d42385496c2c12f588a6a975d18c026da744 100644 --- a/src/pregmod/incubatorReport.tw +++ b/src/pregmod/incubatorReport.tw @@ -1,6 +1,6 @@ :: Incubator Report [nobr] -<<set $incubatorSlaves = 0>> +<<set $incubatorSlaves = 0, $readySlaves = 0>> <<for _inc = 0; _inc < $tanks.length; _inc++>> <<setLocalPronouns $tanks[_inc]>> @@ -17,6 +17,7 @@ <br>@@.pink;<<print $tanks[_inc].slaveName>>'s@@ growth is currently being accelerated. $He <<if Math.round($tanks[_inc].growTime/$incubatorUpgradeSpeed) <= 0>>is @@.lime;ready for release.@@ $He will be ejected from $his tank upon your approach<<else>>will be ready for release in about <<print Math.round($tanks[_inc].growTime/$incubatorUpgradeSpeed)>> weeks<</if>>. <<else>> @@.pink;$tanks[_inc].slaveName@@ is @@.lime;ready for release.@@ $He will be ejected from $his tank upon your approach. + <<set $readySlaves = 1>> <</if>> <<if $incubatorUpgradeWeight == 1>> diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw index 207dc5f6a51229cb383078cc96494a73c1e3d377..09543a8204e625b5109290c0c550ade729ae01c3 100644 --- a/src/uncategorized/buildingWidgets.tw +++ b/src/uncategorized/buildingWidgets.tw @@ -148,7 +148,7 @@ if(!Macro.has('sectorblock')) { <<if $clinic>> <<print ClinicUIName()>> ($clinicSlaves/$clinic<<if $Nurse>>, L<</if>>)<</if>> <<if $schoolroom>> <<print SchoolRoomUIName()>> ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>> <<if $cellblock>> <<print CellblockUIName()>> ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>)<</if>> - <<if $incubator>> <<print IncubatorUIName()>> (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>)<</if>> + <<if $incubator>> <<print IncubatorUIName()>> (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>) <<if $readySlaves > 0>>@@.yellow;[!]@@<</if>> <</if>> <<if $researchLab.level > 0>>[[Prosthetic Lab]]<</if>> <</if>> </td> diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw index 6474694e04707479d7bc0fc143b90212835bb028..88fa1b49a763d085435d14aee96f1545b3bee577 100644 --- a/src/uncategorized/managePenthouse.tw +++ b/src/uncategorized/managePenthouse.tw @@ -114,7 +114,7 @@ __Penthouse Facilities__ <<if $familyTesting == 1 && $seePreg != 0>> <<if $arcologyUpgrade.grid == 1>> <<if $incubator == 0>> - [[Install an incubation chamber to rapidly age children|Manage Penthouse][cashX(forceNeg(Math.trunc(100000*$upgradeMultiplierArcology)), "capEx"), $incubator = 1, $PC.engineering += 1]] + [[Install an incubation chamber to rapidly age children|Manage Penthouse][cashX(forceNeg(Math.trunc(100000*$upgradeMultiplierArcology)), "capEx"), $incubator = 1, $PC.engineering += 1, $readySlaves = 0]] //Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology))>>// <<else>> The penthouse has a specialized facility dedicated to rapidly aging children. diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index 4cb7632c40db75d919919bafc83f02ce918401dc..1273eff2ee89b167345ed71b852085dc9c026f2e 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -605,6 +605,9 @@ <<else>> ($incubatorSlaves/$incubator) <</if>> + <<if $readySlaves > 0>> + @@.yellow;[!]@@ + <</if>> <</if>> <<if ($pit)>> <br> <<link "$pitNameCaps""Pit">><</link>>