diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js index 11531fc0a6a909da393ef2ab394205e9743a20c2..6cc977e2afeb08aa4280f101774c8210e0699fc8 100644 --- a/src/js/SlaveState.js +++ b/src/js/SlaveState.js @@ -1930,13 +1930,13 @@ App.Entity.SlaveState = class SlaveState { /** Has the slave gone through female puberty. * * 0: no; 1: yes */ - this.pubertyXX = undefined; + this.pubertyXX = 0; /** Target .physicalAge for male puberty to occur. */ this.pubertyAgeXY = 13; /** Has the slave gone through male puberty. * * 0: no; 1: yes */ - this.pubertyXY = undefined; + this.pubertyXY = 0; /** * not fully implemented. * * 0: no scars diff --git a/src/js/assayJS.js b/src/js/assayJS.js index 62ea88d163ae3c8e1fb13e00e316f4aafdb3140f..80868bdbf88cfe178192f8a559d0b1157fe531f9 100644 --- a/src/js/assayJS.js +++ b/src/js/assayJS.js @@ -349,6 +349,17 @@ window.newSlave = /** @param {App.Entity.SlaveState} slave */ function newSlave( V.REReductionCheckinIDs.push(slave.ID); } + if ((slave.ovaries === 1 || slave.mpreg === 1) && slave.physicalAge >= slave.pubertyAgeXX) { + slave.pubertyXX = 1; + } else { + slave.pubertyXX = 0; + } + if (slave.balls > 0 && slave.ballType !== "sterile" && slave.physicalAge >= slave.pubertyAgeXY) { + slave.pubertyXY = 1; + } else { + slave.pubertyXY = 0; + } + generatePronouns(slave); SetBellySize(slave); addSlave(slave); diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js index f4dee9f0c0ae93aca3a1c856b740bf3b3d9db091..a10e638dbb4b4dede910560c01184819bbd180a1 100644 --- a/src/js/generateNewSlaveJS.js +++ b/src/js/generateNewSlaveJS.js @@ -69,7 +69,6 @@ window.GenerateNewSlave = (function(){ function GenerateXXSlave() { slave.ovaries = 1; - slave.pubertyXY = 0; slave.energy = jsRandom(1,85); generateXXGeneticQuirks(); @@ -84,14 +83,12 @@ window.GenerateNewSlave = (function(){ generateXXTeeth(); generateXXMods(); generateXXBodyHair(); - generateXXPuberty(); } function GenerateXYSlave() { slave.genes = "XY"; slave.hLength = 10; slave.prostate = 1; - slave.pubertyXX = 0; slave.energy = jsRandom(15,90); generateXYGeneticQuirks(); @@ -107,7 +104,6 @@ window.GenerateNewSlave = (function(){ generateXYTeeth(); generateXYMods(); generateXYBodyHair(); - generateXYPuberty(); } function generateXXBodyProportions() { @@ -1050,26 +1046,6 @@ window.GenerateNewSlave = (function(){ slave.eyebrowFullness = jsEither(["bushy", "natural", "natural", "natural", "natural", "natural", "natural", "natural", "natural", "pencil-thin", "tapered", "tapered", "tapered", "thick", "thick", "thin", "thin", "threaded", "threaded", "threaded"]); } - function generateXXPuberty() { - if (slave.physicalAge >= slave.pubertyAgeXX) { - slave.pubertyXX = 1; - } else { - slave.pubertyXX = 0; - } - } - - function generateXYPuberty() { - if (slave.balls > 0) { - if (slave.physicalAge >= slave.pubertyAgeXY) { - slave.pubertyXY = 1; - } else { - slave.pubertyXY = 0; - } - } else { - slave.pubertyXY = 0; - } - } - function generateXXGeneticQuirks() { chance = jsRandom(1,1000); if (chance >= 980) {