From 04bc3b4c06e0132021c8db96aaba47f264f84ad1 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 13 Oct 2017 16:26:47 -0400
Subject: [PATCH] Fixes
---
sanityCheck | 2 +-
src/pregmod/widgets/slaveSummaryWidgets.tw | 18 +++++++++++-------
src/uncategorized/RETS.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 8 ++++----
src/uncategorized/saRecruitGirls.tw | 4 ++--
5 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/sanityCheck b/sanityCheck
index 412422f8782..b87ef63cf00 100755
--- a/sanityCheck
+++ b/sanityCheck
@@ -51,7 +51,7 @@ $GREP "<<[^<>]*[<>]\?[^<>]*>>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
$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\)" -- "src/*" | myprint "WrongCapitilization"
-$GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\|canAcheive\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|bellyimplant\|bellyfluid\|pronounCaps\)" -- 'src/*' | myprint "SpellCheck"
+$GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\|canAcheive\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|pregBelly\|bellyimplant\|bellyfluid\|pronounCaps\)" -- 'src/*' | myprint "SpellCheck"
$GREP "\$slave\[" -- 'src/*' | myprint "ShouldBeSlaves"
# Check for strange spaces e.g. $slaves[$i]. lips
$GREP "\$slaves\[\$i\]\. " -- 'src/*' | myprint "MissingPropertyAfterSlaves"
diff --git a/src/pregmod/widgets/slaveSummaryWidgets.tw b/src/pregmod/widgets/slaveSummaryWidgets.tw
index e44c77edaf3..34f88ec90b7 100644
--- a/src/pregmod/widgets/slaveSummaryWidgets.tw
+++ b/src/pregmod/widgets/slaveSummaryWidgets.tw
@@ -2553,14 +2553,16 @@ _Slave.faceShape face.
<<if _ssj != -1>>
<<SlaveFullName $slaves[_ssj]>>'s @@.lightgreen;daughter<<if _Slave.relationshipTarget == $slaves[_ssj].ID>><<if _Slave.relationship == 1>> and friend<<elseif _Slave.relationship == 2>> and best friend<<elseif _Slave.relationship == 3>> and FWB<<elseif _Slave.relationship == 4>> and lover<<else>> and wife<</if>><<set _relationshipHandled = 1>><</if>>.@@
<</if>>
- <<elseif _Slave.father == -1>>
- Your @@.lightgreen;daughter
+ <<elseif _Slave.mother == -1>>
+ Your
<<if _Slave.relationship == -3>>
- and wife.@@
+ @@.lightgreen;daughter and wife.@@
<<set _relationshipHandled = 1>>
<<elseif _Slave.relationship == -2>>
- and lover.@@
+ @@.lightgreen;daughter and lover.@@
<<set _relationshipHandled = 1>>
+ <<else>>
+ @@.lightgreen;daughter.@@
<</if>>
<</if>>
<<if _Slave.father > 0 && _Slave.father != _Slave.mother>>
@@ -2569,13 +2571,15 @@ _Slave.faceShape face.
<<SlaveFullName $slaves[_ssj]>>'s @@.lightgreen;daughter<<if _Slave.relationshipTarget == $slaves[_ssj].ID>><<if _Slave.relationship == 1>> and friend<<elseif _Slave.relationship == 2>> and best friend<<elseif _Slave.relationship == 3>> and FWB<<elseif _Slave.relationship == 4>> and lover<<else>> and wife<</if>><<set _relationshipHandled = 1>><</if>>.@@
<</if>>
<<elseif _Slave.father == -1 && _Slave.father != _Slave.mother>>
- Your @@.lightgreen;daughter
+ Your
<<if _Slave.relationship == -3>>
- and wife.@@
+ @@.lightgreen;daughter and wife.@@
<<set _relationshipHandled = 1>>
<<elseif _Slave.relationship == -2>>
- and lover.@@
+ @@.lightgreen;daughter and lover.@@
<<set _relationshipHandled = 1>>
+ <<else>>
+ @@.lightgreen;daughter.@@
<</if>>
<</if>>
<<if _Slave.daughters == 1>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index fd3bde304ce..94ed6b75145 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -407,7 +407,7 @@ She shrugs.
<<if $activeSlave.fetish == "sadist">>
"I thought <<s>>he wa<<s>> going to whine and <<s>>truggle, but <<s>>he's kinda di<<s>>appointing."
<<elseif $activeSlave.fetish == "pregnancy" && $subSlave.belly >= 10000>>
- <<if $subSlave.pregBelly >= 8000>>
+ <<if $subSlave.bellyPreg >= 8000>>
"<<S>>he'<<s>> <<s>>o pregnant, I ju<<s>>t had to fuck her. I'm <<s>>urpri<<s>>ed <<s>>he's enjoying it <<s>>o much."
<<else>>
"Her belly'<<s>> <<s>>o round, I ju<<s>>t had to fuck her. I ju<<s>>t wi<<s>>h <<s>>he wa<<s>> pregnant."
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 4cfc25efdc7..7ad633c1676 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -6468,7 +6468,7 @@
<<if $slaves[$i].fuckdoll == 0>>
<<if $slaves[$i].fetish != "mindbroken">>
-<<if ($slaves[$i].pregBelly >= 100000) || ($slaves[$i].preg > 20 && $slaves[$i].pregType >= 10) || ($slaves[$i].preg > 10 && $slaves[$i].pregType >= 20)>>
+<<if ($slaves[$i].bellyPreg >= 100000) || ($slaves[$i].preg > 20 && $slaves[$i].pregType >= 10) || ($slaves[$i].preg > 10 && $slaves[$i].pregType >= 20)>>
<<if $pregAccessibility == 1>>
<<if ($slaves[$i].devotion > 20)>>
She's @@.mediumaquamarine;thankful@@ to you for providing living spaces adapted to heavily pregnant life.
@@ -6848,7 +6848,7 @@
<<set $slaves[$i].prestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with the sight of her holes stretched to their limits.">>
the sight of her holes stretched to their limits,
<<set $desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her stuffed to her limit">>
- <<elseif $slaves[$i].pregBelly >= 1500>>
+ <<elseif $slaves[$i].bellyPreg >= 1500>>
<<set $slaves[$i].prestigeDesc = "She is world famous for her career in slave pornography. Millions are intimately familiar with growth of her belly and her pregnant pussy.">>
the sight of her rounded belly and pregnant pussy,
<<set $desc = "a framed shot from porn starring " + $slaves[$i].slaveName + " showing her pregnant pussy getting pounded">>
@@ -6895,7 +6895,7 @@
<<elseif ($slaves[$i].sexualQuirk == "size queen")>>
<<set $slaves[$i].prestigeDesc = "She is famous for her recurring in slave pornography. Her many fans relish the sight of her holes stretched to their limits.">>
the sight of her holes stretched to their limits,
- <<elseif $slaves[$i].pregBelly >= 1500>>
+ <<elseif $slaves[$i].bellyPreg >= 1500>>
<<set $slaves[$i].prestigeDesc = "She is famous for her recurring role in slave pornography. Her many fans relish her rounded belly and pregnant pussy.">>
the sight of her rounded belly and pregnant pussy,
<<else>>
@@ -6939,7 +6939,7 @@
<<elseif ($slaves[$i].sexualQuirk == "size queen")>>
<<set $slaves[$i].prestigeDesc = "She is well known from slave pornography. Thousands have enjoyed the sight of her holes stretched to their limits.">>
the sight of her holes stretched to their limits,
- <<elseif $slaves[$i].pregBelly >= 1500>>
+ <<elseif $slaves[$i].bellyPreg >= 1500>>
<<set $slaves[$i].prestigeDesc = "She is well known from slave pornography. Thousands have enjoyed the sight of her rounded belly and pregnant pussy.">>
the sight of her rounded belly and pregnant pussy,
<<else>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index cdb0d304d7b..dcae2a82062 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -519,7 +519,7 @@ She uses her extra time and @@.yellowgreen;recruitment allowance@@ this week to
<<set _seed += 2>>
<</if>>
<<set _FSmatch++, $arcologies[0].FSRepopulationFocus += 0.01*$FSSingleSlaveRep>>
- <<elseif $slaves[$i].pregBelly >= 1500>>
+ <<elseif $slaves[$i].bellyPreg >= 1500>>
<<if $slaves[$i].pregType >= 20>>
<<set _seed += 3>>
<<elseif $slaves[$i].pregType >= 10>>
@@ -536,7 +536,7 @@ She uses her extra time and @@.yellowgreen;recruitment allowance@@ this week to
<<if $arcologies[0].FSRestart != "unset">>
<<if $slaves[$i].bellyPreg >= 1500 && $slaves[$i].breedingMark == 1>>
<<set _seed += 4, _FSmatch++, $arcologies[0].FSRestart += 0.01*$FSSingleSlaveRep>>
- <<elseif $slaves[$i].pregBelly < 100>>
+ <<elseif $slaves[$i].bellyPreg < 100>>
<<if ($slaves[$i].ovaries == 0 && $slaves[$i].balls == 0)>>
<<set _seed += 4, _FSmatch++, $arcologies[0].FSRestart += 0.01*$FSSingleSlaveRep>>
<<elseif ($slaves[$i].ovaries == 0 || $slaves[$i].balls == 0)>>
--
GitLab