diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index e78de45fc22517ee1668654a1cb4ae5642fd0f14..401d673f353981f2b3d430c7adde1c6d33a2d5db 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -37853,7 +37853,7 @@ window.EconomyDatatypeCleanup = function EconomyDatatypeCleanup() { V.deltaDemand = Math.clamp(+V.deltaDemand, -3000, 3000) || 0; V.econWeatherDamage = Math.max(+V.econWeatherDamage, 0) || 0; V.disasterResponse = Math.clamp(+V.disasterResponse, 0, 2) || 0; - V.antiWeatherFreeze = Math.max(+V.antiWeatherFreeze, 0) || 0; + V.antiWeatherFreeze = Math.clamp(+V.antiWeatherFreeze, 0, 2) || 0; V.GDP = Math.max(+V.GDP, 1) || 278.6; V.NPCSlaves = Math.max(+V.NPCSlaves, 0) || 0; V.visitors = Math.max(+V.visitors, 0) || 0; diff --git a/src/js/datatypeCleanupJS.tw b/src/js/datatypeCleanupJS.tw index 65aaf9e11fe90961290402d84223ff6ae33631c1..e416a1e72faf941242e430a5d96f097424ddad97 100644 --- a/src/js/datatypeCleanupJS.tw +++ b/src/js/datatypeCleanupJS.tw @@ -1217,7 +1217,7 @@ window.EconomyDatatypeCleanup = function EconomyDatatypeCleanup() { V.deltaDemand = Math.clamp(+V.deltaDemand, -3000, 3000) || 0; V.econWeatherDamage = Math.max(+V.econWeatherDamage, 0) || 0; V.disasterResponse = Math.clamp(+V.disasterResponse, 0, 2) || 0; - V.antiWeatherFreeze = Math.max(+V.antiWeatherFreeze, 0) || 0; + V.antiWeatherFreeze = Math.clamp(+V.antiWeatherFreeze, 0, 2) || 0; V.GDP = Math.max(+V.GDP, 1) || 278.6; V.NPCSlaves = Math.max(+V.NPCSlaves, 0) || 0; V.visitors = Math.max(+V.visitors, 0) || 0; diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index bdfe5355636314a33e6dba11a2c9be86fc48f745..c3806153acf20756bc01a5c4f63cb67737594f6b 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -933,7 +933,7 @@ _SCD = Math.trunc(($upperClass * (2 + _slaveDemandU)) + ($topClass * (12 + _slav /*Top Class Citizens*/ /*Setting GDP depending on population*/ -<<set $GDP = Math.trunc((($NPCSlaves + $menials) * 0.28) + ($lowerClass * 0.35) + ($middleClass * 0.75) + ($upperClass * 2) + ($topClass * 10)) / 10>> +<<set $GDP = Math.trunc((($NPCSlaves + $menials) * 0.35 * _slaveProductivity) + ($lowerClass * 0.35) + ($middleClass * 0.75) + ($upperClass * 2) + ($topClass * 10)) / 10>> /*Top Class Interest in living in your arcology*/ <<if $eliteFailTimer > 0>> /*when you fail the eugenics elite and they leave this triggers*/ <<set _TCD = Math.trunc(($GDP / 15 + _topClass) * $rentEffectT * _topClassP + $TCBase - ($eliteFail / 15 * $eliteFailTimer)),