From ccab38fddb08c137fd7cde3f65d7025b581dac13 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sat, 7 Apr 2018 17:01:34 -0400
Subject: [PATCH] tweaks

---
 src/uncategorized/dairyReport.tw              |  20 ++--
 src/uncategorized/dispensary.tw               |   4 +-
 src/uncategorized/fondleBoobs.tw              |   8 +-
 src/uncategorized/fondleButt.tw               |   6 +-
 src/uncategorized/fondleVagina.tw             |  12 +-
 .../freeRangeDairyAssignmentScene.tw          | 113 ++++++++----------
 6 files changed, 75 insertions(+), 88 deletions(-)

diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 1ca0743f127..c7408ba143e 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -92,7 +92,7 @@
 	<</if>>
 	<<if $dairyRestraintsSetting != 2>> /* how much effort the MM must take to force a slave into a stall */
 		<<for _dI = 0; _dI < _DL; _dI++>>
-			<<set $i =  $slaveIndices[$DairyiIDs[_dI]]>>
+			<<set $i = $slaveIndices[$DairyiIDs[_dI]]>>
 			<<if $slaves[$i].devotion < 20>>
 				<<set _MMWorkout++>>
 			<</if>>
@@ -223,7 +223,7 @@
 		<</if>>
 		<<if $slaves[$i].prestigeDesc == "She is remembered for winning best in show as a cockmilker.">>
 			<<if (($slaves[$i].balls > 6) && ($slaves[$i].dick != 0)) || (($slaves[$i].balls > 4) && ($slaves[$i].dick != 0) && ($slaves[$i].prostate > 1))>>
-				She spends extra time with $slaves[$i].slaveName, the massive ejaculating cow.  She can't help but massage the cow's dick and testes to stimulate them further and coax more from them.
+				She spends extra time with $slaves[$i].slaveName, the massive ejaculating cow. She can't help but massage the cow's dick and testes to stimulate them further and coax more from them.
 				<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
 			<<else>>
 				She is disappointed that the (formerly) massive ejaculating cow $slaves[$i].slaveName<<if $slaves[$i].balls == 0 || $slaves[$i].dick == 0>> is incapable of giving cum. <<elseif $slaves[$i].prostate < 2>> no longer possesses a hyperactive prostate. <<else>>'s balls are considerably smaller than at their heyday.<</if>>
@@ -442,7 +442,7 @@
 					<<if $slaves[$i].boobs < 50000>>
 						<<if $arcologies[0].FSAssetExpansionistResearch == 1>>
 							<<if ($slaves[$i].boobs < 2000)>>
-								<<set _growth  = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
+								<<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 							<<elseif ($slaves[$i].boobs < 5000)>>
 								<<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 							<<else>>
@@ -462,7 +462,7 @@
 					<<if $slaves[$i].boobs < 25000>>
 						<<if $arcologies[0].FSAssetExpansionistResearch == 1>>
 							<<if ($slaves[$i].boobs < 2000)>>
-								<<set _growth  = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
+								<<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 							<<elseif ($slaves[$i].boobs < 5000)>>
 								<<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 							<<else>>
@@ -480,7 +480,7 @@
 					<<if $slaves[$i].boobs < 10000>>
 						<<if $arcologies[0].FSAssetExpansionistResearch == 1>>
 							<<if ($slaves[$i].boobs < 2000)>>
-								<<set _growth  = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
+								<<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 							<<elseif ($slaves[$i].boobs < 5000)>>
 								<<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 							<<else>>
@@ -498,7 +498,7 @@
 					<<if $slaves[$i].boobs < 5000>>
 						<<if $arcologies[0].FSAssetExpansionistResearch == 1>>
 							<<if ($slaves[$i].boobs < 2000)>>
-								<<set _growth  = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
+								<<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 							<<elseif ($slaves[$i].boobs < 5000)>>
 								<<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 							<<else>>
@@ -556,7 +556,7 @@
 				<<if $slaves[$i].boobs < 50000>>
 					<<if $arcologies[0].FSAssetExpansionistResearch == 1>>
 						<<if ($slaves[$i].boobs < 2000)>>
-							<<set _growth  = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
+							<<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 						<<elseif ($slaves[$i].boobs < 5000)>>
 							<<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 						<<else>>
@@ -576,7 +576,7 @@
 				<<if $slaves[$i].boobs < 25000>>
 					<<if $arcologies[0].FSAssetExpansionistResearch == 1>>
 						<<if ($slaves[$i].boobs < 2000)>>
-							<<set _growth  = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
+							<<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 						<<elseif ($slaves[$i].boobs < 5000)>>
 							<<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 						<<else>>
@@ -594,7 +594,7 @@
 				<<if $slaves[$i].boobs < 10000>>
 					<<if $arcologies[0].FSAssetExpansionistResearch == 1>>
 						<<if ($slaves[$i].boobs < 2000)>>
-							<<set _growth  = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
+							<<set _growth = 75*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 						<<elseif ($slaves[$i].boobs < 5000)>>
 							<<set _growth = 50*Math.trunc(($injectionUpgrade*2)+$dairyFeedersSetting+$dairyRestraintsSetting+((50)/4))>>
 						<<else>>
@@ -885,7 +885,7 @@
 <<if $intelligenceLost > 1>>
 	$intelligenceLost cows suffered some loss of intelligence due to accumulated mental stress from life attached to a milking machine.
 <<elseif $intelligenceLost > 0>>
-	One cow  suffered some loss of intelligence due to accumulated mental stress from life attached to a milking machine.
+	One cow suffered some loss of intelligence due to accumulated mental stress from life attached to a milking machine.
 <</if>>
 <<if _stupidified > 1>>
 	_stupidified cows were so mentally dulled by use as biological factories that they were reduced to a very low level of intelligence.
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index ff3d15ed4e3..bfbf3c60fc6 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -439,9 +439,9 @@ Implant Production
 <</if>>
 
 <<if ($ImplantProductionUpgrade == 0) && ($rep > 2000*_PCSkillCheck)>>
-    [[Upgrade the fabricator with an experimental implant manufacturer|Dispensary][$cash -= 20000*_PCSkillCheck, $ImplantProductionUpgrade = 1]]
+	[[Upgrade the fabricator with an experimental implant manufacturer|Dispensary][$cash -= 20000*_PCSkillCheck, $ImplantProductionUpgrade = 1]]
 	//Costs <<print cashFormat(20000*_PCSkillCheck)>>//
-    <br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the fabrication of special implants using the autosurgery.//
+	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the fabrication of special implants using the autosurgery.//
 	<br>
 <<elseif ($ImplantProductionUpgrade > 0)>>
 	The fabricator is capable of crafting special implants.
diff --git a/src/uncategorized/fondleBoobs.tw b/src/uncategorized/fondleBoobs.tw
index e89a26d91b5..cebd4c6cce5 100644
--- a/src/uncategorized/fondleBoobs.tw
+++ b/src/uncategorized/fondleBoobs.tw
@@ -96,7 +96,7 @@ You call her over so you can fondle her
 		cute breasts,
 	<<else>>
 		flat breasts,
-	<</if>><<if ($activeSlave.amp != 1)>> she places her hands on your <<if $PC.boobs == 1>>bosom<<else>>manly chest<</if>> in turn, her tendency towards sexual dominance encouraging her to compete with you in fondling each other.<</if>> You both alternate between taking your mouth to her<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples and hers to yours, gently nuzzling and nibbling while simultaneously fondling each other all the while. Both of you continue to passionately lick, nibble, stroke and fondle one other until tiredly, she slows down. When you eventually stop, she looks up at you happily. <<if ($activeSlave.accent >= 3)>>She does her best to communicate excitement with her $activeSlave.eyeColor eyes, since she does not speak $language well enough to express herself.<<elseif ($activeSlave.amp == 1) && (canTalk($activeSlave) == false)>>She does her best to communicate excitement with her $activeSlave.eyeColor eyes.<<elseif canTalk($activeSlave) == false>>She signs that she liked that.<<else>>"That wa<<s>> fun, <<Master>>," she <<say>>s cheerfully.<</if>> She looks at you with her $activeSlave.eyeColor eyes, smiling.
+	<</if>><<if ($activeSlave.amp != 1)>> she places her hands on your <<if $PC.boobs == 1>>bosom<<else>>manly chest<</if>> in turn, her tendency towards sexual dominance encouraging her to compete with you in fondling each other.<</if>> You both alternate between taking your mouth to her<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples and hers to yours, gently nuzzling and nibbling while simultaneously fondling each other all the while. Both of you continue to passionately lick, nibble, stroke and fondle one other until tiredly, she slows down. When you eventually stop, she looks up at you happily. <<if ($activeSlave.accent >= 3)>>She does her best to communicate excitement with her $activeSlave.eyeColor eyes, since she does not speak $language well enough to express herself.<<elseif ($activeSlave.amp == 1) && (!canTalk($activeSlave)>>She does her best to communicate excitement with her $activeSlave.eyeColor eyes.<<elseif !canTalk($activeSlave)>>She signs that she liked that.<<else>>"That wa<<s>> fun, <<Master>>," she <<say>>s cheerfully.<</if>> She looks at you with her $activeSlave.eyeColor eyes, smiling.
 <<elseif ($activeSlave.fetish == "submissive") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
 	She eagerly comes over to you, to stand between you and your desk. You lean over while she submissively lies down upon it, face up, with her breasts pointed to the air. You place your hands on her
 	<<if ($activeSlave.boobs >= 20000)>>
@@ -113,7 +113,7 @@ You call her over so you can fondle her
 		cute breasts, cupping them and gently playing with her $activeSlave.nipples nipples between your fingers and thumbs,
 	<<else>>
 		flat breasts, gently playing with her hard, erect nipples between your fingers and thumbs,
-	<</if>> teasing them and pulling them gently towards you, Moving your head close to her breasts, you nuzzle on a nipple with your lips and even lick it delicately with your tongue. Then you alternate, gently nibbling with your teeth on the other nipple. You squeeze the tips of her<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples with your thumbs and fingers and tweak them in your fingertips, then you dab her nipples with your thumbs, flicking them in different directions. She moans passionately at the continued stimulation of her breasts and nipples. When you finally stop, she reaches up to your face with her hand and lovingly strokes it, a blissful look on her $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>She does her best to communicate devotion with her $activeSlave.eyeColor eyes, since she's not confident in her ability to express it in $language.<<elseif ($activeSlave.amp == 1) && (canTalk($activeSlave) == false)>>She does her best to communicate devotion with her $activeSlave.eyeColor eyes.<<elseif canTalk($activeSlave) == false>>She signs that she loves you.<<else>>"Plea<<s>>e don't <<s>>top, <<Master>>," she <<say>>s quietly.<</if>> She looks at you longingly, eager for more.
+	<</if>> teasing them and pulling them gently towards you, Moving your head close to her breasts, you nuzzle on a nipple with your lips and even lick it delicately with your tongue. Then you alternate, gently nibbling with your teeth on the other nipple. You squeeze the tips of her<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples with your thumbs and fingers and tweak them in your fingertips, then you dab her nipples with your thumbs, flicking them in different directions. She moans passionately at the continued stimulation of her breasts and nipples. When you finally stop, she reaches up to your face with her hand and lovingly strokes it, a blissful look on her $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>She does her best to communicate devotion with her $activeSlave.eyeColor eyes, since she's not confident in her ability to express it in $language.<<elseif ($activeSlave.amp == 1) && !canTalk($activeSlave)>>She does her best to communicate devotion with her $activeSlave.eyeColor eyes.<<elseif !canTalk($activeSlave)>>She signs that she loves you.<<else>>"Plea<<s>>e don't <<s>>top, <<Master>>," she <<say>>s quietly.<</if>> She looks at you longingly, eager for more.
 <<elseif ($activeSlave.fetish == "masochist") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
 	She hurriedly comes over to you, to stand between you and your desk. You lean over while she lies down upon it, face up, with her breasts pointed to the air. She gasps as you slap your hands on her
 	<<if ($activeSlave.boobs >= 20000)>>
@@ -130,7 +130,7 @@ You call her over so you can fondle her
 		cute breasts, cupping them and roughly playing with her $activeSlave.nipples nipples between your fingers and thumbs,
 	<<else>>
 		flat breasts, roughly playing with her hard, erect nipples between your fingers and thumbs,
-	<</if>> teasing them and firmly pulling them in all directions. Moving your head close to her breasts, you put your lips on a nipple and close your lips firmly around it to pull strongly on it. Then you alternate, bite hard with your teeth on the other. You firmly squeeze the tips of her<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples with your thumbs and fingers and tweak them in your fingertips, then you push her nipples with your thumbs, flicking them hard in different directions. She moans passionately at the continued punishment of her breasts and nipples. Your rough play leaves red marks on her breasts and nipples and she becomes even more aroused. When you finally stop she rubs the marks on her breasts with her hands, an ecstatic look on her $activeSlave.skin face. <<if ($activeSlave.amp == 1) && (canTalk($activeSlave) == false)>>She does her best to communicate her pleasure with her $activeSlave.eyeColor eyes.<<elseif canTalk($activeSlave) == false>>She signs that she loves it.<<else>>"Plea<<s>>e puni<<sh>> me more, <<Master>>," she <<say>>s quietly.<</if>> She looks at you longingly, hungry for more.
+	<</if>> teasing them and firmly pulling them in all directions. Moving your head close to her breasts, you put your lips on a nipple and close your lips firmly around it to pull strongly on it. Then you alternate, bite hard with your teeth on the other. You firmly squeeze the tips of her<<if ($activeSlave.lactation > 0)>> milky<</if>> nipples with your thumbs and fingers and tweak them in your fingertips, then you push her nipples with your thumbs, flicking them hard in different directions. She moans passionately at the continued punishment of her breasts and nipples. Your rough play leaves red marks on her breasts and nipples and she becomes even more aroused. When you finally stop she rubs the marks on her breasts with her hands, an ecstatic look on her $activeSlave.skin face. <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>She does her best to communicate her pleasure with her $activeSlave.eyeColor eyes.<<elseif !canTalk($activeSlave)>>She signs that she loves it.<<else>>"Plea<<s>>e puni<<sh>> me more, <<Master>>," she <<say>>s quietly.<</if>> She looks at you longingly, hungry for more.
 <<elseif ($activeSlave.devotion > 50)>>
 	She devotedly comes over to you, to stand between you and your desk. Her doting $activeSlave.eyeColor eyes looking in yours. You place your hands on her
 	<<if ($activeSlave.boobs >= 20000)>>
@@ -164,7 +164,7 @@ You call her over so you can fondle her
 		cute breasts, cupping them and gently playing with her $activeSlave.nipples nipples between your fingers and thumbs,
 	<<else>>
 		flat breasts, gently playing with her hard, erect nipples between your fingers and thumbs,
-	<</if>> teasing them and pulling them towards you. Moving your head close to her breasts, you nuzzle on a nipple with your lips and even lick it delicately with your tongue. Then you alternate, gently nibbling with your teeth on the other nipple. You squeeze the tips of her nipples with your thumbs and fingers and tweak them in your fingertips, then you dab her nipples with your thumbs, flicking them in different directions. You sense considerable uneasiness in the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>girl<</if>>; she's doing her duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of her mind by your hands on her breasts. She gradually loses herself in the feeling of your gentle hands. When you finally stop, her $activeSlave.eyeColor eyes gaze puzzlingly at you. Even though she has accepted life as a sex slave, she looks as though she is unsure of what to make of this. <<if ($activeSlave.amp == 1) && (canTalk($activeSlave) == false)>>Her eyes beg for an answer: is that it?<<elseif canTalk($activeSlave) == false>>She signs hesitantly, asking if that's it.<<else>>She asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
+	<</if>> teasing them and pulling them towards you. Moving your head close to her breasts, you nuzzle on a nipple with your lips and even lick it delicately with your tongue. Then you alternate, gently nibbling with your teeth on the other nipple. You squeeze the tips of her nipples with your thumbs and fingers and tweak them in your fingertips, then you dab her nipples with your thumbs, flicking them in different directions. You sense considerable uneasiness in the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>girl<</if>>; she's doing her duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of her mind by your hands on her breasts. She gradually loses herself in the feeling of your gentle hands. When you finally stop, her $activeSlave.eyeColor eyes gaze puzzlingly at you. Even though she has accepted life as a sex slave, she looks as though she is unsure of what to make of this. <<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>Her eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>She signs hesitantly, asking if that's it.<<else>>She asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
 <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>>
 	She shakes at your touch fearfully. As you softly place your hands on her
 	<<if ($activeSlave.boobs >= 20000)>>
diff --git a/src/uncategorized/fondleButt.tw b/src/uncategorized/fondleButt.tw
index b2d451299c2..78798804fdc 100644
--- a/src/uncategorized/fondleButt.tw
+++ b/src/uncategorized/fondleButt.tw
@@ -137,9 +137,9 @@ You call her over so you can fondle her
 	<<elseif $activeSlave.butt <= 20>>
 		couch-like
 	<</if>> buttocks a gentle smack. She turns to face you, kissing you, but looking at you longingly as if she wants more.
-	<<if ($activeSlave.amp == 1) && (canTalk($activeSlave) == false)>>
+	<<if ($activeSlave.amp == 1) && !canTalk($activeSlave)>>
 		She does her best to communicate love with her $activeSlave.eyeColor eyes.
-	<<elseif canTalk($activeSlave) == false>>
+	<<elseif !canTalk($activeSlave)>>
 		She signs that she loves you.
 	<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>> "I love you,
 		<<Master>>," she lisps happily.
@@ -313,7 +313,7 @@ You call her over so you can fondle her
 	<<elseif ($activeSlave.anus == 0)>>
 		virgin
 	<</if>> butthole as you trace it with your fingers and thumb. Eventually, you decide to stop but she remains in position over your desk until you stand her up yourself.
-<<elseif  $activeSlave.devotion < -20>>
+<<elseif $activeSlave.devotion < -20>>
 	<<if ($activeSlave.amp != 1)>>
 		You instruct her to present her buttocks and anus. Opposed to the thought of your hands groping her, she tries to step back, but you catch her and pull her closer to you her as you reach around and grab her
 	<<else>>
diff --git a/src/uncategorized/fondleVagina.tw b/src/uncategorized/fondleVagina.tw
index 53755443591..0c16be452e2 100644
--- a/src/uncategorized/fondleVagina.tw
+++ b/src/uncategorized/fondleVagina.tw
@@ -22,7 +22,7 @@ You call her over so you can fondle her
 <</if>>
 
 <<if ($activeSlave.vagina != -1)>>
-	<<if  $activeSlave.devotion <= 20>>
+	<<if $activeSlave.devotion <= 20>>
 		<<if $activeSlave.clit == 1>>
 			Her big clit peeks out from under its hood
 		<<elseif $activeSlave.clit == 2>>
@@ -111,9 +111,9 @@ You call her over so you can fondle her
 	<<else>>
 		pretty little clit
 	<</if>> and rub it with your fingertips as your hand nears it. As she becomes more aroused, she grabs hold of your wrist lightly, moving her hands along with the motion of your own. Her pussy juices run down her leg as she begins to moan audibly<<if ($activeSlave.amp != 1)>>, gently clamping your hand between her thighs<</if>> as you continue to move your hand along her pussy. She moans loudly as she shudders in orgasmic joy.
-	<<if (($activeSlave.amp == 1) && (canTalk($activeSlave) == false))>>
+	<<if (($activeSlave.amp == 1) && !canTalk($activeSlave))>>
 		She does her best to communicate love with her $activeSlave.eyeColor eyes.
-	<<elseif canTalk($activeSlave) == false>>
+	<<elseif !canTalk($activeSlave)>>
 		She signs that she loves you.
 	<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>> "I love you,
 		<<Master>>," she lisps rapturously.
@@ -122,7 +122,7 @@ You call her over so you can fondle her
 	<</if>>
 	<<elseif ($activeSlave.devotion > 20)>>
 	She accepts your orders without comment and presents her virgin pussy to you, watching your hands with some slight trepidation. She gasps as you gently trace along her
-	<<if  $activeSlave.labia == 1>>
+	<<if $activeSlave.labia == 1>>
 		lovely petals
 	<<elseif $activeSlave.labia == 2>>
 		prominent petals
@@ -250,7 +250,7 @@ You call her over so you can fondle her
 			pretty little clit
 		<</if>> and rub it with your fingertips as your hand nears it. She begs you not to stop as she looks into your eyes expectantly as she shudders in an orgasm.
 	<</if>>
-<<elseif  $activeSlave.devotion < -20>>
+<<elseif $activeSlave.devotion < -20>>
 	She tries to refuse, so you push the disobedient slave down over your desk as you move your hands towards her.
 	<<if ($activeSlave.vagina != -1)>>
 		You gently trace along her
@@ -273,7 +273,7 @@ You call her over so you can fondle her
 			pretty little clit
 		<</if>> and rub it with your fingertips as your hand nears it, despite her resistant pulling against you. She bites her lip but she cannot help but moan and she shudders in an orgasm.
 	<</if>> She looks at you shamefully as you stop moving your hand.
-<<elseif  $activeSlave.devotion <= 20>>
+<<elseif $activeSlave.devotion <= 20>>
 	She obeys silently, standing in front of you as you move your hands towards her.
 	<<if ($activeSlave.vagina != -1)>>
 		You gently trace along her
diff --git a/src/uncategorized/freeRangeDairyAssignmentScene.tw b/src/uncategorized/freeRangeDairyAssignmentScene.tw
index 23bad72a681..7533a8992b9 100644
--- a/src/uncategorized/freeRangeDairyAssignmentScene.tw
+++ b/src/uncategorized/freeRangeDairyAssignmentScene.tw
@@ -76,7 +76,7 @@ Eventually, $activeSlave.slaveName arrives at her designated milking stall.
 <<set $assayedSlaveAvailable = 0>>
 <<if $familyTesting == 1>>
 	<<if totalRelatives($activeSlave) > 0>>
-		<<set _relativeCattle = $slaves.filter(function(s) { return ((s.ID == $activeSlave.father || s.ID == $activeSlave.mother || $activeSlave.ID == s.mother || $activeSlave.ID == s.father || areSisters(s, $activeSlave) > 0) && isSlaveAvailable(s) && s.assignment == "work in the dairy") ; })>>
+		<<set _relativeCattle = $slaves.filter(function(s) { return (areRelated(s, $activeSlave) && isSlaveAvailable(s) && s.assignment == "work in the dairy") ; })>>
 		<<if _relativeCattle.length > 0>>
 			<<set $assayedSlave = _relativeCattle.random()>>
 			<<set $assayedSlaveAvailable = 1>>
@@ -100,43 +100,30 @@ Eventually, $activeSlave.slaveName arrives at her designated milking stall.
 	<</if>>
 <<else>>
 	<<if ($activeSlave.relation != 0)>>
-		<<for $i = 0; $i < $slaves.length; $i++>>
-		<<if $slaves[$i].ID == $activeSlave.relationTarget >>
-			<<if $slaves[$i].assignment == "work in the dairy">>
-				<<set $assayedSlave = $slaves[$i]>>
-				<<set $assayedSlaveAvailable = 1>>
-			<</if>>
-			<<break>>
-		<</if>>
-		<</for>>
-		<<if $assayedSlaveAvailable == 1>>
+		<<set $assayedSlave = $slaves.find(function(s) { return s.ID == $activeSlave.relationTarget && s.assignment == "work in the dairy" ; })>>
+		<<if def $assayedSlave>>
+			<<set $assayedSlaveAvailable = 1>>
 			<<set $assayType = $activeSlave.relation>>
 		<</if>>
 	<</if>>
 <</if>> /*closes extended family mode */
 <<if $assayedSlaveAvailable == 0 && $activeSlave.relationship > 0>>
-    <<for $i = 0; $i < $slaves.length; $i++>>
-    <<if $slaves[$i].ID == $activeSlave.relationshipTarget>>
-        <<if $slaves[$i].assignment == "work in the dairy">>
-            <<set $assayedSlave = $slaves[$i]>>
-            <<set $assayedSlaveAvailable = 1>>
-        <</if>>
-        <<break>>
-    <</if>>
-    <</for>>
-    <<if $assayedSlaveAvailable == 1>>
-        <<if ($activeSlave.relationship <= 1)>>
-            <<set $assayType = "friend">>
-        <<elseif ($activeSlave.relationship <= 2)>>
-            <<set $assayType = "best friend">>
-        <<elseif ($activeSlave.relationship <= 3)>>
-            <<set $assayType = "fuckbuddy">>
-        <<elseif ($activeSlave.relationship <= 4)>>
-            <<set $assayType = "lover">>
-        <<else>>
-            <<set $assayType = "slave wife">>
-        <</if>>
-    <</if>>
+	<<set $assayedSlave = $slaves.find(function(s) { return s.ID == $activeSlave.relationTarget && s.assignment == "work in the dairy" ; })>>
+	<<if def $assayedSlave>>
+		<<set $assayedSlaveAvailable = 1>>
+		<<switch $activeSlave.relationship>>
+		<<case 1>>
+			<<set $assayType = "friend">>
+		<<case 2>>
+			<<set $assayType = "best friend">>
+		<<case 3>>
+			<<set $assayType = "fuckbuddy">>
+		<<case 4>>
+			<<set $assayType = "lover">>
+		<<case 5>>
+			<<set $assayType = "slave wife">>
+		<</switch>>
+	<</if>>
 <</if>>
 <<if $assayedSlaveAvailable == 1>>
     Her $assayType $assayedSlave.slaveName is at the dairy, too. She is in the adjacent stall. The two of them are going to be milked right next to each other.
@@ -170,7 +157,7 @@ Near the headrest of the chair, an artificial phallus is installed. The cow can
     <</if>>
 <</if>>
 <br/>
-The milking chair comes with a small screen, providing mental stimulation for the cow. It is highly pornographic, of course. It also includes live-streams of close-ups from the cow's being milked or their orifices being penetrated. $activeSlave.slaveName selects her favorite programe<<if !canSee($activeSlave)>> to listen to<</if>>. It features
+The milking chair comes with a small screen, providing mental stimulation for the cow. It is highly pornographic, of course. It also includes live-streams of close-ups from the cow's being milked or their orifices being penetrated. $activeSlave.slaveName selects her favorite program<<if !canSee($activeSlave)>> to listen to<</if>>. It features
 <<if $activeSlave.attrXY > $activeSlave.attrXX || $activeSlave.behavioralQuirk == "adores men">>
     men
 <<else>>
@@ -258,19 +245,19 @@ The milking cups on her nipples begin to pulse rhythmically. Soon, a steady flow
 <</if>>
 <<if $activeSlave.dick > 0>>
 The milking machine uses suction to draw her dick into the receptacle.
-    <<if $activeSlave.dick > 10>>
-       Her dick is too large to even consider getting hard again, so it just attaches firmly to the tip.
-    <<elseif $activeSlave.dick > 8>>
-        She is on the verge of passing out as most of her blood volume rushes into her dick. She cannot possibly reach a full erection without the machine's help. She fights to stay awake so she can enjoy her behemothial cock at throbbing hardness.
-    <<elseif $activeSlave.dick > 6>>
-        She feels dizzy as most of her blood volume rushes into her dick. It is not easy for her body to maintain an erection. But with the machine's help, she can produce a full throbbing hard-on.
-    <<else>>
-        It brings her to a full, throbbing erection within seconds.
-    <</if>>
+	<<if $activeSlave.dick > 10>>
+		Her dick is too large to even consider getting hard again, so it just attaches firmly to the tip.
+	<<elseif $activeSlave.dick > 8>>
+		She is on the verge of passing out as most of her blood volume rushes into her dick. She cannot possibly reach a full erection without the machine's help. She fights to stay awake so she can enjoy her inhuman cock at throbbing hardness.
+	<<elseif $activeSlave.dick > 6>>
+		She feels dizzy as most of her blood volume rushes into her dick. It is not easy for her body to maintain an erection. But with the machine's help, she can produce a full throbbing hard-on.
+	<<else>>
+		It brings her to a full, throbbing erection within seconds.
+	<</if>>
 The machine strokes her dick mechanically, but very pleasurable.
 <</if>>
 It does not take long for $activeSlave.slaveName to reach her first orgasm of many. Her muscles tense.
-    <<if $activeSlave.dick > 0>>
+	<<if $activeSlave.dick > 0>>
 		Her	<<if $activeSlave.balls > 5 >>cum-engorged<</if>> balls draw up.
 		Her <<if $activeSlave.dick > 8 >>gargantuan member<<elseif $activeSlave.dick > 6 >>huge cock<<else>>dick<</if>> twitches and flexes within its receptacle.
 			<<if $activeSlave.balls >= 50>>
@@ -283,33 +270,33 @@ It does not take long for $activeSlave.slaveName to reach her first orgasm of ma
 			The machine strains to suck down the giant load from her huge balls.
 		<<elseif $activeSlave.balls > 5>>
 			The copious ejaculation from her over-sized balls give the machine something to work on.
-        <<elseif $activeSlave.balls > 0>>
+		<<elseif $activeSlave.balls > 0>>
 			Her ejaculate is quickly sucked away.
-        <<else>>
+		<<else>>
 			Her ballslessness impedes cum-production, but ejaculating feels nice, anyway.
-        <</if>>
-    <</if>>
+		<</if>>
+	<</if>>
 <<if ($activeSlave.dick < 1) && ($activeSlave.balls > 0) && ($activeSlave.prostate > 0)>>
 	Cum splashes from her urethra and is quickly sucked away.
 <</if>>
 <<if $activeSlave.lactation > 0>>
 <br>
 The milking cups on her nipples switch from rhythmic pulsing into intense suction. Aided by her orgasm, milk spurts from her nipples 
-    <<if $activeSlave.boobs > 20000>>
-    in obscenely massive amounts. Her immense breasts seem to never empty.
-    <<elseif $activeSlave.boobs > 10000>>
-    in absurdly large amounts. Her gargantuan breasts do not seem to get less milk-laden for a long time.
-    <<elseif $activeSlave.boobs > 5000>>
-    in powerful jets. Her huge breasts can provide multiple liters of milk.
-    <<elseif $activeSlave.boobs > 1000>>
-    for quite some time. Her large breasts can store an impressive volume of milk.
-    <<elseif $activeSlave.boobs > 700>>
-    until there is enough for whitening a cup of coffee. Her average breasts cannot store much more milk.
-    <<elseif ($arcologies[0].FSSlimnessEnthusiast > 80)>>
-    for a surprisingly long time. Your arcology succeeded in optimized the milking process for small breasts.
-    <<else>>
-    for a short time. Her small tits cannot dispense much milk at once.
-    <</if>>
+	<<if $activeSlave.boobs > 20000>>
+		in obscenely massive amounts. Her immense breasts seem to never empty.
+	<<elseif $activeSlave.boobs > 10000>>
+		in absurdly large amounts. Her gargantuan breasts do not seem to get less milk-laden for a long time.
+	<<elseif $activeSlave.boobs > 5000>>
+		in powerful jets. Her huge breasts can provide multiple liters of milk.
+	<<elseif $activeSlave.boobs > 1000>>
+		for quite some time. Her large breasts can store an impressive volume of milk.
+	<<elseif $activeSlave.boobs > 700>>
+		until there is enough for whitening a cup of coffee. Her average breasts cannot store much more milk.
+	<<elseif ($arcologies[0].FSSlimnessEnthusiast > 80)>>
+		for a surprisingly long time. Your arcology succeeded in optimized the milking process for small breasts.
+	<<else>>
+		for a short time. Her small tits cannot dispense much milk at once.
+	<</if>>
 <</if>>
 <<if $activeSlave.prostate != 0 && $activeSlave.dick == 0 && $activeSlave.balls == 0>>
 <br>
-- 
GitLab