From 035c47990df6aad9ef8da3a4b80f134330166b19 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 25 Mar 2018 12:10:56 -0400
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 4 ++++
slave variables documentation - Pregmod.txt | 1 +
src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw | 2 ++
src/pregmod/incubator.tw | 4 +++-
src/pregmod/widgets/seBirthWidgets.tw | 2 +-
5 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index d67264bc42b..d998a492996 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,10 @@
3/24/2018
+ 7
+ -fixed a couple minor annoyances
+ -if any slave has a .reservedChildren value, the incubator global tracking resetter will be usable
+
6
-new voluntarily enslaved pairs can show their incestual love during recruitment
-minor tweaks to muscle building and steroids
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 0d62847e0ce..a2a9fe3d4bc 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -1740,6 +1740,7 @@ diet:
"XXY"
"cum production"
"cleansing"
+"fertility"
dietCum:
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index 2cc4866ed34..2bb08c572ba 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -71,6 +71,8 @@
<<set $tempSlave.pregSource = Number($tempSlave.pregSource) || 0>>
<<if $tempSlave.preg < 0>>
<<set $tempSlave.pregKnown = 0>>
+<<elseif $tempSlave.preg > 0>>
+ <<set $tempSlave.pregKnown = 1>>
<</if>>
<<set $tempSlave.dick = Number($tempSlave.dick) || 0>>
<<set $tempSlave.clit = Number($tempSlave.clit) || 0>>
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 0b74ed8a742..a54a6346916 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -49,6 +49,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
<</if>>
<<if $slaves[_u].pregType > 1>>$slaves[_u].pregType babies<<else>>baby<</if>>.
<<if $slaves[_u].reservedChildren > 0>>
+ <<set _childrenReserved = 1>>
<<if $slaves[_u].pregType == 1>>
Her child will be placed in $incubatorName.
<<elseif $slaves[_u].reservedChildren < $slaves[_u].pregType>>
@@ -117,6 +118,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
octuplets.
<</switch>>
<<if $PC.reservedChildren > 0>>
+ <<set _childrenReserved = 1>>
<<if $PC.pregType == 1>>
Your child will be placed in $incubatorName.
<<elseif $PC.reservedChildren < $PC.pregType>>
@@ -157,7 +159,7 @@ Reserve an eligible mother-to-be's child to be placed in a tank upon birth. Of $
You have @@.red;no room for your offspring.@@
<</if>>
<</if>>
-<<if $reservedChildren != 0>> /* the oops I made it go negative somehow button */
+<<if $reservedChildren != 0 || _childrenReserved == 1>> /* the oops I made it go negative somehow button */
<br>
<<link "Clear all reserved children">>
<<for _u = 0; _u < _SL; _u++>>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 55a01d44fbe..e226b4a03b6 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -680,7 +680,7 @@ All in all,
<</if>>
<<if $birthDamage > 0>>
<<set $slaves[$i].health -= Math.round(($birthDamage/2)*10)>>
- <<if $birthDamage > 5 && _compoundCondition == 1>>
+ <<if $birthDamage > 5 && _compoundCondition == 1 && _curBabies > 0>>
Or it would have been, were $pronoun only having one. With each additional child that needed to be birthed, @@.red;the damage to $possessive health was compounded.@@
<<set $slaves[$i].health -= _curBabies>>
<</if>>
--
GitLab