diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 1ef563e4bc016bd30a10622a5a12a146b0dbd80c..64d44042ac69ae616a585682cbf2425bf1ce4306 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 dae7a161ddabdac96715ccd310bda94855244fd1..56214a1f7baf8cf51c1cc0ee30b0c3c5657e9332 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 dab78300c41d3d9a62fc23c0aad2db1291ebc1d3..65dd14ad803c9cd39076e88c737ac134abf5c547 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 10f2817344400988f5c28236d9008df8e89d5545..b8722e826836f10d3bba3a3ba8bf5c1214a6b64f 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">>