Datatype updates

devNotes/twine JS.txt

@@ -37140,15 +37140,15 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() {
 	V.economy = Math.max(+V.economy, 20) || 100;
 	V.difficultySwitch = Math.clamp(+V.difficultySwitch, 0, 1) || 0;
 	V.localEcon = Math.max(+V.localEcon, 20) || V.economy;
-	V.econRate = Math.clamp(V.econRate, 1, 4) || 2;
+	V.econRate = Math.clamp(+V.econRate, 1, 4) || 2;
 	V.slaveCostFactor = Math.max(+V.slaveCostFactor, 0) || 1;
 	if (V.menialSupplyFactor !== 0) {
-		V.menialSupplyFactor = Math.clamp(V.menialSupplyFactor, -50000, 50000) || (1 - V.slaveCostFactor) * 400 * 1000 * 0.5; /* (1 - slaveCostFactor) * price elasticity * base price * 0.5 */
+		V.menialSupplyFactor = Math.clamp(+V.menialSupplyFactor, -50000, 50000) || (1 - V.slaveCostFactor) * 400 * 1000 * 0.5; /* (1 - slaveCostFactor) * price elasticity * base price * 0.5 */
 	}
 	if (V.menialDemandFactor !== 0) {
-		V.menialDemandFactor = Math.clamp(V.menialDemandFactor, -50000, 50000) || -V.menialSupplyFactor;
+		V.menialDemandFactor = Math.clamp(+V.menialDemandFactor, -50000, 50000) || -V.menialSupplyFactor;
 	}
-	V.slaveCostRandom = Math.clamp(V.slaveCostRandom, -3, 3) || 0;
+	V.slaveCostRandom = Math.clamp(+V.slaveCostRandom, -3, 3) || 0;
 	V.demandTimer = Math.max(+V.demandTimer, 0) || 0;
 	V.elapsedDemandTimer = Math.max(+V.elapsedDemandTimer, 0) || 0;
 	V.supplyTimer = Math.max(+V.supplyTimer, 0) || 0;
@@ -37156,7 +37156,12 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() {
 	V.deltaSupply = Math.clamp(+V.deltaSupply, -3000, 3000) || 0;
 	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.disasterResponse = Math.clamp(+V.disasterResponse, 0, 2) || 0;
+	V.GDP = Math.max(+V.GDP, 1) || 278.6;
+	V.NPCSlaves = Math.max(+V.NPCSlaves, 0) || 0;
+	V.helots = Math.max(+V.helots, 0) || 0;
+	V.fuckdolls  = Math.max(+V.fuckdolls , 0) || 0;
+	V.menialBioreactors  = Math.max(+V.menialBioreactors , 0) || 0;
 	V.foodCost = Math.trunc(2500/V.economy);
 	V.drugsCost = Math.trunc(10000/V.economy);

src/js/datatypeCleanupJS.tw

@@ -1210,15 +1210,15 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() {
 	V.economy = Math.max(+V.economy, 20) || 100;
 	V.difficultySwitch = Math.clamp(+V.difficultySwitch, 0, 1) || 0;
 	V.localEcon = Math.max(+V.localEcon, 20) || V.economy;
-	V.econRate = Math.clamp(V.econRate, 1, 4) || 2;
+	V.econRate = Math.clamp(+V.econRate, 1, 4) || 2;
 	V.slaveCostFactor = Math.max(+V.slaveCostFactor, 0) || 1;
 	if (V.menialSupplyFactor !== 0) {
-		V.menialSupplyFactor = Math.clamp(V.menialSupplyFactor, -50000, 50000) || (1 - V.slaveCostFactor) * 400 * 1000 * 0.5; /* (1 - slaveCostFactor) * price elasticity * base price * 0.5 */
+		V.menialSupplyFactor = Math.clamp(+V.menialSupplyFactor, -50000, 50000) || (1 - V.slaveCostFactor) * 400 * 1000 * 0.5; /* (1 - slaveCostFactor) * price elasticity * base price * 0.5 */
 	}
 	if (V.menialDemandFactor !== 0) {
-		V.menialDemandFactor = Math.clamp(V.menialDemandFactor, -50000, 50000) || -V.menialSupplyFactor;
+		V.menialDemandFactor = Math.clamp(+V.menialDemandFactor, -50000, 50000) || -V.menialSupplyFactor;
 	}
-	V.slaveCostRandom = Math.clamp(V.slaveCostRandom, -3, 3) || 0;
+	V.slaveCostRandom = Math.clamp(+V.slaveCostRandom, -3, 3) || 0;
 	V.demandTimer = Math.max(+V.demandTimer, 0) || 0;
 	V.elapsedDemandTimer = Math.max(+V.elapsedDemandTimer, 0) || 0;
 	V.supplyTimer = Math.max(+V.supplyTimer, 0) || 0;
@@ -1226,7 +1226,12 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() {
 	V.deltaSupply = Math.clamp(+V.deltaSupply, -3000, 3000) || 0;
 	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.disasterResponse = Math.clamp(+V.disasterResponse, 0, 2) || 0;
+	V.GDP = Math.max(+V.GDP, 1) || 278.6;
+	V.NPCSlaves = Math.max(+V.NPCSlaves, 0) || 0;
+	V.helots = Math.max(+V.helots, 0) || 0;
+	V.fuckdolls  = Math.max(+V.fuckdolls , 0) || 0;
+	V.menialBioreactors  = Math.max(+V.menialBioreactors , 0) || 0;
 
 	V.foodCost = Math.trunc(2500/V.economy);
 	V.drugsCost = Math.trunc(10000/V.economy);