From d158e67ae6c50e041b43269cfa009ab2a6a62610 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Mon, 19 Mar 2018 11:32:24 -0400 Subject: [PATCH] fixes and preg setting cleanup --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 8 ++++++++ src/cheats/PCCheatMenuCheatDatatypeCleanup.tw | 2 +- src/uncategorized/saLongTermEffects.tw | 8 +++----- src/utility/descriptionWidgetsFlesh.tw | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 28f8df841a6..8ca29bf6d16 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,10 +2,18 @@ 0.10.7.0/1 +3/19/2018 + + 401 + -tweaked saLongTermEffects pregnancy setting + -various little fixes + -fixed missed closing '>' in neighborsFSAdoption + 3/18/2018 400 -added neighbor FS Incest Festishist + -new JS functions (areRelated()) -more fixes 3/17/2018 diff --git a/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw b/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw index c0e7b875c7e..ddbf1141848 100644 --- a/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw +++ b/src/cheats/PCCheatMenuCheatDatatypeCleanup.tw @@ -36,7 +36,7 @@ <<set $PC.ageImplant = Number($PC.ageImplant) || 0>> <<set $playerAging = Number($playerAging) || 0>> <<set $PC.ageImplant = Number($PC.ageImplant) || 0>> -<<set $PC.physicalAge = Number($PC.physicalAge) || 0>> +<<set $PC.physicalAge = Number($PC.physicalAge) || 14>> <<set $PC.visualAge = Number($PC.visualAge) || 14>> <<set $PC.actualAge = Number($PC.actualAge) || 14>> <<set $PC.ovaryAge = Number($PC.ovaryAge) || 14>> \ No newline at end of file diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 6c81d45601b..de246b0dae8 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -4376,17 +4376,15 @@ <<set $slaves[$i].pregSource = _tempRival.ID>> <<elseif (random(1,100) > 60) && ($PC.dick == 1) && ($slaves[$i].eggType == "human")>> /* still 40% chance of impregnation by PC */ <<set $slaves[$i].pregSource = -1>> - <<elseif (random(1,100) > 95) && ($slaves[$i].eggType == "human")>> /* 5% chance of impregnation by random citizen - TODO: make this optional for players who want random fathers from among their own slaves only */ + <<elseif (random(1,100) > 95) && ($slaves[$i].eggType == "human") && $slaves[$i].devotion < 20>> /* 5% chance of impregnation by random citizen - TODO: make this optional for players who want random fathers from among their own slaves only */ <<set $slaves[$i].pregSource = -2>> <<else>> - /* default pregSource to a random citizen in case no eligible father is found */ - <<set $slaves[$i].pregSource = ($slaves[$i].eggType == "human") ? -2 : 0>> /* pregmod: random citizens cannot father non-human children */ /* pick a random starting point in the slave array and iterate (wrapping around) until finding eligible father or coming back to starting point */ <<if $slaves.length == 1>> - <<if canImpreg($slaves[$i], $slaves[$i]) && _conceptionSeed > 95>> + <<if canImpreg($slaves[$i], $slaves[$i]) && _conceptionSeed > 95 && ($slaves[$i].releaseRules == "permissive" || $slaves[$i].releaseRules == "masturbation")>> <<set $slaves[$i].pregSource = $slaves[$i].ID>> <</if>> - <<else>> + <<elseif $slaves[$i].releaseRules == "permissive" || ($slaves[$i].devotion < 20 && $slaves[$i].trust > 50) || $universalRulesConsent == 0>> <<set _sourceSeed = random(0,$slaves.length-1)>> <<for _m = _sourceSeed + 1; _m != _sourceSeed; _m++>> <<if _m == $slaves.length>><<set _m = 0>><</if>> /* wrap around */ diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index a18769dfc71..822563ad1be 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -2693,7 +2693,7 @@ $pronounCap's got a $pronounCap's such a nympho that despite this, $possessive limp member is tipped by a drop of precum. <</if>> <<elseif ($activeSlave.dick > 1) && ($activeSlave.hormoneBalance >= 100)>> - Since $pronoun's on an intense regimen of female hormones, $possessive cock is soft. + Since $possessive body is flooded with female hormones, $possessive cock is soft. <<if ($activeSlave.devotion > 75)>> Despite this, $pronoun's so devoted to you that being near you has $possessive horny. $possessiveCap limp member is tipped by a drop of precum. <<elseif ($activeSlave.drugs == "testicle enhancement") || ($activeSlave.drugs == "hyper testicle enhancement")>> -- GitLab