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/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/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