From 3bf75b3c0a816dd4e1c8653cd7e797971d75f7c6 Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Thu, 14 May 2020 00:30:09 -0400 Subject: [PATCH] fix womb --- .../updateSlaveObject.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/data/backwardsCompatibility/updateSlaveObject.js b/src/data/backwardsCompatibility/updateSlaveObject.js index 9cd184f6c4f..bc8af03b910 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); + } + } + } }; -- GitLab