From d61e0573a61aaf5973af41cb60d040164085d3cf Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Wed, 20 May 2020 13:36:25 +0200
Subject: [PATCH] remove sideBarOptions.compact as it is now unneeded
---
js/003-data/gameVariableData.js | 2 +-
src/Mods/SecExp/buildings/propagandaHub.tw | 6 +-----
src/Mods/SecExp/buildings/riotControlCenter.tw | 6 +-----
src/Mods/SecExp/buildings/secBarracks.tw | 6 +-----
src/Mods/SecExp/buildings/securityHQ.tw | 6 +-----
src/Mods/SpecialForce/Firebase.tw | 6 +-----
src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw | 6 +-----
src/data/backwardsCompatibility/backwardsCompatibility.js | 3 ---
src/facilities/farmyard/food/foodMarket.tw | 6 +-----
src/uncategorized/changeLanguage.tw | 6 +-----
src/uncategorized/neighborInteract.tw | 6 +-----
src/uncategorized/options.tw | 4 ----
12 files changed, 10 insertions(+), 53 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 66564913911..cdaaf2927f6 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -1425,7 +1425,7 @@ App.Data.resetOnNGPlus = {
postSexCleanUp: 1,
sideBarOptions: {
- compact: 1, Cash: 1, Upkeep: 1, SexSlaveCount: 1, roomPop: 1, Rep: 1, GSP: 1, Authority: 1, Security: 1, Crime: 1, confirmWeekEnd: 0,
+ Cash: 1, Upkeep: 1, SexSlaveCount: 1, roomPop: 1, Rep: 1, GSP: 1, Authority: 1, Security: 1, Crime: 1, confirmWeekEnd: 0,
},
DefaultBirthDestination: "individually decided fates",
legendaryFacility: 0,
diff --git a/src/Mods/SecExp/buildings/propagandaHub.tw b/src/Mods/SecExp/buildings/propagandaHub.tw
index e1890fedb48..2d147704b53 100644
--- a/src/Mods/SecExp/buildings/propagandaHub.tw
+++ b/src/Mods/SecExp/buildings/propagandaHub.tw
@@ -7,11 +7,7 @@
<</if>>
<<set $nextButton = "Back">>
-<<if $sideBarOptions.compact > 0>>
- <<set $nextLink = "Manage Arcology">>
-<<else>>
- <<set $nextLink = "Main">>
-<</if>>
+<<set $nextLink = "Main">>
Propaganda Hub
<hr>
diff --git a/src/Mods/SecExp/buildings/riotControlCenter.tw b/src/Mods/SecExp/buildings/riotControlCenter.tw
index dbc973c78b0..1f4074f665c 100644
--- a/src/Mods/SecExp/buildings/riotControlCenter.tw
+++ b/src/Mods/SecExp/buildings/riotControlCenter.tw
@@ -1,11 +1,7 @@
:: riotControlCenter [nobr jump-to-safe jump-from-safe]
<<set $nextButton = "Back">>
-<<if $sideBarOptions.compact > 0>>
- <<set $nextLink = "Manage Arcology">>
-<<else>>
- <<set $nextLink = "Main">>
-<</if>>
+<<set $nextLink = "Main">>
Riot Control Center
<hr>
diff --git a/src/Mods/SecExp/buildings/secBarracks.tw b/src/Mods/SecExp/buildings/secBarracks.tw
index 50253abea96..3b3826a3fb2 100644
--- a/src/Mods/SecExp/buildings/secBarracks.tw
+++ b/src/Mods/SecExp/buildings/secBarracks.tw
@@ -1,11 +1,7 @@
:: secBarracks [nobr jump-to-safe jump-from-safe]
<<set $nextButton = "Back">>
-<<if $sideBarOptions.compact > 0>>
- <<set $nextLink = "Manage Arcology">>
-<<else>>
- <<set $nextLink = "Main">>
-<</if>>
+<<set $nextLink = "Main">>
The Barracks
<hr>
diff --git a/src/Mods/SecExp/buildings/securityHQ.tw b/src/Mods/SecExp/buildings/securityHQ.tw
index 215e7093187..36f6fc97eb0 100644
--- a/src/Mods/SecExp/buildings/securityHQ.tw
+++ b/src/Mods/SecExp/buildings/securityHQ.tw
@@ -7,11 +7,7 @@
<</if>>
<<set $nextButton = "Back">>
-<<if $sideBarOptions.compact > 0>>
- <<set $nextLink = "Manage Arcology">>
-<<else>>
- <<set $nextLink = "Main">>
-<</if>>
+<<set $nextLink = "Main">>
Security Headquarters
<hr>
diff --git a/src/Mods/SpecialForce/Firebase.tw b/src/Mods/SpecialForce/Firebase.tw
index 599ab92ca27..28060521187 100644
--- a/src/Mods/SpecialForce/Firebase.tw
+++ b/src/Mods/SpecialForce/Firebase.tw
@@ -12,11 +12,7 @@
<</switch>>
<<set $nextButton = "Back">>
- <<if $sideBarOptions.compact > 0>>
- <<set $nextLink = "Manage Arcology">>
- <<else>>
- <<set $nextLink = "Main">>
- <</if>>
+ <<set $nextLink = "Main">>
<<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 c2d33e31417..41f53158762 100644
--- a/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw
+++ b/src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw
@@ -1,11 +1,7 @@
:: MOD_Edit Arcology Cheat Datatype Cleanup [nobr]
<<set $nextButton = "Continue">>
-<<if $sideBarOptions.compact > 0>>
- <<set $nextLink = "Manage Arcology">>
-<<else>>
- <<set $nextLink = "Main">>
-<</if>>
+<<set $nextLink = "Main">>
<<if $customEvalCode>>
<<if $customEvalCode.charAt(0) != "(" || $nextLink == ")">> /* second condition is only there for sanityCheck */
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 75ad567df68..61efa463e4b 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -190,9 +190,6 @@ App.Update.globalVariables = function(node) {
if (typeof V.sideBarOptions.roomPop === "undefined") {
V.sideBarOptions.roomPop = 1;
}
- if (typeof V.sideBarOptions.compact === "undefined") {
- V.sideBarOptions.compact = 1;
- }
if (typeof V.sideBarOptions.confirmWeekEnd === "undefined") {
V.sideBarOptions.confirmWeekEnd = 0;
}
diff --git a/src/facilities/farmyard/food/foodMarket.tw b/src/facilities/farmyard/food/foodMarket.tw
index 0773bc2bafe..75f2109bee0 100644
--- a/src/facilities/farmyard/food/foodMarket.tw
+++ b/src/facilities/farmyard/food/foodMarket.tw
@@ -7,11 +7,7 @@
<<set _maxFood = Math.trunc($cash/$farmyardFoodCost)>>
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>>
+<<set $nextLink = "Main">>
<br>
<<link "Buy <<= massFormat(1)>>" _link>><<set cashX(forceNeg($farmyardFoodCost*1), "farmyard"), $foodStored += 1>><</link>>
diff --git a/src/uncategorized/changeLanguage.tw b/src/uncategorized/changeLanguage.tw
index 95f3c2a4197..7dbd3c9616c 100644
--- a/src/uncategorized/changeLanguage.tw
+++ b/src/uncategorized/changeLanguage.tw
@@ -1,11 +1,7 @@
:: Change Language [nobr jump-from-safe]
<<set $nextButton = "Confirm changes">>
-<<if $sideBarOptions.compact > 0>>
- <<set $nextLink = "Manage Arcology">>
-<<else>>
- <<set $nextLink = "Main">>
-<</if>>
+<<set $nextLink = "Main">>
<<set $revivalistLanguage = 0>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index 73d6c14c3e1..e13e2bbe922 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -22,11 +22,7 @@
[[Cheat Edit Neighboring Arcologies|MOD_Edit Neighbor Arcology Cheat]]<br><br>
<</if>>
-<<if $sideBarOptions.compact > 0>>
- <<set $nextLink = "Manage Arcology">>
-<<else>>
- <<set $nextLink = "Main">>
-<</if>>
+<<set $nextLink = "Main">>
<<set $nextButton = "Back">>
You have <<print $arcologies.length-1>> neighbors. <br><br>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 739b3ee57c0..2e5e940f852 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -166,10 +166,6 @@ This save was created using FC version $ver build $releaseID.
<<set _options = new App.UI.OptionsGroup()>>
- <<run _options.addOption("Compact side bar is", "compact", $sideBarOptions)
- .addValue("Enabled", 1).on().addValue("Disabled", 0).off()
- .addComment("Disabling this will move the sidebar 'Manage Arcology' links onto the Main menu, while keeping the passage visible.")>>
-
<<run _options.addOption("Cash is", "Cash", $sideBarOptions)
.addValue("Shown", 1).on().addValue("Hidden", 0).off()>>
--
GitLab