From 69e439e71992340c4b34bcc05f115acdf19af818 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 20 Mar 2018 19:49:48 -0400 Subject: [PATCH] added recieve catcher then promptly fixed all the receives it found. --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 ++++ sanityCheck | 1 + src/npc/descriptions/fVagina.tw | 2 +- src/pregmod/widgets/pregmodBirthWidgets.tw | 2 +- src/uncategorized/saDiet.tw | 28 ++++++++++---------- src/uncategorized/saLongTermEffects.tw | 2 +- 6 files changed, 23 insertions(+), 17 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index a75ad9e5e6e..539c1b20568 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,11 @@ 3/20/2018 + 403 + -XX, XY, and XXY diets now properly handle boobs + -minor fixes + -pregmodder can not spell "receive" thus necessitating a sanityCheck entry + 402 -SFanon's new trio of recruits -Pregmodfan's continued fixing and tweaking of his preg tracking system diff --git a/sanityCheck b/sanityCheck index 1d4697aa88f..4439db027c1 100755 --- a/sanityCheck +++ b/sanityCheck @@ -52,6 +52,7 @@ $GREP "<<<[^<>]*[<>]\?[^<>]*>>" -- "src/*.tw" | myprint "TooManyAngleBrackets" # Check for wrong capitalization on 'activeslave' and other common typos $GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\|activeUnits\)" -- "src/*" | myprint "WrongCapitilization" $GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\|canAcheive\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|pregBelly\|bellyimplant\|bellyfluid\|pronounCaps\)" -- 'src/*' | myprint "SpellCheck" +$GREP "\(recieve\|recieves\)" -- 'src/*' | myprint "PregmodderCannotSpellReceive" $GREP "\$slave\[" -- 'src/*' | myprint "ShouldBeSlaves" # Check for strange spaces e.g. $slaves[$i]. lips $GREP "\$slaves\[\$i\]\. " -- 'src/*' | myprint "MissingPropertyAfterSlaves" diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw index 7e74c311bd1..cf1d28742cc 100644 --- a/src/npc/descriptions/fVagina.tw +++ b/src/npc/descriptions/fVagina.tw @@ -60,7 +60,7 @@ You call her over so you can Her huge labia are almost dripping with arousal. <</if>> <<if $activeSlave.vaginaLube > 1>> - A steady stream of lube leaks from her pussy in preparation to recieve you. + A steady stream of lube leaks from her pussy in preparation to receive you. <</if>> <</if>> diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw index bf1dbd93fff..400412b1a1b 100644 --- a/src/pregmod/widgets/pregmodBirthWidgets.tw +++ b/src/pregmod/widgets/pregmodBirthWidgets.tw @@ -726,7 +726,7 @@ <<case "be the Schoolteacher">> <<if !canWalk($slaves[$i])>> <<if (random(1,20) > $suddenBirth)>> - She calls for her teaching aid to help position her so the class may recieve a lesson on childbirth. She begins working on birthing <<if $slaves[$i].birthsTotal == 0>>her first<<else>>this week's<</if>> baby, fully aware of her watching students. She demonstrates the proper ways to labor and how to deliver a baby. She explains the infant's future as her child taken and excuses the class for a short break in order to freshen up. Upon their return, she begins a lesson on being a broodmother, as there is always a curious face locked onto her still very gravid middle. + She calls for her teaching aid to help position her so the class may receive a lesson on childbirth. She begins working on birthing <<if $slaves[$i].birthsTotal == 0>>her first<<else>>this week's<</if>> baby, fully aware of her watching students. She demonstrates the proper ways to labor and how to deliver a baby. She explains the infant's future as her child taken and excuses the class for a short break in order to freshen up. Upon their return, she begins a lesson on being a broodmother, as there is always a curious face locked onto her still very gravid middle. <<set $humiliation = 1>> <<else>> While teaching a lesson, $slaves[$i].slaveName's water breaks. Sensing she wouldn't be able to make it to the birthing area, she instead chooses to act on the opportunity. Today's lesson will be on childbirth. diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw index fd85323b423..d358c21fdd7 100644 --- a/src/uncategorized/saDiet.tw +++ b/src/uncategorized/saDiet.tw @@ -449,7 +449,7 @@ Hormonal changes encourage her body to @@.lime;grow softer.@@ <<set $slaves[$i].weight += 1>> <</if>> - <<if ($slaves[$i].breasts <= 500)>> + <<if (($slaves[$i].boobs < 500)>> Her breasts @@.lime;grow slightly@@ from the estrogen. <<set $slaves[$i].boobs += 10>> <</if>> @@ -478,7 +478,7 @@ Hormonal changes encourage her body to @@.lime;grow softer.@@ <<set $slaves[$i].weight += 1>> <</if>> - <<if ($slaves[$i].breasts <= 600)>> + <<if ($slaves[$i].boobs < 600)>> Her breasts @@.lime;grow slightly@@ from the estrogen. <<set $slaves[$i].boobs += 10>> <</if>> @@ -499,7 +499,7 @@ Hormonal changes encourage her body to @@.lime;grow softer.@@ <<set $slaves[$i].weight += 1>> <</if>> - <<if ($slaves[$i].breasts <= 400)>> + <<if ($slaves[$i].boobs < 400)>> Her breasts @@.lime;grow slightly@@ from the estrogen. <<set $slaves[$i].boobs += 10>> <</if>> @@ -548,7 +548,7 @@ Her balls @@.lime;swell@@ due to the male hormones in her diet. <<set $slaves[$i].balls += 1>> <</if>> - <<if ($slaves[$i].breasts > 400)>> + <<if (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 400)>> Her breasts @@.orange;lose some mass@@ from the lack of estrogen in her diet. <<set $slaves[$i].boobs -= 10>> <</if>> @@ -565,7 +565,7 @@ Hormonal changes encourage her body to @@.lime;gain muscle.@@ <<set $slaves[$i].muscles += 1>> <</if>> - <<if ($slaves[$i].breasts > 500)>> + <<if (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 500)>> Her breasts @@.orange;lose some mass@@ from the lack of estrogen in her diet. <<set $slaves[$i].boobs -= 10>> <</if>> @@ -593,7 +593,7 @@ Her balls @@.lime;swell@@ due to the male hormones in her diet. <<set $slaves[$i].balls += 1>> <</if>> - <<if ($slaves[$i].breasts > 300)>> + <<if (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 300)>> Her breasts @@.orange;lose some mass@@ to better suit her body chemistry. <<set $slaves[$i].boobs -= 10>> <</if>> @@ -621,7 +621,7 @@ Hormonal changes encourage her body to @@.lime;grow softer.@@ <<set $slaves[$i].weight += 1>> <</if>> - <<if ($slaves[$i].breasts <= 800)>> + <<if ($slaves[$i].boobs < 800)>> Her breasts @@.lime;grow slightly@@ to fit her developing femininity. <<set $slaves[$i].boobs += 10>> <</if>> @@ -923,7 +923,7 @@ Hormonal changes encourage its body to @@.lime;grow softer.@@ <<set $slaves[$i].weight += 1>> <</if>> - <<if ($slaves[$i].breasts <= 500)>> + <<if (($slaves[$i].boobs-$slaves[$i].boobsImplant) < 500)>> Its breasts @@.lime;grow slightly@@ from the estrogen. <<set $slaves[$i].boobs += 10>> <</if>> @@ -948,7 +948,7 @@ Hormonal changes encourage its body to @@.lime;grow softer.@@ <<set $slaves[$i].weight += 1>> <</if>> - <<if ($slaves[$i].breasts <= 600)>> + <<if (($slaves[$i].boobs-$slaves[$i].boobsImplant) < 600)>> Its breasts @@.lime;grow slightly@@ from the estrogen. <<set $slaves[$i].boobs += 10>> <</if>> @@ -965,7 +965,7 @@ Hormonal changes encourage its body to @@.lime;grow softer.@@ <<set $slaves[$i].weight += 1>> <</if>> - <<if ($slaves[$i].breasts <= 400)>> + <<if (($slaves[$i].boobs-$slaves[$i].boobsImplant) < 400)>> Its breasts @@.lime;grow slightly@@ from the estrogen. <<set $slaves[$i].boobs += 10>> <</if>> @@ -1005,7 +1005,7 @@ Its balls @@.lime;swell@@ due to the male hormones in its diet. <<set $slaves[$i].balls += 1>> <</if>> - <<if ($slaves[$i].breasts > 400)>> + <<if (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 400)>> Its breasts @@.orange;lose some mass@@ from the lack of estrogen in its diet. <<set $slaves[$i].boobs -= 10>> <</if>> @@ -1014,7 +1014,7 @@ Hormonal changes encourage its body to @@.lime;gain muscle.@@ <<set $slaves[$i].muscles += 1>> <</if>> - <<if ($slaves[$i].breasts > 500)>> + <<if (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 500)>> Its breasts @@.orange;lose some mass@@ from the lack of estrogen in its diet. <<set $slaves[$i].boobs -= 10>> <</if>> @@ -1038,7 +1038,7 @@ Its balls @@.lime;swell@@ due to the male hormones in its diet. <<set $slaves[$i].balls += 1>> <</if>> - <<if ($slaves[$i].breasts > 300)>> + <<if (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 300)>> Its breasts @@.orange;lose some mass@@ to better suit its body chemistry. <<set $slaves[$i].boobs -= 10>> <</if>> @@ -1060,7 +1060,7 @@ Hormonal changes @@.lime;thin its waist.@@ <<set $slaves[$i].waist-->> <</if>> - <<if ($slaves[$i].breasts <= 800)>> + <<if (($slaves[$i].boobs-$slaves[$i].boobsImplant) < 800)>> Its breasts @@.lime;grow slightly@@ to fit its developing femininity. <<set $slaves[$i].boobs += 10>> <</if>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index f578d80e0a2..2ed9d8f8ff8 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -4410,7 +4410,7 @@ <</if>> /* CLOSES CAN GET PREGNANT */ /* PREGNANCY TYPE SANITY CHECK (not for pregnancies started above) */ -<<if $slaves[$i].preg < 1>> +<<if $slaves[$i].preg <= 0>> <<if $slaves[$i].pregType != 0>> <<set $slaves[$i].pregType = 0>> <<set WombFlush($slaves[$i])>> -- GitLab