diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js index 8fc321d5d57b9e0fbfa6463da3532464401fd690..122a2270f6ee532d2ab9975a111054a73c4f00fa 100644 --- a/src/js/datatypeCleanupJS.js +++ b/src/js/datatypeCleanupJS.js @@ -2130,7 +2130,7 @@ App.Entity.Utils.RARuleDatatypeCleanup = function() { if (v === "null") { set[k] = null; } - if (k === 'assignment' || k === 'clothes') { + if (k === 'assignment' || k === 'clothes' || k === 'label' || k === 'removeLabel' ) { continue; } if (v[0].toLowerCase() !== v[0]) { diff --git a/src/js/pregJS.js b/src/js/pregJS.js index c23e1caf4d8000c3988e8e5ea358bbb7bd9c224b..20c9aaaca1ac021df5fafccab0167ec2dac50628 100644 --- a/src/js/pregJS.js +++ b/src/js/pregJS.js @@ -391,15 +391,25 @@ window.setPregType = function(actor) { } let freevol = maxvol - cmvol; let coeff = ((maxvol/actor.womb.length) / (freevol/ftvol)) / 2; // more divide to 2 is to balance for ensured 1 ova even if overlimit. - // console.log("ftvol:", ftvol, " cmvol:", cmvol, " maxvol:", maxvol, " freevol:", freevol, " coeff:", coeff); + + if (coeff < 0) + coeff = 0; + + if (State.variables.seeHyperPreg !== 0) { + coeff += jsRandom(0, fertilityStack/2); //this second chance for implantation. Should be affected only by chemical and genetic for easier implantation. Not directly related to ova count, only to body/womb condition. Raise succesful implantation chance with already overful womb. AFTER previous check. + } + if (ovum > coeff) { ovum = coeff; } + /* for future, if mounthly cycle will be a thing to implement, this will be useful. if (ovum < 0) ovum = jsRandom(coeff/fertilityStack, 1); */ if (ovum < 1) { ovum = 1; } + + //console.log("Name: ", actor.slaveName, " ftvol:", ftvol, " cmvol:", cmvol, " maxvol:", maxvol, " freevol:", freevol, " coeff:", coeff, " fertilityStack: ", fertilityStack, " ovum: ", ovum); } return Math.ceil(ovum);