From 9d2a856f384dfcdc618912a7f9de017260a42b53 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 27 Feb 2018 23:21:26 -0500
Subject: [PATCH] fix to fsDevelopments.tw
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 3 +++
devNotes/twine JS | 20 +++++++++++++++-----
src/uncategorized/fsDevelopments.tw | 8 ++++----
3 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 8acbe7c1576..f559e886fd0 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,9 @@
2/28/18
+ 376
+ -pregmodfan's fixes to player pregnancy
+
375
-Sfanon's fixes and tweaks
-some more robust catchers for NaN'd rep
diff --git a/devNotes/twine JS b/devNotes/twine JS
index da9b1c92fba..55597276503 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -6855,6 +6855,15 @@ window.WombInit = function(actor) //Init womb system.
actor.womb = [];
}
+// console.log("broodmother:" + typeof actor.broodmother);
+
+ if ( typeof actor.broodmother != "number" )
+ {
+ actor.broodmother = 0;
+ actor.broodmotherFetuses = 0;
+ }
+
+
if (actor.womb.length == 0 && actor.pregType != 0 && actor.broodmother == 0) //backward compatibility setup. Fully accurate for normal pregnancy only.
{
WombImpregnate(actor, actor.pregType, actor.pregSource, actor.preg);
@@ -7059,26 +7068,26 @@ window.WombMaxPreg = function(actor)
window.WombNormalizePreg = function(actor)
{
- //console.log("New actor: " + actor.slaveName + " ===============");
+// console.log("New actor: " + actor.slaveName + " ===============" + actor.name);
WombInit(actor);
if (actor.womb.length > 0)
{
var max = WombMaxPreg(actor);
- //console.log("max: " + max);
- //console.log(".preg: "+ actor.preg);
+// 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");
+// console.log("progressin womb");
}
else if ( max > actor.preg)
{
actor.preg = max;
- //console.log("advancing .preg");
+// console.log("advancing .preg");
}
actor.pregType = actor.womb.length;
@@ -7086,6 +7095,7 @@ window.WombNormalizePreg = function(actor)
}
else if (actor.womb.length == 0 && actor.broodmother < 1)
{
+// console.log("preg fixing");
actor.pregType = 0;
actor.pregKnown = 0;
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index c42af19a25c..541de3f1df9 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -950,8 +950,8 @@ With her $assistantAppearance appearance, $assistantName's public visibility mes
<</if>>
<<if $arcologies[0].FSMaturityPreferentialist < 0>>
<<set $arcologies[0].FSMaturityPreferentialist = "unset">><<set $FSCredits += 1>>
- <<set $arcologies[0].FSYouthPreferentialistLaw = 0, $arcologies[0].FSYouthPreferentialistSMR = 0>>
- <<if $assistantFSAppearance == "youth preferentialist">><<set $assistantFSAppearance = "default">><</if>>
+ <<set $arcologies[0].FSMaturityPreferentialistLaw = 0, $arcologies[0].FSMaturityPreferentialistSMR = 0>>
+ <<if $assistantFSAppearance == "maturity preferentialist">><<set $assistantFSAppearance = "default">><</if>>
<<ClearFacilityDecorations>>
@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
<<elseif $arcologies[0].FSMaturityPreferentialist > $arcologies[0].FSMaturityPreferentialistDecoration>>
@@ -978,8 +978,8 @@ With her $assistantAppearance appearance, $assistantName's public visibility mes
<</if>>
<<if $arcologies[0].FSYouthPreferentialist < 0>>
<<set $arcologies[0].FSYouthPreferentialist = "unset">><<set $FSCredits += 1>>
- <<set $arcologies[0].FSMaturityPreferentialistLaw = 0, $arcologies[0].FSMaturityPreferentialistSMR = 0>>
- <<if $assistantFSAppearance == "maturity preferentialist">><<set $assistantFSAppearance = "default">><</if>>
+ <<set $arcologies[0].FSYouthPreferentialistLaw = 0, $arcologies[0].FSYouthPreferentialistSMR = 0>>
+ <<if $assistantFSAppearance == "youth preferentialist">><<set $assistantFSAppearance = "default">><</if>>
<<ClearFacilityDecorations>>
@@.red;Your future society project has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
<<elseif $arcologies[0].FSYouthPreferentialist > $arcologies[0].FSYouthPreferentialistDecoration>>
--
GitLab