diff --git a/src/002-config/mousetrapConfig.js b/src/002-config/mousetrapConfig.js index 75e7bbcaa7393ae11fad4a0d1114925bf43d3024..a2a99786b0c3ac330eaa2cbf5e30f16258ca5ec6 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 7c2c1b7b951554b2d5e5096a69376d79e1fffbfa..0000000000000000000000000000000000000000 --- 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 1e1bc6247f412d4327713462482d06801e5e53e0..ee2c5d1bd8ad69fb9525dca7f2652f26942c7ac6 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 39bf58cdea85372a3b64a62e0220462745bd69a8..0bbd75f797ff0a22513f1eae99f0c64727751019 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>>