diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index 48e3f4b3c3dce16ce2a4e2a06510eec064cc28f7..db8e6256de2674a853cc7cddefd49acf3b1ca445 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -11203,9 +11203,9 @@ window.WombInit = function(actor) { ft.genetics = generateGenetics(actor.ID, actor.pregSource, i); i++; }); - } else if (actor.womb.length == 0 && actor.pregType != 0 && actor.broodmother == 0) { + } else if (actor.womb.length == 0 && actor.pregType > 0 && actor.broodmother == 0) { WombImpregnate(actor, actor.pregType, actor.pregSource, actor.preg); - } else if (actor.womb.length == 0 && actor.pregType != 0 && actor.broodmother > 0 && actor.broodmotherOnHold < 1) { + } else if (actor.womb.length == 0 && actor.pregType > 0 && actor.broodmother > 0 && actor.broodmotherOnHold < 1) { //sorry but for already present broodmothers it's impossible to calculate fully, approximation used. var i, pw = actor.preg, bCount, bLeft; if (pw > 40) pw = 40; //to avoid disaster. diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw index 4b56123e14c0a5b1e510c4a754c8bf691df100cd..4cd077330693ca3730390401d7e71df0237cfaf0 100644 --- a/src/js/wombJS.tw +++ b/src/js/wombJS.tw @@ -59,9 +59,9 @@ window.WombInit = function(actor) { ft.genetics = generateGenetics(actor.ID, actor.pregSource, i); i++; }); - } else if (actor.womb.length == 0 && actor.pregType != 0 && actor.broodmother == 0) { + } else if (actor.womb.length == 0 && actor.pregType > 0 && actor.broodmother == 0) { WombImpregnate(actor, actor.pregType, actor.pregSource, actor.preg); - } else if (actor.womb.length == 0 && actor.pregType != 0 && actor.broodmother > 0 && actor.broodmotherOnHold < 1) { + } else if (actor.womb.length == 0 && actor.pregType > 0 && actor.broodmother > 0 && actor.broodmotherOnHold < 1) { //sorry but for already present broodmothers it's impossible to calculate fully, approximation used. var i, pw = actor.preg, bCount, bLeft; if (pw > actor.pregData.normalBirth) pw = actor.pregData.normalBirth; //to avoid disaster. diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index cd21c718be9a0076639205eb4cf0244cb2546763..c07c4d1dc72db7280c7c53ac7744b69a2973c5b7 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -1272,7 +1272,6 @@ extremely pale -5 s.geneMods.rapidCellGrowth = 0; } } - s.pregType = s.pregType || 0; WombInit(s); })>> <</widget>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 986c0315c518022955146e3eebeb4e66bf11f119..102cc3266b66d57f56aa9b57d0d9716b4741729f 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -3635,7 +3635,6 @@ Setting missing slave variables: <<if $nurseryNannies > 0>> <<for _bci = 0; _bci < $cribs.length; _bci++>> <<set _nurseryChild = $cribs[_bci]>> - <<set _nurseryChild.pregType = 0>> <<PMODinit _nurseryChild>> <</for>> <</if>>