From 4e2fa093afa899495176c4bac417c1a0e6ff0fc0 Mon Sep 17 00:00:00 2001 From: Jones <Jones> Date: Mon, 12 Nov 2018 10:12:02 +0100 Subject: [PATCH] Terrain tweaks --- src/uncategorized/arcmgmt.tw | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index 8f370fc0690..f936b16e486 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -634,12 +634,10 @@ $lowerClass -= _enslaved>> <<set _crime = 0.8>> <</if>> <<if $terrain == "urban">> - <<set _terrain = 1.1>> -<<elseif $terrain == "rural">> + <<set _terrain = 1.2>> +<<elseif $terrain == "rural" || "marine">> <<set _terrain = 1>> -<<elseif $terrain == "marine">> - <<set _terrain = 0.9>> -<<elseif $terrain == "oceanic" || "ravine">> +<<else>> <<set _terrain = 0.8>> <</if>> @@ -701,7 +699,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * <br><<print _LCD>> LCD | <<print _slaveProductivity>> | <<print _lowerClassP>> /*Changing population depending on work available*/ <<if $lowerClass < _LCD>> - <<set _LCImmigration = Math.trunc((_LCD - $lowerClass) * 0.3) + 1, + <<set _LCImmigration = Math.trunc((_LCD - $lowerClass) * (0.3 * _terrain)) + 1, $lowerClass += _LCImmigration>> <<if _LCImmigration > 1>> <br>@@.green;<<print _LCImmigration>> Lower class citizens@@ moved to your arcology. @@ -755,7 +753,7 @@ $ASlaves += _enslavedNPC>> <br><<print _MCD>> MCD /*Middle Class Citizens immigrating*/ <<if $middleClass < _MCD>> - <<set _MCImmigration = Math.trunc((_MCD - $middleClass) * 0.3) + 1, + <<set _MCImmigration = Math.trunc((_MCD - $middleClass) * (0.3 * _terrain)) + 1, $middleClass += _MCImmigration>> <<if _MCImmigration > 1>> <br>@@.green;<<print _MCImmigration>> Middle class citizens@@ moved to your arcology. @@ -778,7 +776,7 @@ $ASlaves += _enslavedNPC>> <<set _UCD = Math.trunc((($UCBase * ($localEcon / 100)) + ($arcologies[0].prosperity * 0.2) + _upperClass + ($ASlaves * 0.02) + ($lowerClass * 0.025) + (($middleClass + $visitors * 0.6) * 0.05) + ($topClass * 0.3)) * $rentEffectU * _upperClassP)>> /*Upper Class Citizens immigrating*/ <<if $upperClass < _UCD>> - <<set _UCImmigration = Math.trunc((_UCD - $upperClass) * 0.3) + 1, + <<set _UCImmigration = Math.trunc((_UCD - $upperClass) * (0.3 * _terrain)) + 1, $upperClass += _UCImmigration>> <<if _UCImmigration > 1>> <br>@@.green;<<print _UCImmigration>> Upper class citizens@@ moved to your arcology. @@ -803,7 +801,7 @@ $ASlaves += _enslavedNPC>> _TCD = Math.trunc(($GDP / 15 + _topClass) * $rentEffectT * _topClassP + $TCBase)>> /*Top Class Citizens immigrating*/ <<if $topClass < _TCD>> - <<set _TCImmigration = Math.trunc((_TCD - $topClass) * 0.3) + 1, + <<set _TCImmigration = Math.trunc((_TCD - $topClass) * (0.3 * _terrain)) + 1, $topClass += _TCImmigration>> <<if _TCImmigration > 1>> <br>@@.green;<<print _TCImmigration>> Millionaires@@ moved to your arcology. /*Fat Cat? One-Percenter?*/ -- GitLab