From 87f5e6e9c1ce9f9bf08a864b20551ede6aae7b13 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 12 Dec 2018 17:59:34 -0500
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 +++++++
devNotes/twine JS.txt | 2 +-
src/uncategorized/RETS.tw | 2 +-
src/uncategorized/nonRandomEvent.tw | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 1ef563e4bc0..64d44042ac6 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@
0.10.7.1-1.3.x
+12/12/2018
+
+ 2
+ -tweaked natural lactation logic (now decreases at week start and engorges at week end)
+ -added a rule for facility heads to direct them on how to handle their lactation
+ -fixes
+
12/11/2018
1
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index dae7a161dda..56214a1f7ba 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -26099,7 +26099,7 @@ window.SlaveSummaryUncached = (function(){
}
return SlaveSummaryUncached;
-};
+})();
// :: Remove activeSlave JS [script]
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index dab78300c41..65dd14ad803 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -889,7 +889,7 @@ The slaves are about to go to bed; they're naked, and the horny $activeSlave.sla
<<elseif $activeSlave.fetishKnown && $activeSlave.fetish == "pregnancy" && $subSlave.bellyPreg >= 5000>>
"You're <<s>>o hot with that belly," $he wheedles. "It'<<s>> ju<<s>>t <<s>>o big, and round, and, um, out there." $He swallows, getting distracted.
<<elseif $subSlave.face > 95>>
- "You're the prettie<<s>>t <<= lispReplace(SlaveTitle($subSlave))>> in the whole arcology," $he wheedles. "I can't look at your perfect <<= lispReplace($subSlave.faceShape)>> fa<<c>>e and not want to make love to you<<if !_vaginal>>r butt<</if>>!"
+ "You're the prettie<<s>>t <<if SlaveStatsChecker.checkForLisp($activeSlave)>><<= lispReplace(SlaveTitle($subSlave))>><<else>>SlaveTitle($subSlave)<</if>> in the whole arcology," $he wheedles. "I can't look at your perfect <<if SlaveStatsChecker.checkForLisp($activeSlave)>><<= lispReplace($subSlave.faceShape)>><<else>>$subSlave.faceShape<</if>> fa<<c>>e and not want to make love to you<<if !_vaginal>>r butt<</if>>!"
<<elseif !_vaginal && $subSlave.butt > 3>>
"You've got <<s>>uch a ni<<c>>e a<<ss>>," $he wheedles. "It'<<s>> ju<<s>>t <<s>>o big, and round, and, um, out there." $He swallows, getting distracted.
<<elseif $subSlave.boobShape == "perky">>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index 10f28173444..b8722e82683 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -43,7 +43,7 @@
<<elseif ($week == 29)>>
<<set $Event = "aid invitation">>
<<goto "Generic Plot Events">>
-<<elseif (_effectiveWeek == 31)>>
+<<elseif (_effectiveWeek == 31) && ($mercenaries == 0)>>
<<goto "P mercenaries">>
<<elseif (_effectiveWeek == 35) && ($mercenaries > 0)>>
<<goto "P snatch and grab">>
--
GitLab