diff --git a/src/endWeek/reports/incubatorReport.js b/src/endWeek/reports/incubatorReport.js
index 6bb4ebbfd4b6e3a146bbc12abee540691f6c58be..01fa627ea92df91c2ba5440120944913d3746197 100644
--- a/src/endWeek/reports/incubatorReport.js
+++ b/src/endWeek/reports/incubatorReport.js
@@ -756,64 +756,68 @@ App.EndWeek.incubatorReport = function() {
r = [];
if (((V.incubator.setting.pregAdaptation === 1 && tank.genes === "XX") || (V.incubator.setting.pregAdaptation === 2 && tank.genes === "XY") || V.incubator.setting.pregAdaptation === 3) && tank.growTime > 0) {
- r.push(`The incubator is working on adapting ${his} abdomen and reproductive organs for future pregnancies.`);
+ if (tank.incubatorPregAdaptationInWeek <= 0) {
+ r.push(`${His} physique will be mature enough on release that the incubator's reproductive capacity system would have no effect on ${him} at current settings, so it is unused.`);
+ } else {
+ r.push(`The incubator is working on adapting ${his} abdomen and reproductive organs for future pregnancies.`);
- let weekAdapt = tank.incubatorPregAdaptationInWeek * V.incubator.upgrade.speed;
- if (isNaN(weekAdapt)) {
- /* NaN check AFTER multiply operation, against it result is critical here. Need to be absolutely sure about this operation, not about just tank property itself. This give me two very unpleasant hours to catch this */
- tank.incubatorPregAdaptationInWeek = (15000 / 2000 - tank.pregAdaptation) / tank.growTime;
- }
- weekAdapt = tank.incubatorPregAdaptationInWeek * V.incubator.upgrade.speed;
- /* Now it should be fine */
- weekAdapt *= 1 + (V.incubator.setting.reproduction / 5);
- weekAdapt *= 1 + (tank.hormoneBalance / 1500);
- tank.pregAdaptation += weekAdapt;
- /* here goes side effect from intense and extreme settings: */
- if (random(0, 100) <= (tank.incubatorPregAdaptationPower - 1) * (V.incubator.upgrade.speed / 2 + 1)) {
- switch (random(1, 9)) { /* side effect selection*/
- case 1:
- tank.preg = -2;
- r.push(`It caused <span class="red">reproductive damage</span> when excessive meddling damaged an organ.`);
- break;
- case 2:
- if (tank.ovaries === 1 || tank.mpreg === 1) {
- tank.preg = -3;
- }
- if (tank.balls > 0) {
- tank.ballType = "sterile";
- }
- r.push(`It caused <span class="red">severe reproductive damage</span> when excessive hormones shut down the associated organs.`);
- break;
- case 3:
- tank.lactation = 1;
- r.push(`It has <span class="orange">triggered a hormonal disorder,</span> causing ${his} breast glands to begin producing milk.`);
- break;
- case 4:
- tank.bellySag = 100;
- tank.bellySagPreg = 100;
- r.push(`It activated <span class="red">emergency protocols</span> when overpressure to ${his} abdominal tissues and skin reached critical levels. ${His} belly has lost muscle tone and has begun to strongly sag.`);
- break;
- case 5:
- tank.health.condition -= 15;
- r.push(`Overzealous prodding caused some <span class="red">internal bleeding.</span>`);
- break;
- case 6:
- tank.weight += 50;
- r.push(`An unexpected shift in hormones spurred <span class="red">massive weight gain</span> before it could be corrected.`);
- break;
- case 7:
- tank.weight -= 50;
- r.push(`An unexpected shift in hormones spurred <span class="red">massive weight loss</span> before it could be corrected.`);
- break;
- case 8:
- tank.boobs += 5000;
- tank.boobShape = "saggy";
- r.push(`An unexpected shift in hormones encouraged <span class="green">explosive breast growth</span> before it could be corrected.`);
- break;
- case 9:
- tank.hips = 3;
- r.push(`A malfunction in the skeletal reconstruction software caused it to <span class="green">overwiden ${his} hips.</span>`);
- break;
+ let weekAdapt = tank.incubatorPregAdaptationInWeek * V.incubator.upgrade.speed;
+ if (isNaN(weekAdapt)) {
+ /* NaN check AFTER multiply operation, against it result is critical here. Need to be absolutely sure about this operation, not about just tank property itself. This give me two very unpleasant hours to catch this */
+ tank.incubatorPregAdaptationInWeek = (15000 / 2000 - tank.pregAdaptation) / tank.growTime;
+ }
+ weekAdapt = tank.incubatorPregAdaptationInWeek * V.incubator.upgrade.speed;
+ /* Now it should be fine */
+ weekAdapt *= 1 + (V.incubator.setting.reproduction / 5);
+ weekAdapt *= 1 + (tank.hormoneBalance / 1500);
+ tank.pregAdaptation += weekAdapt;
+ /* here goes side effect from intense and extreme settings: */
+ if (random(0, 100) <= (tank.incubatorPregAdaptationPower - 1) * (V.incubator.upgrade.speed / 2 + 1)) {
+ switch (random(1, 9)) { /* side effect selection*/
+ case 1:
+ tank.preg = -2;
+ r.push(`It caused <span class="red">reproductive damage</span> when excessive meddling damaged an organ.`);
+ break;
+ case 2:
+ if (tank.ovaries === 1 || tank.mpreg === 1) {
+ tank.preg = -3;
+ }
+ if (tank.balls > 0) {
+ tank.ballType = "sterile";
+ }
+ r.push(`It caused <span class="red">severe reproductive damage</span> when excessive hormones shut down the associated organs.`);
+ break;
+ case 3:
+ tank.lactation = 1;
+ r.push(`It has <span class="orange">triggered a hormonal disorder,</span> causing ${his} breast glands to begin producing milk.`);
+ break;
+ case 4:
+ tank.bellySag = 100;
+ tank.bellySagPreg = 100;
+ r.push(`It activated <span class="red">emergency protocols</span> when overpressure to ${his} abdominal tissues and skin reached critical levels. ${His} belly has lost muscle tone and has begun to strongly sag.`);
+ break;
+ case 5:
+ tank.health.condition -= 15;
+ r.push(`Overzealous prodding caused some <span class="red">internal bleeding.</span>`);
+ break;
+ case 6:
+ tank.weight += 50;
+ r.push(`An unexpected shift in hormones spurred <span class="red">massive weight gain</span> before it could be corrected.`);
+ break;
+ case 7:
+ tank.weight -= 50;
+ r.push(`An unexpected shift in hormones spurred <span class="red">massive weight loss</span> before it could be corrected.`);
+ break;
+ case 8:
+ tank.boobs += 5000;
+ tank.boobShape = "saggy";
+ r.push(`An unexpected shift in hormones encouraged <span class="green">explosive breast growth</span> before it could be corrected.`);
+ break;
+ case 9:
+ tank.hips = 3;
+ r.push(`A malfunction in the skeletal reconstruction software caused it to <span class="green">overwiden ${his} hips.</span>`);
+ break;
+ }
}
}
}
diff --git a/src/facilities/incubator/incubatorUtils.js b/src/facilities/incubator/incubatorUtils.js
index 88452ff09d0cad69ecc1beb9bd3db6617e72734c..4b258a4c771db338cd39aacf5f3335f4fc030a86 100644
--- a/src/facilities/incubator/incubatorUtils.js
+++ b/src/facilities/incubator/incubatorUtils.js
@@ -7,15 +7,15 @@ App.Facilities.Incubator.newChild = function(child) {
child.growTime = Math.trunc(V.targetAge * 52);
child.incubatorPregAdaptationPower = V.incubator.setting.pregAdaptationPower;
if (V.incubator.setting.pregAdaptationPower === 1) {
- fullAdapt = 45000 / 2000;
+ fullAdapt = 45000 / 2000; //22.5
} else if (V.incubator.setting.pregAdaptationPower === 2) {
- fullAdapt = 100000 / 2000;
+ fullAdapt = 100000 / 2000; //50
} else if (V.incubator.setting.pregAdaptationPower === 3) {
- fullAdapt = 150000 / 2000;
+ fullAdapt = 150000 / 2000; //75
} else {
- fullAdapt = 15000 / 2000;
+ fullAdapt = 15000 / 2000; //7.5
}
- child.incubatorPregAdaptationInWeek = (fullAdapt - child.pregAdaptation) / child.growTime;
+ child.incubatorPregAdaptationInWeek = Math.max(((fullAdapt - child.pregAdaptation) / child.growTime), 0);
V.incubator.tanks.push(child);
};