diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index f9c8ec7b2d1e6b7989aa4c8bd001c4b073daac9b..306d76d7307ef59a61dc89495f441c71ab090cbc 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1513,7 +1513,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $postSexCleanUp = 1>>
-<<set $sideBarOptions = {Cash:1, Upkeep:1, SexSlaveCount:1, Rep:1, GSP:1, Authority:1, Security:1, Crime:1}>>
+<<set $sideBarOptions = {Cash:1, Upkeep:1, SexSlaveCount:1, roomPop:1, Rep:1, GSP:1, Authority:1, Security:1, Crime:1}>>
<<set $DefaultBirthDestination = "individually decided fates">>
<<set $abbreviateHormoneBalance = 2>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index afdecd0454b9d91c130922498ce62756efa5b2a8..0b33341ef0303584cc90bbd3b1adb3bbec2b7fb4 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3914,7 +3914,10 @@ Done<br>
<<set $upgradeMultiplierTrade = upgradeMultiplierTrade()>>
<<if ndef $sideBarOptions>>
- <<set $sideBarOptions = {Cash:1, Upkeep:1, SexSlaveCount:1, Rep:1, GSP:1, Authority:1, Security:1, Crime:1}>>
+ <<set $sideBarOptions = {Cash:1, Upkeep:1, SexSlaveCount:1, roomPop:1, Rep:1, GSP:1, Authority:1, Security:1, Crime:1}>>
+<</if>>
+<<if ndef $sideBarOptions.roomPop>>
+ <<set $sideBarOptions.roomPop = 1>>
<</if>>
<<set $JobIDArray = resetJobIDArray()>>
diff --git a/src/uncategorized/headGirlSuite.tw b/src/uncategorized/headGirlSuite.tw
index 79e99876adb1c8ab84512f365c99438752904a75..1e816f2706568a6c20fff8e8be21abb046c1b0ac 100644
--- a/src/uncategorized/headGirlSuite.tw
+++ b/src/uncategorized/headGirlSuite.tw
@@ -9,14 +9,18 @@
<<if $HeadGirl == 0>>
You have no Head Girl appointed to live in $HGSuiteName.
+ <<link "Select Head Girl">><<goto "HG Select">><</link>>
<<elseif $HGSuiteSlaves > 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>>
<<else>>
<<setLocalPronouns $HeadGirl>>
Your Head Girl $HeadGirl.slaveName lives alone in $his handsome suite.
+ <<link "Manage Head Girl">><<goto "HG Select">><</link>>
<</if>>
+<<if $HeadGirl != 0>>
<br>//Any slave assigned to live with your Head Girl will become, for most practical purposes, $his slave.//
<br>
@@ -46,5 +50,5 @@
<br><br>
<<print App.UI.SlaveList.listSJFacilitySlaves(App.Entity.facilities.headGirlSuite)>>
-
+<</if>>
<br><br>Rename $HGSuiteName: <<textbox "$HGSuiteName" $HGSuiteName "Head Girl Suite">> //Use a noun or similar short phrase//
diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw
index fa76f8fa23baea0f7697821f876cf6bf1e044a4d..b0dd2398d7ee70ff5a10d8225ba5fb6c22a7d514 100644
--- a/src/uncategorized/hgSelect.tw
+++ b/src/uncategorized/hgSelect.tw
@@ -10,6 +10,9 @@
<<setLocalPronouns $HeadGirl>>
<<set _HGName = SlaveFullName($HeadGirl)>>
''__@@.pink;_HGName@@__'' is serving as your Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort; it is $his role to serve and comfort you at your side, in addition to performing normal Head Girl duties<</if>>.
+ <<if ($HGSuite)>>
+ <br> Currently $he lives in <<link "$HGSuiteNameCaps""Head Girl Suite">><</link>>
+ <</if>>
<br><br>
<</if>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 3bb66487d3015d32e0ed9ae5cfa92722ec3fe03c..160137053b35aaa42d12fed9fea0c8f8dd072267 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -626,6 +626,13 @@ Genetics array test:
@@.cyan;SHOWN.@@ //[[Hide|Options][$sideBarOptions.SexSlaveCount = 0]]//
<</if>>
+<br>Room population is
+<<if $sideBarOptions.roomPop < 1>>
+ @@.red;HIDDEN.@@ //[[Show|Options][$sideBarOptions.roomPop = 1]]//
+<<else>>
+ @@.cyan;SHOWN.@@ //[[Hide|Options][$sideBarOptions.roomPop = 0]]//
+<</if>>
+
<br>Rep is
<<if $sideBarOptions.Rep < 1>>
@@.red;HIDDEN.@@ //[[Show|Options][$sideBarOptions.Rep = 1]]//
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index c04be11f1ca0ddd49fae51f445d4641e78ad24fc..3839c55cd4093a5e06fd9862303bf419f9cf7fbf 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -213,12 +213,13 @@ Your arcology has gained a well-off citizen.
<br>
<<if _clonedSlave.relationship >= 4>>
<<link "Send $his _girl2 into retirement with $him">>
+ <<set _sr = $slaveIndices[_clonedSlave.relationshipTarget]>> /* must be reset since $activeSlave may already be removed from $slaves */
<<replace "#artFrame">>
/* 000-250-006 */
<<if $seeImages == 1>>
<div class="imageColumn">
<div class="imageRef medImg">
- <<SlaveArt $activeSlave 2 0>>
+ <<SlaveArt _clonedSlave 2 0>>
</div>
<div class="imageRef medImg">
<<SlaveArt $slaves[_sr] 2 0>>
@@ -228,7 +229,6 @@ Your arcology has gained a well-off citizen.
/* 000-250-006 */
<</replace>>
<<replace "#result">>
- <<set _sr = $slaveIndices[_clonedSlave.relationshipTarget]>> /* must be reset since $activeSlave may already be removed from $slaves */
$He doesn't get far before $he <<if canHear(_clonedSlave)>>hears a desperate pursuit behind $him<<else>>feels a gentle tap on $his shoulder<</if>>. It's $his <<if _clonedSlave.relationship >= 5>>wife<<else>>lover<</if>>, $slaves[_sr].slaveName, <<if canHear(_clonedSlave)>>hurrying to catch<<else>>finally catching<</if>> up. Watching on the monitors, you see _clonedSlave.slaveName's mixed pleasure and pain at seeing _him2 again so soon, followed by a tearful explanation and an embrace so heartfelt that the pair of ex-slaves collapse to the floor together, sobbing.
<<set $activeSlave = $slaves[_sr]>>
<<= removeActiveSlave() >>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index b718c2a772f123a9c73d56ec89403e1b9fa347fe..9a71ecdf91e0063e110d003143c3efd85fab0d78 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -58,6 +58,7 @@
@@.cyan;[Ent]@@
<<if $rulesError && $rulesAssistantAuto == 1>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>>
</span>
+ <br>
<<elseif $nextButton == " ">> <br><br>
<span id="nextButton">
/* Hide the button until the player makes a choice */
@@ -68,7 +69,7 @@
<<set $ui = "main">>
<<goto $nextLink>>
<</link>></strong>
- @@.cyan;[Space]@@
+ @@.cyan;[Space]@@<br>
</span>
<</if>>
@@ -201,15 +202,14 @@
<<if $sideBarOptions.SexSlaveCount > 0>> <br>
@@.pink;Total Sex Slaves@@ | <<print $slaves.length>>
<</if>>
-
- <<if _Pass === "Manage Penthouse">> <br>
+ <<if $sideBarOptions.roomPop > 0>> <br>
@@.pink;Penthouse Beds@@ |
<<if $dormitoryPopulation+$roomsPopulation > ($dormitory+$rooms)>>@@.red;<<print $dormitoryPopulation+$roomsPopulation>>@@<<else>><<print $dormitoryPopulation+$roomsPopulation>><</if>>/<<print ($dormitory+$rooms)>>
<br>@@.pink;Dormitory Beds@@ | <<if $dormitoryPopulation > $dormitory>>@@.red;<<print $dormitoryPopulation>>@@<<else>><<print $dormitoryPopulation>><</if>>/<<print $dormitory>>
<br>@@.pink;Luxury Rooms@@ | <<if $roomsPopulation > $rooms>>@@.red;<<print $roomsPopulation>>@@<<else>><<print $roomsPopulation>><</if>>/<<print $rooms>>
<</if>>
- <<if _Pass !== "Manage Penthouse" || _Pass === "Main">>
+ <<if _Pass !== "Manage Penthouse">>
<<if $sideBarOptions.GSP > 0 && _Pass !== "Neighbor Interact">> <br>
@@.yellowgreen;GSP@@ |
<<print Math.trunc(0.1*$arcologies[0].prosperity)>>m