From 649f837061f581f8ceabd2ff68f24d6e6886968c Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Mon, 13 Nov 2017 19:45:47 -0500
Subject: [PATCH] RESS work and fixes (hope RESS works as git refuses to merge
 without this commit)

---
 src/uncategorized/RESS.tw                  | 83 +++++++++++++++-------
 src/uncategorized/RETS.tw                  |  4 +-
 src/uncategorized/randomIndividualEvent.tw |  1 +
 3 files changed, 60 insertions(+), 28 deletions(-)

diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index f1c193f9a45..d40975498de 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -3501,7 +3501,7 @@ and flirting with passersby. Or she would be, if she weren't surrounded by a gro
 <<elseif $activeSlave.bellyPreg >= 450000>>
 	"My god, her belly is //huge//! I can almost see inside,"
 <<elseif $activeSlave.belly >= 450000>>
-	"My god, her belly is //huge//! Whats in her?"
+	"My god, her belly is //huge//! What's in her?"
 <<elseif $activeSlave.weight > 190>>
 	"I've never seen someone //that// fat before. I wonder what is feels like to fuck a girl like her?"
 <<elseif $activeSlave.butt > 10>>
@@ -18075,28 +18075,42 @@ You tell her kindly that you understand, and that she'll be trained to address t
 	You instruct $assistantName to have $activeSlave.slaveName offer her body to the highest bidder among the eager tourists. Though the boys are initially taken aback by her forwardness, a rapid yet red-faced bidding war takes place. As soon as the winning bid is decided, $activeSlave.slaveName sinks to her knees in front of the winner and unbuckles his pants, soon taking his hardening member deep into her mouth.
 	<br><br>
 	Some time later, you return to the video feed to see
-	<<if $activeSlave.boobs > 15000>>
+	<<if $activeSlave.bellyPreg >= 750000>>
+		the lucky winner carefully taking $activeSlave.slaveName from behind as he gingerly carresses her straining, squirming pregnancy.
+	<<elseif $activeSlave.belly >= 750000>>
+		the lucky winner taking $activeSlave.slaveName from behind with his arms wrapped as far around her _belly middle as possible.
+	<<elseif $activeSlave.boobs > 25000>>
 		the lucky winner's head poking out from beneath pair of humongous breasts as $activeSlave.slaveName rides him.
-	<<elseif hyperPregBellyOne($activeSlave)>>
-		the lucky winner carefully taking $activeSlave.slaveName from behind as he ginergerly carresses her titanic, squirming pregenancy.
-	<<elseif hyperBellyOne($activeSlave)>>
-		the lucky winner taking $activeSlave.slaveName from behind with his arms wrapped as far around her titanic middle as possible.
-	<<elseif $activeSlave.boobs > 5000>>
-		the lucky winner's head enveloped by a pair of massive breasts as $activeSlave.slaveName rides him.
-	<<elseif hyperPregBellyOne($activeSlave)>>
-		the lucky winner taking $activeSlave.slaveName almost tenderly in missionary, his arms wrapped around her gigantic pregnant belly.
-	<<elseif hyperBellyOne($activeSlave)>>
-		the lucky winner taking $activeSlave.slaveName roughly in missionary, his arms wrapped around her gigantically distended belly.
+	<<elseif $activeSlave.bellyPreg >= 450000>>
+		the lucky winner taking $activeSlave.slaveName almost tenderly in missionary, his arms wrapped around her _belly pregnant belly.
+	<<elseif $activeSlave.belly >= 450000>>
+		the lucky winner taking $activeSlave.slaveName roughly in missionary, his arms wrapped around her massively distended belly.
+	<<elseif $activeSlave.weight > 190>>
+		the lucky winner's head poking out from beneath $activeSlave.slaveName's humongous belly as she rides him.
 	<<elseif $activeSlave.butt > 10>>
 		the luck winner wrapping his arms around $activeSlave.slaveName's massive ass as he struggles to get deep enough into it to penetrate her.
+	<<elseif $activeSlave.bellyFluid >= 5000>>
+		the lucky winner playfully jiggling $activeSlave.slaveName's <<print $activeSlave.inlationType>>-filled belly as she rides him vigorously to give her stomach that extra bounce for him.
+	<<elseif $activeSlave.clit >= 3>>
+		the lucky winner gazing down at the clit rubbing against his stomach as $activeSlave.slaveName rides him.
+	<<elseif $activeSlave.boobs > 5000>>
+		the lucky winner's head enveloped by a pair of massive breasts as $activeSlave.slaveName rides him.
+	<<elseif $activeSlave.belly >= 150000>>
+		<<if $activeSlave.bellyPreg > 0>>
+			the lucky winner taking $activeSlave.slaveName almost tenderly in missionary, his hands gently cradling her _belly pregnant belly.
+		<<else>>
+			the lucky winner taking $activeSlave.slaveName almost tenderly in missionary, his hands massaging her _belly swollen belly.
+		<</if>>
 	<<elseif $activeSlave.dick > 6>>
-		the lucky winner gazing down at a lengthy cock slapping against his stomach as $activeSlave.slaveName rides him.
-	<<elseif $activeSlave.intelligence > 1>>
-		the lucky winner engaged in a lively debate with $activeSlave.slaveName as he takes her from behind.
-	<<elseif bigBellyPreg($activeSlave)>>
-		the lucky winner taking $activeSlave.slaveName almost tenderly in missionary, his hands cradling her pregnant belly.
-	<<elseif bigBelly($activeSlave)>>
-		the lucky winner taking $activeSlave.slaveName almost tenderly in missionary, his hands massaging her swollen belly.
+		the lucky winner gazing down at the lengthy cock slapping against his stomach as $activeSlave.slaveName rides him.
+	<<elseif $activeSlave.weight > 130>>
+		the lucky winner groping $activeSlave.slaveName's jiggling body as she gently rides him.
+	<<elseif $activeSlave.belly >= 1500>>
+		<<if $activeSlave.bellyPreg > 0>>
+			the lucky winner taking $activeSlave.slaveName almost tenderly in missionary, his hands cradling her pregnant belly.
+		<<else>>
+			the lucky winner taking $activeSlave.slaveName almost tenderly in missionary, his hands massaging her swollen belly.
+		<</if>>
 	<<elseif $activeSlave.dick > 3>>
 		the lucky winner gazing down at a cock slapping against his stomach as $activeSlave.slaveName rides him.
 	<<elseif $activeSlave.anus > 2>>
@@ -18109,20 +18123,37 @@ You tell her kindly that you understand, and that she'll be trained to address t
 		the lucky winner with a pair of plush lips wrapped around his cock, his hands gripping onto a $activeSlave.hColor-haired head for dear life as $activeSlave.slaveName sucks him dry.
 	<<elseif $activeSlave.face > 60>>
 		the lucky winner staring in awe at the beautiful face of $activeSlave.slaveName, as she rides him tenderly.
+	<<elseif $activeSlave.intelligence > 1>>
+		the lucky winner engaged in a lively debate with $activeSlave.slaveName as he takes her from behind.
 	<<else>>
 		the lucky winner taking $activeSlave.slaveName in every position he can think of, which is amusingly not very many at all.
 	<</if>>
 	<br><br>
 	In the end, the boy sates his lust on $activeSlave.slaveName till he can't continue. His compatriots, having had their own voyeuristic fill, drag their overstimulated friend off and wander away in search of their accommodation.
-	<<if canDoVaginal($activeSlave) && $activeSlave.vagina != 0>>
-		<<set $activeSlave.vaginalCount += 1, $vaginalTotal += 1>>
-		<<set $activeSlave.publicCount++>>
+	<<if canDoVaginal($activeSlave)>>
+		<<set $activeSlave.vaginalCount += 5, $vaginalTotal += 5, $activeSlave.publicCount += 5>>
+		<<if canDoAnal($activeSlave)>>
+			<<set $activeSlave.analCount += 2, $analTotal += 2>>
+			<<set $activeSlave.publicCount += 2>>
+			<<if $activeSlave.anus == 0>>
+				<<set $activeSlave.anus++>>
+			<</if>>
+		<</if>>
+		<<if $activeSlave.vagina == 0>>
+			<<set $activeSlave.vagina++>>
+		<</if>>
 	<<else>>
-		<<set $activeSlave.analCount += 1, $analTotal += 1>>
-		<<set $activeSlave.publicCount++>>
+		<<set $activeSlave.analCount += 5, $analTotal += 5>>
+		<<set $activeSlave.publicCount += 5>>
+		<<if $activeSlave.anus == 0>>
+			<<set $activeSlave.anus++>>
+		<</if>>
+	<</if>>
+	<<if $activeSlave.eggType == "human" && canGetPregnant($activeSlave)>>
+		<<KnockMeUp $activeSlave 15 2 0 1>>
 	<</if>>
-	<<set $activeSlave.oralCount += 1, $oralTotal += 1, $cash += 2000>>
-	<<set $activeSlave.publicCount++>>
+	<<set $activeSlave.oralCount += 2, $oralTotal += 2, $cash += 2000>>
+	<<set $activeSlave.publicCount += 2>>
 	<</replace>>
 <</link>>
 <</if>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 56bb8591b19..ced62dc6d97 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1554,7 +1554,7 @@ she adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
 		<<set $activeSlave.penetrativeCount++, $penetrativeTotal++>>
 	<</if>>
 	<<set _rets = $slaves.findIndex(function(s) { return s.ID == $subSlave.ID; })>>
-	<<set $slaves[_rets].analCount++, $slaves[$i].trust += 4>>
+	<<set $slaves[_rets].analCount++, $slaves[_rets].trust += 4>>
 	<<set $analTotal++>>
 	<<if canPenetrate($activeSlave) && canImpreg($slaves[_rets], $activeSlave)>>
 		<<KnockMeUp $slaves[_rets] 5 1 $activeSlave.ID 1>>
@@ -1570,7 +1570,7 @@ she adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
 		<<set $activeSlave.penetrativeCount++, $penetrativeTotal++>>
 	<</if>>
 	<<set _rets = $slaves.findIndex(function(s) { return s.ID == $subSlave.ID; })>>
-	<<set $slaves[_rets].analCount += 2, $slaves[$i].trust -= 5>>
+	<<set $slaves[_rets].analCount += 2, $slaves[_rets].trust -= 5>>
 	<<set $analTotal += 2>>
 	<<if $PC.dick == 1 && canGetPregnant($slaves[_rets]) && $slaves[_rets].eggType == "human">>
 		<<KnockMeUp $slaves[_rets] 5 1 -1 1>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index eb016c1d64e..c767da6e804 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -1420,6 +1420,7 @@
 
 <<if $eventSlave.assignment == "serve the public">>
 <<if $eventSlave.devotion >= -20>>
+<<if canDoAnal($eventSlave) || canDoVaginal($eventSlave)
 	<<set $RESSevent.push("nice guys")>>
 <</if>>
 <</if>>
-- 
GitLab