diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js index 9b31d425185acb64c5400c860899fa014a13de01..ded5225ef57db926fd144a3a7626f4d5ab6da092 100644 --- a/src/002-config/fc-version.js +++ b/src/002-config/fc-version.js @@ -2,5 +2,5 @@ App.Version = { base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed. pmod: "4.0.0-alpha.23", commitHash: null, - release: 1190, // When getting close to 2000, please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js. + release: 1191, // When getting close to 2000, please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js. }; diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js index ab4c98677200304a66a9c8ff9d23ff50331db42b..4c5bf894744cf2c3da2cc08f71447d067283874a 100644 --- a/src/data/backwardsCompatibility/backwardsCompatibility.js +++ b/src/data/backwardsCompatibility/backwardsCompatibility.js @@ -2146,21 +2146,6 @@ App.Update.oldVersions = function(node) { if (typeof V.PC.ballType === "undefined") { V.PC.ballType = "human"; } - const quirks = {}; - App.Data.geneticQuirks.forEach((value, q) => quirks[q] = 0); - if (typeof V.PC.geneticQuirks === "undefined") { - // initialize quirks from scratch - V.PC.geneticQuirks = clone(quirks); - if (V.PC.birthMaster > 0) { - V.PC.geneticQuirks.fertility = 2; - } else if (V.PC.career === "servant") { - V.PC.geneticQuirks.fertility = 1; - } - } else { - // add any new quirks - V.PC.geneticQuirks = Object.assign(clone(quirks), V.PC.geneticQuirks); - } - V.PC.geneMods = Object.assign({NCS: 0, rapidCellGrowth: 0, immortality: 0, flavoring: 0, aggressiveSperm: 0, livestock: 0, progenitor: 0}, V.PC.geneMods); if (V.releaseID < 1032) { if (V.PC.pregSource === -1) { V.PC.pregSource = -6; @@ -2440,6 +2425,21 @@ App.Update.oldVersions = function(node) { V.PC.skill.combat = 10; } } + const quirks = {}; + App.Data.geneticQuirks.forEach((value, q) => quirks[q] = 0); + if (typeof V.PC.geneticQuirks === "undefined") { + // initialize quirks from scratch + V.PC.geneticQuirks = clone(quirks); + if (V.PC.birthMaster > 0) { + V.PC.geneticQuirks.fertility = 2; + } else if (V.PC.career === "servant") { + V.PC.geneticQuirks.fertility = 1; + } + } else { + // add any new quirks + V.PC.geneticQuirks = Object.assign(clone(quirks), V.PC.geneticQuirks); + } + V.PC.geneMods = Object.assign({NCS: 0, rapidCellGrowth: 0, immortality: 0, flavoring: 0, aggressiveSperm: 0, livestock: 0, progenitor: 0}, V.PC.geneMods); if (!V.PC.natural) { V.PC.natural = new App.Entity.GeneticState(); if (V.PC.physicalAge >= 20) {