From 36ca1219601bc3127037f7a4c0694b715d7ce14d Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 16 Feb 2017 19:03:33 -0500
Subject: [PATCH] Walkpast improvements and vanilla bug fix.

---
 src/js/storyJS.tw             |  44 ++++
 src/uncategorized/walkPast.tw | 429 ++++++++++++++++++----------------
 src/utility/miscWidgets.tw    |   8 +-
 3 files changed, 282 insertions(+), 199 deletions(-)

diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index acbd6474f4f..d6ac532e7e6 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -260,6 +260,35 @@ window.canBreed = function(slave1, slave2) {
 	}
 };
 
+//is the slave's belly big enough to get in the way
+window.bigBellyPreg = function(slave) {
+	if (!slave) {
+		return null;
+	} else if (slave.preg > 0 && slave.pregType >= 20) {
+		return true;
+	} else if (slave.preg > 10 && slave.pregType >= 10) {
+		return true;
+	} else if (slave.preg > 20) {
+		return true;
+	} else {
+		return false;
+	}
+};
+
+window.bigBelly = function(slave) {
+	if (!slave) {
+		return null;
+	} else if (bigBellyPreg(slave) == true) {
+		return true;
+	} else if (slave.inflation > 2) {
+		return true;
+	} else if (slave.bellyImplant > 8000) {
+		return true;
+	} else {
+		return false;
+	}
+};
+
 window.milkAmount = function(slave) {
 	var milk;
 	var calcs;
@@ -464,6 +493,21 @@ window.canDoVaginal = function(slave) {
 	return true;
 };
 
+window.canPenetrate = function(slave) {
+	if (!slave) {
+		return null;
+	} else if (canAchieveErection(slave) == false) {
+		return false;
+	} else if (slave.dickAccessory == "chastity") {
+		return false;
+	} else if (slave.dickAccessory == "combined chastity") {
+		return false;
+	} else if (slave.dick > 7) {
+		return false;
+	}
+	return true;
+};
+
 window.tooBigBreasts = function(slave){
 	if (!slave) {
 		return null;
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index fe32ea1f338..092f149bed9 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -2,7 +2,7 @@
 
 //
 <<set $target to "">>
-<<if $familyTesting == 1 && ($activeSlave.mother > 0 || $activeSlave.father > 0 || $activeSlave.daughters > 0 || $activeSlave.sisters > 0) && random(1,100) > 80>>
+<<if $familyTesting == 1 && totalRelatives($activeSlave) > 0 && random(1,100) > 80>>
 	<<set $relations to 0>>
 	<<set $relations to []>>
 	<<if $activeSlave.sisters > 0>>
@@ -48,7 +48,7 @@
 		<<set $relationType = "half-sister">>
 	<</if>>
 	<<set _seed to 110, $partner to "relation">>
-<<elseif ($activeSlave.relation isnot 0) and (random(1,100) gt 80)>>
+<<elseif $familyTesting == 0 && ($activeSlave.relation isnot 0) and (random(1,100) gt 80)>>
 	<<set _seed to 110, $partner to "relation">>
 <<elseif ($activeSlave.relationship gt 0) and (random(1,100) gt 70)>>
 	<<set _seed to 120, $partner to "relationship">>
@@ -62,15 +62,15 @@
 
 <span id="walk">
 
-<<if ($partner isnot "relationship") or ($activeSlave.relationship is 1) or ($activeSlave.relationship is 2) or ($activeSlave.releaseRules is "restrictive")>>
+<<if ($partner != "relationship") or ($activeSlave.relationship is 1) or ($activeSlave.relationship is 2) or ($activeSlave.releaseRules == "restrictive")>>
 	$activeSlave.slaveName
 	<<switch $activeSlave.assignment>>
 	<<case "work in the dairy">>
-		<<if ($dairyRestraintsSetting gt 1)>>
+		<<if ($dairyRestraintsSetting > 1)>>
 		is strapped to a milking machine in $dairyName.
-		<<elseif ($activeSlave.lactation is 0) and ($activeSlave.balls gt 0)>>
+		<<elseif ($activeSlave.lactation is 0) and ($activeSlave.balls > 0)>>
 		is working in $dairyName, and is having her cock milked. As you watch, her balls tighten as the phallus up her butt brings her closer to a copious ejaculation.
-		<<elseif _seed gt 50>>
+		<<elseif _seed > 50>>
 		is working in $dairyName, and is having her tits milked, but you have a good view of her <<if $seeRace is 1>>$activeSlave.race body <</if>>on the feeds.
 		<<else>>
 		is working in $dairyName, and is massaging her sore tits, but you have a good view of her <<if $seeRace is 1>>$activeSlave.race body <</if>>on the feeds.
@@ -78,25 +78,25 @@
 	<<case "work in the brothel">>
 		<<Beauty $activeSlave>>
 		is working in $brothelName, and is
-		<<if ($beauty gt 100) and (random(1,2) is 1)>>
-			<<if (_seed gt 80)>>
+		<<if ($beauty > 100) and (random(1,2) is 1)>>
+			<<if (_seed > 80)>>
 			riding one customer's dick while she gives another a blowjob.
-			<<elseif (_seed gt 60)>>
+			<<elseif (_seed > 60)>>
 			sucking one customer's cock while giving another a handjob.
-			<<elseif (_seed gt 40)>>
+			<<elseif (_seed > 40)>>
 			eating out one customer's cunt while another uses a strap-on on her.
-			<<elseif (_seed gt 20)>>
+			<<elseif (_seed > 20)>>
 			getting pounded by two women wearing strap-ons.
 			<<else>>
 			being double penetrated by a pair of customers.
 			<</if>>
-		<<elseif (_seed gt 80)>>
+		<<elseif (_seed > 80)>>
 		riding a customer's dick.
-		<<elseif (_seed gt 60)>>
+		<<elseif (_seed > 60)>>
 		sucking a customer's cock.
-		<<elseif (_seed gt 40)>>
+		<<elseif (_seed > 40)>>
 		pleasuring a customer's cunt.
-		<<elseif (_seed gt 20)>>
+		<<elseif (_seed > 20)>>
 		getting pounded by a woman wearing a strap-on.
 		<<else>>
 		being held down and buttfucked by a customer.
@@ -105,25 +105,25 @@
 	<<case "serve the public">>
 		<<Beauty $activeSlave>>
 		is serving the public, and is
-		<<if ($beauty gt 100) and (random(1,2) is 1)>>
-			<<if (_seed gt 80)>>
+		<<if ($beauty > 100) and (random(1,2) is 1)>>
+			<<if (_seed > 80)>>
 			riding one citizen's dick while she gives another a blowjob.
-			<<elseif (_seed gt 60)>>
+			<<elseif (_seed > 60)>>
 			sucking one citizen's cock while giving another a handjob.
-			<<elseif (_seed gt 40)>>
+			<<elseif (_seed > 40)>>
 			eating out one citizen's cunt while another uses a strap-on on her.
-			<<elseif (_seed gt 20)>>
+			<<elseif (_seed > 20)>>
 			getting pounded by two women wearing strap-ons.
 			<<else>>
 			being double penetrated by a pair of citizens.
 			<</if>>
-		<<elseif (_seed gt 80)>>
+		<<elseif (_seed > 80)>>
 		riding a citizen's dick.
-		<<elseif (_seed gt 60)>>
+		<<elseif (_seed > 60)>>
 		sucking a citizen's cock.
-		<<elseif (_seed gt 40)>>
+		<<elseif (_seed > 40)>>
 		pleasuring a citizen's cunt.
-		<<elseif (_seed gt 20)>>
+		<<elseif (_seed > 20)>>
 		getting pounded by a citizen wearing a strap-on.
 		<<else>>
 		being held down and buttfucked by a citizen.
@@ -131,13 +131,13 @@
 		You have a voyeuristic view of her <<if $seeRace is 1>>$activeSlave.race body <</if>>on the feeds.
 	<<case "serve in the club">>
 		is working in $clubName,
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		displaying her <<if $seeRace is 1>>$activeSlave.race <</if>>body, keeping citizens company, and flirting with anyone who shows interest.
 		<<else>>
 		or rather just off it, having taken a prominent citizen back to a discreet room <<if $seeRace is 1>> so he can use her $activeSlave.race body<</if>>.
 		<</if>>
 	<<case "work as a servant">>
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		was scrubbing the penthouse floor, until another slave requested oral service.
 		<<else>>
 		is scrubbing the penthouse floor.
@@ -146,33 +146,33 @@
 		<<if $activeSlave.fuckdoll > 0>>
 			waiting for use in $masterSuiteName, next to a display case full of other sex toys. 
 		<<elseif $masterSuiteUpgradeLuxury is 1>>
-			<<if _seed gt 50>>
+			<<if _seed > 50>>
 				is kneeling on the big bed in $masterSuiteName, awaiting your return.
 			<<else>>
 				is beautifying herself in $masterSuiteName so she'll be pretty when you return.
 			<</if>>
 		<<elseif $masterSuiteUpgradeLuxury is 2>>
 			is in $masterSuiteName's fuckpit,
-			<<if (_seed gt 80)>>
+			<<if (_seed > 80)>>
 				with a pair of her fellow fucktoys industriously sucking on her nipples.
-			<<elseif (_seed gt 60)>>
-				<<if $activeSlave.anus gt 0>>
+			<<elseif (_seed > 60)>>
+				<<if $activeSlave.anus > 0>>
 				taking double penetration from
 				<<else>>
 				being spitroasted by
 				<</if>>
 				a pair of her fellow fucktoys.
-			<<elseif (_seed gt 40)>>
+			<<elseif (_seed > 40)>>
 				<<if canAchieveErection($activeSlave)>>
 				with her dick inside
-				<<elseif $activeSlave.dick gt 0>>
+				<<elseif $activeSlave.dick > 0>>
 				getting her soft dick sucked by
 				<<else>>
 				getting eaten out by
 				<</if>>
 				a fellow fucktoy.
-			<<elseif (_seed gt 20)>>
-				<<if $activeSlave.anus gt 0>>
+			<<elseif (_seed > 20)>>
+				<<if $activeSlave.anus > 0>>
 				getting her ass pounded
 				<<else>>
 				getting eaten out
@@ -182,7 +182,7 @@
 				performing oral sex on a fellow fucktoy.
 			<</if>>
 		<<else>>
-			<<if ($activeSlave.energy gt 95)>>
+			<<if ($activeSlave.energy > 95)>>
 				is having enthusiastic sex with your other pets while waiting for your cock.
 			<<else>>
 				is having idle sex with several of your other toys while they await your pleasure.
@@ -201,6 +201,12 @@
 					Another slave is spanking her and giving her a handjob at the same time.
 					<<elseif ($activeSlave.fetish is "boobs")>>
 					She has a slave sucking on each of her nipples while she gives each a handjob.
+					<<elseif ($activeSlave.fetish is "pregnancy")>>
+						<<if bigBelly($activeSlave)>>
+							She's sighing contentedly as her rounded belly is sensually rubbed.
+						<<else>>
+							She's happily roleplaying conceiving a child as she gets fucked.
+						<</if>>
 					<</if>>
 				<</if>>
 			<</if>>
@@ -213,13 +219,13 @@
 		is working from her apartment, but you have a fine view of her <<if $seeRace is 1>>$activeSlave.race body <</if>>on the feeds.
 	<<case "be confined in the arcade" "work a glory hole">>
 		is confined in <<if $activeSlave.assignment == "be confined in the arcade">>$arcadeName<<else>>a glory hole<</if>>;
-		<<if (_seed gt 80)>>
+		<<if (_seed > 80)>>
 		$possessive ass is held out at cock height, and a customer is using $possessive fuckhole.
-		<<elseif (_seed gt 60)>>
+		<<elseif (_seed > 60)>>
 		$possessive mouth is held open at cock height, and a customer is fucking $possessive throat.
-		<<elseif (_seed gt 40)>>
+		<<elseif (_seed > 40)>>
 		a woman is abusing $possessive with a couple of dildos.
-		<<elseif (_seed gt 20)>>
+		<<elseif (_seed > 20)>>
 		a customer is cruelly spanking $possessive helpless butt.
 		<<else>>
 		a customer is harshly using $possessive defenseless anus.
@@ -234,7 +240,7 @@
 		<</if>>
 	<<case "be the Wardeness">>
 		is looking after the cells: she is
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		forcing a resistant slave to orally service her.
 		<<else>>
 		beating a rebellious slave across the buttocks.
@@ -257,7 +263,7 @@
 %/
 	<<default>> /* WALKPASTS START HERE */
 
-		<<if ($activeSlave.heels is 1) and ($activeSlave.shoes isnot "flats") and ($activeSlave.shoes isnot "none")>>
+		<<if ($activeSlave.heels is 1) and ($activeSlave.shoes != "flats") and ($activeSlave.shoes != "none")>>
 			walks past your desk with the tiny swaying steps she must take in order to walk on her surgically altered legs. She is on her way to
 		<<elseif ($activeSlave.shoes is "heels")>>
 			walks past your desk with the swaying steps she must take in her high heels. She is on her way to
@@ -289,28 +295,28 @@
 		<<else>>
 		<<switch $activeSlave.assignment>>
 		<<case "rest">>
-			<<if _seed gt 50>>
+			<<if _seed > 50>>
 			bed;
 			<<else>>
 			eat;
 			<</if>>
 		<<case "get milked">>
 			drain her
-			<<if ($activeSlave.lactation is 0) and ($activeSlave.balls gt 0)>>
+			<<if ($activeSlave.lactation is 0) and ($activeSlave.balls > 0)>>
 			cum-filled, <<if $seeRace is 1>>$activeSlave.race <</if>>balls;
-			<<elseif ($activeSlave.lactation gt 0) and ($activeSlave.balls gt 0)>>
+			<<elseif ($activeSlave.lactation > 0) and ($activeSlave.balls > 0)>>
 			cum-filled, <<if $seeRace is 1>>$activeSlave.race <</if>>balls and milky udders;
 			<<else>>
 			milky <<if $seeRace is 1>>$activeSlave.race <</if>>udders;
 			<</if>>
 		<<case "whore">>
-			<<if _seed gt 50>>
+			<<if _seed > 50>>
 			sell her <<if $seeRace is 1>>$activeSlave.race <</if>>body;
 			<<else>>
 			ply her trade as a whore;
 			<</if>>
 		<<case "serve the public">>
-			<<if _seed gt 50>>
+			<<if _seed > 50>>
 			serve the public;
 			<<else>>
 			be a public slut;
@@ -337,7 +343,7 @@
 /%
 		<<case "please you">>
 			sit next to you and wait for
-			<<if _seed gt 50>>
+			<<if _seed > 50>>
 			you to fuck her;
 			<<else>>
 			her Master to use her<<if $seeRace is 1>> $activeSlave.race body<</if>>;
@@ -371,7 +377,7 @@
 
 <<if ($partner is "rivalry")>>
 	<<set _partnerSlave to null>>
-	<<for _i to 0; _i lt $slaves.length; _i++>>
+	<<for _i to 0; _i < $slaves.length; _i++>>
 		<<if $slaves[_i].ID == $activeSlave.rivalryTarget>>
 		<<set _partnerSlave to $slaves[_i]>>
 		<<break>>
@@ -382,9 +388,9 @@
 	<</if>>
 
 	Meanwhile,
-	<<if $activeSlave.rivalry gte 3>>
+	<<if $activeSlave.rivalry >= 3>>
 		_partnerSlave.slaveName, who she hates,
-	<<elseif $activeSlave.rivalry gte 2>>
+	<<elseif $activeSlave.rivalry >= 2>>
 		her rival _partnerSlave.slaveName
 	<<else>>
 		_partnerSlave.slaveName, who she dislikes,
@@ -397,13 +403,13 @@
 		is working from her apartment, but you have a fine view of her <<if $seeRace is 1>>_partnerSlave.race body <</if>>on the feeds.
 	<<case "work in the brothel">>
 		is working in the brothel, and is
-		<<if _seed gt 80>>
+		<<if _seed > 80>>
 		riding a customer's dick.
-		<<elseif _seed gt 60>>
+		<<elseif _seed > 60>>
 		sucking a customer's cock.
-		<<elseif _seed gt 40>>
+		<<elseif _seed > 40>>
 		pleasuring a customer's cunt.
-		<<elseif _seed gt 20>>
+		<<elseif _seed > 20>>
 		getting pounded by a woman wearing a strap-on.
 		<<else>>
 		being held down and buttfucked by a customer.
@@ -411,24 +417,24 @@
 		You have a voyeuristic view of her <<if $seeRace is 1>>_partnerSlave.race body <</if>>on the feeds.
 	<<case "serve the public">>
 		is serving the public, and is
-		<<if _seed gt 80>>
+		<<if _seed > 80>>
 		riding a citizen's dick.
-		<<elseif _seed gt 60>>
+		<<elseif _seed > 60>>
 		sucking a citizen's cock.
-		<<elseif _seed gt 40>>
+		<<elseif _seed > 40>>
 		pleasuring a citizen's cunt.
-		<<elseif _seed gt 20>>
+		<<elseif _seed > 20>>
 		getting pounded by a citizen wearing a strap-on.
 		<<else>>
 		being held down and buttfucked by a citizen.
 		<</if>>
 		You have a voyeuristic view of her <<if $seeRace is 1>>_partnerSlave.race body <</if>>on the feeds.
 	<<case "work in the dairy">>
-		<<if ($dairyRestraintsSetting gt 1)>>
+		<<if ($dairyRestraintsSetting > 1)>>
 		is strapped to a milking machine in $dairyName.
-		<<elseif (_partnerSlave.race.lactation is 0) and (_partnerSlave.race.balls gt 0)>>
+		<<elseif (_partnerSlave.lactation is 0) and (_partnerSlave.balls > 0)>>
 		is working in $dairyName, and is having her cock milked. As you watch, her balls tighten as the phallus up her butt brings her closer to a copious ejaculation.
-		<<elseif _seed gt 50>>
+		<<elseif _seed > 50>>
 		is working in $dairyName, having her tits milked.
 		<<else>>
 		is working in $dairyName, massaging her sore tits.
@@ -436,13 +442,13 @@
 		You have a good view of her <<if $seeRace is 1>>_partnerSlave.race body <</if>>on the feeds.
 	<<case "serve in the club">>
 		is working on the club,
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		displaying her <<if $seeRace is 1>>_partnerSlave.race <</if>>body, keeping citizens company, and flirting with anyone who shows interest.
 		<<else>>
 		or rather just off it, having taken a prominent citizen back to a discreet room <<if $seeRace is 1>> so he can use her _partnerSlave.race body<</if>>.
 		<</if>>
 	<<case "work as a servant">>
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		was scrubbing the penthouse floor, until another slave requested oral service.
 		<<else>>
 		is scrubbing the penthouse floor.
@@ -463,7 +469,7 @@
 		is working in the dairy, looking after your stock.
 	<<default>>
 
-	<<if (_partnerSlave.heels is 1) and (_partnerSlave.shoes isnot "flats") and (_partnerSlave.shoes isnot "none")>>
+	<<if (_partnerSlave.heels is 1) and (_partnerSlave.shoes != "flats") and (_partnerSlave.shoes != "none")>>
 		walks past your desk with the tiny swaying steps she must take in order to walk on her surgically altered legs. She is on her way to
 	<<elseif (_partnerSlave.shoes is "heels")>>
 		walks past your desk with the swaying steps she must take in her high heels. She is on her way to
@@ -483,25 +489,25 @@
 
 	<<switch _partnerSlave.assignment>>
 	<<case "whore">>
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		whore;
 		<<else>>
 		sell her <<if $seeRace is 1>>_partnerSlave.race <</if>>body;
 		<</if>>
 	<<case "serve the public">>
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		serve the public;
 		<<else>>
 		be a public slut;
 		<</if>>
 	<<case "rest">>
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		eat;
 		<<else>>
 		bed;
 		<</if>>
 	<<case "get milked">>
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		milk her overfull <<if $seeRace is 1>>_partnerSlave.race <</if>>tits;
 		<<else>>
 		drain her milky <<if $seeRace is 1>>_partnerSlave.race <</if>>udders;
@@ -536,14 +542,14 @@
 
 	<</switch>>
 	<<set $target to "FRival", _partnerSlave to null>>
-<<elseif ($partner is "relationship") and ($activeSlave.relationship gte 3) and ($activeSlave.releaseRules isnot "restrictive")>>
+<<elseif ($partner is "relationship") and ($activeSlave.relationship >= 3) and ($activeSlave.releaseRules != "restrictive")>>
 	<<set _partnerSlave to null>>
-	<<for _i to 0; _i lt $slaves.length; _i++>>
+	<<for _i to 0; _i < $slaves.length; _i++>>
 		<<if $slaves[_i].ID == $activeSlave.relationshipTarget>>
 			<<set _partnerSlave to $slaves[_i]>>
-			<<if $activeSlave.relationship lte 3>>
+			<<if $activeSlave.relationship <= 3>>
 			<<set _activeSlaveRel to "friend with benefits">>
-			<<elseif $activeSlave.relationship lte 4>>
+			<<elseif $activeSlave.relationship <= 4>>
 			<<set _activeSlaveRel to "lover">>
 			<<else>>
 			<<set _activeSlaveRel to "slave wife">>
@@ -560,21 +566,21 @@
 	<<set _seed to random(1,3)>>
 	<<if _seed is 1>> /* SEXY TIMES */
 
-	<<if (($activeSlave.fetish is "dom") or ($activeSlave.fetish is "sadist")) and ($activeSlave.dick gt 0) and ($activeSlave.balls gt 0) and ($activeSlave.dickAccessory isnot "chastity") and ($activeSlave.hormones lte 0) and ((_partnerSlave.fetish is "dom") or (_partnerSlave.fetish is "sadist")) and (_partnerSlave.dick gt 0) and (_partnerSlave.balls gt 0) and (_partnerSlave.dickAccessory isnot "chastity") and (_partnerSlave.hormones lte 0)>>
+	<<if (($activeSlave.fetish is "dom") or ($activeSlave.fetish is "sadist")) and ($activeSlave.dick > 0) and canPenetrate($activeSlave) and ((_partnerSlave.fetish is "dom") or (_partnerSlave.fetish is "sadist")) and (_partnerSlave.dick > 0) and canPenetrate(_partnerSlave)>>
 		performing double anal on another slave. They're face to face over their sub's shoulders, looking into each other's eyes with every appearance of enjoyment and love, since for them rubbing dicks inside another slave's butt is what constitutes healthy sexual activity. _partnerSlave.slaveName is on the bottom, and holds their victim atop her with _partnerSlave.slaveName's cock already hilted in her ass so $activeSlave.slaveName can force herself inside as well. They enjoy the overstimulated girl's struggles.
 		<<set $activeSlave.penetrativeCount++, _partnerSlave.penetrativeCount++, $penetrativeTotal += 2>>
-	<<elseif ($activeSlave.energy gt 95)>>
-		having loud sex <<if $activeSlave.livingRules is "spare">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName is such a sexual addict that she wants it all the time, and _partnerSlave.slaveName does her best to help her _activeSlaveRel get off.
-		<<if ($activeSlave.vagina gt 0) or ($activeSlave.anus gt 0)>>
+	<<elseif ($activeSlave.energy > 95)>>
+		having loud sex <<if $activeSlave.livingRules is "luxurious">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName is such a sexual addict that she wants it all the time, and _partnerSlave.slaveName does her best to help her _activeSlaveRel get off.
+		<<if ($activeSlave.vagina > 0) or ($activeSlave.anus > 0)>>
 			$activeSlave.slaveName is down on her knees in front of _partnerSlave.slaveName, taking
-			<<if (_partnerSlave.dick gt 1) and (_partnerSlave.balls gt 0) and (_partnerSlave.dickAccessory isnot "chastity") and (_partnerSlave.dickAccessory isnot "combined chastity") and (_partnerSlave.hormones lt 1)>>
+			<<if (_partnerSlave.dick > 1) and canPenetrate(_partnerSlave)>>
 				her cock doggy style,
-			<<elseif (_partnerSlave.dick gt 1)>>
+			<<elseif (_partnerSlave.dick > 1)>>
 				a finger fuck, since her _activeSlaveRel is impotent,
 			<<else>>
 				a strap-on, doggy style,
 			<</if>>
-			<<if ($activeSlave.vagina gt 0) and canDoVaginal($activeSlave) and (random(1,100) gt 50)>>
+			<<if ($activeSlave.vagina > 0) and canDoVaginal($activeSlave) and (random(1,100) > 50)>>
 				in her pussy.
 				<<VaginalVCheck>>
 			<<elseif canDoAnal($activeSlave) >>
@@ -586,10 +592,10 @@
 			They're scissoring enthusiastically and playing with each other's breasts.
 			<<set $activeSlave.mammaryCount++, _partnerSlave.mammaryCount++, $mammaryTotal += 2>>
 		<</if>>
-	<<elseif ($activeSlave.fetishStrength > 60) and ($activeSlave.fetishKnown is 1) and ($activeSlave.fetish isnot "pregnancy")>>
+	<<elseif ($activeSlave.fetishStrength > 60) and ($activeSlave.fetishKnown is 1)>>
 	<<switch $activeSlave.fetish>>
 	<<case "boobs">>
-		snuggling rather sexually <<if $activeSlave.livingRules is "spare">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName loves having her breasts touched and massaged, so _partnerSlave.slaveName looks after her _activeSlaveRel's tits.
+		snuggling rather sexually <<if $activeSlave.livingRules is "luxurious">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName loves having her breasts touched and massaged, so _partnerSlave.slaveName looks after her _activeSlaveRel's tits.
 		<<if (_partnerSlave.amp is 1)>>
 			Since _partnerSlave.slaveName is an amputee $activeSlave.slaveName has her propped on her belly so she can easily suckle and nuzzle.
 		<<else>>
@@ -597,38 +603,38 @@
 		<</if>>
 		<<set $activeSlave.mammaryCount++, _partnerSlave.mammaryCount++, $mammaryTotal += 2>>
 	<<case "buttslut">>
-		having loud buttsex <<if $activeSlave.livingRules is "spare">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName is such an anal addict that she wants it all the time, and _partnerSlave.slaveName does her best to keep her _activeSlaveRel satisfied.
-		<<if ($activeSlave.anus gt 0)>>
+		having loud buttsex <<if $activeSlave.livingRules is "luxurious">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName is such an anal addict that she wants it all the time, and _partnerSlave.slaveName does her best to keep her _activeSlaveRel satisfied.
+		<<if ($activeSlave.anus > 0)>>
 			$activeSlave.slaveName is down on her knees in front of _partnerSlave.slaveName, taking
-			<<if (_partnerSlave.dick gt 1) and (_partnerSlave.balls gt 0) and (_partnerSlave.hormones lt 1) and (_partnerSlave.dickAccessory isnot "chastity")>>
+			<<if (_partnerSlave.dick > 1) and canPenetrate(_partnerSlave)>>
 				her cock up the butt.
-				<<if ($activeSlave.anus gt 2) and (_partnerSlave.dick gt 2)>>
+				<<if ($activeSlave.anus > 2) and (_partnerSlave.dick > 2)>>
 					$activeSlave.slaveName is clearly enjoying getting buttfucked by a cock big enough to make her feel tight again.
-				<<elseif ($activeSlave.anus gt 2) and (_partnerSlave.dick gt 1)>>
+				<<elseif ($activeSlave.anus > 2) and (_partnerSlave.dick > 1)>>
 					$activeSlave.slaveName's gaping ass takes _partnerSlave.slaveName's cock easily.
-				<<elseif ($activeSlave.anus gt 2)>>
+				<<elseif ($activeSlave.anus > 2)>>
 					$activeSlave.slaveName can barely tell _partnerSlave.slaveName's little dick is even there, but it's the thought that counts.
-				<<elseif ($activeSlave.anus lt 2) and (_partnerSlave.dick gt 2)>>
+				<<elseif ($activeSlave.anus < 2) and (_partnerSlave.dick > 2)>>
 					$activeSlave.slaveName is panting and writhing with the pain of taking her _activeSlaveRel's massive dick. _partnerSlave.slaveName is doing her best to be gentle.
-				<<elseif ($activeSlave.anus lt 2) and (_partnerSlave.dick gt 1)>>
+				<<elseif ($activeSlave.anus < 2) and (_partnerSlave.dick > 1)>>
 					$activeSlave.slaveName is writhing with the mixed pain and pleasure of having her tight ass stretched by her _activeSlaveRel's nice cock.
-				<<elseif ($activeSlave.anus lt 2)>>
+				<<elseif ($activeSlave.anus < 2)>>
 					$activeSlave.slaveName's tight anus and _partnerSlave.slaveName's little dick work well together; $activeSlave.slaveName can take it easily, and _partnerSlave.slaveName gets to fuck a hole that's tight, even for her.
 				<</if>>
-			<<elseif (_partnerSlave.dick gt 1)>>
+			<<elseif (_partnerSlave.dick > 1)>>
 				a finger fuck, since her _activeSlaveRel is impotent.
-				<<if ($activeSlave.anus gt 2)>>
+				<<if ($activeSlave.anus > 2)>>
 					Or rather, a fist fuck, since that's what it takes to satisfy her _activeSlaveRel's gaping hole.
-				<<elseif ($activeSlave.anus gt 1)>>
+				<<elseif ($activeSlave.anus > 1)>>
 					_partnerSlave.slaveName is using three fingers to stretch her _activeSlaveRel's asshole.
 				<<else>>
 					_partnerSlave.slaveName is using two fingers to gently fuck her _activeSlaveRel's tight anus.
 				<</if>>
 			<<else>>
 				a strap-on up the butt, doggy style. _partnerSlave.slaveName is using a
-				<<if ($activeSlave.anus gt 2)>>
+				<<if ($activeSlave.anus > 2)>>
 					massive fake phallus to satisfy her _activeSlaveRel's gaping hole.
-				<<elseif ($activeSlave.anus gt 1)>>
+				<<elseif ($activeSlave.anus > 1)>>
 					decent-sized fake phallus to stretch her _activeSlaveRel's asshole.
 				<<else>>
 					small fake phallus to gently fuck her _activeSlaveRel's tight anus.
@@ -641,14 +647,14 @@
 			<<set $activeSlave.oralCount++, _partnerSlave.oralCount++, $oralTotal += 2>>
 		<</if>>
 	<<case "cumslut">>
-		sharing oral pleasure <<if $activeSlave.livingRules is "spare">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName is such an oral addict that she wants it all the time, and _partnerSlave.slaveName certainly doesn't mind all the loving oral attention. They're lying down to 69 comfortably,
-		<<if (_partnerSlave.dick gt 1) and (_partnerSlave.balls gt 0) and (_partnerSlave.dickAccessory isnot "chastity") and (_partnerSlave.hormones lt 1)>>
+		sharing oral pleasure <<if $activeSlave.livingRules is "luxurious">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName is such an oral addict that she wants it all the time, and _partnerSlave.slaveName certainly doesn't mind all the loving oral attention. They're lying down to 69 comfortably,
+		<<if (_partnerSlave.dick > 1) and canPenetrate(_partnerSlave)>>
 			with $activeSlave.slaveName hungrily sucking her _activeSlaveRel's turgid cock.
 			<<set _partnerSlave.penetrativeCount++, $penetrativeTotal++>>
-		<<elseif (_partnerSlave.dick gt 1) and (_partnerSlave.anus gt 0)>>
+		<<elseif (_partnerSlave.dick > 1) and (_partnerSlave.anus > 0)>>
 			with $activeSlave.slaveName hungrily sucking her _activeSlaveRel's limp cock. She has a finger up poor impotent _partnerSlave.slaveName's butt to stimulate her prostate so she can cum for her.
 			<<set _partnerSlave.penetrativeCount++, $penetrativeTotal++>>
-		<<elseif (_partnerSlave.dick gt 1)>>
+		<<elseif (_partnerSlave.dick > 1)>>
 			with $activeSlave.slaveName hungrily sucking her _activeSlaveRel's limp cock. She has a finger massaging poor impotent _partnerSlave.slaveName's perineum in the hope of stimulating her so she can cum for her.
 			<<set _partnerSlave.penetrativeCount++, $penetrativeTotal++>>
 		<<else>>
@@ -657,11 +663,11 @@
 		<</if>>
 		<<set $activeSlave.oralCount++, $oralTotal++>>
 	<<case "submissive">>
-		wrestling <<if $activeSlave.livingRules is "spare">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName is such a submissive that she wants it rough all the time, and _partnerSlave.slaveName does her best give her _activeSlaveRel the constant abuse she loves. $activeSlave.slaveName is down on her knees in front of _partnerSlave.slaveName, worshipping
-		<<if (_partnerSlave.dick gt 1) and (_partnerSlave.balls gt 0) and (_partnerSlave.dickAccessory isnot "chastity") and (_partnerSlave.hormones lt 1)>>
+		wrestling <<if $activeSlave.livingRules is "luxurious">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName is such a submissive that she wants it rough all the time, and _partnerSlave.slaveName does her best give her _activeSlaveRel the constant abuse she loves. $activeSlave.slaveName is down on her knees in front of _partnerSlave.slaveName, worshipping
+		<<if (_partnerSlave.dick > 1) and canPenetrate(_partnerSlave)>>
 			her cock
 			<<set _partnerSlave.penetrativeCount++, $penetrativeTotal++>>
-		<<elseif (_partnerSlave.dick gt 1)>>
+		<<elseif (_partnerSlave.dick > 1)>>
 			her asshole
 			<<set _partnerSlave.oralCount++, $oralTotal++>>
 		<<else>>
@@ -671,8 +677,8 @@
 		while _partnerSlave.slaveName rains light slaps and loving insults down on her bitch of a _activeSlaveRel.
 		<<set $activeSlave.oralCount++, $oralTotal++>>
 	<<case "dom">>
-		wrestling <<if $activeSlave.livingRules is "spare">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName is so dominant with other slaves that she prefers to take what she wants, and _partnerSlave.slaveName does her best give her _activeSlaveRel the struggle fucking she loves. $activeSlave.slaveName is on top of _partnerSlave.slaveName getting oral, though it's more of a rough facefuck as $activeSlave.slaveName forces
-		<<if ($activeSlave.dick gt 1) and ($activeSlave.balls gt 0) and (_partnerSlave.dickAccessory isnot "chastity") and ($activeSlave.hormones lt 1)>>
+		wrestling <<if $activeSlave.livingRules is "luxurious">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName is so dominant with other slaves that she prefers to take what she wants, and _partnerSlave.slaveName does her best give her _activeSlaveRel the struggle fucking she loves. $activeSlave.slaveName is on top of _partnerSlave.slaveName getting oral, though it's more of a rough facefuck as $activeSlave.slaveName forces
+		<<if ($activeSlave.dick > 1) and canPenetrate($activeSlave)>>
 			her cock
 		<<else>>
 			a strap-on
@@ -680,19 +686,19 @@
 		down _partnerSlave.slaveName's throat.
 		<<set _partnerSlave.oralCount++, $activeSlave.penetrativeCount++, $oralTotal++, $penetrativeTotal++>>
 	<<case "sadist">>
-		playing pain games <<if $activeSlave.livingRules is "spare">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName loves hurting other slaves, even her friends, and _partnerSlave.slaveName submits to her agonizing ministrations as often as $activeSlave.slaveName can cajole or force her into it. $activeSlave.slaveName has _partnerSlave.slaveName over her knee and is methodically tanning _partnerSlave.slaveName's $activeSlave.skin ass.
+		playing pain games <<if $activeSlave.livingRules is "luxurious">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName loves hurting other slaves, even her friends, and _partnerSlave.slaveName submits to her agonizing ministrations as often as $activeSlave.slaveName can cajole or force her into it. $activeSlave.slaveName has _partnerSlave.slaveName over her knee and is methodically tanning _partnerSlave.slaveName's $activeSlave.skin ass.
 	<<case "masochist">>
-		playing pain games <<if $activeSlave.livingRules is "spare">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName loves being hurt, so _partnerSlave.slaveName frequently indulges her with spanking, slapping, pinching, and more exotic forms of abuse. _partnerSlave.slaveName has $activeSlave.slaveName over her knee and is methodically tanning $activeSlave.slaveName's $activeSlave.skin ass.
+		playing pain games <<if $activeSlave.livingRules is "luxurious">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName loves being hurt, so _partnerSlave.slaveName frequently indulges her with spanking, slapping, pinching, and more exotic forms of abuse. _partnerSlave.slaveName has $activeSlave.slaveName over her knee and is methodically tanning $activeSlave.slaveName's $activeSlave.skin ass.
 	<<case "humiliation">>
-		having open and visible sex <<if $activeSlave.livingRules is "spare">>in the doorway of the nice little room they share.<<else>>out in the hallway near the slave dormitory.<</if>> $activeSlave.slaveName pretends to hate fucking where other slaves can see her, but _partnerSlave.slaveName knows her _activeSlaveRel gets off on the mild humiliation. _partnerSlave.slaveName
-		<<if ($activeSlave.vagina gt 0) or ($activeSlave.anus gt 0)>>
+		having open and visible sex <<if $activeSlave.livingRules is "luxurious">>in the doorway of the nice little room they share.<<else>>out in the hallway near the slave dormitory.<</if>> $activeSlave.slaveName pretends to hate fucking where other slaves can see her, but _partnerSlave.slaveName knows her _activeSlaveRel gets off on the mild humiliation. _partnerSlave.slaveName
+		<<if ($activeSlave.vagina > 0) or ($activeSlave.anus > 0)>>
 			has her back propped up against a doorframe and $activeSlave.slaveName in her lap, so she can blush at any passing slave as she shyly rides _partnerSlave.slaveName's
-			<<if (_partnerSlave.dick gt 1) and (_partnerSlave.balls gt 0) and (_partnerSlave.dickAccessory isnot "chastity") and (_partnerSlave.hormones lt 1)>>
+			<<if (_partnerSlave.dick > 1) and canPenetrate(_partnerSlave)>>
 				cock
 			<<else>>
 				strap-on
 			<</if>>
-			<<if ($activeSlave.vagina gt 0) and ($activeSlave.vaginalAccessory isnot "chastity belt") and (random(1,100) gt 50)>>
+			<<if ($activeSlave.vagina > 0) and canDoVaginal($activeSlave) and (random(1,100) > 50)>>
 				in her pussy.
 				<<VaginalVCheck>>
 			<<else>>
@@ -704,73 +710,106 @@
 			is giving $activeSlave.slaveName oral out in the open so she can blush and shiver as passing slaves see her climax.
 			<<set $activeSlave.oralCount++, _partnerSlave.oralCount++, $oralTotal += 2>>
 		<</if>>
+	<<case "pregnancy">>
+		having intimate sex <<if $activeSlave.livingRules == "luxurious">>in the nice little room they share.<<elseif ($activeSlave.ID is $HeadGirl.ID) and ($HGSuite is 1)>>in $activeSlave.ID's suite.<<else>>out in the open in the slave dormitory.<</if>> $activeSlave.slaveName's <<if $activeSlave.preg > 10 || $activeSlave.bellyImplant > 2000 || $activeSlave.inflation > 1>>middle is heavily rounded<<else>>desire to be bred is raging<</if>>, and _partnerSlave.slaveName does her best to keep her _activeSlaveRel satisfied.
+		_partnerSlave.slaveName
+		<<if ($activeSlave.vagina > 0) or ($activeSlave.anus > 0)>>
+			<<if _partnerSlave.preg > 20 || _partnerSlave.bellyImplant > 4000>> is heavily pregnant herself, so she has $activeSlave.slaveName on her back so that she can penetrate her as best she can with her<<else>>has $activeSlave.slaveName on her back so that she can tease her belly as she fucks her with her<<elseif _partnerSlave.preg > 10>> is pregnant herself, so she has $activeSlave.slaveName on her back so that she can penetrate her easier with her<<else>>has $activeSlave.slaveName on her back so that tease her belly as she fucks her with her<</if>>
+			<<if (_partnerSlave.dick > 1) &&  canPenetrate(_partnerSlave)>>
+				cock
+			<<else>>
+				strap-on
+			<</if>>
+			<<if ($activeSlave.vagina > 0) and canDoVaginal($activeSlave) and (random(1,100) > 50)>>
+				in her <<if $activeSlave.preg > 10>>pregnant <</if>>pussy.
+				<<VaginalVCheck>>
+			<<else>>
+				in her ass.
+				<<AnalVCheck>>
+			<</if>>
+			<<set _partnerSlave.penetrativeCount++, $penetrativeTotal++>>
+		<<else>>
+			is giving $activeSlave.slaveName oral to try and sate her lust.
+			<<set $activeSlave.oralCount++, _partnerSlave.oralCount++, $oralTotal += 2>>
+		<</if>>
 	<</switch>>
 	<<elseif ($release is 1)>>
 		just spooning in bed. Since $activeSlave.slaveName gets fucked at work, _partnerSlave.slaveName understands that what she really wants from her is emotional intimacy. They're cuddling quietly, offering each other silent comfort and companionship.
-	<<elseif ($activeSlave.dick gt 1) and ($activeSlave.balls gt 0) and $activeSlave.dickAccessory isnot ("chastity") and ($activeSlave.hormones lt 1) and (_partnerSlave.vagina gt 0) and canDoVaginal(_partnerSlave) and (_partnerSlave.amp isnot 1) and ($activeSlave.amp isnot 1)>>
-		<<if $activeSlave.livingRules is "spare">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> making love in the missionary position. _partnerSlave.slaveName has her legs wrapped around $activeSlave.slaveName's waist and her arms hugging her around the chest, and is looking deep into her eyes as she enjoys the wonderful feeling of her _activeSlaveRel's cock in her womanhood.
+	<<elseif ($activeSlave.dick > 1) and canPenetrate($activeSlave) and (_partnerSlave.vagina > 0) and canDoVaginal(_partnerSlave) and (_partnerSlave.amp != 1) and ($activeSlave.amp != 1)>>
+		<<if $activeSlave.livingRules is "luxurious">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> making love in the missionary position. _partnerSlave.slaveName has her legs wrapped around $activeSlave.slaveName's waist and her arms hugging her around the chest, and is looking deep into her eyes as she enjoys the wonderful feeling of her _activeSlaveRel's cock in her womanhood.
 		<<set $activeSlave.penetrativeCount++, _partnerSlave.vaginalCount++, $vaginalTotal++, $penetrativeTotal++>>
-	<<elseif ($activeSlave.clit gt 2) and ($activeSlave.vaginalAccessory isnot "chastity belt") and (_partnerSlave.vagina gt 0) and canDoVaginal(_partnerSlave) and (_partnerSlave.amp isnot 1) and ($activeSlave.amp isnot 1)>>
-		<<if $activeSlave.livingRules is "spare">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> making love in the missionary position. _partnerSlave.slaveName has her legs wrapped around $activeSlave.slaveName's waist and her arms hugging her around the chest, and is looking deep into her eyes as she enjoys the wonderful feeling of her _activeSlaveRel's huge clit in her womanhood.
+	<<elseif ($activeSlave.clit > 2) and ($activeSlave.vaginalAccessory != "chastity belt") and (_partnerSlave.vagina > 0) and canDoVaginal(_partnerSlave) and (_partnerSlave.amp != 1) and ($activeSlave.amp != 1)>>
+		<<if $activeSlave.livingRules is "luxurious">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> making love in the missionary position. _partnerSlave.slaveName has her legs wrapped around $activeSlave.slaveName's waist and her arms hugging her around the chest, and is looking deep into her eyes as she enjoys the wonderful feeling of her _activeSlaveRel's huge clit in her womanhood.
 		<<set _partnerSlave.vaginalCount++, $activeSlave.penetrativeCount++, $vaginalTotal++, $penetrativeTotal++>>
-	<<elseif ($activeSlave.dick gt 1) and ($activeSlave.balls gt 0) and $activeSlave.dickAccessory isnot ("chastity") and ($activeSlave.hormones lt 1) and canDoAnal(_partnerSlave) and (_partnerSlave.anus gt 0) and (_partnerSlave.amp isnot 1) and ($activeSlave.amp isnot 1)>>
-		<<if $activeSlave.livingRules is "spare">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> having gentle anal sex while spooning. $activeSlave.slaveName is enjoying _partnerSlave.slaveName's ass, and is doing her best to ensure her _activeSlaveRel enjoys being buttfucked. She's nibbling her _activeSlaveRel's ears and neck, cupping a breast with one hand, and lightly stimulating her with the other.
+	<<elseif ($activeSlave.dick > 1) and canPenetrate($activeSlave) and canDoAnal(_partnerSlave) and (_partnerSlave.anus > 0) and (_partnerSlave.amp != 1) and ($activeSlave.amp != 1)>>
+		<<if $activeSlave.livingRules is "luxurious">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> having gentle anal sex while spooning. $activeSlave.slaveName is enjoying _partnerSlave.slaveName's ass, and is doing her best to ensure her _activeSlaveRel enjoys being buttfucked. She's nibbling her _activeSlaveRel's ears and neck, cupping a breast with one hand, and lightly stimulating her with the other.
 		<<set _partnerSlave.analCount++, $activeSlave.penetrativeCount++, $analTotal++, $penetrativeTotal++>>
-	<<elseif ($activeSlave.clit gt 2) and canDoAnal(_partnerSlave) and (_partnerSlave.anus gt 0) and (_partnerSlave.amp isnot 1) and ($activeSlave.amp isnot 1)>>
-		<<if $activeSlave.livingRules is "spare">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> managing to have clitoral-anal sex. _partnerSlave.slaveName is facedown with her ass up, spreading her buttocks as wide as possible, giving her _activeSlaveRel the opportunity to squat over her and penetrate it with her huge, erect clit. $activeSlave.slaveName can't thrust much, but the shocking lewdness of the act is enough for both of them.
+	<<elseif ($activeSlave.clit > 2) and canDoAnal(_partnerSlave) and (_partnerSlave.anus > 0) and (_partnerSlave.amp != 1) and ($activeSlave.amp != 1)>>
+		<<if $activeSlave.livingRules is "luxurious">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> managing to have clitoral-anal sex. _partnerSlave.slaveName is facedown with her ass up, spreading her buttocks as wide as possible, giving her _activeSlaveRel the opportunity to squat over her and penetrate it with her huge, erect clit. $activeSlave.slaveName can't thrust much, but the shocking lewdness of the act is enough for both of them.
 		<<set _partnerSlave.analCount++, $activeSlave.penetrativeCount++, $analTotal++, $penetrativeTotal++>>
-	<<elseif ($activeSlave.dick gt 1) and ($activeSlave.balls gt 0) and $activeSlave.dickAccessory isnot ("chastity") and ($activeSlave.hormones lt 1) and (_partnerSlave.amp isnot 1) and ($activeSlave.amp isnot 1)>>
-		<<if $activeSlave.livingRules is "spare">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> spooning while $activeSlave.slaveName gently rubs her cock between _partnerSlave.slaveName's thighs, pressed tightly together. Since _partnerSlave.slaveName is a virgin, this is the closest they can come to penetrative intercourse, but $activeSlave.slaveName is enjoying _partnerSlave.slaveName's body anyway, and is doing her best to ensure her _activeSlaveRel enjoys herself. She's nibbling her _activeSlaveRel's ears and neck, cupping a breast with one hand, and lightly stimulating her with the other.
+	<<elseif ($activeSlave.dick > 1) and canPenetrate($activeSlave) and (_partnerSlave.amp != 1) and ($activeSlave.amp != 1)>>
+		<<if $activeSlave.livingRules is "luxurious">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> spooning while $activeSlave.slaveName gently rubs her cock between _partnerSlave.slaveName's thighs, pressed tightly together. Since _partnerSlave.slaveName is a virgin, this is the closest they can come to penetrative intercourse, but $activeSlave.slaveName is enjoying _partnerSlave.slaveName's body anyway, and is doing her best to ensure her _activeSlaveRel enjoys herself. She's nibbling her _activeSlaveRel's ears and neck, cupping a breast with one hand, and lightly stimulating her with the other.
 		<<set $activeSlave.penetrativeCount++, $penetrativeTotal++>>
-	<<elseif ($activeSlave.clit gt 2) and ($activeSlave.vaginalAccessory isnot "chastity belt") and (_partnerSlave.amp isnot 1) and ($activeSlave.amp isnot 1)>>
-		<<if $activeSlave.livingRules is "spare">>in the nice little room they share,<<else>>out in the open in the slave dormitory,<</if>> with _partnerSlave.slaveName down on her knees in front of $activeSlave.slaveName. From behind _partnerSlave.slaveName it looks like she's giving her _activeSlaveRel a conventional, if enthusiastic, blowjob. Only on closer inspection does it become clear how unusual the oral is: $activeSlave.slaveName has such a huge clit that her _activeSlaveRel can suck her off just like it were a penis.
+	<<elseif ($activeSlave.clit > 2) and ($activeSlave.vaginalAccessory != "chastity belt") and (_partnerSlave.amp != 1) and ($activeSlave.amp != 1)>>
+		<<if $activeSlave.livingRules is "luxurious">>in the nice little room they share,<<else>>out in the open in the slave dormitory,<</if>> with _partnerSlave.slaveName down on her knees in front of $activeSlave.slaveName. From behind _partnerSlave.slaveName it looks like she's giving her _activeSlaveRel a conventional, if enthusiastic, blowjob. Only on closer inspection does it become clear how unusual the oral is: $activeSlave.slaveName has such a huge clit that her _activeSlaveRel can suck her off just like it were a penis.
 		<<set _partnerSlave.oralCount++, $activeSlave.penetrativeCount++, $oralTotal++, $penetrativeTotal++>>
-	<<elseif (_partnerSlave.vagina gt 0) and canDoVaginal(_partnerSlave) and (_partnerSlave.amp isnot 1) and ($activeSlave.amp isnot 1)>>
-		<<if $activeSlave.livingRules is "spare">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> making love in the missionary position. _partnerSlave.slaveName has her legs wrapped around $activeSlave.slaveName's waist and her arms hugging her around the chest, and is looking deep into her eyes as she enjoys the feeling of her _activeSlaveRel fucking her with a strap-on.
+	<<elseif (_partnerSlave.vagina > 0) and canDoVaginal(_partnerSlave) and (_partnerSlave.amp != 1) and ($activeSlave.amp != 1)>>
+		<<if $activeSlave.livingRules is "luxurious">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> making love in the missionary position. _partnerSlave.slaveName has her legs wrapped around $activeSlave.slaveName's waist and her arms hugging her around the chest, and is looking deep into her eyes as she enjoys the feeling of her _activeSlaveRel fucking her with a strap-on.
 		<<set _partnerSlave.vaginalCount++, $activeSlave.penetrativeCount++, $vaginalTotal++, $penetrativeTotal++>>
-	<<elseif (_partnerSlave.anus gt 0) and (_partnerSlave.amp isnot 1) and ($activeSlave.amp isnot 1) and canDoAnal(_partnerSlave)>>
-		<<if $activeSlave.livingRules is "spare">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> having gentle anal sex while spooning. $activeSlave.slaveName is enjoying penetrating _partnerSlave.slaveName's ass  with a strap-on, and is doing her best to ensure her _activeSlaveRel enjoys being buttfucked. She's nibbling her _activeSlaveRel's ears and neck, cupping a breast with one hand, and lightly stimulating her with the other.
+	<<elseif (_partnerSlave.anus > 0) and (_partnerSlave.amp != 1) and ($activeSlave.amp != 1) and canDoAnal(_partnerSlave)>>
+		<<if $activeSlave.livingRules is "luxurious">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> having gentle anal sex while spooning. $activeSlave.slaveName is enjoying penetrating _partnerSlave.slaveName's ass  with a strap-on, and is doing her best to ensure her _activeSlaveRel enjoys being buttfucked. She's nibbling her _activeSlaveRel's ears and neck, cupping a breast with one hand, and lightly stimulating her with the other.
 		<<set _partnerSlave.analCount++, $activeSlave.penetrativeCount++, $analTotal++, $penetrativeTotal++>>
-	<<elseif (_partnerSlave.amp isnot 1) and ($activeSlave.amp isnot 1)>>
-		<<if $activeSlave.livingRules is "spare">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> enjoying some mutual masturbation.
+	<<elseif (_partnerSlave.amp != 1) and ($activeSlave.amp != 1)>>
+		<<if $activeSlave.livingRules is "luxurious">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> enjoying some mutual masturbation.
 	<<elseif (_partnerSlave.amp is 1)>>
-		just cuddling <<if $activeSlave.livingRules is "spare">>in bed in the nice little room they share.<<else>>on $activeSlave.slaveName's bedroll in the slave dormitory.<</if>> $activeSlave.slaveName is using _partnerSlave.slaveName's limbless torso as a pillow, which _partnerSlave.slaveName seems to be enjoying, by her contented expression.
+		just cuddling <<if $activeSlave.livingRules is "luxurious">>in bed in the nice little room they share.<<else>>on $activeSlave.slaveName's bedroll in the slave dormitory.<</if>> $activeSlave.slaveName is using _partnerSlave.slaveName's limbless torso as a pillow, which _partnerSlave.slaveName seems to be enjoying, by her contented expression.
 	<<else>>
-		just cuddling <<if $activeSlave.livingRules is "spare">>in bed in the nice little room they share.<<else>>on $activeSlave.slaveName's bedroll in the slave dormitory.<</if>> They're lying quietly, offering each other silent comfort and companionship.
+		just cuddling <<if $activeSlave.livingRules is "luxurious">>in bed in the nice little room they share.<<else>>on $activeSlave.slaveName's bedroll in the slave dormitory.<</if>> They're lying quietly, offering each other silent comfort and companionship.
 	<</if>>
 
 	<<elseif _seed is 2>> /* CUDDLE TIME */
-	<<if ($activeSlave.energy gt 95) and (random(0,2) is 0)>>
+	<<if ($activeSlave.energy > 95) and (random(0,2) is 0)>>
 		lying in bed together. _partnerSlave.slaveName has somehow managed to exhaust her _activeSlaveRel, and the sexually sated nympho is curled up with her head on _partnerSlave.slaveName's chest, snoring lightly. _partnerSlave.slaveName is smiling fondly at her.
-	<<elseif (_partnerSlave.dick gt 6) and ($activeSlave.amp isnot 1)>>
+	<<elseif (_partnerSlave.dick > 6) and ($activeSlave.amp != 1)>>
 		sleeping in bed together. $activeSlave.slaveName is cuddled up close to _partnerSlave.slaveName, and is cradling her _activeSlaveRel's enormous, soft cock with one hand.
-	<<elseif ($activeSlave.fetishKnown is 1) and ($activeSlave.fetish isnot "pregnancy")>>
+	<<elseif ($activeSlave.fetishKnown is 1)>>
 		<<switch $activeSlave.fetish>>
 		<<case "boobs">>
-			sleeping in bed together. $activeSlave.slaveName is using _partnerSlave.slaveName's <<if _partnerSlave.boobs gt 2000>>enormous breasts<<elseif _partnerSlave.boobs gt 1000>>huge boobs<<elseif _partnerSlave.boobs gt 300>>healthy tits<<else>>flat chest<</if>>, which she loves, as a pillow.
+			sleeping in bed together. $activeSlave.slaveName is using _partnerSlave.slaveName's <<if _partnerSlave.boobs > 2000>>enormous breasts<<elseif _partnerSlave.boobs > 1000>>huge boobs<<elseif _partnerSlave.boobs > 300>>healthy tits<<else>>flat chest<</if>>, which she loves, as a pillow.
 		<<case "buttslut">>
-			sleeping in bed together. _partnerSlave.slaveName is sleeping face down so $activeSlave.slaveName can use her <<if _partnerSlave.butt gt 5>>enormous posterior<<elseif _partnerSlave.butt gt 2>>big butt<<elseif _partnerSlave.butt gt 1>>trim behind<<else>>skinny ass<</if>>, which $activeSlave.slaveName loves, as a pillow.
+			sleeping in bed together. _partnerSlave.slaveName is sleeping face down so $activeSlave.slaveName can use her <<if _partnerSlave.butt > 5>>enormous posterior<<elseif _partnerSlave.butt > 2>>big butt<<elseif _partnerSlave.butt > 1>>trim behind<<else>>skinny ass<</if>>, which $activeSlave.slaveName loves, as a pillow.
 		<<case "cumslut">>
-			sleeping in bed together. $activeSlave.slaveName is spooning her _activeSlaveRel, her head nestled alongside _partnerSlave.slaveName's, her <<if $activeSlave.lips gt 70>>enormous<<elseif $activeSlave.lips gt 40>>pillowlike<<elseif $activeSlave.lips gt 10>>plush<<else>>pretty<</if>> lips wet from kissing her to sleep.
+			sleeping in bed together. $activeSlave.slaveName is spooning her _activeSlaveRel, her head nestled alongside _partnerSlave.slaveName's, her <<if $activeSlave.lips > 70>>enormous<<elseif $activeSlave.lips > 40>>pillowlike<<elseif $activeSlave.lips > 10>>plush<<else>>pretty<</if>> lips wet from kissing her to sleep.
 		<<case "submissive" "masochist" "humiliation">>
 			sleeping in bed together. $activeSlave.slaveName is being spooned by her _activeSlaveRel, smiling peacefully at being held.
 		<<case "dom" "sadist">>
-			sleeping in bed together. $activeSlave.slaveName is spooning her _activeSlaveRel possessively<<if $activeSlave.amp isnot 1>>, and even in her sleep, has a proprietary hand on _partnerSlave.slaveName's <<if _partnerSlave.balls gt 0>>balls<<elseif _partnerSlave.balls gt 0>>soft cock<<else>>pussy<</if>><</if>>.
+			sleeping in bed together. $activeSlave.slaveName is spooning her _activeSlaveRel possessively<<if $activeSlave.amp != 1>>, and even in her sleep, has a proprietary hand on _partnerSlave.slaveName's <<if _partnerSlave.balls > 0>>balls<<elseif _partnerSlave.balls > 0>>soft cock<<else>>pussy<</if>><</if>>.
+		<<case "pregnancy">>
+			sleeping in bed together. 
+			<<if bigBelly($activeSlave) && bigBelly(_activeSlaveRel)>>
+				They are pressed as close as they can be with their rounded middles in the way.
+			<<elseif bigBelly($activeSlave)>>
+				$activeSlave.slaveName is spooning her _activeSlaveRel possessively, her rounded belly pushing into her back.
+			<<elseif bigBelly(_activeSlaveRel)>>
+				$activeSlave.slaveName is spooning her _activeSlaveRel possessively<<if $activeSlave.amp != 1>>, and even in her sleep, has a proprietary hand on _partnerSlave.slaveName's belly<</if>>.
+			<<else>>
+				$activeSlave.slaveName is being spooned by her _activeSlaveRel, smiling peacefully at being held.
+			<</if>>
 		<</switch>>
-	<<elseif $activeSlave.height gt _partnerSlave.height>>
+	<<elseif $activeSlave.height > _partnerSlave.height>>
 		sleeping in bed together, with the taller $activeSlave.slaveName curled around her little _activeSlaveRel.
 	<<elseif $activeSlave.amp is 1>>
 		sleeping in bed together; _partnerSlave.slaveName is using her limbless _activeSlaveRel as a pillow.
-	<<elseif _partnerSlave.amp isnot 1>>
+	<<elseif _partnerSlave.amp != 1>>
 		resting in bed together, holding hands in their sleep.
 	<<else>>
 		sleeping quietly in bed together.
 	<</if>>
 
 	<<else>> /* TOGETHER TIME */
-	<<if ($activeSlave.actualAge gte _partnerSlave.actualAge+10) and canTalk(_partnerSlave)>>
+	<<if ($activeSlave.actualAge >= _partnerSlave.actualAge+10) and canTalk(_partnerSlave)>>
 		tidying up their room together. _partnerSlave.slaveName is chattering about her day, while $activeSlave.slaveName listens quietly, smiling fondly at her _activeSlaveRel's prattle.
-	<<elseif ($activeSlave.amp isnot 1) and (canTalk($activeSlave) == false)>>
+	<<elseif ($activeSlave.amp != 1) and (canTalk($activeSlave) == false)>>
 		getting ready for bed. $activeSlave.slaveName is using gestures to tell her $activeSlave.slaveName about her day; _partnerSlave.slaveName is very patient and does her best to follow.
 	<<elseif ($activeSlave.behavioralQuirk is "confident") and canTalk($activeSlave)>>
 		finishing up a meal together. $activeSlave.slaveName is concluding a story, her clear confident voice ringing as she relates a slight.
@@ -786,9 +825,9 @@
 		have just woken up. $activeSlave.slaveName appears to be praying, but to go by her _activeSlaveRel's quiet mirth, she seems to be substituting in some lewd words.
 	<<elseif ($activeSlave.behavioralQuirk is "advocate") and canTalk($activeSlave)>>
 		starting a meal together. A third, less well trained slave has asked $activeSlave.slaveName an innocent question, and is getting enthusiastic slave dogma in return. Her _activeSlaveRel smiles tolerantly.
-	<<elseif ($activeSlave.amp is 1) and (_partnerSlave.amp isnot 1)>>
+	<<elseif ($activeSlave.amp is 1) and (_partnerSlave.amp != 1)>>
 		using some of their free time to watch the weather; _partnerSlave.slaveName carried her _activeSlaveRel to a window so she could look out with her.
-	<<elseif ($activeSlave.amp isnot 1) and (_partnerSlave.amp is 1)>>
+	<<elseif ($activeSlave.amp != 1) and (_partnerSlave.amp is 1)>>
 		using some of their free time to watch the weather; $activeSlave.slaveName carried her _activeSlaveRel to a window so she could look out with her.
 	<<elseif $cockFeeder is 1>>
 		taking in a meal together; they've chosen dispensers next to each other and are slurping away.
@@ -804,14 +843,14 @@
 	<<if $slaves[_i].ID is _partnerSlave.ID>>
 		<<set $slaves[_i] to _partnerSlave>>
 	<<else>>
-		<<for _i to 0; _i lt $slaves.length; _i++>>
+		<<for _i to 0; _i < $slaves.length; _i++>>
 			<<if $slaves[_i].ID is _partnerSlave.ID>>
 			<<set $slaves[_i] to _partnerSlave>>
 			<<break>>
 			<</if>>
 		<</for>>
 	<</if>>
-	<<for _i to 0; _i lt $slaves.length; _i++>>
+	<<for _i to 0; _i < $slaves.length; _i++>>
 		<<if $slaves[_i].ID is $activeSlave.ID>>
 		<<set $slaves[_i] to $activeSlave>>
 		<<break>>
@@ -825,7 +864,7 @@
 		<<if $familyTesting == 1>>
 			<<set _partnerSlave = $relation>>
 		<<else>>
-			<<for _i to 0; _i lt $slaves.length; _i++>>
+			<<for _i to 0; _i < $slaves.length; _i++>>
 				<<if $slaves[_i].ID == $activeSlave.relationTarget>>
 					<<set _partnerSlave to $slaves[_i]>>
 					<<break>>
@@ -833,18 +872,18 @@
 			<</for>>
 		<</if>>
 	<<else>>
-		<<for _i to 0; _i lt $slaves.length; _i++>>
+		<<for _i to 0; _i < $slaves.length; _i++>>
 			<<if $slaves[_i].ID == $activeSlave.relationshipTarget>>
 			<<set _partnerSlave to $slaves[_i]>>
-			<<if $activeSlave.relationship lte 1>>
+			<<if $activeSlave.relationship <= 1>>
 				<<set _activeSlaveRel to "friend", _partnerRel to "friend">>
-			<<elseif $activeSlave.relationship lte 2>>
+			<<elseif $activeSlave.relationship <= 2>>
 				<<set _activeSlaveRel to "best friend", _partnerRel to "best friend">>
-			<<elseif $activeSlave.relationship lte 3>>
+			<<elseif $activeSlave.relationship <= 3>>
 				<<set _activeSlaveRel to "friend with benefits", _partnerRel to "friend with benefits">>
-			<<elseif $activeSlave.relationship lte 4>>
+			<<elseif $activeSlave.relationship <= 4>>
 				<<set _activeSlaveRel to "lover", _partnerRel to "lover">>
-			<<elseif $activeSlave.relationship gt 4>>
+			<<elseif $activeSlave.relationship > 4>>
 				<<set _activeSlaveRel to "slave wife", _partnerRel to "slave wife">>
 			<</if>>
 			<<break>>
@@ -863,13 +902,13 @@
 		is working from her apartment, but you have a fine view of her <<if $seeRace is 1>>_partnerSlave.race body <</if>>on the feeds.
 	<<case "work in the brothel">>
 		is working in the brothel, and is
-		<<if (_seed gt 80)>>
+		<<if (_seed > 80)>>
 		riding a customer's dick.
-		<<elseif (_seed gt 60)>>
+		<<elseif (_seed > 60)>>
 		sucking a customer's cock.
-		<<elseif (_seed gt 40)>>
+		<<elseif (_seed > 40)>>
 		pleasuring a customer's cunt.
-		<<elseif (_seed gt 20)>>
+		<<elseif (_seed > 20)>>
 		getting pounded by a woman wearing a strap-on.
 		<<else>>
 		being held down and buttfucked by a customer. You have a voyeuristic view of her <<if $seeRace is 1>>_partnerSlave.race body <</if>>on the feeds.
@@ -877,24 +916,24 @@
 		You have a voyeuristic view of her <<if $seeRace is 1>>_partnerSlave.race body <</if>>on the feeds.
 	<<case "serve the public">>
 		is serving the public, and is
-		<<if (_seed gt 80)>>
+		<<if (_seed > 80)>>
 		riding a citizen's dick.
-		<<elseif (_seed gt 60)>>
+		<<elseif (_seed > 60)>>
 		sucking a citizen's cock.
-		<<elseif (_seed gt 40)>>
+		<<elseif (_seed > 40)>>
 		pleasuring a citizen's cunt.
-		<<elseif (_seed gt 20)>>
+		<<elseif (_seed > 20)>>
 		getting pounded by a citizen wearing a strap-on.
 		<<else>>
 		being held down and buttfucked by a citizen.
 		<</if>>
 		You have a voyeuristic view of her <<if $seeRace is 1>>_partnerSlave.race body <</if>>on the feeds.
 	<<case "work in the dairy">>
-		<<if ($dairyRestraintsSetting gt 1)>>
+		<<if ($dairyRestraintsSetting > 1)>>
 		is strapped to a milking machine in $dairyName.
-		<<elseif (_partnerSlave.lactation is 0) and (_partnerSlave.balls gt 0)>>
+		<<elseif (_partnerSlave.lactation is 0) and (_partnerSlave.balls > 0)>>
 		is working in $dairyName, and is having her cock milked. As you watch, her balls tighten as the phallus up her butt brings her closer to a copious ejaculation.
-		<<elseif _seed gt 50>>
+		<<elseif _seed > 50>>
 		is working in $dairyName, having her tits milked.
 		<<else>>
 		is working in $dairyName, massaging her sore tits.
@@ -902,13 +941,13 @@
 		You have a good view of her <<if $seeRace is 1>>_partnerSlave.race body <</if>>on the feeds.
 	<<case "serve in the club">>
 		is working on the club,
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		displaying her <<if $seeRace is 1>>_partnerSlave.race <</if>>body, keeping citizens company, and flirting with anyone who shows interest.
 		<<else>>
 		or rather just off it, having taken a prominent citizen back to a discreet room <<if $seeRace is 1>> so he can use her _partnerSlave.race body<</if>>.
 		<</if>>
 	<<case "work as a servant">>
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		was scrubbing the penthouse floor, until another slave requested oral service.
 		<<else>>
 		is scrubbing the penthouse floor.
@@ -929,7 +968,7 @@
 		is working in the dairy, looking after your stock.
 	<<default>>
 
-	<<if (_partnerSlave.heels is 1) and (_partnerSlave.shoes isnot "flats") and (_partnerSlave.shoes isnot "none")>>
+	<<if (_partnerSlave.heels is 1) and (_partnerSlave.shoes != "flats") and (_partnerSlave.shoes != "none")>>
 		walks past your desk with the tiny swaying steps she must take in order to walk on her surgically altered legs. She is on her way to
 	<<elseif (_partnerSlave.shoes is "heels")>>
 		walks past your desk with the swaying steps she must take in her high heels. She is on her way to
@@ -947,32 +986,32 @@
 
 	<<switch _partnerSlave.assignment>>
 	<<case "whore">>
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		whore;
 		<<else>>
 		sell her <<if $seeRace is 1>>_partnerSlave.race <</if>>body;
 		<</if>>
 	<<case "serve the public">>
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		serve the public;
 		<<else>>
 		be a public slut;
 		<</if>>
 	<<case "rest">>
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		eat;
 		<<else>>
 		bed;
 		<</if>>
 	<<case "get milked">>
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		milk her overfull <<if $seeRace is 1>>_partnerSlave.race <</if>>tits;
 		<<else>>
 		drain her milky <<if $seeRace is 1>>_partnerSlave.race <</if>>udders;
 		<</if>>
 	<<case "please you">>
 		sit next to you and wait for
-		<<if _seed gt 50>>
+		<<if _seed > 50>>
 		you to fuck her;
 		<<else>>
 		her Master to use her<<if $seeRace is 1>> _partnerSlave.race body<</if>>;
@@ -1005,7 +1044,7 @@
 
 	<</switch>>
 	<<set $target to "FRelation", _partnerSlave to null>>
-<<elseif (_seed gt 80) && ($activeSlave.fuckdoll == 0)>>
+<<elseif (_seed > 80) && ($activeSlave.fuckdoll == 0)>>
 	<<BoobsDescription>>
 	<<switch $activeSlave.clothes>>
 	<<case "uncomfortable straps">>
@@ -1035,7 +1074,7 @@
 	<<case "cutoffs and a t-shirt">>
 		Her tits are bare under her t-shirt, so movement gives delicious hints of their motion.
 	<<case "a slutty outfit">>
-		<<if (random(1,100) gt 50)>>
+		<<if (random(1,100) > 50)>>
 		For today's slutty outfit she's chosen a handkerchief top that occasionally comes untied and spills her breasts out naked.
 		<<else>>
 		For today's slutty outfit she's chosen a halter top cut so low that her breasts occasionally pop out.
@@ -1090,20 +1129,20 @@
 		<</if>>
 	<</switch>>
 	<<set $target to "FBoobs">>
-<<elseif (_seed gt 60)>>
+<<elseif (_seed > 60)>>
 	<<ButtDescription>>
 	<<switch $activeSlave.clothes>>
 	<<case "a Fuckdoll suit">>
 		Its suit is expressly designed to encourage use of its rear hole.
 	<<case "uncomfortable straps">>
 		A strap passes between her
-		<<if ($activeSlave.amp isnot 1 )>>
+		<<if ($activeSlave.amp != 1 )>>
 		legs, giving her gait an awkward sway.
 		<<else>>
 		leg stumps, pressing against her genitals.
 		<</if>>
 	<<case "shibari ropes">>
-		<<if ($activeSlave.amp isnot 1 )>>
+		<<if ($activeSlave.amp != 1 )>>
 		Ropes bind her legs, giving her gait an awkward sway.
 		<<else>>
 		A rope passes between her leg stumps, pressing against her genitals.
@@ -1138,9 +1177,9 @@
 		As she moves, her cutoffs hug her butt.
 	<<case "a slutty outfit">>
 		For today's slutty outfit she's chosen
-		<<if (random(1,100) gt 50) and ($activeSlave.amp isnot 1)>>
+		<<if (random(1,100) > 50) and ($activeSlave.amp != 1)>>
 		yoga pants so sheer that everything she's got is clearly visible.
-		<<elseif ($activeSlave.dick gt 0)>>
+		<<elseif ($activeSlave.dick > 0)>>
 		a miniskirt so brief that her ass is hanging out the back, and her dick is occasionally visible from the front.
 		<<else>>
 		a miniskirt so brief that her ass is hanging out the back, and her naked cunt is occasionally visible from the front.
@@ -1166,13 +1205,13 @@
 			This schoolgirl clearly takes it up the ass.
 		<</if>>
 	<<case "a kimono">>
-		<<if ($activeSlave.butt gt 5)>>
+		<<if ($activeSlave.butt > 5)>>
 		Her kimono demurely covers her behind, though it cannot conceal its massive shape.
 		<<else>>
 		Her kimono demurely covers her behind.
 		<</if>>
 	<<case "a hijab and abaya">>
-		<<if ($activeSlave.butt gt 5>>
+		<<if ($activeSlave.butt > 5>>
 		Her abaya totally covers her behind, though it cannot conceal its massive shape.
 		<<else>>
 		Her abaya totally conceals her behind.
@@ -1334,7 +1373,7 @@
 		<<case "harem gauze">>
 			Her silken garb and huge pregnant belly makes her look like a belly dancer.
 		<<case "a comfortable bodysuit">>
-			Her huge belly lewdly fills her bodysuit. <<if ($activeSlave.bellyAccessory isnot "a huge empathy belly") && ($activeSlave.bellyAccessory isnot "a large empathy belly")>>You swear you can see her babies kicking underneath the form fitting material.<</if>>
+			Her huge belly lewdly fills her bodysuit. <<if ($activeSlave.bellyAccessory != "a huge empathy belly") && ($activeSlave.bellyAccessory != "a large empathy belly")>>You swear you can see her babies kicking underneath the form fitting material.<</if>>
 		<<case "a schoolgirl outfit">>
 			Her huge belly is only partly covered by her blouse.
 		<<case "a kimono">>
@@ -1342,7 +1381,7 @@
 		<<case "a hijab and abaya">>
 			Her huge belly tents her abaya.
 		<<case "a leotard">>
-			Her huge belly lewdly stretches her leotard. <<if ($activeSlave.bellyAccessory isnot "a huge empathy belly") && ($activeSlave.bellyAccessory isnot "a large empathy belly")>>You swear you can see her babies kicking underneath the form fitting material.<</if>>
+			Her huge belly lewdly stretches her leotard. <<if ($activeSlave.bellyAccessory != "a huge empathy belly") && ($activeSlave.bellyAccessory != "a large empathy belly")>>You swear you can see her babies kicking underneath the form fitting material.<</if>>
 		<<case "a chattel habit">>
 			Her huge belly shoves the strip of cloth on her front to her side.
 		<<case "a bunny outfit">>
@@ -1396,7 +1435,7 @@
 		<<case "harem gauze">>
 			Her silken garb and big pregnant belly makes her look like a belly dancer.
 		<<case "a comfortable bodysuit">>
-			Her big belly fills her bodysuit. <<if ($activeSlave.bellyAccessory isnot "a medium empathy belly")>>You swear you can see her babies kicking underneath the form fitting material.<</if>>
+			Her big belly fills her bodysuit. <<if ($activeSlave.bellyAccessory != "a medium empathy belly")>>You swear you can see her babies kicking underneath the form fitting material.<</if>>
 		<<case "a schoolgirl outfit">>
 			Her big belly is only partly covered by her blouse.
 		<<case "a kimono">>
@@ -1404,7 +1443,7 @@
 		<<case "a hijab and abaya">>
 			Her big belly tents her abaya.
 		<<case "a leotard">>
-			Her big belly stretches her leotard. <<if ($activeSlave.bellyAccessory isnot "a medium empathy belly")>>You swear you can see her babies kicking underneath the form fitting material.<</if>>
+			Her big belly stretches her leotard. <<if ($activeSlave.bellyAccessory != "a medium empathy belly")>>You swear you can see her babies kicking underneath the form fitting material.<</if>>
 		<<case "a chattel habit">>
 			Her big belly shoves the strip of cloth on her front to her side.
 		<<case "a bunny outfit">>
@@ -2368,7 +2407,7 @@ every motion.
 	<</if>>
 	<</if>>
 	<<set $target to "FVagina">>
-<<elseif (_seed gt 20)>>
+<<elseif (_seed > 20)>>
 	<<AnusDescription>>
 	<<switch $activeSlave.clothes>>
 	<<case "a Fuckdoll suit">>
@@ -2386,9 +2425,9 @@ every motion.
 	<<case "a penitent nuns habit">>
 		Her habit chafes her rear end so cruelly that it would probably be a relief to her to have it pulled up for a rough buttfuck.
 	<<case "attractive lingerie">>
-		<<if ($activeSlave.anus gt 1) and ($activeSlave.amp is 1)>>
+		<<if ($activeSlave.anus > 1) and ($activeSlave.amp is 1)>>
 		Her pretty g-string frequently fails to cover her big butthole.
-		<<elseif ($activeSlave.anus gt 1)>>
+		<<elseif ($activeSlave.anus > 1)>>
 		As she moves, her pretty g-string frequently fails to cover her big butthole.
 		<<else>>
 		As she moves, her pretty g-string draws your attention to her ass.
@@ -2410,7 +2449,7 @@ every motion.
 			This schoolgirl clearly takes it up the ass.
 		<</if>>
 	<<case "a kimono">>
-		<<if ($activeSlave.butt gt 5)>>
+		<<if ($activeSlave.butt > 5)>>
 		Her kimono demurely covers her behind, though it cannot conceal its massive shape.
 		<<else>>
 		Her kimono demurely covers her behind.
@@ -2424,7 +2463,7 @@ every motion.
 		Her dress demurely covers her behind.
 	  <</if>>
 	<<case "a hijab and abaya">>
-		<<if ($activeSlave.butt gt 5)>>
+		<<if ($activeSlave.butt > 5)>>
 		Her abaya totally covers her behind, though it cannot conceal its massive shape.
 		<<else>>
 		Her abaya totally conceals her behind.
@@ -2432,7 +2471,7 @@ every motion.
 	<<case "battledress">>
 		Her fatigue trousers are not particularly flattering to her butt.
 	<<case "a string bikini">>
-		<<if ($activeSlave.anus gt 1)>>
+		<<if ($activeSlave.anus > 1)>>
 		As she moves, her big butthole is clearly visible behind her tiny g-string.
 		<<else>>
 		As she moves, her tiny g-string draws your attention to her ass.
@@ -2444,7 +2483,7 @@ every motion.
 	<<case "cutoffs and a t-shirt">>
 		As she moves, her tight cutoffs flatter her butt.
 	<<case "a slutty outfit">>
-		<<if ($activeSlave.butt gt 5)>>
+		<<if ($activeSlave.butt > 5)>>
 		For today's slutty outfit she's chosen a leather skirt with zippers that permit ready access to her butt.
 		<<else>>
 		For today's slutty outfit she's chosen fishnets with a hole cut over her asshole so she can be sodomized without removing or damaging her clothing.
@@ -2485,7 +2524,7 @@ every motion.
 		<</if>>
 	<</switch>>
 	<<set $target to "FAnus">>
-<<elseif (_seed gt 0)>>
+<<elseif (_seed > 0)>>
 	<<LipsDescription>>
 	<<switch $activeSlave.collar>>
 	<<case "a Fuckdoll suit">>
@@ -2531,16 +2570,16 @@ every motion.
 <</if>>
 
 <<if $activeSlave.fuckdoll == 0>>
-<<if (_seed lte 80) and (_seed gt 40) and ($activeSlave.vaginalAccessory is "chastity belt")>>
+<<if (_seed <= 80) and (_seed > 40) and ($activeSlave.vaginalAccessory is "chastity belt")>>
 	//If you wish to have vanilla intercourse with her you must order her to remove her chastity belt.//
-<<elseif _seed gt 100>>
+<<elseif _seed > 100>>
 	<<if $familyTesting == 1 && _seed == 110>>
 	<<else>>
 	<span id="walkpast"><<click "Summon them both">><<replace "#walk">><<display $target>><</replace>><</click>></span>
 	<</if>>
 <<elseif $activeSlave.assignment is "stay confined">>
 	<span id="walkpast"><<click "Have her brought out of her cell">><<replace "#walk">><<display $target>><</replace>><</click>></span>
-<<elseif ($activeSlave.assignment is "work in the dairy") and ($dairyRestraintsSetting gt 1)>>
+<<elseif ($activeSlave.assignment is "work in the dairy") and ($dairyRestraintsSetting > 1)>>
 	//She is strapped into a milking machine and cannot leave $dairyName.//
 <<elseif ($activeSlave.assignmentVisible is 0)>>
 	<span id="walkpast"><<click "Have her take a break and come up">><<replace "#walk">><<display $target>><</replace>><</click>></span>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 445f5321ca4..2087f4820ee 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1225,7 +1225,7 @@ $args[2]: icon UI Display for vector art, 1 for on.
 
 <<set _folderLoc = "'resources/vector">>
 
-<<if $args[2] == 1 >>
+<<if $args[2] == 1>>
 	<<print "<object type='image/svg+xml' data=" + _folderLoc + "/test ui.svg'" + "/></object>">>
 <</if>>
 
@@ -1309,7 +1309,7 @@ $args[2]: icon UI Display for vector art, 1 for on.
 <<elseif $args[0].butt > 2>>
 	<<set _buttSize = 0>>
 <</if>>
-<<if $args[0].fuckdoll != 0 >>
+<<if $args[0].fuckdoll != 0>>
 	<<set _buttSize = _buttSize + " latex">>
 <</if>>
 <<print "<object type='image/svg+xml' data=" + _imgSkinLoc + "/butt " + _buttSize + ".svg'" + "/></object>">>
@@ -1548,7 +1548,7 @@ $args[2]: icon UI Display for vector art, 1 for on.
 
 /% Hair Foreground%/
 <<if $args[0].hStyle != "shaved">>
-<<if $args[0].fuckdoll == 0 >>
+<<if $args[0].fuckdoll == 0>>
 <<print "<object type='image/svg+xml' data=" + _folderLoc + "/body/addon/hair fore neat " + _hairColor + ".svg'" + "/></object>">>
 <</if>>
 <</if>>
@@ -1627,4 +1627,4 @@ $args[2]: icon UI Display for vector art, 1 for on.
 
 <</if>> /* CLOSES IMAGE CHOICE */
 
-<</widget>>
\ No newline at end of file
+<</widget>>
-- 
GitLab