diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw index 3297207ea00a25d69f7101a94e4b7b8d76b6070d..2f36be99a26dfd17f3c6c9b93bd6f2ed30a101be 100644 --- a/src/js/wombJS.tw +++ b/src/js/wombJS.tw @@ -27,6 +27,7 @@ $slave.bellyPreg = WombGetWolume($slave) - return double, with current womb volu window.WombInit = function(actor) //Init womb system. { + if (!Array.isArray(actor.womb)) { //alert("creating new womb"); //debugging @@ -131,7 +132,6 @@ window.WombBirth = function(actor, readyAge) window.WombFlush = function(actor) { actor.womb = []; - } window.WombBirthReady = function(actor, readyAge) @@ -238,20 +238,26 @@ window.WombMaxPreg = function(actor) window.WombNormalizePreg = function(actor) { - if (actor.womb.length > 1) + //console.log("New actor: " + actor.slaveName + " ==============="); + WombInit(actor); + + if (actor.womb.length > 0) { var max = WombMaxPreg(actor); - + //console.log("max: " + max); + //console.log(".preg: "+ actor.preg); if (actor.pregWeek < 1 ) actor.pregWeek = 1 if (max < actor.preg) { WombProgress(actor, actor.preg - max); + //console.log("progressin womb"); } else if ( max > actor.preg) { actor.preg = max; + //console.log("advancing .preg"); } actor.pregType = actor.womb.length; diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw index f6073846f5f6eabb39ada8c8ee25a13e7b005318..f4934275f0a172cfbde8fe41e2ff1652dcb741e9 100644 --- a/src/pregmod/widgets/seBirthWidgets.tw +++ b/src/pregmod/widgets/seBirthWidgets.tw @@ -869,7 +869,7 @@ All in all, <<set _curBabies = $slaves[$i].curBabies.length>> <<if $slaves[$i].broodmother > 0 >> - <<set $slaves[$i].preg = 37>> + <<set $slaves[$i].preg = WombMaxPreg($slaves[$i])>> <<if $slaves[$i].broodmotherOnHold != 1 && $slaves[$i].womb.length == 0>> /* normally if broodmother is empty and not on hold then implant impregnate her immdiately*/ <<set WombImpregnate($slaves[$i], 1, $slaves[$i].pregSource, 1)>> <</if>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 34ed58882905a77a189cc73f3c160cc1ac8ec32a..4baa7c953f193bca888a5c4bc9017bd8870a5bc4 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -2488,7 +2488,6 @@ This experience This block now relpaced with universal code */ - <<set WombInit($args[0])>> <<set WombNormalizePreg($args[0])>> /*now with support for legacy code that advance pregnancy by setting .preg++ */ <<if $args[0].bellyImplant > 0>>