From 946d615c60f58a681a0d13f876bab153709feba7 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 24 Feb 2018 20:47:44 -0500
Subject: [PATCH] rcc fix
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 4 ++++
devNotes/twine JS | 12 +++++++++---
src/SecExp/riotControlCenter.tw | 2 +-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 212f78e3150..25c89280bf7 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 7cd81877382..bda2205444a 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 9ee877018b8..eba811b40b1 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>>
--
GitLab