From dec21ea49ab027d7adb2b2a61cdeaccbb7c1eafa Mon Sep 17 00:00:00 2001
From: DCoded <dsoloha@live.com>
Date: Fri, 3 May 2019 09:22:02 -0400
Subject: [PATCH] Reverted unused changes
---
src/002-config/mousetrapConfig.js | 1 -
src/SecExp/secOverview.tw | 57 ------------------------------
src/uncategorized/futureSociety.tw | 2 +-
src/uncategorized/storyCaption.tw | 38 --------------------
4 files changed, 1 insertion(+), 97 deletions(-)
delete mode 100644 src/SecExp/secOverview.tw
diff --git a/src/002-config/mousetrapConfig.js b/src/002-config/mousetrapConfig.js
index 75e7bbcaa73..a2a99786b0c 100644
--- a/src/002-config/mousetrapConfig.js
+++ b/src/002-config/mousetrapConfig.js
@@ -54,7 +54,6 @@ Mousetrap.bind("h", function() {
});
Mousetrap.bind("s", function() {
$("#buySlaves a.macro-link").trigger("click");
- $("#story-caption #secOverview a.macro-link").trigger("click");
});
Mousetrap.bind("a", function() {
$("#managePA a.macro-link").trigger("click");
diff --git a/src/SecExp/secOverview.tw b/src/SecExp/secOverview.tw
deleted file mode 100644
index 7c2c1b7b951..00000000000
--- a/src/SecExp/secOverview.tw
+++ /dev/null
@@ -1,57 +0,0 @@
-:: secOverview [nobr]
-
-<<set $nextButton = "Back", $nextLink = "Manage Arcology", $returnTo = "Manage Arcology">>
-
-/* TODO: expand this. a LOT */
-<<if $propHub && $secHQ && $secBarracks && $riotCenter>>
- <br>
- <span id="propHub">
- <<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>>
- </span>
- <br>
- <span id="securityHQ">
- <<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>>
- </span>
- <br>
- <span id="secBarracks">
- <<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>>
- </span>
- <br>
- <span id="riotCenter">
- <<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>>
- </span>
-<<else>>
- <<set _breaks = []>>
- <<if $propHub>>
- <br>
- <span id="propHub">
- <<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>>
- </span>
- <<else>>
- <<set _breaks.push("<br>")>>
- <</if>>
- <<if $secHQ>>
- <br>
- <span id="securityHQ">
- <<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>>
- </span>
- <<else>>
- <<set _breaks.push("<br>")>>
- <</if>>
- <<if $secBarracks>>
- <br>
- <span id="secBarracks">
- <<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>>
- </span>
- <<else>>
- <<set _breaks.push("<br>")>>
- <</if>>
- <<if $riotCenter>>
- <br>
- <span id="riotCenter">
- <<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>>
- </span>
- <<else>>
- <<set _breaks.push("<br>")>>
- <</if>>
-<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index 1e1bc6247f4..ee2c5d1bd8a 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -1,7 +1,7 @@
:: Future Society [nobr]
<<setAssistantPronouns>>
-<<set $nextButton = "Back", $nextLink = "Manage Arcology", $showEncyclopedia = 1, $encyclopedia = "Future Societies", $FSReminder = "">>
+<<set $nextButton = "Back", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "Future Societies", $FSReminder = "">>
<<if ndef $arcologies[0].FSSubjugationist>>
<<set $arcologies[0].FSSubjugationist = "unset">>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 39bf58cdea8..0bbd75f797f 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -742,46 +742,8 @@
<br>[[Description Options]]
<br><br><br><br><br><br>
-<<elseif _Pass == "secOverview">>
- <br><br>
- <<set _breaks = []>>
- <<if $propHub>>
- <br>
- <span id="propHub">
- <<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>>
- </span> @@.cyan;[Shift+H]@@
- <<else>>
- <<set _breaks.push("<br>")>>
- <</if>>
- <<if $secHQ>>
- <br>
- <span id="securityHQ">
- <<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>>
- </span> @@.cyan;[Shift+S]@@
- <<else>>
- <<set _breaks.push("<br>")>>
- <</if>>
- <<if $secBarracks>>
- <br>
- <span id="secBarracks">
- <<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>>
- </span> @@.cyan;[Shift+A]@@
- <<else>>
- <<set _breaks.push("<br>")>>
- <</if>>
- <<if $riotCenter>>
- <br>
- <span id="riotCenter">
- <<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>>
- </span> @@.cyan;[Shift+R]@@
- <<else>>
- <<set _breaks.push("<br>")>>
- <</if>>
- <br><br><br><br>
-
<<elseif _Pass == "propagandaHub" || _Pass == "securityHQ" || _Pass == "secBarracks" || _Pass == "riotControlCenter">>
<br><br>
- <<set _breaks = []>>
<<if $propHub == 1>>
<br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
<</if>>
--
GitLab