diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index d67264bc42bfc92e235b124fffbd4ed3900b9f90..d998a4929960cf42f137caf12f91c1169874d83d 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 0d62847e0ce38e8a577461d5819283423edecb02..a2a9fe3d4bcc83cfb241de6337679f1a2d701a29 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 2cc4866ed34f0522fb4f756429cd4a1ae6f0b934..2bb08c572ba9ff4dc492d52c3696ffa77f3401ac 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 0b74ed8a742a1f59e3975d9220f187282f1edef0..a54a63469161e207cb33a5b0c959d7b6fd7b93c2 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 55a01d44fbeed73166ef090533597a1e514faf7f..e226b4a03b6579d3dae20156e5f5fb50ffc642ac 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>>