Skip to content
Snippets Groups Projects
Commit 796a9762 authored by Blank's avatar Blank Committed by Pregmodder
Browse files

Story caption fixes ii

parent 0ab14ee6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/uncategorized/storyCaption.tw
+ 87
− 133
View file @ 796a9762
:: StoryCaption [nobr] :: StoryCaption [nobr]
<<set _Pass = passage()>> <<set _Pass = passage()>>
<<widget "userButton">>
<<if $ui != "start" && _Pass !== "Encyclopedia">> <<if _Pass !== "Encyclopedia">> <br><br> <</if>>
<<if $cheatMode || $debugMode>> _Pass<br> <</if>> <<if $nextButton === "END WEEK">>
<span id="week">''Week $week''</span> <span id="endWeekButton"> <strong>
<<if $week > 52>> (<<= years($week)>>) <</if>> <<link [[($nextButton)|($nextLink)]]>><</link>>
<br>Week of $month $day, $year </strong> </span> @@.cyan;[Ent]@@
<<if (_Pass == "Main") && ($cheatMode)&& ($cheatModeM)>> <<if $rulesError && $rulesAssistantAuto == 1>>
<<set _TWeek = $week>> <br>@@.yellow; WARNING: some custom rules will change slave variables@@
<<textbox "$week" $week>> <</if>>
<<link "Apply">> <<else>>
<<set $week = Math.trunc(Number($week) || _TWeek)>> <strong>
<<if $week < 1>><<set $week = 1>><</if>> <<if _Pass !== "Encyclopedia">> /* must use link so spacebar shortcut will work */
<<replace "#week">>''Week $week''<</replace>> <<link "$nextButton">> <<set $ui = "main">> <<goto $nextLink>> <</link>>
<</link>> <<else>>
<<link [[($nextButton)|($nextLink)]]>><</link>> to Free Cities.
<</if>>
</strong> @@.cyan;[Space]@@
<</if>> <</if>>
<br> <br>
<<if $weatherToday.severity == 1>> <</widget>>
//@@.cyan;$weatherToday.name@@//
<<elseif $weatherToday.severity == 2>> <<widget "security">> <br>
//@@.yellow;$weatherToday.name@@// <<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">>
<<elseif $weatherToday.severity == 3>> <span id="SFMButton"> <br>
//@@.orange;$weatherToday.name@@// <<link "$SF.Caps's firebase""Firebase">><</link>>
<<else>> </span> @@.cyan;[Z]@@
//@@.red;$weatherToday.name@@//
<</if>> <</if>>
<<if ["attackHandler", "rebellionHandler", "attackOptions", "rebellionOptions"].includes(_Pass)>>
<br> <<if $propHub > 0 && _Pass !== "propagandaHub">>
<span id="propHub"> <br>
<<link [[Manage PR|propagandaHub][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span> @@.cyan;[Shift+H]@@
<</if>>
<<if $secHQ > 0 && _Pass !== "securityHQ">>
<span id="securityHQ"> <br>
<<link [[Manage Security|securityHQ][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span> @@.cyan;[Shift+S]@@
<</if>> <</if>>
<</if>>
<<if $ui !== "start" || _Pass === "Encyclopedia">> <<if $secBarracks > 0 && _Pass !== "secBarracks">>
<<if $nextButton === " ">> <span id="secBarracks"> <br>
<span id="nextButton"> <<link [[Manage Military|secBarracks][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
/* Hide the button until the player makes a choice */ </span> @@.cyan;[Shift+A]@@
</span> <</if>>
<<else>> <<if $riotCenter > 0 && _Pass !== "riotControlCenter">>
<<if _Pass !== "Encyclopedia">> <br><br> <</if>> <span id="riotCenter"> <br>
<<if $nextButton === "END WEEK">> <<link [[Manage Rebels|riotControlCenter][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
<span id="endWeekButton"><strong> </span> @@.cyan;[Shift+R]@@
<<link [[($nextButton)|($nextLink)]]>><</link>> <</if>>
</strong></span> <</widget>>
@@.cyan;[Ent]@@
<<if $rulesError && $rulesAssistantAuto == 1>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>> <<if $ui != "start" || _Pass === "Encyclopedia">>
<<if _Pass !== "Encyclopedia">>
<<if $cheatMode || $debugMode>> _Pass<br> <</if>>
<span id="week">''Week $week''</span>
<<if $week > 52>> (<<= years($week)>>) <</if>>
<br>Week of $month $day, $year
<<if (_Pass == "Main") && ($cheatMode)&& ($cheatModeM)>>
<<set _TWeek = $week>>
<<textbox "$week" $week>>
<<link "Apply">>
<<set $week = Math.trunc(Number($week) || _TWeek)>>
<<if $week < 1>><<set $week = 1>><</if>>
<<replace "#week">>''Week $week''<</replace>>
<</link>>
<</if>>
<br>
<<if $weatherToday.severity == 1>>
//@@.cyan;$weatherToday.name@@//
<<elseif $weatherToday.severity == 2>>
//@@.yellow;$weatherToday.name@@//
<<elseif $weatherToday.severity == 3>>
//@@.orange;$weatherToday.name@@//
<<else>> <<else>>
<span id="nextButton"><strong> //@@.red;$weatherToday.name@@//
<<if _Pass !== "Encyclopedia">> /* must use link so spacebar shortcut will work */
<<link "$nextButton">> <<set $ui = "main">> <<goto $nextLink>> <</link>>
<<else>>
<<link [[($nextButton)|($nextLink)]]>><</link>>
<</if>>
</strong></span>
<<if _Pass === "Encyclopedia">> to Free Cities.<</if>> @@.cyan;[Space]@@
<</if>> <</if>>
<br><br>
<</if>> <</if>>
<span id="nextButton">
<<if $nextButton !== " ">> <<userButton>> <</if>>
</span>
<</if>> <</if>>
<<if _Pass == "Encyclopedia">> <<if _Pass == "Encyclopedia">> <br>
/* Intro, new players, PC/Gameplay focused */ /* Intro, new players, PC/Gameplay focused */
[[Playing Free Cities|Encyclopedia][$encyclopedia = "Playing Free Cities"]] [[Playing Free Cities|Encyclopedia][$encyclopedia = "Playing Free Cities"]]
<br>[[Design your master|Encyclopedia][$encyclopedia = "Design Your Master"]] <br>[[Design your master|Encyclopedia][$encyclopedia = "Design Your Master"]]
...@@ -83,7 +108,7 @@ ...@@ -83,7 +108,7 @@
<span id="cost"><<SlaveCostDescription>></span> <span id="cost"><<SlaveCostDescription>></span>
<</if>> <</if>>
<<if $ui != "start" && _Pass !== "Encyclopedia">> <<if $ui != "start" && _Pass !== "Encyclopedia">> <br>
<<if $sideBarOptions.Cash > 0>> <<if $sideBarOptions.Cash > 0>>
<<set $cash = Math.trunc($cash)>> <<set $cash = Math.trunc($cash)>>
<span id="cash"> <span id="cash">
...@@ -499,21 +524,18 @@ ...@@ -499,21 +524,18 @@
<<if _Pass !== "Manage Penthouse">> <br> <<if _Pass !== "Manage Penthouse">> <br>
<span id="managePenthouse"> <span id="managePenthouse">
<<link [[Manage Penthouse]]>><</link>> <<link [[Manage Penthouse]]>><</link>>
</span> </span> @@.cyan;[P]@@
@@.cyan;[P]@@
<</if>> <</if>>
<<if _Pass !== "Manage Arcology">> <br> <<if _Pass !== "Manage Arcology">> <br>
<span id="manageArcology"> <span id="manageArcology">
<<link [[Manage Arcology]]>><</link>> <<link [[Manage Arcology]]>><</link>>
</span> </span> @@.cyan;[C]@@
@@.cyan;[C]@@
<</if>> <</if>>
<<if _Pass !== "Manage Personal Affairs">> <<if _Pass !== "Manage Personal Affairs">>
<span id="managePerson"> <br> <span id="managePerson"> <br>
<<link [[Manage Personal Affairs]]>><</link>> <<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>
...@@ -526,14 +548,12 @@ ...@@ -526,14 +548,12 @@
<<if $FSAnnounced>> <<if $FSAnnounced>>
<span id="FSButton"> <br> <span id="FSButton"> <br>
<<link [[Future Societies|Future Society][$nextButton = "Back", $nextLink = "Main"]]>><</link>> <<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>
<<link [[Personal Assistant|Personal assistant options]]>><</link>> <<link [[Personal Assistant|Personal assistant options]]>><</link>>
</span> </span> @@.cyan;[T]@@
@@.cyan;[T]@@
<</if>> <</if>>
<<if _Pass === "Main" && $newModelUI === 0>> <<if _Pass === "Main" && $newModelUI === 0>>
...@@ -681,14 +701,12 @@ ...@@ -681,14 +701,12 @@
<<if $sideBarOptions.compact > 0>> <br> <</if>> <<if $sideBarOptions.compact > 0>> <br> <</if>>
<span id="policyButton"> <br> <span id="policyButton"> <br>
<<link [[Policies]]>><</link>> <<link [[Policies]]>><</link>>
</span> </span> @@.cyan;[Y]@@
@@.cyan;[Y]@@
<<if $secExp == 1>> <<if $secExp == 1>>
<span id="edictButton"> <br> <span id="edictButton"> <br>
<<link [[Edicts|edicts]]>><</link>> <<link [[Edicts|edicts]]>><</link>>
</span> </span> @@.cyan;[D]@@
@@.cyan;[D]@@
<</if>> <</if>>
<<if $arcologies.length > 1>> <br> <<if $arcologies.length > 1>> <br>
[[Diplomacy|Neighbor Interact]] [[Diplomacy|Neighbor Interact]]
...@@ -696,39 +714,8 @@ ...@@ -696,39 +714,8 @@
<span id="Security"> <span id="Security">
<<if $secExp > 0 || $SF.Toggle && $SF.Active >= 1>> <br> <<if $secExp > 0 || $SF.Toggle && $SF.Active >= 1>> <br>
<<link "Manage Security">> <<replace "#Security">> <br> <<link "Manage Security">> <<replace "#Security">>
<<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">> <<security>>
<span id="SFMButton"> <br>
<<link "$SF.Caps's firebase""Firebase">><</link>>
</span>
@@.cyan;[Z]@@
<</if>>
<<if $propHub > 0 && _Pass !== "propagandaHub">>
<span id="propHub"> <br>
<<link [[Manage PR|propagandaHub][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span>
@@.cyan;[Shift+H]@@
<</if>>
<<if $secHQ > 0 && _Pass !== "securityHQ">>
<span id="securityHQ"> <br>
<<link [[Manage Security|securityHQ][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span>
@@.cyan;[Shift+S]@@
<</if>>
<<if $secBarracks > 0 && _Pass !== "secBarracks">>
<span id="secBarracks"> <br>
<<link [[Manage Military|secBarracks][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span>
@@.cyan;[Shift+A]@@
<</if>>
<<if $riotCenter > 0 && _Pass !== "riotControlCenter">>
<span id="riotCenter"> <br>
<<link [[Manage Rebels|riotControlCenter][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span>
@@.cyan;[Shift+R]@@
<</if>>
<</replace>> <</link>> <</replace>> <</link>>
<</if>> <</if>>
</span> </span>
...@@ -737,8 +724,7 @@ ...@@ -737,8 +724,7 @@
<<if _Pass === "Manage Penthouse">> <<if _Pass === "Manage Penthouse">>
<span id="URButton"> <br><br> <span id="URButton"> <br><br>
<<link [[Universal Rules]]>><</link>> <<link [[Universal Rules]]>><</link>>
</span> </span> @@.cyan;[V]@@
@@.cyan;[V]@@
<<if $geneticMappingUpgrade>> <br>[[Gene Lab|Gene Lab]]<</if>> <<if $geneticMappingUpgrade>> <br>[[Gene Lab|Gene Lab]]<</if>>
<<if $dispensary>> <br>[[Pharmaceutical Fabricator|Dispensary]]<</if>> <<if $dispensary>> <br>[[Pharmaceutical Fabricator|Dispensary]]<</if>>
...@@ -765,38 +751,7 @@ ...@@ -765,38 +751,7 @@
[[Rules Assistant Summary]] [[Rules Assistant Summary]]
<<elseif ["Firebase", "propagandaHub", "securityHQ", "secBarracks", "riotControlCenter"].includes(_Pass)>> <<elseif ["Firebase", "propagandaHub", "securityHQ", "secBarracks", "riotControlCenter"].includes(_Pass)>>
<<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">> <<security>>
<span id="SFMButton"> <br>
<<link "$SF.Caps's firebase""Firebase">><</link>>
</span>
@@.cyan;[Z]@@
<</if>>
<<if $propHub > 0 && _Pass !== "propagandaHub">>
<span id="propHub"> <br>
<<link [[Manage PR|propagandaHub][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span>
@@.cyan;[Shift+H]@@
<</if>>
<<if $secHQ > 0 && _Pass !== "securityHQ">>
<span id="securityHQ"> <br>
<<link [[Manage Security|securityHQ][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span>
@@.cyan;[Shift+S]@@
<</if>>
<<if $secBarracks > 0 && _Pass !== "secBarracks">>
<span id="secBarracks"> <br>
<<link [[Manage Military|secBarracks][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span>
@@.cyan;[Shift+A]@@
<</if>>
<<if $riotCenter > 0 && _Pass !== "riotControlCenter">>
<span id="riotCenter"> <br>
<<link [[Manage Rebels|riotControlCenter][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span>
@@.cyan;[Shift+R]@@
<</if>>
<<elseif _Pass == "Wardrobe Use">> <br> <<elseif _Pass == "Wardrobe Use">> <br>
[[Wardrobe (shopping)|Wardrobe]] [[Wardrobe (shopping)|Wardrobe]]
...@@ -807,8 +762,7 @@ ...@@ -807,8 +762,7 @@
<<if !["Description Options", "Options", "Summary Options"].includes(_Pass)>> <<if !["Description Options", "Options", "Summary Options"].includes(_Pass)>>
<span id="optionsButton"> <span id="optionsButton">
<<link [[Game Options|Options][$nextButton = "Back", $nextLink = _Pass]]>><</link>> <<link [[Game Options|Options][$nextButton = "Back", $nextLink = _Pass]]>><</link>>
</span> </span> @@.cyan;[O]@@
@@.cyan;[O]@@
<<else>> <<else>>
<<if _Pass !== "Summary Options">> [[Summary Options]] <</if>> <<if _Pass !== "Summary Options">> [[Summary Options]] <</if>>
<<if _Pass === "Options">> <br> <</if>> <<if _Pass === "Options">> <br> <</if>>
...@@ -819,7 +773,7 @@ ...@@ -819,7 +773,7 @@
<<if _Pass === "Encyclopedia" || $showEncyclopedia === 0 || $encyclopedia === " " || $nextButton === "Continue">> <<if _Pass === "Encyclopedia" || $showEncyclopedia === 0 || $encyclopedia === " " || $nextButton === "Continue">>
<<else>> <<else>>
<<if $nextButton === "Continue" || $nextButton === " ">> <br> <</if>> <<if $nextButton === " ">> <br> <</if>>
<br>//FCE:// [[$encyclopedia|Encyclopedia][$nextButton = "Back", $nextLink = _Pass]] <br>//FCE:// [[$encyclopedia|Encyclopedia][$nextButton = "Back", $nextLink = _Pass]]
<</if>> <</if>>
......
src/utility/miscWidgets.tw
+ 2
− 10
View file @ 796a9762
...@@ -7,15 +7,7 @@ Call as <<UpdateNextButton>> ...@@ -7,15 +7,7 @@ Call as <<UpdateNextButton>>
Allows for dynamic updating of the next button in the storyCaption (left side-bar) for events that disable the button until user makes a selection Allows for dynamic updating of the next button in the storyCaption (left side-bar) for events that disable the button until user makes a selection
%/ %/
<<widget "UpdateNextButton">> <<widget "UpdateNextButton">>
<<replace "#nextButton">> <<replace "#nextButton">> <<userButton>> <</replace>>
<strong><<link "$nextButton">> /* must use link so spacebar shortcut will work */
<<if $nextButton != " ">> /* but no effect if nextButton is set to a blank space */
<<set $ui = "main">>
<<goto $nextLink>>
<</if>>
<</link>></strong>
<<if $nextButton != " ">>@@.cyan;[Space]@@<</if>>
<</replace>>
<</widget>> <</widget>>
/% /%
...@@ -864,4 +856,4 @@ $args[0]: Slave. ...@@ -864,4 +856,4 @@ $args[0]: Slave.
/* /*
Call as <<EventNameDelink>> Call as <<EventNameDelink>>
*/ */
<<widget "EventNameDelink">><<replace "#name">><<= SlaveFullName($activeSlave)>><</replace>><</widget>> <<widget "EventNameDelink">><<replace "#name">><<= SlaveFullName($activeSlave)>><</replace>><</widget>>
\ 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