diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js index 3d5f3383b8bfb1634a313ce83d2699f7c2428ee8..d3e7d3c15ff8618ab22f9cbdfaaf6a1ea854a2c5 100644 --- a/src/data/backwardsCompatibility/backwardsCompatibility.js +++ b/src/data/backwardsCompatibility/backwardsCompatibility.js @@ -257,9 +257,6 @@ App.Update.globalVariables = function(node) { V.IsPastPrimePC = 5000; } - // Looks at all wombs, including PC. - BCReserveInit(); - // Menials { if (typeof V.AMenials !== "undefined") { @@ -1558,9 +1555,7 @@ App.Update.oldVersions = function(node) { } } if (V.releaseID < 1057) { - let PCdiv = document.createElement("div"); - node.append(PCdiv); - PCdiv.append(`Standardizing player object... `); + node.append(`Standardizing player object... `); if (typeof V.PC.actualAge === "undefined") { if (V.PC.age === 1) { V.PC.actualAge = 20; @@ -1993,8 +1988,6 @@ App.Update.oldVersions = function(node) { if (typeof V.PC.faceShape === "undefined") { V.PC.faceShape = "normal"; } - - PCdiv.append(`Done!`); } if ((typeof V.familyTesting === "undefined") && V.releaseID < 1065) { diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js index 9cd184f6c4f32357e04dc4d75fa799aa9261ba6d..bc8af03b9105306352fcf44e9212ad01889b48de 100644 --- a/src/data/backwardsCompatibility/updateSlaveObject.js +++ b/src/data/backwardsCompatibility/updateSlaveObject.js @@ -2,11 +2,6 @@ App.Update.Slave = function(slave, genepool = false) { slave.geneticQuirks = Object.assign({ macromastia: 0, gigantomastia: 0, fertility: 0, hyperFertility: 0, superfetation: 0, gigantism: 0, dwarfism: 0, pFace: 0, uFace: 0, albinism: 0, heterochromia: 0, rearLipedema: 0, wellHung: 0, wGain: 0, wLoss: 0, mGain: 0, mLoss: 0, androgyny: 0, girlsOnly: 0 }, slave.geneticQuirks); - if (genepool) { - slave.womb = []; - } else { - WombInit(slave); - } if (slave.earShape === undefined) { slave.earShape = "normal"; } if (slave.earT === undefined) { slave.earT = "none"; } @@ -84,13 +79,6 @@ App.Update.Slave = function(slave, genepool = false) { } if (slave.induceLactation === undefined) { slave.induceLactation = 0; } if (slave.weightDirection === undefined) { slave.weightDirection = 0; } - if (V.releaseID < 1036) { - for (let pmw = 0; pmw < slave.womb.length; pmw++) { - if (slave.womb[pmw].genetics.mother !== slave.womb[pmw].motherID || slave.womb[pmw].genetics.father !== slave.womb[pmw].fatherID) { - slave.womb[pmw].genetics = generateGenetics(slave, slave.womb[pmw].fatherID, pmw); - } - } - } if (slave.clone === undefined) { slave.clone = 0; } if (slave.abortionTat === undefined) { slave.abortionTat = -1; } if (slave.birthsTat === undefined) { slave.birthsTat = -1; } @@ -1022,4 +1010,16 @@ App.Update.Slave = function(slave, genepool = false) { if (slave.geneticQuirks.albinism === 2 && !slave.albinismOverride) { induceAlbinism(slave, 2); } + if (genepool) { + slave.womb = []; + } else { + WombInit(slave); + } + if (V.releaseID < 1036) { + for (let pmw = 0; pmw < slave.womb.length; pmw++) { + if (slave.womb[pmw].genetics.mother !== slave.womb[pmw].motherID || slave.womb[pmw].genetics.father !== slave.womb[pmw].fatherID) { + slave.womb[pmw].genetics = generateGenetics(slave, slave.womb[pmw].fatherID, pmw); + } + } + } }; diff --git a/src/js/wombJS.js b/src/js/wombJS.js index df9d8831ba3d771542f60d77eb0316f97179d610..4dda1d1d184d00209ceb7494e916333617a08367 100644 --- a/src/js/wombJS.js +++ b/src/js/wombJS.js @@ -49,10 +49,27 @@ globalThis.WombInit = function(actor) { // actor.pregData = setup.pregData.human; // any changes in setup pregData template will be applied immediately to all. But can't be made separate changes. } + if (typeof actor.eggType !== 'string') { + actor.eggType = "human"; + } + // backward compatibility setup. Fully accurate for normal pregnancy only. if (actor.womb.length > 0 && actor.womb[0].genetics === undefined && actor.eggType === "human") { i = 0; actor.womb.forEach(function(ft) { + if (typeof ft.reserve !== 'string') { + ft.reserve = ""; + } + if (typeof ft.motherID !== 'number') { // setting missing biological mother ID for fetus. + ft.motherID = slave.ID; + } + if (ft.ID === undefined) { + ft.ID = generateNewID(); + } + if (typeof ft.realAge !== 'number') { // setting missing chronological age + ft.realAge = ft.age; + } + ft.genetics = generateGenetics(actor, actor.pregSource, i); i++; }); @@ -882,34 +899,3 @@ globalThis.WombGetLittersData = function(actor) { return data; }; - -globalThis.BCReserveInit = function() { - V.slaves.forEach(function(slave) { - slave.womb.forEach(function(ft) { - if (typeof ft.reserve !== 'string') { - ft.reserve = ""; - } - if (typeof ft.motherID !== 'number') { // setting missing biological mother ID for fetus. - ft.motherID = slave.ID; - } - if (ft.ID === undefined) { - ft.ID = generateNewID(); - } - if (typeof ft.realAge !== 'number') { // setting missing chronological age - ft.realAge = ft.age; - } - }); - }); - - V.PC.womb.forEach(function(ft) { - if (typeof ft.reserve !== 'string') { - ft.reserve = ""; - } - if (typeof ft.motherID !== 'number') { - ft.motherID = V.PC.ID; - } - if (typeof ft.realAge !== 'number') { // setting missing chronological age - ft.realAge = ft.age; - } - }); -};