From 8269931917290bfbb42df56e2a61ddba19b7ecda Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Thu, 14 Feb 2019 00:19:57 -0500 Subject: [PATCH] fixed issues with asexual reproduction ova implant --- src/js/storyJS.js | 2 +- src/uncategorized/saLongTermEffects.tw | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/js/storyJS.js b/src/js/storyJS.js index 64b3a1b087f..9dec944bddd 100644 --- a/src/js/storyJS.js +++ b/src/js/storyJS.js @@ -209,7 +209,7 @@ window.isFertile = function(slave) { return null; } - if (slave.womb.length > 0 && slave.geneticQuirks.superfetation < 2 && slave.ovaImplant < 1) { /* currently pregnant without superfetation */ + if (slave.womb.length > 0 && slave.geneticQuirks.superfetation < 2) { /* currently pregnant without superfetation */ return false; } else if (slave.womb.length > 0) { /* temp failure condition to prevent current double preg bug */ return false; diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 64a15e71d9d..f342f7ef413 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -128,7 +128,7 @@ /* MENTAL DEVELOPMENT */ - <<if $slaves[$i].ovaImplant == "asexual" && canGetPregnant($slaves[$i])>> + <<if $slaves[$i].ovaImplant == "asexual" && isFertile($slaves[$i]) && $slaves[$i].preg == 0>> The frequent internal ejaculations and accompanying climaxes brought about by $his ovarian modifications keeps $him sexually sated. <<if ($slaves[$i].energy >= 10) && ($slaves[$i].attrXY >= 10 || $slaves[$i].attrXX >= 10)>> However, the constant self-gratification @@.red;both damages what $he finds attractive and leaves sex less satisfying.@@ @@ -3640,12 +3640,12 @@ <</switch>> /* closes assignment checks */ <</if>> /* closes all impregnation checks */ - <<if $slaves[$i].ovaImplant == "asexual">> - <<= knockMeUp($slaves[$i], 100, 2, $slaves[$i].ID, 1)>> - Since $he is fertile and still not pregnant, the frequent orgasms caused by $his asexual reproduction modifications eventually leave $him @@.lime;pregnant with $his own child.@@ - <</if>> - <</if>> /* CLOSES CAN GET PREGNANT */ + + <<if $slaves[$i].ovaImplant == "asexual" && isFertile($slaves[$i]) && $slaves[$i].preg == 0>> + <<= knockMeUp($slaves[$i], 100, 2, $slaves[$i].ID, 1)>> + Since $he is fertile and still not pregnant, the frequent orgasms caused by $his asexual reproduction modifications eventually leave $him @@.lime;pregnant with $his own child.@@ + <</if>> /* PREGNANCY TYPE SANITY CHECK (not for pregnancies started above) */ <<if $slaves[$i].preg <= 0>> -- GitLab