From 3dd5c99d2ed606e73f68d22a7390ac4e45fd592c Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sat, 9 Feb 2019 19:00:58 -0500
Subject: [PATCH] Update
---
src/js/assayJS.js | 11 -----------
src/js/generateNewSlaveJS.js | 1 +
src/js/heroCreator.js | 1 +
src/js/slaveGenerationJS.js | 13 +++++++++++++
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 80868bdbf88..62ea88d163a 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -349,17 +349,6 @@ 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 a10e638dbb4..e6c91b99673 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -57,6 +57,7 @@ window.GenerateNewSlave = (function(){
}
function postGenCleanup() {
+ generatePuberty(slave);
generateBoobTweaks(); /* split this up for female vs. male? */
generateSkills();
generateDisabilities();
diff --git a/src/js/heroCreator.js b/src/js/heroCreator.js
index 62194ac9182..95f8d0ca54d 100644
--- a/src/js/heroCreator.js
+++ b/src/js/heroCreator.js
@@ -3,5 +3,6 @@ window.getHeroSlave = function (heroSlave, baseHeroSlave) {
for (var attrname in heroSlave) {
newSlave[attrname] = heroSlave[attrname];
}
+ generatePuberty(newSlave);
return newSlave;
};
diff --git a/src/js/slaveGenerationJS.js b/src/js/slaveGenerationJS.js
index 6cbbe9b0817..ced22106148 100644
--- a/src/js/slaveGenerationJS.js
+++ b/src/js/slaveGenerationJS.js
@@ -1417,3 +1417,16 @@ window.generatePronouns = /** @param {App.Entity.SlaveState} slave*/ function ge
slave.noun = "girl";
}
};
+
+window.generatePuberty = function(slave) {
+ 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;
+ }
+}
--
GitLab