diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index bd38b589e4bd9bef1dfe5e86646dc4ea65f6fec7..eff14c9a19a2b2fbb995e95525832fbc68b695b6 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,10 +4,15 @@ 3/08/2018 + 388 + -fixed a very very unlikely case in sister indentifying + -fixed some improper pregnancy sets in the dairy + -fixed more improper preg sets in saLongTermEffects + 387 -tweaked saGuardsYou to actually count facility heads the BG has trained when it comes to counting successors -your BG nows considers servants and your harem in her count - -a race now no longer be both superior and inferior + -a race now no longer can be both superior and inferior -slaves can now die of age as young as 50 should they be in bad condition, conversely, healthy slaves live longer -reordered full royal court enslavement to circumvent a possible ghost in the machine situation -partial revert to scheduledEvent to handle sugarcube BS diff --git a/devNotes/twine JS b/devNotes/twine JS index 8336529a864a31d08d7d086e13a24ff1b1c31dbb..39bcb333b0f8cdbf71ec9de12571c4fc9c5a015e 100644 --- a/devNotes/twine JS +++ b/devNotes/twine JS @@ -1191,7 +1191,7 @@ window.sameMom = function(slave1, slave2){ // testtest catches the case if a mother is a father or a father a mother - thank you familyAnon, for this code window.sameTParent = function(slave1, slave2) { - if (slave1.mother == -1 && slave1.father == 1 && slave2.mother == -1 && slave2.father == -1) { + if (slave1.mother == -1 && slave1.father == -1 && slave2.mother == -1 && slave2.father == -1) { return 1; } else if (slave1.mother == slave2.father && slave1.father == slave2.mother && slave1.mother != 0 && slave1.mother != -2 && slave1.father != 0 && slave1.father != -2 && slave1.mother != slave1.father) { return 2; diff --git a/src/js/extendedFamilyModeJS.tw b/src/js/extendedFamilyModeJS.tw index 587edad98c8782d5770596542c5991efd8341f65..1ee880e7801b1d783fca45f32f3f45a98f994b3d 100644 --- a/src/js/extendedFamilyModeJS.tw +++ b/src/js/extendedFamilyModeJS.tw @@ -20,7 +20,7 @@ window.sameMom = function(slave1, slave2){ // testtest catches the case if a mother is a father or a father a mother - thank you familyAnon, for this code window.sameTParent = function(slave1, slave2) { - if (slave1.mother == -1 && slave1.father == 1 && slave2.mother == -1 && slave2.father == -1) { + if (slave1.mother == -1 && slave1.father == -1 && slave2.mother == -1 && slave2.father == -1) { return 1; } else if (slave1.mother == slave2.father && slave1.father == slave2.mother && slave1.mother != 0 && slave1.mother != -2 && slave1.father != 0 && slave1.father != -2 && slave1.mother != slave1.father) { return 2; diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw index ef85666bee043045e058d812409df9e9da6873ed..7a38d7737b56aa5c9e3275242243c35a0a9b5a08 100644 --- a/src/pregmod/widgets/seBirthWidgets.tw +++ b/src/pregmod/widgets/seBirthWidgets.tw @@ -292,7 +292,11 @@ <<set $birthsTotal += _curBabies>> <<if $slaves[$i].pregSource > 0>> <<set _babyDaddy = $slaves.findIndex(function(s) { return s.ID == $slaves[$i].pregSource; })>> - <<set $slaves[_babyDaddy].slavesFathered += _curBabies>> + <<if _babyDaddy != -1>> + <<set $slaves[_babyDaddy].slavesFathered += _curBabies>> + <<else>> + Note: Unknown father when one should be found. Suspect ID is $slaves[$i].pregSource + <</if>> <<elseif $slaves[$i].pregSource == -1>> <<set $PC.slavesFathered += _curBabies>> <</if>> diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index d9f5bef218736e3ca66cb9aac7281bca24cd3b5e..84b13415e01a2a9e930b3d14020c5c0ee98fdd4c 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -63,7 +63,7 @@ <<if (canImpreg($slaves[$i], $Milkmaid))>> <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $Milkmaid.ID, $slaves[$i].pregKnown = 1, $slaves[$i].pregWeek = 1, _milkmaidImpregnated++, $slaves[$i].vaginalCount += 10, $vaginalTotal += 10>> <<SetPregType $slaves[$i]>> - <<set WombImpregnate($activeSlave, $activeSlave.pregType, $Milkmaid.ID, 1)>> + <<set WombImpregnate($slaves[$i], $activeSlave.pregType, $Milkmaid.ID, 1)>> <</if>> <</for>> <<if _milkmaidImpregnated > 0>> @@ -763,6 +763,7 @@ <<set $slaves[$i].pregType = either(1, 1, 1, 1, 2, 2, 2, 3, 3, 4)>> <</if>> <<set $slaves[$i].pregSource = -2>> + <<set WombImpregnate($slaves[$i], $slaves[$i].pregType, -2, 1)>> <</if>> /*closes eggType */ <<if ($slaves[$i].vagina == 0)>> <<set $slaves[$i].vagina++>> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 05e22e5d7b76584909602170a6705000c346d365..0fb1a31f2ab2b2a6919c8dce910c3f43d3aa0a95 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -2144,9 +2144,9 @@ Her scars make her look like she's in the right place. <<case "lip atrophiers">> <<if ($activeSlave.amp != 1)>>She massages her lips uncomfortably<<else>>She licks her lips uncomfortably<</if>>. The A-TRPH must be having an effect, painfully causing her body to atrophy her lips. <<case "breast redistributors">> - <<if ($activeSlave.amp != 1)>>She pinches at the fat building on her belly and lets off a sigh.<<else>>She squirms under the added weight building on her belly<</if>>. The RDST-D must be having an effect, encouraging her body to redistribute her breasts' adipose tissue to her middle. + <<if ($activeSlave.amp != 1)>>She pinches at the fat building on her belly and lets off a sigh<<else>>She squirms under the added weight building on her belly<</if>>. The RDST-D must be having an effect, encouraging her body to redistribute her breasts' adipose tissue to her middle. <<case "butt redistributors">> - <<if ($activeSlave.amp != 1)>>She pinches at the fat building on her belly and lets off a sigh.<<else>>She squirms under the added weight building on her belly<</if>>. The RDST-D must be having an effect, encouraging her body to redistribute her buttock's adipose tissue to her middle. + <<if ($activeSlave.amp != 1)>>She pinches at the fat building on her belly and lets off a sigh<<else>>She squirms under the added weight building on her belly<</if>>. The RDST-D must be having an effect, encouraging her body to redistribute her buttock's adipose tissue to her middle. <<case "sag-B-gone">> Her breasts are shiny from the layer of anti-sag cream rubbed onto them. They might be a little perkier, or not. <<default>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index a24bb573eb75e23672bddfa0880e1cb181426d8f..2eb8d75c0b7a4bd8f3c0e0f3db7095a27f0cf0f0 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -4155,7 +4155,7 @@ /* CAN GET PREGNANT (fertile, not on contraceptives and not wearing chastity) */ -<<if canGetPregnant($slaves[$i])>> +<<if canGetPregnant($slaves[$i]) && $dairyPregSetting == 0>> <<set _conceptionSeed = random(1,100)>> @@ -4190,6 +4190,7 @@ <</if>> <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = -1, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1>><<SetPregType $slaves[$i]>> + <<set WombImpregnate($slaves[$i], $slaves[$i].pregType, -1, 1)>> <<set $activeSlave = $slaves[$i]>><<if $slaves[$i].mpreg == 1>><<AnalVCheck 10>><<else>><<VaginalVCheck 10>><</if>><<set $slaves[$i] = $activeSlave>> <<elseif (($slaves[$i].vagina == 0) || (($slaves[$i].anus == 0) && ($slaves[$i].mpreg > 0)))>> @@ -4284,8 +4285,8 @@ <<set $slaves[$i].preg = 1, $slaves[$i].pregSource = $HeadGirl.ID, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1, $HGCum -= 1, $HeadGirl.penetrativeCount += 10, $penetrativeTotal += 10>> <<SetPregType $slaves[$i]>> - <<set WombImpregnate($slaves[$i], $activeSlave.pregType, $HeadGirl.ID, 1)>> - <<set $activeSlave = $slaves[$i]>><<if $slaves[$i].mpreg == 1>><<AnalVCheck 10>><<else>><<VaginalVCheck 10>><</if>><<set $slaves[$i] to $activeSlave>> + <<set WombImpregnate($slaves[$i], $slaves[$i].pregType, $HeadGirl.ID, 1)>> + <<set $activeSlave = $slaves[$i]>><<if $slaves[$i].mpreg == 1>><<AnalVCheck 10>><<else>><<VaginalVCheck 10>><</if>><<set $slaves[$i] = $activeSlave>> <<for $j = 0; $j < $slaves.length; $j++>> <<if $HeadGirl.ID == $slaves[$j].ID>> <<set $slaves[$j] = $HeadGirl>>