diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index d25baf3e601010368f9b36e11c3ab9b5c3eca056..b666ed47a24876239a3dcb4047e0d43288780c89 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -1,64 +1,89 @@ :: StoryCaption [nobr] <<set _Pass = passage()>> - -<<if $ui != "start" && _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>> +<<widget "userButton">> + <<if _Pass !== "Encyclopedia">> <br><br> <</if>> + <<if $nextButton === "END WEEK">> + <span id="endWeekButton"> <strong> + <<link [[($nextButton)|($nextLink)]]>><</link>> + </strong> </span> @@.cyan;[Ent]@@ + <<if $rulesError && $rulesAssistantAuto == 1>> + <br>@@.yellow; WARNING: some custom rules will change slave variables@@ + <</if>> + <<else>> + <strong> + <<if _Pass !== "Encyclopedia">> /* must use link so spacebar shortcut will work */ + <<link "$nextButton">> <<set $ui = "main">> <<goto $nextLink>> <</link>> + <<else>> + <<link [[($nextButton)|($nextLink)]]>><</link>> to Free Cities. + <</if>> + </strong> @@.cyan;[Space]@@ <</if>> <br> - <<if $weatherToday.severity == 1>> - //@@.cyan;$weatherToday.name@@// - <<elseif $weatherToday.severity == 2>> - //@@.yellow;$weatherToday.name@@// - <<elseif $weatherToday.severity == 3>> - //@@.orange;$weatherToday.name@@// - <<else>> - //@@.red;$weatherToday.name@@// +<</widget>> + +<<widget "security">> <br> + <<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">> + <span id="SFMButton"> <br> + <<link "$SF.Caps's firebase""Firebase">><</link>> + </span> @@.cyan;[Z]@@ <</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 $ui !== "start" || _Pass === "Encyclopedia">> - <<if $nextButton === " ">> - <span id="nextButton"> - /* Hide the button until the player makes a choice */ - </span> - <<else>> - <<if _Pass !== "Encyclopedia">> <br><br> <</if>> - <<if $nextButton === "END WEEK">> - <span id="endWeekButton"><strong> - <<link [[($nextButton)|($nextLink)]]>><</link>> - </strong></span> - @@.cyan;[Ent]@@ - <<if $rulesError && $rulesAssistantAuto == 1>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</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>> +<</widget>> + +<<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>> - <span id="nextButton"><strong> - <<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]@@ + //@@.red;$weatherToday.name@@// <</if>> - <br><br> <</if>> + <span id="nextButton"> + <<if $nextButton !== " ">> <<userButton>> <</if>> + </span> <</if>> -<<if _Pass == "Encyclopedia">> +<<if _Pass == "Encyclopedia">> <br> /* Intro, new players, PC/Gameplay focused */ [[Playing Free Cities|Encyclopedia][$encyclopedia = "Playing Free Cities"]] <br>[[Design your master|Encyclopedia][$encyclopedia = "Design Your Master"]] @@ -83,7 +108,7 @@ <span id="cost"><<SlaveCostDescription>></span> <</if>> -<<if $ui != "start" && _Pass !== "Encyclopedia">> +<<if $ui != "start" && _Pass !== "Encyclopedia">> <br> <<if $sideBarOptions.Cash > 0>> <<set $cash = Math.trunc($cash)>> <span id="cash"> @@ -499,21 +524,18 @@ <<if _Pass !== "Manage Penthouse">> <br> <span id="managePenthouse"> <<link [[Manage Penthouse]]>><</link>> - </span> - @@.cyan;[P]@@ + </span> @@.cyan;[P]@@ <</if>> <<if _Pass !== "Manage Arcology">> <br> <span id="manageArcology"> <<link [[Manage Arcology]]>><</link>> - </span> - @@.cyan;[C]@@ + </span> @@.cyan;[C]@@ <</if>> <<if _Pass !== "Manage Personal Affairs">> <span id="managePerson"> <br> <<link [[Manage Personal Affairs]]>><</link>> - </span> - @@.cyan;[X]@@ + </span> @@.cyan;[X]@@ <</if>> <<if $corpAnnounced == 1 && _Pass !== "Manage Corporation">> <span id="manageCorporation"> <br> @@ -526,14 +548,12 @@ <<if $FSAnnounced>> <span id="FSButton"> <br> <<link [[Future Societies|Future Society][$nextButton = "Back", $nextLink = "Main"]]>><</link>> - </span> - @@.cyan;[F]@@ + </span> @@.cyan;[F]@@ <<if ($FSCredits > 0) || ($FSReminder)>>@@.yellow;[!]@@<</if>> <</if>> <span id="PAOButton"> <br> <<link [[Personal Assistant|Personal assistant options]]>><</link>> - </span> - @@.cyan;[T]@@ + </span> @@.cyan;[T]@@ <</if>> <<if _Pass === "Main" && $newModelUI === 0>> @@ -681,14 +701,12 @@ <<if $sideBarOptions.compact > 0>> <br> <</if>> <span id="policyButton"> <br> <<link [[Policies]]>><</link>> - </span> - @@.cyan;[Y]@@ + </span> @@.cyan;[Y]@@ <<if $secExp == 1>> <span id="edictButton"> <br> <<link [[Edicts|edicts]]>><</link>> - </span> - @@.cyan;[D]@@ + </span> @@.cyan;[D]@@ <</if>> <<if $arcologies.length > 1>> <br> [[Diplomacy|Neighbor Interact]] @@ -696,39 +714,8 @@ <span id="Security"> <<if $secExp > 0 || $SF.Toggle && $SF.Active >= 1>> <br> - <<link "Manage Security">> <<replace "#Security">> <br> - <<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">> - <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>> + <<link "Manage Security">> <<replace "#Security">> + <<security>> <</replace>> <</link>> <</if>> </span> @@ -737,8 +724,7 @@ <<if _Pass === "Manage Penthouse">> <span id="URButton"> <br><br> <<link [[Universal Rules]]>><</link>> - </span> - @@.cyan;[V]@@ + </span> @@.cyan;[V]@@ <<if $geneticMappingUpgrade>> <br>[[Gene Lab|Gene Lab]]<</if>> <<if $dispensary>> <br>[[Pharmaceutical Fabricator|Dispensary]]<</if>> @@ -765,38 +751,7 @@ [[Rules Assistant Summary]] <<elseif ["Firebase", "propagandaHub", "securityHQ", "secBarracks", "riotControlCenter"].includes(_Pass)>> - <<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">> - <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>> + <<security>> <<elseif _Pass == "Wardrobe Use">> <br> [[Wardrobe (shopping)|Wardrobe]] @@ -807,8 +762,7 @@ <<if !["Description Options", "Options", "Summary Options"].includes(_Pass)>> <span id="optionsButton"> <<link [[Game Options|Options][$nextButton = "Back", $nextLink = _Pass]]>><</link>> - </span> - @@.cyan;[O]@@ + </span> @@.cyan;[O]@@ <<else>> <<if _Pass !== "Summary Options">> [[Summary Options]] <</if>> <<if _Pass === "Options">> <br> <</if>> @@ -819,7 +773,7 @@ <<if _Pass === "Encyclopedia" || $showEncyclopedia === 0 || $encyclopedia === " " || $nextButton === "Continue">> <<else>> - <<if $nextButton === "Continue" || $nextButton === " ">> <br> <</if>> + <<if $nextButton === " ">> <br> <</if>> <br>//FCE:// [[$encyclopedia|Encyclopedia][$nextButton = "Back", $nextLink = _Pass]] <</if>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 7403c6bf2a956e4a135b3f4a14c01c6d79c692c3..c2a0cd652f681430c91f3754683da44676a86103 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -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 %/ <<widget "UpdateNextButton">> - <<replace "#nextButton">> - <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>> + <<replace "#nextButton">> <<userButton>> <</replace>> <</widget>> /% @@ -864,4 +856,4 @@ $args[0]: Slave. /* 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