diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 212f78e3150f61926cf32f31204421a0ed12f8fc..25c89280bf7afa66139142b3d3c649c82c94c2a6 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,10 @@ 2/24/18 + 369 + -fixes for pregmodfan's pregnancy tracking + -SFanon's continued SF work + 368 -added missing dairy broodmother birth -hacking skill allows you to pose as a medical expert to gain access to some of surgeon's starting bonuses diff --git a/devNotes/twine JS b/devNotes/twine JS index 7cd81877382da04b08ffb79675ef9b16befb4511..bda2205444ada5e748eb848033efd87604aecf65 100644 --- a/devNotes/twine JS +++ b/devNotes/twine JS @@ -6848,6 +6848,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 @@ -6952,7 +6953,6 @@ window.WombBirth = function(actor, readyAge) window.WombFlush = function(actor) { actor.womb = []; - } window.WombBirthReady = function(actor, readyAge) @@ -7059,20 +7059,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/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw index 9ee877018b8f45023d66ca7d7000b13acb6ec011..eba811b40b1e0abffe72520c4cf27049089cc9ed 100644 --- a/src/SecExp/riotControlCenter.tw +++ b/src/SecExp/riotControlCenter.tw @@ -31,7 +31,7 @@ The riot control center opens its guarded doors to you. The great chamber inside <<goto "riotControlCenter">> <</link>> <br>Invest more resources into the project to increase its effectiveness. - <br>//Costs <<print cashFormat(Math.trunc((5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1)*$HackingSkillMultiplier))>>. Will accelerate the tension decay, but will increase upkeep costs.// + <br>//Costs <<print cashFormat(Math.trunc((5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1)*$HackingSkillMultiplier)))>>. Will accelerate the tension decay, but will increase upkeep costs.// <<else>> You upgraded your free media scheme to its limits. <</if>>