From 942bbe843adb351f0ef57765efc8bf9dd977cc08 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 29 Nov 2018 19:29:11 -0500
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 6 ++++++
devNotes/twine JS.txt | 2 +-
src/js/generateGenetics.tw | 2 +-
src/pregmod/widgets/seBirthWidgets.tw | 4 ++--
src/uncategorized/reRecruit.tw | 2 +-
5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index dd35aad3fbb..567694de0a8 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,10 +2,16 @@
0.10.7.1-1.1.x
+11/29/2018
+
+ 3
+ -more fixes
+
11/28/2018
2
-fixed bad string pass
+ -tweaked how slave recruit events are handled
1
-fixes
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index ef41ccc177c..c53fb06f7cc 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -10694,7 +10694,7 @@ window.generateChild = function(mother, ova, destination) {
let V = State.variables;
let genes = ova.genetics; //maybe just argument this? We'll see.
let pregUpgrade = V.pregnancyMonitoringUpgrade;
- let child;
+ let child = {};
if (!destination) { //does extra work for the incubator if defined, otherwise builds a simple object
if (genes.gender == "XX") {
diff --git a/src/js/generateGenetics.tw b/src/js/generateGenetics.tw
index 03b99998085..b574f256aa1 100644
--- a/src/js/generateGenetics.tw
+++ b/src/js/generateGenetics.tw
@@ -514,7 +514,7 @@ window.generateChild = function(mother, ova, destination) {
let V = State.variables;
let genes = ova.genetics; //maybe just argument this? We'll see.
let pregUpgrade = V.pregnancyMonitoringUpgrade;
- let child;
+ let child = {};
if (!destination) { //does extra work for the incubator if defined, otherwise builds a simple object
if (genes.gender == "XX") {
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index de2bec8f2ed..7ccb9ce4dc2 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -860,7 +860,7 @@ All in all,
<<set $slaves[$i].reservedChildren -= _cToIncub>>
<<set $slaves[$i].reservedChildrenNursery -= _cToNursery>>
<br><br>
- Of $his _curBabies child<<if _curBabies > 1>>ren<</if>>, _cToIncub <<if _curBabies === 1>>was<<else>>were<</if>> taken to $incubatorName<<if $nursery > 0>>, and _cToNursery <<if _cToNursery === 1>>was<<else>>were<</if>> taken to $nurseryName<</if>>.
+ Of $his _curBabies child<<if _curBabies > 1>>ren<</if>>, _cToIncub <<if _cToIncub === 1>>was<<else>>were<</if>> taken to $incubatorName<<if $nursery > 0>>, and _cToNursery <<if _cToNursery === 1>>was<<else>>were<</if>> taken to $nurseryName<</if>>.
<<if _cToIncub + _cToNursery > 0>>
<<for _cb = 0; _cb < _curBabies; _cb++>> /* if there is no reserved children, code in loop will not trigger */
<<if $slaves[$i].curBabies[_cb].reserve == "incubator">>
@@ -888,7 +888,7 @@ All in all,
<<else>>
$nurseryName,
<</if>>
- it's time to decide the fate of the other<<if _curBabies > 0>><</if>>.
+ it's time to decide the fate of the other<<if _curBabies > 0>>s<</if>>.
<</if>>
<</if>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index d6133c1ebd1..7119ce06a22 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1728,12 +1728,12 @@
<<case "held POW">>
-<<set $activeSlave.PLimb = 1>>
<<set $activeSlaveOneTimeMinAge = Math.max($fertilityAge, 8)>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<include "Generate XX Slave">>
+<<set $activeSlave.PLimb = 1>>
<<set $activeSlave.origin = "You helped free her from a POW camp after being abandoned by her country, leaving her deeply indebted to you.">>
<<set $activeSlave.devotion = random(0,20)>>
<<set $activeSlave.trust = random(0,20)>>
--
GitLab