From a1e5826079362ce114a957dbdb2ba60c62ef3c4b Mon Sep 17 00:00:00 2001
From: Heretek <throwaway5647389012@gmail.com>
Date: Thu, 15 Jun 2023 06:21:13 +0000
Subject: [PATCH] Fix BC bug
---
.../backwardsCompatibility.js | 43 +++++++++----------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index d61345e80f3..5cabbc8f03b 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -212,12 +212,11 @@ App.Update.globalVariables = function(node) {
V.incubator.capacity = V.incubator.capacity || 0;
V.incubator.tanks = V.incubator.tanks || [];
-
if (V.incubator.capacity > 0) {
V.incubator.name = V.incubator.name || V.incubatorName || "the Incubator";
V.incubator.organs = V.incubator.organs || V.incubatorOrgans || [];
V.incubator.readySlaves = V.incubator.readySlaves || V.readySlaves || 0;
- V.incubator.bulkRelease = V.incubator.bulkRelease || V.incubator.setting.bulkRelease || V.incubatorBulkRelease || 0;
+ V.incubator.bulkRelease = V.incubator.bulkRelease !== undefined ? V.incubator.bulkRelease : V.incubator.setting.bulkRelease || V.incubatorBulkRelease || 0;
V.incubator.upgrade = V.incubator.upgrade || {};
V.incubator.upgrade.speed = V.incubator.upgrade.speed || V.incubatorUpgradeSpeed || 5;
@@ -228,32 +227,32 @@ App.Update.globalVariables = function(node) {
V.incubator.upgrade.pregAdaptation = V.incubator.upgrade.pregAdaptation || V.incubatorUpgradePregAdaptation || 0;
V.incubator.upgrade.organs = V.incubator.upgrade.organs || V.incubatorUpgradeOrgans || 0;
- V.incubator.maleSetting = V.incubator.maleSetting || {...V.incubator.setting} || {};
- V.incubator.maleSetting.targetAge = V.incubator.maleSetting.targetAge || V.targetAge || V.minimumSlaveAge || 18;
+ V.incubator.maleSetting = V.incubator.maleSetting || (V.incubator.setting !== undefined ? {...V.incubator.setting} : {});
+ V.incubator.maleSetting.targetAge = V.incubator.maleSetting.targetAge !== undefined ? V.incubator.maleSetting.targetAge : V.targetAge || V.minimumSlaveAge || 18;
if (V.incubatorImprintSetting === 0) {
V.incubator.maleSetting.imprint = "trust";
}
- V.incubator.maleSetting.imprint = V.incubator.maleSetting.imprint || V.incubator.setting.imprint || V.incubatorImprintSetting || "trust";
- V.incubator.maleSetting.weight = V.incubator.maleSetting.weight || V.incubator.setting.weight || V.incubatorWeightSetting || 0;
- V.incubator.maleSetting.muscles = V.incubator.maleSetting.muscles || V.incubator.setting.muscles || V.incubatorMusclesSetting || 0;
- V.incubator.maleSetting.growthStims = V.incubator.maleSetting.growthStims || V.incubator.setting.growthStims || V.incubatorGrowthStimsSetting || 0;
- V.incubator.maleSetting.reproduction = V.incubator.maleSetting.reproduction || V.incubator.setting.reproduction || V.incubatorReproductionSetting || 0;
- let provisionalPregAdaptation = (V.incubator.setting.pregAdaptation || V.incubatorPregAdaptationSetting || 0);
- V.incubator.maleSetting.pregAdaptation = V.incubator.maleSetting.pregAdaptation || ((provisionalPregAdaptation === 2 || provisionalPregAdaptation === 3) ? 1 : 0); //Convert to boolean
- V.incubator.maleSetting.pregAdaptationPower = V.incubator.maleSetting.pregAdaptationPower || V.incubator.setting.pregAdaptationPower || V.incubatorPregAdaptationPower || 0;
-
- V.incubator.femaleSetting = V.incubator.femaleSetting || {...V.incubator.setting} || {};
- V.incubator.femaleSetting.targetAge = V.incubator.femaleSetting.targetAge || V.targetAge || V.minimumSlaveAge || 18;
+ V.incubator.maleSetting.imprint = V.incubator.maleSetting.imprint !== undefined ? V.incubator.maleSetting.imprint : V.incubator.setting.imprint || V.incubatorImprintSetting || "trust";
+ V.incubator.maleSetting.weight = V.incubator.maleSetting.weight !== undefined ? V.incubator.maleSetting.weight : V.incubator.setting.weight || V.incubatorWeightSetting || 0;
+ V.incubator.maleSetting.muscles = V.incubator.maleSetting.muscles !== undefined ? V.incubator.maleSetting.muscles : V.incubator.setting.muscles || V.incubatorMusclesSetting || 0;
+ V.incubator.maleSetting.growthStims = V.incubator.maleSetting.growthStims !== undefined ? V.incubator.maleSetting.growthStims : V.incubator.setting.growthStims || V.incubatorGrowthStimsSetting || 0;
+ V.incubator.maleSetting.reproduction = V.incubator.maleSetting.reproduction !== undefined ? V.incubator.maleSetting.reproduction : V.incubator.setting.reproduction || V.incubatorReproductionSetting || 0;
+ let provisionalPregAdaptation = V.incubator.setting !== undefined ? V.incubator.setting.pregAdaptation : V.incubatorPregAdaptationSetting || 0;
+ V.incubator.maleSetting.pregAdaptation = V.incubator.maleSetting.pregAdaptation !== undefined ? V.incubator.maleSetting.pregAdaptation : ((provisionalPregAdaptation === 2 || provisionalPregAdaptation === 3) ? 1 : 0); //Convert to boolean
+ V.incubator.maleSetting.pregAdaptationPower = V.incubator.maleSetting.pregAdaptationPower !== undefined ? V.incubator.maleSetting.pregAdaptationPower : V.incubator.setting.pregAdaptationPower || V.incubatorPregAdaptationPower || 0;
+
+ V.incubator.femaleSetting = V.incubator.femaleSetting || (V.incubator.setting !== undefined ? {...V.incubator.setting} : {});
+ V.incubator.femaleSetting.targetAge = V.incubator.femaleSetting.targetAge !== undefined ? V.incubator.femaleSetting.targetAge : V.targetAge || V.minimumSlaveAge || 18;
if (V.incubatorImprintSetting === 0) {
V.incubator.femaleSetting.imprint = "trust";
}
- V.incubator.femaleSetting.imprint = V.incubator.femaleSetting.imprint || V.incubator.setting.imprint || V.incubatorImprintSetting || "trust";
- V.incubator.femaleSetting.weight = V.incubator.femaleSetting.weight || V.incubator.setting.weight || V.incubatorWeightSetting || 0;
- V.incubator.femaleSetting.muscles = V.incubator.femaleSetting.muscles || V.incubator.setting.muscles || V.incubatorMusclesSetting || 0;
- V.incubator.femaleSetting.growthStims = V.incubator.femaleSetting.growthStims || V.incubator.setting.growthStims || V.incubatorGrowthStimsSetting || 0;
- V.incubator.femaleSetting.reproduction = V.incubator.femaleSetting.reproduction || V.incubator.setting.reproduction || V.incubatorReproductionSetting || 0;
- V.incubator.femaleSetting.pregAdaptation = V.incubator.femaleSetting.pregAdaptation || ((provisionalPregAdaptation === 1 || provisionalPregAdaptation === 3) ? 1 : 0);
- V.incubator.femaleSetting.pregAdaptationPower = V.incubator.femaleSetting.pregAdaptationPower || V.incubator.setting.pregAdaptationPower || V.incubatorPregAdaptationPower || 0;
+ V.incubator.femaleSetting.imprint = V.incubator.femaleSetting.imprint !== undefined ? V.incubator.femaleSetting.imprint : V.incubator.setting.imprint || V.incubatorImprintSetting || "trust";
+ V.incubator.femaleSetting.weight = V.incubator.femaleSetting.weight !== undefined ? V.incubator.femaleSetting.imprint : V.incubator.setting.weight || V.incubatorWeightSetting || 0;
+ V.incubator.femaleSetting.muscles = V.incubator.femaleSetting.muscles !== undefined ? V.incubator.femaleSetting.muscles : V.incubator.setting.muscles || V.incubatorMusclesSetting || 0;
+ V.incubator.femaleSetting.growthStims = V.incubator.femaleSetting.growthStims !== undefined ? V.incubator.femaleSetting.growthStims : V.incubator.setting.growthStims || V.incubatorGrowthStimsSetting || 0;
+ V.incubator.femaleSetting.reproduction = V.incubator.femaleSetting.reproduction !== undefined ? V.incubator.femaleSetting.reproduction : V.incubator.setting.reproduction || V.incubatorReproductionSetting || 0;
+ V.incubator.femaleSetting.pregAdaptation = V.incubator.femaleSetting.pregAdaptation !== undefined ? V.incubator.femaleSetting.pregAdaptation : ((provisionalPregAdaptation === 1 || provisionalPregAdaptation === 3) ? 1 : 0);
+ V.incubator.femaleSetting.pregAdaptationPower = V.incubator.femaleSetting.pregAdaptationPower !== undefined ? V.incubator.femaleSetting.pregAdaptationPower : V.incubator.setting.pregAdaptationPower || V.incubatorPregAdaptationPower || 0;
for (let i = 0; i < V.incubator.tanks.length; i++) {
if (!("incubatorSettings" in V.incubator.tanks[i])) {
--
GitLab