diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index 74a061e75009e1074cafd57dac7ab53e0c8a63a2..d481853a31261020f972c48b800f1e8158e9c852 100644
--- a/src/SecExp/propagandaHub.tw
+++ b/src/SecExp/propagandaHub.tw
@@ -6,7 +6,12 @@
<<set _HistoryDiscount = 1>>
<</if>>
-<<set $nextButton = "Back", $nextLink = "Manage Arcology">>
+<<set $nextButton = "Back">>
+<<if $sideBarOptions.compact > 0>>
+ <<set $nextLink = "Manage Arcology">>
+<<else>>
+ <<set $nextLink = "Main">>
+<</if>>
Propaganda Hub
<hr>
diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw
index 3b3e0a103c66aa6bf422094e832e48a17e64ec05..ad0d2e612621bc8a0833178817dd25d053ed9594 100644
--- a/src/SecExp/riotControlCenter.tw
+++ b/src/SecExp/riotControlCenter.tw
@@ -1,6 +1,11 @@
:: riotControlCenter [nobr]
-<<set $nextButton = "Back", $nextLink = "Manage Arcology">>
+<<set $nextButton = "Back">>
+<<if $sideBarOptions.compact > 0>>
+ <<set $nextLink = "Manage Arcology">>
+<<else>>
+ <<set $nextLink = "Main">>
+<</if>>
Riot Control Center
<hr>
diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw
index 991df65da21d14599b5d3b54a2940ecd699bc46b..531fbd4de6c404d755104f2c6eccbc1bc85108b1 100644
--- a/src/SecExp/secBarracks.tw
+++ b/src/SecExp/secBarracks.tw
@@ -1,6 +1,11 @@
:: secBarracks [nobr]
-<<set $nextButton = "Back", $nextLink = "Manage Arcology">>
+<<set $nextButton = "Back">>
+<<if $sideBarOptions.compact > 0>>
+ <<set $nextLink = "Manage Arcology">>
+<<else>>
+ <<set $nextLink = "Main">>
+<</if>>
The Barracks
<hr>
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index 8f9baa51be804c2840dc03c0530ce083faa5c333..d108018f2572663d66fcb3dd9909ecbe455531d6 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -6,7 +6,12 @@
<<set _HistoryDiscount = 1>>
<</if>>
-<<set $nextButton = "Back", $nextLink = "Manage Arcology">>
+<<set $nextButton = "Back">>
+<<if $sideBarOptions.compact > 0>>
+ <<set $nextLink = "Manage Arcology">>
+<<else>>
+ <<set $nextLink = "Main">>
+<</if>>
Security Headquarters
<hr>
diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw
index 99719e7385c19691bed1e195c6dacaf81a13088a..69fb6b795784a79c2e5a1605b6630e362009149b 100644
--- a/src/SpecialForce/Firebase.tw
+++ b/src/SpecialForce/Firebase.tw
@@ -10,7 +10,14 @@
<<set _EnvCash2 = 500,_EnvCash3 = 250,_EnvCash4 = 150,_EnvProsp = 5>>
<<case 2>>
<<set _EnvCash2 = 550,_EnvCash3 = 300,_EnvCash4 = 200,_EnvProsp = 7>>
- <</switch>> <<set $nextButton = "Back to Manage Arcology",$nextLink = "Manage Arcology">>
+ <</switch>>
+
+ <<set $nextButton = "Back">>
+ <<if $sideBarOptions.compact > 0>>
+ <<set $nextLink = "Manage Arcology">>
+ <<else>>
+ <<set $nextLink = "Main">>
+ <</if>>
<<if $cheatMode > 0>> [[Cheat edit|CheatEdit][]] <br> <</if>>
The firebase of $arcologies[0].name's <<textbox "$SF.Lower" $SF.Lower "Firebase">> is located in the lower levels, occupying unneeded warehouse space. It is not accessible to the general citizenry, but your personal elevator has express service to it. As you step off, two soldiers in combat armor manning the entry checkpoint tense before recognizing their Marshal and stepping aside with a sharp salute.<br>
diff --git a/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw b/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw
index e13e86908279c93bbc3a4a85e65eec3f3b5e4a6f..ae92b59b7f8142076525b567a7312d35664fe4a0 100644
--- a/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw
+++ b/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw
@@ -1,6 +1,11 @@
:: MOD_Edit Arcology Cheat Datatype Cleanup [nobr]
-<<set $nextButton = "Continue", $nextLink = "Manage Arcology">>
+<<set $nextButton = "Continue">>
+<<if $sideBarOptions.compact > 0>>
+ <<set $nextLink = "Manage Arcology">>
+<<else>>
+ <<set $nextLink = "Main">>
+<</if>>
<<if $customEvalCode>>
<<if $customEvalCode.charAt(0) != "(" || $nextLink == ")">> /* second condition is only there for sanityCheck */
diff --git a/src/facilities/farmyard/food/foodMarket.tw b/src/facilities/farmyard/food/foodMarket.tw
index 09fd3aed69631540da6305721b7990eb2d25a52f..dd8d988dd097eb8de838f19694eced7d43269cd9 100644
--- a/src/facilities/farmyard/food/foodMarket.tw
+++ b/src/facilities/farmyard/food/foodMarket.tw
@@ -6,58 +6,64 @@
<<set _foodValue = $foodStored*$foodCost>> /* FIXME: currently costs 25 / kg, will need tweaking */
The food market has @@.chocolate;<<print massFormat($foodStored)>>@@ in storage, valued at a total of @@.yellowgreen;<<print cashFormat(_foodValue)>>.@@
+<<if $sideBarOptions.compact > 0>>
+ <<set _link = "Manage Arcology">>
+<<else>>
+ <<set _link = "Main">>
+<</if>>
+
/* TODO: allow for the buying and selling of food */
<br>
-<<link "Buy <<= massFormat(1)>>" "Manage Arcology">><<set cashX(forceNeg($foodCost*1), "farmyard"), $foodStored += 1>><</link>>
-| <<link "<<= massFormat(10)>>" "Manage Arcology">><<set cashX(forceNeg($foodCost*10), "farmyard"), $foodStored += 10>><</link>>
-| <<link "<<= massFormat(100)>>" "Manage Arcology">><<set cashX(forceNeg($foodCost*100), "farmyard"), $foodStored += 100>><</link>>
-| <<link "<<= massFormat(1000)>>" "Manage Arcology">><<set cashX(forceNeg($foodCost*1000), "farmyard"), $foodStored += 1000>><</link>>
-| <<link "<<= massFormat(10000)>>" "Manage Arcology">><<set cashX(forceNeg($foodCost*10000), "farmyard"), $foodStored += 10000>><</link>>
+<<link "Buy <<= massFormat(1)>>" _link>><<set cashX(forceNeg($foodCost*1), "farmyard"), $foodStored += 1>><</link>>
+| <<link "<<= massFormat(10)>>" _link>><<set cashX(forceNeg($foodCost*10), "farmyard"), $foodStored += 10>><</link>>
+| <<link "<<= massFormat(100)>>" _link>><<set cashX(forceNeg($foodCost*100), "farmyard"), $foodStored += 100>><</link>>
+| <<link "<<= massFormat(1000)>>" _link>><<set cashX(forceNeg($foodCost*1000), "farmyard"), $foodStored += 1000>><</link>>
+| <<link "<<= massFormat(10000)>>" _link>><<set cashX(forceNeg($foodCost*10000), "farmyard"), $foodStored += 10000>><</link>>
<<if $foodStored > 0>>
<br>
- <<link "Sell <<= massFormat(1)>>" "Manage Arcology">><<set cashX(($foodCost*1), "farmyard"), $foodStored -= 1>><</link>>
+ <<link "Sell <<= massFormat(1)>>" _link>><<set cashX(($foodCost*1), "farmyard"), $foodStored -= 1>><</link>>
<</if>>
<<if $foodStored >= 10>>
- | <<link "<<= massFormat(10)>>" "Manage Arcology">><<set cashX(($foodCost*10), "farmyard"), $foodStored -= 10>><</link>>
+ | <<link "<<= massFormat(10)>>" _link>><<set cashX(($foodCost*10), "farmyard"), $foodStored -= 10>><</link>>
<</if>>
<<if $foodStored >= 100>>
- | <<link "<<= massFormat(100)>>" "Manage Arcology">><<set cashX(($foodCost*100), "farmyard"), $foodStored -= 100>><</link>>
+ | <<link "<<= massFormat(100)>>" _link>><<set cashX(($foodCost*100), "farmyard"), $foodStored -= 100>><</link>>
<</if>>
<<if $foodStored >= 1000>>
- | <<link "<<= massFormat(1000)>>" "Manage Arcology">><<set cashX(($foodCost*1000), "farmyard"), $foodStored -= 1000>><</link>>
+ | <<link "<<= massFormat(1000)>>" _link>><<set cashX(($foodCost*1000), "farmyard"), $foodStored -= 1000>><</link>>
<</if>>
<<if $foodStored >= 10000>>
- | <<link "<<= massFormat(10000)>>" "Manage Arcology">><<set cashX(($foodCost*10000), "farmyard"), $foodStored -= 10000>><</link>>
+ | <<link "<<= massFormat(10000)>>" _link>><<set cashX(($foodCost*10000), "farmyard"), $foodStored -= 10000>><</link>>
<</if>>
<<if $food > 0>>
<br>
- <<link "Store <<= massFormat(1)>>" "Manage Arcology">><<set $foodStored += 1, $food -= 1>><</link>>
+ <<link "Store <<= massFormat(1)>>" _link>><<set $foodStored += 1, $food -= 1>><</link>>
<</if>>
<<if $food >= 10>>
- | <<link "<<= massFormat(10)>>" "Manage Arcology">><<set $foodStored += 10, $food -= 10>><</link>>
+ | <<link "<<= massFormat(10)>>" _link>><<set $foodStored += 10, $food -= 10>><</link>>
<</if>>
<<if $food >= 100>>
- | <<link "<<= massFormat(100)>>" "Manage Arcology">><<set $foodStored += 100, $food -= 100>><</link>>
+ | <<link "<<= massFormat(100)>>" _link>><<set $foodStored += 100, $food -= 100>><</link>>
<</if>>
<<if $food >= 1000>>
- | <<link "<<= massFormat(1000)>>" "Manage Arcology">><<set $foodStored += 1000, $food -= 1000>><</link>>
+ | <<link "<<= massFormat(1000)>>" _link>><<set $foodStored += 1000, $food -= 1000>><</link>>
<</if>>
<<if $food >= 10000>>
- | <<link "<<= massFormat(10000)>>" "Manage Arcology">><<set $foodStored += 10000, $food -= 10000>><</link>>
+ | <<link "<<= massFormat(10000)>>" _link>><<set $foodStored += 10000, $food -= 10000>><</link>>
<</if>>
<<if $foodStored > 0>>
<br>
- <<link "Retrieve <<= massFormat(1)>>" "Manage Arcology">><<set $food += 1, $foodStored -= 1>><</link>>
+ <<link "Retrieve <<= massFormat(1)>>" _link>><<set $food += 1, $foodStored -= 1>><</link>>
<</if>>
<<if $foodStored >= 10>>
- | <<link "<<= massFormat(10)>>" "Manage Arcology">><<set $food += 10, $foodStored -= 10>><</link>>
+ | <<link "<<= massFormat(10)>>" _link>><<set $food += 10, $foodStored -= 10>><</link>>
<</if>>
<<if $foodStored >= 100>>
- | <<link "<<= massFormat(100)>>" "Manage Arcology">><<set $food += 100, $foodStored -= 100>><</link>>
+ | <<link "<<= massFormat(100)>>" _link>><<set $food += 100, $foodStored -= 100>><</link>>
<</if>>
<<if $foodStored >= 1000>>
- | <<link "<<= massFormat(1000)>>" "Manage Arcology">><<set $food += 1000, $foodStored -= 1000>><</link>>
+ | <<link "<<= massFormat(1000)>>" _link>><<set $food += 1000, $foodStored -= 1000>><</link>>
<</if>>
<<if $foodStored >= 10000>>
- | <<link "<<= massFormat(10000)>>" "Manage Arcology">><<set $food += 10000, $foodStored -= 10000>><</link>>
+ | <<link "<<= massFormat(10000)>>" _link>><<set $food += 10000, $foodStored -= 10000>><</link>>
<</if>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 306d76d7307ef59a61dc89495f441c71ab090cbc..909e9f9f5b06f3db95a5305d3c639e1d065db2e1 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, roomPop:1, Rep:1, GSP:1, Authority:1, Security:1, Crime:1}>>
+<<set $sideBarOptions = {compact:1, 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 ade48c4b8a9869e774692ded4075fed0928ecfe8..03d4c7c53134053899625d9b3ac85801deb11247 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3920,11 +3920,12 @@ Done<br>
<<set $upgradeMultiplierTrade = upgradeMultiplierTrade()>>
<<if ndef $sideBarOptions>>
- <<set $sideBarOptions = {Cash:1, Upkeep:1, SexSlaveCount:1, roomPop:1, Rep:1, GSP:1, Authority:1, Security:1, Crime:1}>>
+ <<set $sideBarOptions = {compact:1, 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>>
+<<if ndef $sideBarOptions.compact>> <<set $sideBarOptions.compact = 1>> <</if>>
<<set $JobIDArray = resetJobIDArray()>>
diff --git a/src/uncategorized/changeLanguage.tw b/src/uncategorized/changeLanguage.tw
index a93f3ba2fcaefb6b3cc8700ce0da3988eb429741..478bb3aa6e03114cc7ac698e371f153ea3d3fbb9 100644
--- a/src/uncategorized/changeLanguage.tw
+++ b/src/uncategorized/changeLanguage.tw
@@ -1,6 +1,11 @@
:: Change Language [nobr]
-<<set $nextButton = "Confirm changes", $nextLink = "Manage Arcology">>
+<<set $nextButton = "Confirm changes">>
+<<if $sideBarOptions.compact > 0>>
+ <<set $nextLink = "Manage Arcology">>
+<<else>>
+ <<set $nextLink = "Main">>
+<</if>>
<<set $revivalistLanguage = 0>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index 98e4ee74fc9cfddb6d7d4e44482fcb7da34ea724..7376a62617d12f12433a3803298cc3a79afa6e40 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -21,7 +21,13 @@
<<if $cheatMode == 1>>
[[Cheat Edit Neighboring Arcologies|MOD_Edit Neighbor Arcology Cheat]]<br><br>
<</if>>
-<<set $nextLink = "Manage Arcology", $nextButton = "Back">>
+
+<<if $sideBarOptions.compact > 0>>
+ <<set $nextLink = "Manage Arcology">>
+<<else>>
+ <<set $nextLink = "Main">>
+<</if>>
+<<set $nextButton = "Back">>
You have <<print $arcologies.length-1>> neighbors. <br><br>
<<if $arcologies[0].embargoTarget == -1>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index f1411eb51ffc8586177334c12f01948525dc12ee..eeb24b707882148c837bd3648323200e432f6d9c 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -160,11 +160,13 @@ This save was created using FC version $ver build $releaseID.
<<option -1 "Below">>
<</options>>
+ <div class="subHeading">
<<options $newModelUI>>
New Model UI
<<option 1 "Enabled">>
<<option 0 "Disabled">>
<</options>>
+ </div>
<<options $seeArcology>>
Main menu arcology description
@@ -220,6 +222,15 @@ This save was created using FC version $ver build $releaseID.
<div class="subHeading">
''Sidebar''
</div>
+
+ <div class="subHeading">
+ <<if ndef $sideBarOptions.compact>> <<set $sideBarOptions.compact = 1>> <</if>>
+ <<options $sideBarOptions.compact>>
+ The side bar is very compact:
+ <<option 1 "Enabled">>
+ <<option 0 "Disabled">>
+ <</options>>
+ </div>
<<options $sideBarOptions.Cash>>
Cash is
@@ -611,15 +622,6 @@ This save was created using FC version $ver build $releaseID.
<<option 0 "Disabled">>
<</options>>
- <<if $battlesEnabled > 0>>
- <<options $allowPrestigeFromBattles>>
- For every 10 victories a slave commander
- <<option 1 "Gains">>
- <<option 0 "Does not gain">>
- <</options>>
- a prestige rank.
- <</if>>
-
<<if $battlesEnabled > 0>>
<<options $battleFrequency>>
Frequency
@@ -642,6 +644,15 @@ This save was created using FC version $ver build $releaseID.
<</options>>
<</if>>
+ <<if $battlesEnabled > 0>> <br>
+ <<options $allowPrestigeFromBattles>>
+ For every 10 victories a slave commander
+ <<option 1 "Gains">>
+ <<option 0 "Does not gain">>
+ <</options>>
+ a prestige rank.
+ <</if>>
+
<br><br>
<div class="subHeading">
//Force the chosen option to happen every week. <<if $rebellionsEnabled > 0>> Rebellions will take precedence over battles.<</if>>//
@@ -654,7 +665,6 @@ This save was created using FC version $ver build $releaseID.
<<option 0 "No">>
<</options>>
<</if>>
- <br>
<<if $rebellionsEnabled > 0>>
<<options $forceRebellion>>
Force rebellions
@@ -674,7 +684,7 @@ This save was created using FC version $ver build $releaseID.
<</options>>
<</if>>
- <<if $battlesEnabled > 0 && $majorBattlesEnabled > 0>>
+ <<if $battlesEnabled > 0 && $majorBattlesEnabled > 0>> <br>
<<options $majorBattleMult>>
Multiplier is
<<option 1.5 "Very high">>
@@ -684,6 +694,7 @@ This save was created using FC version $ver build $releaseID.
<<option 0.5 "Very low">>
<</options>>
+ <br>
<<options $forceMajorBattle>>
A major battle is
<<option 1 "Guaranteed">>
@@ -693,6 +704,7 @@ This save was created using FC version $ver build $releaseID.
<</if>>
<<if $battlesEnabled > 0 && $majorBattlesEnabled > 0>>
+ <br>
<<options $majorBattleGameOver>>
Gameover on battle loss
<<option 1 "Yes">>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index a5e87324fa280f881671dd4d0fc32a55f676ad0c..73666985b548a612ca478cd1ebf58c1887e854c4 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -28,33 +28,34 @@
<</if>>
<</if>>
-<<if $ui != "start">>
+<<if $ui !== "start" || _Pass === "Encyclopedia">>
<<if $nextButton === " ">>
<span id="nextButton">
/* Hide the button until the player makes a choice */
</span>
<<else>>
- <<if $nextButton === "END WEEK">> <br><br>
+ <<if _Pass !== "Encyclopedia">> <br><br> <</if>>
+ <<if $nextButton === "END WEEK">>
<span id="endWeekButton"><strong>
<<link [[($nextButton)|($nextLink)]]>><</link>>
</strong></span>
@@.cyan;[Ent]@@
<<if $rulesError && $rulesAssistantAuto == 1>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>>
- <br>
<<else>>
<span id="nextButton"><strong>
<<if _Pass !== "Encyclopedia">> /* must use link so spacebar shortcut will work */
- <br><br> <<link "$nextButton">> <<set $ui = "main">> <<goto $nextLink>> <</link>>
+ <<link "$nextButton">> <<set $ui = "main">> <<goto $nextLink>> <</link>>
<<else>>
<<link [[($nextButton)|($nextLink)]]>><</link>>
<</if>>
</strong></span>
- <<if _Pass === "Encyclopedia">> to Free Cities.<</if>> @@.cyan;[Space]@@<br>
+ <<if _Pass === "Encyclopedia">> to Free Cities.<</if>> @@.cyan;[Space]@@
<</if>>
+ <br><br>
<</if>>
<</if>>
-<<if _Pass == "Encyclopedia">> <br>
+<<if _Pass == "Encyclopedia">>
/* Intro, new players, PC/Gameplay focused */
[[Playing Free Cities|Encyclopedia][$encyclopedia = "Playing Free Cities"]]
<br>[[Design your master|Encyclopedia][$encyclopedia = "Design Your Master"]]
@@ -80,7 +81,7 @@
<</if>>
<<if $ui != "start" && _Pass !== "Encyclopedia">>
- <<if $sideBarOptions.Cash > 0>> <br>
+ <<if $sideBarOptions.Cash > 0>>
<<set $cash = Math.trunc($cash)>>
<span id="cash">
<<if $cash > 0>>
@@ -489,22 +490,23 @@
<</if>>
<</if>> /* Closes secExp check and associated sideBarOptions options */
- <</if>> /* Closes Pass !== "Manage Penthouse" || Pass === "Main"*/
+ <</if>> /* Closes Pass !== "Manage Penthouse""*/
- <<if $nextButton !== "Continue" && $nextButton !== " ">>
- <br>
- <<if _Pass !== "Manage Arcology">>
- <span id="manageArcology"> <br>
- <<link [[Manage Arcology]]>><</link>>
- </span>
- @@.cyan;[C]@@
- <</if>>
- <<if _Pass !== "Manage Penthouse">>
- <span id="managePenthouse"> <br>
+ <<if $nextButton !== "Continue" && $nextButton !== " ">> <br>
+ <<if _Pass !== "Manage Penthouse">> <br>
+ <span id="managePenthouse">
<<link [[Manage Penthouse]]>><</link>>
</span>
@@.cyan;[P]@@
<</if>>
+ <<if $sideBarOptions.compact > 0>>
+ <<if _Pass !== "Manage Arcology">> <br>
+ <span id="manageArcology">
+ <<link [[Manage Arcology]]>><</link>>
+ </span>
+ @@.cyan;[C]@@
+ <</if>>
+ <</if>>
<<if _Pass !== "Manage Personal Affairs">>
<span id="managePerson"> <br>
@@ -531,8 +533,9 @@
<<link [[Personal Assistant|Personal assistant options]]>><</link>>
</span>
@@.cyan;[T]@@
+ <</if>>
- <<if $newModelUI === 0 && _Pass === "Main">> <br>
+ <<if _Pass === "Main" && $newModelUI === 0>>
<<if ($HGSuite)>>
<br> <<link "$HGSuiteNameCaps""Head Girl Suite">><</link>>
<<if $abbreviateSidebar == 2>>
@@ -671,19 +674,18 @@
<br>
<</if>>
- <</if>> /* Closes UI state check */
- <</if>> /* _Pass === "Main" || _Pass === "Manage Arcology"*/
+ <</if>>
- <<if _Pass === "Manage Arcology">>
- <span id="Security">
- <span id="policyButton"> <br><br>
- <<link [[Policies][$nextButton = "Back", $nextLink = "Manage Arcology"]]>><</link>>
+ <<if $sideBarOptions.compact === 0 && _Pass === "Main" || _Pass === "Manage Arcology">>
+ <<if $sideBarOptions.compact > 0>> <br> <</if>>
+ <span id="policyButton"> <br>
+ <<link [[Policies]]>><</link>>
</span>
@@.cyan;[Y]@@
<<if $secExp == 1>>
<span id="edictButton"> <br>
- <<link [[Edicts|edicts][$nextButton = "Back", $nextLink = "Manage Arcology"]]>><</link>>
+ <<link [[Edicts|edicts]]>><</link>>
</span>
@@.cyan;[D]@@
<</if>>
@@ -691,6 +693,7 @@
[[Diplomacy|Neighbor Interact]]
<</if>>
+ <span id="Security">
<<if $secExp > 0 || $SF.Toggle && $SF.Active >= 1>> <br>
<<link "Manage Security">> <<replace "#Security">> <br>
<<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">>
@@ -728,8 +731,9 @@
<</replace>> <</link>>
<</if>>
</span>
+ <</if>>
- <<elseif _Pass === "Manage Penthouse">>
+ <<if _Pass === "Manage Penthouse">>
<span id="URButton"> <br><br>
<<link [[Universal Rules]]>><</link>>
</span>
@@ -760,7 +764,6 @@
[[Rules Assistant Summary]]
<<elseif ["Firebase", "propagandaHub", "securityHQ", "secBarracks", "riotControlCenter"].includes(_Pass)>>
- <br>
<<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">>
<span id="SFMButton"> <br>
<<link "$SF.Caps's firebase""Firebase">><</link>>
@@ -847,4 +850,4 @@
<br> <<link "Dump Game State">><<run App.Debug.dumpGameState()>><</link>>
<</if>>
-<</if>> /* Closes ui != "start" */
+<</if>>
\ No newline at end of file