diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js index f3661528ffddc577740206f23bd01b344d1c0909..853624c865fd524880e11134601a9f9c717ea978 100644 --- a/src/data/backwardsCompatibility/datatypeCleanup.js +++ b/src/data/backwardsCompatibility/datatypeCleanup.js @@ -741,7 +741,7 @@ App.Update.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() { if (slave.pubertyXX === 0 && slave.ovaries > 0 && slave.preg === -1) { slave.preg = 0; // no contraceptives for prepubescent slaves } - slave.fertPeak = Math.clamp(+slave.fertPeak, -10, 10) || 0; + slave.fertPeak = Math.clamp(+slave.fertPeak, 0, 4) || 0; slave.broodmother = Math.clamp(+slave.broodmother, 0, 3) || 0; slave.broodmotherFetuses = Math.max(+slave.broodmotherFetuses, 0) || 0; slave.broodmotherOnHold = Math.clamp(+slave.broodmotherOnHold, 0, 1) || 0; @@ -1563,7 +1563,7 @@ App.Update.PCDatatypeCleanup = (function PCDatatypeCleanup() { if (PC.pubertyXX === 0 && (PC.ovaries > 0 || PC.mpreg > 0) && PC.preg === -1) { PC.preg = 0; // no contraceptives for prepubescent slaves } - PC.fertPeak = Math.clamp(+PC.fertPeak, -10, 10) || 0; + PC.fertPeak = Math.clamp(+PC.fertPeak, 0, 4) || 0; PC.pregSource = +PC.pregSource || 0; PC.pregMood = Math.clamp(+PC.pregMood, 0, 2) || 0; if (typeof PC.pregControl !== "string") { diff --git a/src/endWeek/nextWeek/nextWeek.js b/src/endWeek/nextWeek/nextWeek.js index aeee16bb5fe709e5dcbb824f51b6c10c5a4743f1..66a0c12e5e1359560c90fe9c15d81684ca81924d 100644 --- a/src/endWeek/nextWeek/nextWeek.js +++ b/src/endWeek/nextWeek/nextWeek.js @@ -97,10 +97,6 @@ App.EndWeek.nextWeek = function() { } else if (V.PC.fertPeak > 0) { V.PC.fertPeak--; } - // Fertility drugs will always make next week ovulate. - if (V.PC.drugs === "super fertility drugs" || V.PC.drugs === "fertility drugs" ) { - V.PC.fertPeak = 0; - } } } else if (V.PC.geneticQuirks.superfetation === 2 && V.PC.womb.length > 0) { if (V.PC.fertPeak === 0) { @@ -251,10 +247,6 @@ App.EndWeek.nextWeek = function() { // This logics lets you go into the negatives. This allows multiple risky weeks in a row. slave.fertPeak++; } - // Fertility drugs and diet will always make next week risky. - if (slave.drugs === "super fertility drugs" || slave.drugs === "fertility drugs" || slave.diet === "fertility") { - slave.fertPeak = 0; - } } } else if (slave.geneticQuirks.superfetation === 2 && slave.womb.length > 0) { if (slave.fertPeak === 0) { diff --git a/src/facilities/nursery/nurseryDatatypeCleanup.js b/src/facilities/nursery/nurseryDatatypeCleanup.js index 81c362ba03e801b0a43e917a30d0111c78f775db..f79310c451e49d6a1f5812b340d2faac71cdef76 100644 --- a/src/facilities/nursery/nurseryDatatypeCleanup.js +++ b/src/facilities/nursery/nurseryDatatypeCleanup.js @@ -175,7 +175,7 @@ App.Facilities.Nursery.ChildDatatypeCleanup = function(child) { if (typeof child.pregControl !== "string") { child.pregControl = "none"; } - child.fertPeak = Math.clamp(+child.fertPeak, -10, 10) || 0; + child.fertPeak = Math.clamp(+child.fertPeak, 0, 4) || 0; WombNormalizePreg(child); }