From f21d4a2330bc12e00eab74d0a4cea50c0289ca1a Mon Sep 17 00:00:00 2001
From: j <okp57855@psoxs.com>
Date: Fri, 29 Dec 2017 20:54:14 +1300
Subject: [PATCH] Add missing facility and HG checks.
---
src/pregmod/incubator.tw | 2 +-
src/uncategorized/buildingWidgets.tw | 2 +-
src/uncategorized/storyCaption.tw | 13 ++++++-------
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 9657b8fe632..e1943b2a98e 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -21,7 +21,7 @@ $incubatorNameCaps is a clean, cold hall designed to be lined with tanks and the
It's empty and quiet. [[Decommission the incubator|Main][$incubator = 0, $incubatorUpgradeSpeed = 5, $incubatorUpgradeWeight = 0, $incubatorUpgradeMuscles = 0, $incubatorUpgradeReproduction = 0, $incubatorUpgradeGrowthStims = 0, $incubatorWeightSetting = 0, $incubatorMusclesSetting = 0, $incubatorReproductionSetting = 0, $incubatorGrowthStimsSetting = 0, $tanks = []]]
<</if>>
-<br>It can support $incubatorSlaves/$incubator <<if $incubator == 1>>child<<else>>children<</if>>.
+<br>It can support $incubator <<if $incubator == 1>>child<<else>>children<</if>>. Currently $incubatorSlaves tanks are in use.
[[Add another incubation tank|Incubator][$cash -= Math.trunc(60000*$upgradeMultiplierArcology), $incubator += 1]] //Costs <<print cashFormat(Math.trunc(60000*$upgradeMultiplierArcology))>> and will increase upkeep costs//
<<if $freeTanks == 0>>
All of the tanks are currently occupied by growing children.
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index aeae2edcfb8..61849a6e999 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -136,7 +136,7 @@ if(!Macro.has('sectorblock')) {
<<if $masterSuite||$HGSuite||$dojo||$servantsQuarters||$spa||$clinic||$schoolroom||$cellblock||$incubator||$researchLab.built=="true">>
<br>
<<if $masterSuite>>[[Suite|Master Suite]] ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>)<</if>>
- <<if $HGSuite>>[[HG Suite|Head Girl Suite]] <<if $HGSuiteSlaves == 1>>(HG) <<elseif $HGSuiteSlaves == 2>> (HG and roommate)<</if>> <</if>>
+ <<if $HGSuite>>[[HG Suite|Head Girl Suite]] <<if $HeadGirl == 1>>(HG) <<elseif $HGSuiteSlaves == 2>> (HG and roommate)<</if>> <</if>>
<<if $dojo>>[[BG Dojo|BG Select]] <<if $Bodyguard != 0>>(BG) <<else>> (0)<</if>> <</if>>
<<if $servantsQuarters>>[[Quarters|Servants' Quarters]] ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>)<</if>>
<<if $spa>>[[Spa]] ($spaSlaves/$spa<<if $Attendant>>, L<</if>>)<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 335552bef05..6a149b5e22a 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -391,11 +391,10 @@
<<if $newModelUI == 0>>
<<if ($HGSuite)>>
<br>[[$HGSuiteNameCaps|Head Girl Suite]]
- <<if $HGSuiteSlaves == 1>>
<<if $abbreviateSidebar == 2>>
- (HG)
- <<else>>
- (HG and roommate)
+ <<if $HeadGirl == 1>>(HG)
+ <<elseif $HeadGirl == 1 && $HGSuiteSlaves == 2>>(HG and roommate)
+ <</if>>
<</if>>
<</if>>
<</if>>
@@ -610,9 +609,9 @@
<</if>>
<<if $HGSuiteSlaves > 0>>
-<<if $HGSuiteSlaves == 1>> Your head girl <<else>> and her roommate<</if>>
-<<if $HGSuite == 1>> has a little luxurious room in the penthouse with everything <<if $HGSuiteSlaves == 1>> she needs <<else>> they need<</if>> to be a proper Head Girl.
-<<else>> As there is no little luxurious room in the penthouse dedicated to being a headgirl, <<if $HGSuiteSlaves == 1>> she <<else>> they<</if>> live with the rest of your slaves in the dormitory.
+<<if $HeadGirl == 1>> Your head girl <<elseif $HGSuiteSlaves == 2>> and her roommate<</if>>
+<<if $HGSuite == 1>> has a little luxurious room in the penthouse with everything <<if $HeadGirl == 1>> she needs <<elseif HGSuiteSlaves == 2>> they need<</if>> to be a proper Head Girl.
+<<else>> As there is no little luxurious room in the penthouse dedicated to being a headgirl, <<if $HeadGirl == 1>> she <<elseif $HGSuiteSlaves == 2>> they<</if>> live with the rest of your slaves in the dormitory.
<</if>>
<</if>>
--
GitLab