From 0732a2bfd038ad9dd48a0767e903b23f71999bc4 Mon Sep 17 00:00:00 2001 From: Jones <Jones> Date: Tue, 16 Oct 2018 12:48:32 +0200 Subject: [PATCH] Fixes --- src/events/intro/introSummary.tw | 25 +++++++++++-------------- src/uncategorized/storyCaption.tw | 2 +- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index 050f78d0cf8..ba2ca6cd405 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -43,38 +43,38 @@ __''World Settings''__ [[Easier|Intro Summary][$economy = 100]] <</if>> <<else>> - <<if $globalEcon == 100>> + <<if $economy == 100>> The world economy is in ''doubtful'' shape - [[Easier|Economy Intro][$globalEcon = 120]] | [[Harder|Economy Intro][$globalEcon = 80]] - <<elseif $globalEcon > 100>> + [[Easier|Intro Summary][$economy = 120]] | [[Harder|Intro Summary][$economy = 80]] + <<elseif $economy > 100>> The world economy is still in ''good'' shape - [[Harder|Economy Intro][$globalEcon = 100]] + [[Harder|Intro Summary][$economy = 100]] <<else>> The world economy is in ''terrible'' shape - [[Easier|Economy Intro][$globalEcon = 100]] + [[Easier|Intro Summary][$economy = 100]] <</if>> <br> and is <<if $econRate == 1>> ''slowly declining''. - [[Harder|Economy Intro][$econRate = 2]] + [[Harder|Intro Summary][$econRate = 2]] <<elseif $econRate == 2>> ''visibly deteriorating'' around you. - [[Easier|Economy Intro][$econRate = 1]] | [[Harder|Economy Intro][$econRate = 4]] + [[Easier|Intro Summary][$econRate = 1]] | [[Harder|Intro Summary][$econRate = 4]] <<else>> ''going to hell in a handbasket''. - [[Easier|Economy Intro][$econRate = 2]] + [[Easier|Intro Summary][$econRate = 2]] <</if>> /* Not functional yet <br> All the things you need to run your arcology are getting more expensive <<if $incomeMod == 0>> while all forms of income ''remain static''. - [[Easier|Economy Intro][$incomeMod = 1]] + [[Easier|Intro Summary][$incomeMod = 1]] <<elseif $incomeMod == 1>> while all forms of income ''rise but can not keep pace''. - [[Harder|Economy Intro][$incomeMod = 0]] | [[Easier|Economy Intro][$incomeMod = 2]] + [[Harder|Intro Summary][$incomeMod = 0]] | [[Easier|Intro Summary][$incomeMod = 2]] <<else>> but luckily all forms of income ''rise in lockstep''. - [[Harder|Economy Intro][$incomeMod = 1]] + [[Harder|Intro Summary][$incomeMod = 1]] <</if>> */ <</if>> @@ -87,9 +87,6 @@ __''World Settings''__ <<if $difficultySwitch == 1>> <<set $econAdvantage = -2>> <<set $localEcon = $economy>> - /* Not functional yet - <<set $baseCost = Math.trunc(100000/$localEcon)>> - <<set $baseIncome = ... */ <</if>> <br> diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw index f7edea9946c..fff1e378bcb 100644 --- a/src/uncategorized/storyCaption.tw +++ b/src/uncategorized/storyCaption.tw @@ -523,7 +523,7 @@ <</if>> <br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@ <<else>> - <<if $difficultySwitch = 1>> + <<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]@@ -- GitLab