From 0b0e4caa216b64b377e4dcfc56d04efcf3164418 Mon Sep 17 00:00:00 2001
From: i107760 <13422-i107760@users.noreply.gitgud.io>
Date: Fri, 6 Mar 2020 18:04:51 +0100
Subject: [PATCH] BC fix for $farmyardFoodCost and $food
---
js/003-data/gameVariableData.js | 3 ++-
src/data/backwardsCompatibility/backwardsCompatibility.js | 2 +-
src/data/backwardsCompatibility/datatypeCleanup.js | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index f578b2cd9f4..7865db31dbd 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -1037,10 +1037,11 @@ App.Data.defaultGameStateVariables = {
NPCSlaves: 900,
ASlaves: 900,
AProsperityCap: 0,
- food: 50000,
+ food: 125000,
foodLastWeek: 0,
foodProduced: 0,
foodStored: 0,
+ farmyardFoodCost: 5,
foodCost: 25,
foodMarket: 0,
foodRate: {
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 2c06f990a9d..3a8e1766b76 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -996,7 +996,7 @@ App.Update.globalVariables = function() {
if (typeof V.sexSupplyBarriersLC !== "undefined") {
V.sexSupplyBarriers.lowerClass = V.sexSupplyBarriersLC;
}
- V.food = Math.max(+V.food, 0) || 0;
+ V.food = Math.max(+V.food, 0) || 12500;
if (V.foodConsumption === 0) {
V.foodConsumption = ((V.lowerClass * V.foodRate.lower) + (V.middleClass * V.foodRate.middle) + (V.upperClass * V.foodRate.upper) + (V.topClass * V.foodRate.top)); /* total amount food consumed per week */
}
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index e4508b02edd..80342a4fac2 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -1934,11 +1934,11 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() {
V.shelterAbuse = Math.max(+V.shelterAbuse, 0) || 0;
if (V.localEcon > 100) {
- V.farmyardFoodCost = Math.max(5 / (1 + (Math.trunc(1000-100000/$localEcon)/10)/100), 3.125)
+ V.farmyardFoodCost = Math.max(5 / (1 + (Math.trunc(1000-100000/V.localEcon)/10)/100), 3.125);
} else if (V.localEcon === 100) {
- V.farmyardFoodCost = 5
+ V.farmyardFoodCost = 5;
} else {
- V.farmyardFoodCost = Math.min(5 * (1 + 1.5 * Math.sqrt(Math.trunc(100000/$localEcon-1000)/10)/100), 6.5)
+ V.farmyardFoodCost = Math.min(5 * (1 + 1.5 * Math.sqrt(Math.trunc(100000/V.localEcon-1000)/10)/100), 6.5);
}
V.foodCost = Math.trunc(2500 / V.localEcon);
V.drugsCost = Math.trunc(10000 / V.localEcon);
--
GitLab