diff --git a/.gitignore b/.gitignore
index cd29456af544f0c68a943e66c8eb98c24bb890c7..6d78cf02c6e630cfed73c3c0ad5cb3e1b1057651 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,9 @@ __pycache__/
*$py.class
*.swp
*.swo
+Jquery.js
+displayVariables.js
+bugReport.js
# C extensions
*.so
diff --git a/src/002-config/mousetrapConfig.js b/src/002-config/mousetrapConfig.js
index b9cb6fe70c4c40d2d721903531d0322ff2a4807b..64e8bf82a9eb73ad53f1bf8bebe8d8935df29b7e 100644
--- a/src/002-config/mousetrapConfig.js
+++ b/src/002-config/mousetrapConfig.js
@@ -7,6 +7,7 @@ Mousetrap.bind("space", function () {
});
Mousetrap.bind("c", function () {
$("#story-caption #manageArcology a.macro-link").trigger("click");
+ $("#story-caption #manageCorporation a.macro-link").trigger("click");
});
Mousetrap.bind("p", function () {
$("#story-caption #managePenthouse a.macro-link").trigger("click");
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index acf98626f3455dbdcd4d2c90d884a26c6570768b..dabf6c47189ea6b4683274ca6c43ea62d9a0c026 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -74,7 +74,9 @@
<br><br>
<<if $newModelUI == 0>>
<<if _Pass == "Main">>
- <span id="manageArcology"><<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">><</link>></span> @@.cyan;[C]@@
+ <span id="manageArcology">
+ <<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">><</link>>
+ </span> @@.cyan;[C]@@
<</if>>
<br>
<</if>>
@@ -191,6 +193,8 @@
<</if>>
| <<print massFormat($food)>>
</span>
+ <<else>>
+ <br>
<</if>>
<br>Upkeep |
<</if>><<print cashFormat($costs)>>
@@ -591,88 +595,111 @@
<</if>>
<br>
<<if $SF.Toggle && $SF.Active >= 1>>
- <br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
+ <br>
+ <span id="SFMButton">
+ <<link "$SF.Caps's firebase""Firebase">><</link>>
+ </span> @@.cyan;[Z]@@
<</if>>
- <br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
+ <br>
+ <span id="optionsButton">
+ <<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>>
+ </span> @@.cyan;[O]@@
<<else>>
- <br><span id="manageArcology"><<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">><</link>></span> @@.cyan;[C]@@
- <br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@
- <br><span id="managePerson"><<link "Manage Personal Affairs">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Personal Affairs">><</link>></span> @@.cyan;[X]@@
- <<if $corpAnnounced == 1>><br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>></span><</if>>
- <<if $secExp == 1>>
+ <br>
+ <span id="manageArcology">
+ <<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">>
+ <</link>>
+ </span> @@.cyan;[C]@@
+ <br>
+ <span id="managePenthouse">
+ <<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">>
+ <</link>>
+ </span> @@.cyan;[P]@@
+ <br>
+ <span id="managePerson">
+ <<link "Manage Personal Affairs">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Personal Affairs">>
+ <</link>>
+ </span> @@.cyan;[X]@@
+ <br>
+ <span id="PAOButton">
+ <<link [[Manage Personal Assistant|Personal assistant options]]>>
+ <</link>>
+ </span> @@.cyan;[T]@@
+ <br><br><br><br><br><br><br><br>
+ <span id="optionsButton">
+ <<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">>
+ <</link>>
+ </span> @@.cyan;[O]@@
+ <</if>>
+ <br>
+
+<<elseif _Pass == "Manage Arcology">>
+ <br><br>
+ <span id="managePenthouse">
+ <<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>>
+ </span> @@.cyan;[P]@@
+ <<if $corpAnnounced == 1>><br>
+ <span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>></span> @@.cyan;[C]@@<</if>>
+ <<if $secExp == 1>>
<<if $propHub == 1>>
- <br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
+ <br>
+ <span id="propHub">
+ <<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>>
+ </span> @@.cyan;[Shift+H]@@
<</if>>
<<if $secHQ == 1>>
- <br><span id="securityHQ"><<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>></span> @@.cyan;[Shift+S]@@
+ <br>
+ <span id="securityHQ">
+ <<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>>
+ </span> @@.cyan;[Shift+S]@@
<</if>>
<<if $secBarracks == 1>>
- <br><span id="secBarracks"><<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>></span> @@.cyan;[Shift+A]@@
+ <br>
+ <span id="secBarracks">
+ <<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>>
+ </span> @@.cyan;[Shift+A]@@
<</if>>
<<if $riotCenter == 1>>
- <br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
- <</if>>
- <</if>>
- <<if $SF.Toggle && $SF.Active >= 1>>
- <br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
- <</if>>
-
<br>
- <br><span id="PAOButton"><<link [[Personal Assistant|Personal assistant options]]>><</link>></span> @@.cyan;[T]@@
- <br><span id="policyButton"><<link [[Policies]]>><<set $nextButton = "Back", $nextLink = "Main">><</link>></span> @@.cyan;[Y]@@
- <<if $secExp == 1>>
- <br><span id="edictButton"><<link [[Edicts|edicts]]>><<set $nextButton = "Back", $nextLink = "Main">><</link>></span> @@.cyan;[D]@@
- <</if>>
- <<if $FSAnnounced>>
- <br><span id="FSButton"><<link [[Future Societies|Future Society]]>><<set $nextButton = "Back", $nextLink = "Main">><</link>></span> @@.cyan;[F]@@ <<if ($FSCredits > 0) || ($FSReminder)>>@@.yellow;[!]@@<</if>>
+ <span id="riotCenter">
+ <<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>>
+ </span> @@.cyan;[Shift+R]@@
<</if>>
- <br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@
-
- <br>
- <br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
<</if>>
+ <<if $SF.Toggle && $SF.Active >= 1>>
<br>
+ <span id="SFMButton">
+ <<link "$SF.Caps's Firebase""Firebase">><</link>>
+ </span> @@.cyan;[Z]@@
+ <</if>>
-<<elseif _Pass == "Manage Arcology">>
<br>
- <br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@
- <br><span id="managePerson"><<link "Manage Personal Affairs">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Personal Affairs">><</link>></span> @@.cyan;[X]@@
- <<if $corpAnnounced == 1>><br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>></span><</if>>
- <<if $secExp == 1>>
- <<if $propHub == 1>>
- <br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
- <</if>>
- <<if $secHQ == 1>>
- <br><span id="securityHQ"><<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>></span> @@.cyan;[Shift+S]@@
- <</if>>
- <<if $secBarracks == 1>>
- <br><span id="secBarracks"><<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>></span> @@.cyan;[Shift+A]@@
- <</if>>
- <<if $riotCenter == 1>>
- <br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
- <</if>>
- <</if>>
- <<if $SF.Toggle && $SF.Active >= 1>>
- <br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
+ <<if $FSAnnounced>>
+ <br>
+ <span id="FSButton">
+ <<link [[Future Societies|Future Society]]>><<set $nextButton = "Back", $nextLink = "Manage Arcology">><</link>>
+ </span> @@.cyan;[F]@@
<</if>>
-
<br>
- <br><span id="PAOButton"><<link [[Personal Assistant|Personal assistant options]]>><</link>></span> @@.cyan;[T]@@
- <br><span id="policyButton"><<link [[Policies]]>><<set $nextButton = "Back", $nextLink = "Manage Arcology">><</link>></span> @@.cyan;[Y]@@
+ <span id="URButton">
+ <<link [[Universal Rules]]>><</link>>
+ </span> @@.cyan;[V]@@
+ <br>
+ <span id="policyButton">
+ <<link [[Policies]]>><<set $nextButton = "Back", $nextLink = "Manage Arcology">><</link>>
+ </span> @@.cyan;[Y]@@
<<if $secExp == 1>>
- <br><span id="edictButton"><<link [[Edicts|edicts]]>><<set $nextButton = "Back", $nextLink = "Manage Arcology">><</link>></span> @@.cyan;[D]@@
- <</if>>
- <<if $FSAnnounced>>
- <br><span id="FSButton"><<link [[Future Societies|Future Society]]>><<set $nextButton = "Back", $nextLink = "Manage Arcology">><</link>></span> @@.cyan;[F]@@
+ <br>
+ <span id="edictButton">
+ <<link [[Edicts|edicts]]>><<set $nextButton = "Back", $nextLink = "Manage Arcology">><</link>>
+ </span> @@.cyan;[D]@@
<</if>>
- <br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@
+ <br><br>
+ <span id="optionsButton">
+ <<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>>
+ </span> @@.cyan;[O]@@
<br>
- <br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
<<elseif _Pass == "Manage Penthouse">>
- <br>
- <br><span id="manageArcology"><<link [[Manage Arcology|Manage Arcology]]>><</link>></span> @@.cyan;[C]@@
- <<if $corpAnnounced == 1>><br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>></span><</if>>
- <br><span id="managePerson"><<link [[Manage Personal Affairs|Manage Personal Affairs]]>><</link>></span> @@.cyan;[X]@@
<br>
<br><<link [[Wardrobe]]>><</link>>
<br><<if $dispensary>>[[Pharmaceutical Fabricator|Dispensary]]<</if>>
@@ -682,47 +709,17 @@
<br><<if $geneticMappingUpgrade>>[[Gene Lab|Gene Lab]]<</if>>
<br><<if $rep >= 10000>>[[Black Market|The Black Market]]<</if>>
<br><br><br><br><br>
-<<elseif _Pass == "Manage Corporation">>
- <br>
- <br><span id="manageArcology"><<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">><</link>></span> @@.cyan;[C]@@
- <br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@
- <br><span id="managePerson"><<link "Manage Personal Affairs">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Personal Affairs">><</link>></span> @@.cyan;[X]@@
- <<if $corpAnnounced == 1>><br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>></span><</if>>
- <<if $secExp == 1>>
- <<if $propHub == 1>>
- <br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
- <</if>>
- <<if $secHQ == 1>>
- <br><span id="securityHQ"><<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>></span> @@.cyan;[Shift+S]@@
- <</if>>
- <<if $secBarracks == 1>>
- <br><span id="secBarracks"><<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>></span> @@.cyan;[Shift+A]@@
- <</if>>
- <<if $riotCenter == 1>>
- <br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
- <</if>>
- <</if>>
- <<if $SF.Toggle && $SF.Active >= 1>>
- <br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
- <</if>>
-
+ <span id="optionsButton">
+ <<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>>
+ </span> @@.cyan;[O]@@
<br>
- <br><span id="PAOButton"><<link [[Personal Assistant|Personal assistant options]]>><</link>></span> @@.cyan;[T]@@
- <br><span id="policyButton"><<link [[Policies]]>><<set $nextButton = "Back", $nextLink = "Manage Corporation">><</link>></span> @@.cyan;[Y]@@
- <<if $secExp == 1>>
- <br><span id="edictButton"><<link [[Edicts|edicts]]>><<set $nextButton = "Back", $nextLink = "Manage Corporation">><</link>></span> @@.cyan;[D]@@
- <</if>>
- <<if $FSAnnounced>>
- <br><span id="FSButton"><<link [[Future Societies|Future Society]]>><<set $nextButton = "Back", $nextLink = "Manage Corporation">><</link>></span> @@.cyan;[F]@@
- <</if>>
- <br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@
+<<elseif _Pass == "Manage Corporation">>
+ <br><br><br><br><br><br><br><br><br><br><br><br><br>
+ <span id="optionsButton">
+ <<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>>
+ </span> @@.cyan;[O]@@
<br>
- <br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
<<elseif _Pass == "Manage Personal Affairs">>
- <br>
- <br><span id="manageArcology"><<link [[Manage Arcology|Manage Arcology]]>><</link>></span> @@.cyan;[C]@@
- <br><span id="managePenthouse"><<link [[Manage Penthouse|Manage Penthouse]]>><</link>></span> @@.cyan;[X]@@
- <<if $corpAnnounced == 1>><br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>></span><</if>>
<br>
<br><<link [[Wardrobe]]>><</link>>
<br><<if $dispensary>>[[Pharmaceutical Fabricator|Dispensary]]<</if>>
@@ -730,7 +727,7 @@
<br><<if $organFarmUpgrade>>[[Organ Farm|Organ Farm]]<</if>>
<br><<if $geneticMappingUpgrade>>[[Gene Lab|Gene Lab]]<</if>>
<br><<if $rep >= 10000>>[[Black Market|The Black Market]]<</if>>
- <br><br><br><br><br>
+ <br><br><br><br><br><br><br>
<<elseif _Pass == "Wardrobe Use">>
<br>
<br><<link [[Wardrobe (shopping)|Wardrobe]]>><</link>>
@@ -747,20 +744,40 @@
<<elseif _Pass == "propagandaHub" || _Pass == "securityHQ" || _Pass == "secBarracks" || _Pass == "riotControlCenter">>
<br>
<<if $propHub == 1>>
- <br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
+ <<if _Pass != "propagandaHub">>
+ <br>
+ <span id="propHub">
+ <<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>>
+ </span> @@.cyan;[Shift+H]@@
+ <</if>>
<</if>>
<<if $secHQ == 1>>
- <br><span id="securityHQ"><<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>></span> @@.cyan;[Shift+S]@@
+ <<if _Pass != "securityHQ">>
+ <br>
+ <span id="securityHQ">
+ <<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>>
+ </span> @@.cyan;[Shift+S]@@
+ <</if>>
<</if>>
<<if $secBarracks == 1>>
- <br><span id="secBarracks"><<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>></span> @@.cyan;[Shift+A]@@
+ <<if _Pass != "secBarracks">>
+ <br>
+ <span id="secBarracks">
+ <<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>>
+ </span> @@.cyan;[Shift+A]@@
+ <</if>>
<</if>>
<<if $riotCenter == 1>>
- <br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
+ <<if _Pass != "riotControlCenter">>
+ <br>
+ <span id="riotCenter">
+ <<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>>
+ </span> @@.cyan;[Shift+R]@@
+ <</if>>
<</if>>
- <br>
+ <br><br><br><br><br>
<<else>>
- <br><br><br><br><br><br><br><br>
+ <br><br><br><br><br><br><br><br><br><br><br><br><br><br>
<</if>>
<</nobr>>
<</if>>\