Skip to content
Snippets Groups Projects
Commit 7c55233f authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'storyCaptionFix' into 'pregmod-master' 

storyCaptionFix

See merge request pregmodfan/fc-pregmod!4779
parents 2ab2a022 24662c0f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/uncategorized/storyCaption.tw
+ 25
− 25
View file @ 7c55233f
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<<elseif $ui == "disclaimer">> <<elseif $ui == "disclaimer">>
<span id="nextButton"> <span id="nextButton">
<strong> <strong>
[[($nextButton)|$nextLink]] <<link [[($nextButton)|$nextLink]]>><</link>>
</strong> </strong>
</span> </span>
...@@ -66,13 +66,13 @@ ...@@ -66,13 +66,13 @@
<span id="endWeekButton"> <span id="endWeekButton">
<<if $nextButton == "END WEEK">> <br><br> <<if $nextButton == "END WEEK">> <br><br>
<strong> <strong>
[[($nextButton)|$nextLink]] <<link [[($nextButton)|$nextLink]]>><</link>>
</strong> </strong>
@@.cyan;[Ent]@@ @@.cyan;[Ent]@@
<<if $rulesError && $rulesAssistantAuto == 1>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>> <<if $rulesError && $rulesAssistantAuto == 1>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>>
<<elseif $nextButton !== " ">> <br><br> <<elseif $nextButton !== " ">> <br><br>
<strong> <strong>
[[$nextButton|$nextLink][$ui = "main"]] <<link [[$nextButton|$nextLink][$ui = "main"]]>><</link>>
</strong> </strong>
@@.cyan;[Space]@@ @@.cyan;[Space]@@
<</if>> <</if>>
...@@ -494,26 +494,26 @@ ...@@ -494,26 +494,26 @@
<br> <br>
<<if _Pass !== "Manage Arcology">> <<if _Pass !== "Manage Arcology">>
<span id="manageArcology"> <br> <span id="manageArcology"> <br>
[[Manage Arcology]] <<link [[Manage Arcology]]>><</link>>
</span> </span>
@@.cyan;[C]@@ @@.cyan;[C]@@
<</if>> <</if>>
<<if _Pass !== "Manage Penthouse">> <<if _Pass !== "Manage Penthouse">>
<span id="managePenthouse"> <br> <span id="managePenthouse"> <br>
[[Manage Penthouse]] <<link [[Manage Penthouse]]>><</link>>
</span> </span>
@@.cyan;[P]@@ @@.cyan;[P]@@
<</if>> <</if>>
<<if _Pass !== "Manage Personal Affairs">> <<if _Pass !== "Manage Personal Affairs">>
<span id="managePerson"> <br> <span id="managePerson"> <br>
[[Manage Personal Affairs]] <<link [[Manage Personal Affairs]]>><</link>>
</span> </span>
@@.cyan;[X]@@ @@.cyan;[X]@@
<</if>> <</if>>
<<if $corpAnnounced == 1 && _Pass !== "Manage Corporation">> <<if $corpAnnounced == 1 && _Pass !== "Manage Corporation">>
<span id="manageCorporation"> <br> <span id="manageCorporation"> <br>
[[Manage Corporation][$nextButton = "Back", $nextLink = _Pass]] <<link [[Manage Corporation][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span> </span>
<<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>> <<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>>
<</if>> <</if>>
...@@ -521,13 +521,13 @@ ...@@ -521,13 +521,13 @@
<<if (_Pass === "Main") && $newModelUI === 1>> <br> <<if (_Pass === "Main") && $newModelUI === 1>> <br>
<<if $FSAnnounced>> <<if $FSAnnounced>>
<span id="FSButton"> <br> <span id="FSButton"> <br>
[[Future Societies|Future Society][$nextButton = "Back", $nextLink = "Main"]] <<link [[Future Societies|Future Society][$nextButton = "Back", $nextLink = "Main"]]>><</link>>
</span> </span>
@@.cyan;[F]@@ @@.cyan;[F]@@
<<if ($FSCredits > 0) || ($FSReminder)>>@@.yellow;[!]@@<</if>> <<if ($FSCredits > 0) || ($FSReminder)>>@@.yellow;[!]@@<</if>>
<</if>> <</if>>
<span id="PAOButton"> <br> <span id="PAOButton"> <br>
[[Personal Assistant|Personal assistant options]] <<link [[Personal Assistant|Personal assistant options]]>><</link>>
</span> </span>
@@.cyan;[T]@@ @@.cyan;[T]@@
...@@ -675,13 +675,13 @@ ...@@ -675,13 +675,13 @@
<<if _Pass === "Manage Arcology">> <<if _Pass === "Manage Arcology">>
<span id="Security"> <span id="Security">
<span id="policyButton"> <br> <span id="policyButton"> <br>
[[Policies][$nextButton = "Back", $nextLink = "Manage Arcology"]] <<link [[Policies][$nextButton = "Back", $nextLink = "Manage Arcology"]]>><</link>>
</span> </span>
@@.cyan;[Y]@@ @@.cyan;[Y]@@
<<if $secExp == 1>> <<if $secExp == 1>>
<span id="edictButton"> <br> <span id="edictButton"> <br>
[[edicts][$nextButton = "Back", $nextLink = "Manage Arcology"]] <<link [[edicts][$nextButton = "Back", $nextLink = "Manage Arcology"]]>><</link>>
</span> </span>
@@.cyan;[D]@@ @@.cyan;[D]@@
<</if>> <</if>>
...@@ -693,33 +693,33 @@ ...@@ -693,33 +693,33 @@
<<link "Manage Security">> <<replace "#Security">> <<link "Manage Security">> <<replace "#Security">>
<<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">> <<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">>
<span id="SFMButton"> <br> <span id="SFMButton"> <br>
[[$SF.Caps's firebase|Firebase]] <<link [[$SF.Caps's firebase|Firebase]]>><</link>>
</span> </span>
@@.cyan;[Z]@@ @@.cyan;[Z]@@
<</if>> <</if>>
<<if $propHub > 0 && _Pass !== "propagandaHub">> <<if $propHub > 0 && _Pass !== "propagandaHub">>
<span id="propHub"> <br> <span id="propHub"> <br>
[[Manage PR|propagandaHub][$nextButton = "Back", $nextLink = _Pass]] << [[Manage PR|propagandaHub][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span> </span>
@@.cyan;[Shift+H]@@ @@.cyan;[Shift+H]@@
<</if>> <</if>>
<<if $secHQ > 0 && _Pass !== "securityHQ">> <<if $secHQ > 0 && _Pass !== "securityHQ">>
<span id="securityHQ"> <br> <span id="securityHQ"> <br>
[[Manage Security|securityHQ][$nextButton = "Back", $nextLink = _Pass]] <<link [[Manage Security|securityHQ][$nextButton = "Back", $nextLink = _Pass]]>><<link>>
</span> </span>
@@.cyan;[Shift+S]@@ @@.cyan;[Shift+S]@@
<</if>> <</if>>
<<if $secBarracks > 0 && _Pass !== "secBarracks">> <<if $secBarracks > 0 && _Pass !== "secBarracks">>
<span id="secBarracks"> <br> <span id="secBarracks"> <br>
[[Manage Military|secBarracks][$nextButton = "Back", $nextLink = _Pass]] <<link [[Manage Military|secBarracks][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span> </span>
@@.cyan;[Shift+A]@@ @@.cyan;[Shift+A]@@
<</if>> <</if>>
<<if $riotCenter > 0 && _Pass !== "riotControlCenter">> <<if $riotCenter > 0 && _Pass !== "riotControlCenter">>
<span id="riotCenter"> <br> <span id="riotCenter"> <br>
[[Manage Rebels|riotControlCenter][$nextButton = "Back", $nextLink = _Pass]] <<link [[Manage Rebels|riotControlCenter][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span> </span>
@@.cyan;[Shift+R]@@ @@.cyan;[Shift+R]@@
<</if>> <</if>>
...@@ -728,8 +728,8 @@ ...@@ -728,8 +728,8 @@
</span> </span>
<<elseif _Pass === "Manage Penthouse">> <<elseif _Pass === "Manage Penthouse">>
<span id="URButton"> <br> <span id="URButton"> <br><br>
[[Universal Rules]] <<link [[Universal Rules]]>><</link>>
</span> </span>
@@.cyan;[V]@@ @@.cyan;[V]@@
...@@ -760,33 +760,33 @@ ...@@ -760,33 +760,33 @@
<<elseif ["Firebase", "propagandaHub", "securityHQ", "secBarracks", "riotControlCenter"].includes(_Pass)>> <<elseif ["Firebase", "propagandaHub", "securityHQ", "secBarracks", "riotControlCenter"].includes(_Pass)>>
<<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">> <<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">>
<span id="SFMButton"> <br> <span id="SFMButton"> <br>
[[$SF.Caps's firebase|Firebase]] <<link [[$SF.Caps's firebase|Firebase]]>><</link>>
</span> </span>
@@.cyan;[Z]@@ @@.cyan;[Z]@@
<</if>> <</if>>
<<if $propHub > 0 && _Pass !== "propagandaHub">> <<if $propHub > 0 && _Pass !== "propagandaHub">>
<span id="propHub"> <br> <span id="propHub"> <br>
[[Manage PR|propagandaHub][$nextButton = "Back", $nextLink = _Pass]] <<link [[Manage PR|propagandaHub][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span> </span>
@@.cyan;[Shift+H]@@ @@.cyan;[Shift+H]@@
<</if>> <</if>>
<<if $secHQ > 0 && _Pass !== "securityHQ">> <<if $secHQ > 0 && _Pass !== "securityHQ">>
<span id="securityHQ"> <br> <span id="securityHQ"> <br>
[[Manage Security|securityHQ][$nextButton = "Back", $nextLink = _Pass]] <<link [[Manage Security|securityHQ][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span> </span>
@@.cyan;[Shift+S]@@ @@.cyan;[Shift+S]@@
<</if>> <</if>>
<<if $secBarracks > 0 && _Pass !== "secBarracks">> <<if $secBarracks > 0 && _Pass !== "secBarracks">>
<span id="secBarracks"> <br> <span id="secBarracks"> <br>
[[Manage Military|secBarracks][$nextButton = "Back", $nextLink = _Pass]] <<link [[Manage Military|secBarracks][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span> </span>
@@.cyan;[Shift+A]@@ @@.cyan;[Shift+A]@@
<</if>> <</if>>
<<if $riotCenter > 0 && _Pass !== "riotControlCenter">> <<if $riotCenter > 0 && _Pass !== "riotControlCenter">>
<span id="riotCenter"> <br> <span id="riotCenter"> <br>
[[Manage Rebels|riotControlCenter][$nextButton = "Back", $nextLink = _Pass]] <<link [[Manage Rebels|riotControlCenter][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span> </span>
@@.cyan;[Shift+R]@@ @@.cyan;[Shift+R]@@
<</if>> <</if>>
...@@ -799,7 +799,7 @@ ...@@ -799,7 +799,7 @@
<br><br> <br><br>
<<if !["Options", "Summary Options", "Description Options"].includes(_Pass)>> <<if !["Options", "Summary Options", "Description Options"].includes(_Pass)>>
<span id="optionsButton"> <span id="optionsButton">
[[Game Options|Options][$nextButton = "Back", $nextLink = _Pass]] <<link [[Game Options|Options][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span> </span>
@@.cyan;[O]@@ @@.cyan;[O]@@
<<else>> <<else>>
...@@ -843,4 +843,4 @@ ...@@ -843,4 +843,4 @@
<<link "Dump Game State">><<run App.Debug.dumpGameState()>><</link>> <<link "Dump Game State">><<run App.Debug.dumpGameState()>><</link>>
<</if>> <</if>>
<</if>> /* Closes ui != "start" */ <</if>> /* Closes ui != "start" */
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment