From a7d0f6c0ecaca271787d47ec814bfa2b83d4f949 Mon Sep 17 00:00:00 2001 From: Jones <Jones> Date: Thu, 18 Oct 2018 17:19:20 +0200 Subject: [PATCH] Story Caption and minor changes. --- src/events/intro/economyIntro.tw | 4 +-- src/events/intro/introSummary.tw | 2 +- src/uncategorized/storyCaption.tw | 51 +++++++++++++++++++++++++++++-- 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/src/events/intro/economyIntro.tw b/src/events/intro/economyIntro.tw index 7a030946faa..f0a7b5a7605 100644 --- a/src/events/intro/economyIntro.tw +++ b/src/events/intro/economyIntro.tw @@ -25,7 +25,7 @@ The world economy is in ''terrible'' shape [[Easier|Economy Intro][$economy = 100]] <</if>> - <br> and is + <br> And is <<if $econRate == 1>> ''slowly declining''. [[Harder|Economy Intro][$econRate = 2]] @@ -49,7 +49,7 @@ [[Harder|Economy Intro][$incomeMod = 1]] <</if>> */ <br> - <br>[[Switch Economic DIfficulty Back|Economy Intro][$difficultySwitch = 0,$economy = 1]] + <br>[[Revert to Default Difficulty|Economy Intro][$difficultySwitch = 0,$economy = 1]] <</if>> <br> <br>[[Next|Trade Intro]] diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index ba2ca6cd405..17376d64dab 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -53,7 +53,7 @@ __''World Settings''__ The world economy is in ''terrible'' shape [[Easier|Intro Summary][$economy = 100]] <</if>> - <br> and is + <br> And is <<if $econRate == 1>> ''slowly declining''. [[Harder|Intro Summary][$econRate = 2]] diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index fff1e378bcb..8b63bd87d29 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -523,11 +523,11 @@ <</if>> <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]@@ <<if $difficultySwitch == 1>> <br><span id="manageEconomy"><<link "Manage Economy">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Economy">><</link>></span> <</if>> - <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 $secExp == 1>> <<if $propHub == 1>> @@ -569,6 +569,9 @@ <<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 $difficultySwitch == 1>> + <br><span id="manageEconomy"><<link "Manage Economy">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Economy">><</link>></span> + <</if>> <br><span id="managePerson"><<link "Manage Personal Affairs">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Personal Affairs">><</link>></span> @@.cyan;[X]@@ <<if $secExp == 1>> <<if $propHub == 1>> @@ -606,16 +609,60 @@ <<elseif _Pass == "Manage Penthouse">> <br> <br><span id="manageArcology"><<link [[Manage Arcology|Manage Arcology]]>><</link>></span> @@.cyan;[C]@@ + <<if $difficultySwitch == 1>> + <br><span id="manageEconomy"><<link "Manage Economy">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Economy">><</link>></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>> <br><<if $rep >= 10000>>[[Black Market|The Black Market]]<</if>> <br><br><br><br><br> +<<elseif _Pass == "Manage Economy">> + <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 $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 $cyberMod != 0 && $researchLab.built == "true">> + <br>[[Manage Research Lab|Research Lab][$temp = 0]] + <</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]]>><</link>></span> @@.cyan;[Y]@@ + <<if $secExp == 1>> + <br><span id="edictButton"><<link [[Edicts|edicts]]>><</link>></span> @@.cyan;[D]@@ + <</if>> + <<if $FSAnnounced>> + <br><span id="FSButton"><<link [[Future Societies|Future Society]]>><</link>></span> @@.cyan;[F]@@ + <</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]@@ <<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 $difficultySwitch == 1>> + <br><span id="manageEconomy"><<link "Manage Economy">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Economy">><</link>></span> + <</if>> <br> <br><<link [[Wardrobe]]>><</link>> <br><<if $dispensary>>[[Pharmaceutical Fabricator|Dispensary]]<</if>> -- GitLab