diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw index f0db26bfea20fb315d1a6834467c78bdc38f34ec..74a061e75009e1074cafd57dac7ab53e0c8a63a2 100644 --- a/src/SecExp/propagandaHub.tw +++ b/src/SecExp/propagandaHub.tw @@ -6,7 +6,7 @@ <<set _HistoryDiscount = 1>> <</if>> -<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $returnTo = "Manage Penthouse">> +<<set $nextButton = "Back", $nextLink = "Manage Arcology">> Propaganda Hub <hr> diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw index 412872248833d2af03ea4a2b1071a05ada269a0d..84ddd186a2a9846a10c091ff6baa1fd3f25b3cd9 100644 --- a/src/SecExp/riotControlCenter.tw +++ b/src/SecExp/riotControlCenter.tw @@ -1,6 +1,6 @@ :: riotControlCenter [nobr] -<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $returnTo = "Manage Penthouse">> +<<set $nextButton = "Back", $nextLink = "Manage Arcology">> Riot Control Center <hr> diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw index d08bc017185fa438023bf6ffb8d2a71ec9878d12..936f8a64dcc8d7fd879422ec370f1fc0b27f20b4 100644 --- a/src/SecExp/secBarracks.tw +++ b/src/SecExp/secBarracks.tw @@ -1,6 +1,6 @@ :: secBarracks [nobr] -<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $returnTo = "Manage Penthouse">> +<<set $nextButton = "Back", $nextLink = "Manage Arcology">> The Barracks <hr> diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw index 3eada329baf60b07120a95e8f5217b8cc8528b1d..8f9baa51be804c2840dc03c0530ce083faa5c333 100644 --- a/src/SecExp/securityHQ.tw +++ b/src/SecExp/securityHQ.tw @@ -6,7 +6,7 @@ <<set _HistoryDiscount = 1>> <</if>> -<<set $nextButton = "Back", $nextLink = "Manage Penthouse", $returnTo = "Manage Penthouse">> +<<set $nextButton = "Back", $nextLink = "Manage Arcology">> Security Headquarters <hr> diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw index 2b2bb81c715a778d6c3bfe02523215b070418c7c..aac416bc94a9b46ee32ce1e9a3eed49e85b0427d 100644 --- a/src/SpecialForce/Firebase.tw +++ b/src/SpecialForce/Firebase.tw @@ -10,7 +10,7 @@ <<set _EnvCash2 = 500,_EnvCash3 = 250,_EnvCash4 = 150,_EnvProsp = 5>> <<case 2>> <<set _EnvCash2 = 550,_EnvCash3 = 300,_EnvCash4 = 200,_EnvProsp = 7>> - <</switch>> <<set $nextButton = "Back to Manage Penthouse",$nextLink = "Manage Penthouse",$returnTo = "Firebase">> + <</switch>> <<set $nextButton = "Back to Manage Arcology",$nextLink = "Manage Arcology">> <<if $cheatMode > 0>> [[Cheat edit|CheatEdit][]] <br> <</if>> The firebase of $arcologies[0].name's <<textbox "$SF.Lower" $SF.Lower "Firebase">> is located in the lower levels, occupying unneeded warehouse space. It is not accessible to the general citizenry, but your personal elevator has express service to it. As you step off, two soldiers in combat armor manning the entry checkpoint tense before recognizing their Marshal and stepping aside with a sharp salute.<br> diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw index 794c1dc399965ad5f2089494358f5aa24ceef6b3..3bb66487d3015d32e0ed9ae5cfa92722ec3fe03c 100644 --- a/src/uncategorized/options.tw +++ b/src/uncategorized/options.tw @@ -15,6 +15,13 @@ This save was created using FC version $ver build $releaseID. <<if $secExp == 1>> <br> [[Apply Security Expansion mod backwards compatibility |SecExpBackwardCompatibility]] <</if>> +<<if $SF.Toggle && $SF.Active >= 1>> + <br> + <<link "Apply Special Force Expansion mod backwards compatibility">> + <<= App.SF.BC()>> + <<goto "Options">> + <</link>> +<</if>> <br> <<if ($autosave == 0)>> diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index 63f1969ecd18f82aeff863d9070223bbe99bf2dc..890614b66593f66c89d290358388f7acc945710f 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -2,11 +2,6 @@ <<set _Pass = passage()>> <<if _Pass == "Encyclopedia">> - <span id="nextButton"> - <strong> - <<link [[($nextButton)|($nextLink)]]>><</link>> to Free Cities<br><br> - </strong> - </span> /* Intro, new players, PC/Gameplay focused */ [[Playing Free Cities|Encyclopedia][$encyclopedia = "Playing Free Cities"]] <br>[[Design your master|Encyclopedia][$encyclopedia = "Design Your Master"]] @@ -30,15 +25,7 @@ <<elseif _Pass == "Starting Girls">> <span id="cost"><<SlaveCostDescription>></span> -<<elseif $ui == "disclaimer">> - <span id="nextButton"> - <strong> - <<link [[($nextButton)|$nextLink]]>><</link>> - </strong> - </span> - <<elseif $ui != "start">> - <<if $cheatMode || $debugMode>> _Pass<br> <</if>> <span id="week">''Week $week''</span> <<if $week > 52>> (<<= years($week)>>) <</if>> @@ -63,22 +50,28 @@ //@@.red;$weatherToday.name@@// <</if>> - <span id="endWeekButton"> +<span id="nextButton"> <<if $nextButton == "END WEEK">> <br><br> + <span id="endWeekButton"> <strong> - <<link [[($nextButton)|$nextLink]]>><</link>> + <<link [[($nextButton)|($nextLink)]]>><</link>> </strong> - @@.cyan;[Ent]@@ - <<if $rulesError && $rulesAssistantAuto == 1>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>> + </span> + @@.cyan;[Ent]@@<br> + <<if $rulesError && $rulesAssistantAuto > 0>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>> <<elseif $nextButton !== " ">> <br><br> - <strong> - <<link [[$nextButton|$nextLink][$ui = "main"]]>><</link>> + <strong> + <<link "$nextButton">> /* must use link so spacebar shortcut will work */ + <<set $ui = "main">> + <<goto $nextLink>> + <</link>> </strong> - @@.cyan;[Space]@@ + @@.cyan;[Space]@@<br> <</if>> - </span> +</span> - <<if $sideBarOptions.Cash > 0>> <br><br> + + <<if $sideBarOptions.Cash > 0>> <br> <<set $cash = Math.trunc($cash)>> <span id="cash"> <<if $cash > 0>> @@ -674,7 +667,7 @@ <<if _Pass === "Manage Arcology">> <span id="Security"> - <span id="policyButton"> <br> + <span id="policyButton"> <br><br> <<link [[Policies][$nextButton = "Back", $nextLink = "Manage Arcology"]]>><</link>> </span> @@.cyan;[Y]@@ @@ -689,31 +682,31 @@ [[Diplomacy|Neighbor Interact]] <</if>> - <<if $secExp > 0 || $SF.Toggle && $SF.Active >= 1>> <br><br> - <<link "Manage Security">> <<replace "#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>> + <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@ <</if>> <<if $propHub > 0 && _Pass !== "propagandaHub">> <span id="propHub"> <br> - << [[Manage PR|propagandaHub][$nextButton = "Back", $nextLink = _Pass]]>><</link>> + <<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>> + <<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>> + <<link [[Manage Military|secBarracks][$nextButton = "Back", $nextLink = _Pass]]>><</link>> </span> @@.cyan;[Shift+A]@@ <</if>> @@ -758,9 +751,10 @@ [[Rules Assistant Summary]] <<elseif ["Firebase", "propagandaHub", "securityHQ", "secBarracks", "riotControlCenter"].includes(_Pass)>> + <br> <<if $SF.Toggle && $SF.Active >= 1 && _Pass !== "Firebase">> <span id="SFMButton"> <br> - <<link [[$SF.Caps's firebase|Firebase]]>><</link>> + <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@ <</if>>