From 21eb8f987e669226c45e133a624e342a7f610861 Mon Sep 17 00:00:00 2001
From: lowercase-donkey <lowercasedonkey@gmail.com>
Date: Tue, 27 Aug 2019 19:37:46 -0400
Subject: [PATCH] hgsuite
---
src/init/storyInit.tw | 1 -
src/js/DefaultRules.js | 2 +-
src/js/assignJS.js | 2 --
src/pregmod/widgets/pregmodBirthWidgets.tw | 2 +-
src/uncategorized/buildingWidgets.tw | 2 +-
src/uncategorized/headGirlSuite.tw | 4 ++--
src/uncategorized/main.tw | 2 +-
src/uncategorized/penthouseReport.tw | 2 +-
src/uncategorized/storyCaption.tw | 4 ++--
src/utility/birthWidgets.tw | 2 +-
10 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index c63bb6f1723..0d308d82d4e 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -667,7 +667,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $farmyardNameCaps = "The Farmyard">>
<<set $HGSuite = 0>>
-<<set $HGSuiteSlaves = 0>>
<<set $HGSuiteSurgery = 1>>
<<set $HGSuiteDrugs = 1>>
<<set $HGSuiteHormones = 1>>
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 28975a16789..1c63c978986 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -108,7 +108,7 @@ window.DefaultRules = (function() {
break;
case "live with your Head Girl":
- if ((V.HGSuiteSlaves < 1 && slave.indentureRestrictions <= 0)) {
+ if ((V.HGSuiteiIDs.length < 1 && slave.indentureRestrictions <= 0)) {
break;
} else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index b5d37a3c524..df85e3966b0 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -154,7 +154,6 @@ window.assignJob = function assignJob(slave, job) {
case "hgsuite":
slave.assignment = "live with your Head Girl";
slave.assignmentVisible = 0;
- V.HGSuiteSlaves++;
V.HGSuiteiIDs.push(slave.ID);
slave.livingRules = "luxurious";
break;
@@ -473,7 +472,6 @@ window.removeJob = function removeJob(slave, assignment) {
case "hgsuite":
slave.assignment = "rest";
V.HGSuiteiIDs.delete(slave.ID);
- V.HGSuiteSlaves--;
break;
case "work as a nanny":
diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw
index b85bd80c795..d64feb822c7 100644
--- a/src/pregmod/widgets/pregmodBirthWidgets.tw
+++ b/src/pregmod/widgets/pregmodBirthWidgets.tw
@@ -1031,7 +1031,7 @@
<<case "be your Head Girl">>
<<if (random(1,20) > $suddenBirth)>>
- $He returns to <<if $HGSuite == 1>>$his room's bed<<else>>$his bed<</if>> and strips before slipping into it. $He makes $himself comfortable<<if $HGSuiteSlaves != 0>>, as $his slave rushes to $his side,<</if>> and begins working on birthing <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby. $His child is promptly taken<<if $HGSuiteSlaves != 0>> by $his roommate<</if>> and $he rests awhile before returning to managing your slaves.
+ $He returns to <<if $HGSuite == 1>>$his room's bed<<else>>$his bed<</if>> and strips before slipping into it. $He makes $himself comfortable<<if $HGSuiteiIDs.length != 0>>, as $his slave rushes to $his side,<</if>> and begins working on birthing <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby. $His child is promptly taken<<if $HGSuiteiIDs.length != 0>> by $his roommate<</if>> and $he rests awhile before returning to managing your slaves.
<<else>>
While overseeing your other slaves, $slaves[$i].slaveName's water breaks. $He attempts to hold back the coming birth until $he can catch a break in $his duties but ultimately fails.
<<set $humiliation = 1>>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index 2f22f5e4b00..ac60d2a4423 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -144,7 +144,7 @@ if(!Macro.has('sectorblock')) {
<<if $masterSuite||$HGSuite||$dojo||$servantsQuarters||$spa||$nursery||$clinic||$schoolroom||$cellblock||$incubator||$researchLab.level > 0>>
<br>
<<if $masterSuite>> <<print MasterSuiteUIName()>> ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>)<</if>>
- <<if $HGSuite>> <<print HeadGirlSuiteUIName()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>>, 1)<<else>>)<</if>><</if>><</if>>
+ <<if $HGSuite>> <<print HeadGirlSuiteUIName()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteiIDs.length > 0>>, 1)<<else>>)<</if>><</if>><</if>>
<<if $dojo > 1>>[[Armory|BG Select]] <<if $Bodyguard != 0>>(BG)<</if>> <</if>>
<<if $servantsQuarters>> <<print ServantQuartersUIName()>> ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>)<</if>>
<<if $spa>> <<print SpaUIName()>> ($spaSlaves/$spa<<if $Attendant>>, L<</if>>)<</if>>
diff --git a/src/uncategorized/headGirlSuite.tw b/src/uncategorized/headGirlSuite.tw
index 704755c93c4..c243b1194c7 100644
--- a/src/uncategorized/headGirlSuite.tw
+++ b/src/uncategorized/headGirlSuite.tw
@@ -1,6 +1,6 @@
:: Head Girl Suite [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Head Girl Suite", $showEncyclopedia = 1, $encyclopedia = "Head Girl Suite", $HGSuiteSlaves = $HGSuiteiIDs.length, _SL = $slaves.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Head Girl Suite", $showEncyclopedia = 1, $encyclopedia = "Head Girl Suite", _SL = $slaves.length>>
<<if $HGSuiteName != "the Head Girl Suite">>
<<set $HGSuiteNameCaps = $HGSuiteName.replace("the ", "The ")>>
@@ -10,7 +10,7 @@
<<if $HeadGirl == 0>>
You have no Head Girl appointed to live in $HGSuiteName.
<<link "Select Head Girl">><<goto "HG Select">><</link>>
-<<elseif $HGSuiteSlaves > 0>>
+<<elseif $HGSuiteiIDs.length > 0>>
<<setLocalPronouns $HeadGirl>>
Your Head Girl $HeadGirl.slaveName has $slaves[_i].slaveName living in $HGSuiteName with $him, as $his servant, assistant, and sexual appliance.
<<link "Manage Head Girl">><<goto "HG Select">><</link>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index d838ece7f14..c80a6a9e356 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -68,7 +68,7 @@
_BG = $slaveIndices[$Bodyguard.ID]>>
<<if (def _HG && $HGSuite > 0)>><<set $slavesVisible++>><</if>>
-<<if ($HGSuiteSlaves > 0)>><<set $slavesVisible++>><</if>>
+<<if ($HGSuiteiIDs.length > 0)>><<set $slavesVisible++>><</if>>
<<if (def _BG && $dojo > 1)>><<set $slavesVisible++>><</if>>
<<set $nextButton = "END WEEK", $nextLink = "End Week", $showEncyclopedia = 1, $encyclopedia = "How to Play">>
diff --git a/src/uncategorized/penthouseReport.tw b/src/uncategorized/penthouseReport.tw
index 28a6d8425cd..825b0c81aec 100644
--- a/src/uncategorized/penthouseReport.tw
+++ b/src/uncategorized/penthouseReport.tw
@@ -13,7 +13,7 @@
<<include "Full Report">>
<br><br>
- <<if ($slaves[$i].assignment == "be your Head Girl") && ($HGSuiteSlaves > 0)>>
+ <<if ($slaves[$i].assignment == "be your Head Girl") && ($HGSuiteiIDs.length > 0)>>
/% We found the Head Girl, now let's find her slave %/
<<set _iTemp = $i>>
<<set _ID = $HGSuiteiIDs[0], $i = $slaveIndices[_ID]>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 50c0fddadc9..fe22cea4874 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -558,9 +558,9 @@
<<if ($HGSuite)>>
<br> <<link "$HGSuiteNameCaps""Head Girl Suite">><</link>>
<<if $abbreviateSidebar == 2>>
- <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>>, 1)<<else>>)<</if>><</if>>
+ <<if $HeadGirl != 0>>(HG<<if $HGSuiteiIDs.length > 0>>, 1)<<else>>)<</if>><</if>>
<<else>>
- <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>> and slave<<else>>)<</if>><</if>>
+ <<if $HeadGirl != 0>>(HG<<if $HGSuiteiIDs.length > 0>> and slave<<else>>)<</if>><</if>>
<</if>>
<</if>>
<<if ($dojo > 1)>>
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index a5f41771782..c6b964b62c4 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -378,7 +378,7 @@
$He waddles to $his maternity ward and strips before laying on an open bed. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>> as $his assistants watch. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he is helped to the recovery ward until $he recovers enough to take over $clinicName again.
<<case "be your Head Girl">>
- $He returns to <<if $HGSuite == 1>>$his room's bed<<else>>$his bed<</if>> and strips before slipping into it. $He makes $himself comfortable<<if $HGSuiteSlaves != 0>> as $his slave rushes to $his side,<</if>> and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken<<if $HGSuiteSlaves != 0>> by $his roommate<</if>> and $he rests awhile before returning to managing your slaves.
+ $He returns to <<if $HGSuite == 1>>$his room's bed<<else>>$his bed<</if>> and strips before slipping into it. $He makes $himself comfortable<<if $HGSuiteiIDs.length != 0>> as $his slave rushes to $his side,<</if>> and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken<<if $HGSuiteiIDs.length != 0>> by $his roommate<</if>> and $he rests awhile before returning to managing your slaves.
<<case "guard you">>
Or $he would have, if $he'd stop refusing to leave your side. You lead $him someplace private and help $him undress. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. You call for a servant to quickly gather $his child<<if $slaves[$i].pregType > 1>>ren<</if>> as you help $him into the shower, making sure to wait outside for your loyal guardian to finish.
--
GitLab