From e8fba2930a6daf62d4387d458db3735476b6de65 Mon Sep 17 00:00:00 2001 From: Jones <Jones> Date: Fri, 30 Nov 2018 00:26:41 +0100 Subject: [PATCH] Fixes --- src/events/intro/introSummary.tw | 3 ++- src/uncategorized/arcmgmt.tw | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index cf139d5d63b..664a7bb55e7 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -27,6 +27,7 @@ You may review your settings before clicking "Continue" to begin. __''World Settings''__ <br>Economic climate: +<<set $localEcon = $economy>> <<if $economy > 125>> ''not truly dire. Not yet.'' //Very Easy// <br>[[Harder|Intro Summary][$economy = 125]] @@ -43,7 +44,7 @@ __''World Settings''__ ''this is the last dance.'' //Very Hard// <br>[[Easier|Intro Summary][$economy = 80]] <</if>> -<<if $difficultySwitch == 1>><<set $econAdvantage = -2, $localEcon = $economy>><</if>> +<<if $difficultySwitch == 1>><<set $econAdvantage = -2>><</if>> <br>Economic forecast: <<if $difficultySwitch == 0>> ''no change.'' //Vanilla// diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index 5644784c089..b20340d39e2 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -681,7 +681,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * <br>@@.red;<<print _NPCSlavesSold>> slaves were sold by your inhabitants. They've got more than enough of them already. <<elseif _NPCSlavesSold > 0>> <br>@@.red;One slave was sold by your inhabitants. They've got more than enough of them already. - </if> + <</if>> <</if>> /*Selling excess slaves for profit*/ <<elseif $NPCSlaves > _SCD * 1.2>> @@ -693,7 +693,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * <br>@@.red;<<print _NPCSlavesSold>> slaves were sold by your inhabitants. They saw an opportunity for profit. <<elseif _NPCSlavesSold > 0>> <br>@@.red;One slave was sold by your inhabitants. They saw an opportunity for profit. - </if> + <</if>> <</if>> <</if>> /*Buying slaves because they are really cheap*/ @@ -964,7 +964,7 @@ This week, rents from $arcologies[0].name came to @@.yellowgreen;<<print cashFor <<set _earnings = 0>> You own <<if $helots > 0>> - <<if $helots > Math.trunc((_LSCD / ($slaveProductivity + _slaveProductivity) - _SCD)>> + <<if $helots > Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity) - _SCD)>> <<set _earnings += Math.trunc((_LSCD / ($slaveProductivity + _slaveProductivity) - _SCD) * 10>> <br>@@.red;more menial slaves than there was work@@, consider selling some. You own <<else>> -- GitLab