From 3ce8efa72be3cb86e7cd603e41a63319489c8b04 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 8 Jun 2017 07:50:00 -0400
Subject: [PATCH] Vanilla stuff and fixes.

---
 src/uncategorized/futureSocities.tw    | 11 ++-
 src/uncategorized/pMercenaryRomeo.tw   |  2 +
 src/uncategorized/reMilfTourist.tw     |  6 +-
 src/uncategorized/saLongTermEffects.tw | 94 +++++++++++++-------------
 src/uncategorized/walkPast.tw          | 19 +++---
 src/utility/descriptionWidgets.tw      |  4 +-
 6 files changed, 69 insertions(+), 67 deletions(-)

diff --git a/src/uncategorized/futureSocities.tw b/src/uncategorized/futureSocities.tw
index 931959e6f88..6e3aaed5024 100644
--- a/src/uncategorized/futureSocities.tw
+++ b/src/uncategorized/futureSocities.tw
@@ -426,6 +426,7 @@ You have unlocked
 <</if>>
 possible societal customizations.
 
+/*
 You are spending ¤$FSSpending each week to support your societal goals.
 <<if $FSSpending > 900>>
 	[[Decrease|Future Society][$FSSpending -= 1000]] |
@@ -437,14 +438,12 @@ You are spending ¤$FSSpending each week to support your societal goals.
 <<else>>
 	Increase
 <</if>>
-/*
+*/
 <<if $FSSpending > 10000>><<set _warn = 1>><</if>>
 <<set $FSSpending = Number($FSSpending) || 0>>
-<<set $FSSpending = Math.clamp(Math.trunc($FSSpending/1000)*1000, 0, 10000)>>
-You are spending ¤$FSSpending each week to support your societal goals.
-<<textbox "$FSSpending" $FSSpending "Future Society">>
-<<if _warn>>//Spending more than ¤10000 weekly will be counterproductive//<</if>>
-*/
+<<set $FSSpending = Math.clamp(Math.ceil($FSSpending/1000)*1000, 0, 10000)>>
+<br>You are spending ¤<<textbox "_newFSSpending" $FSSpending>> each week to support your societal goals. [[Save changes|Future Society][$FSSpending = Number(_newFSSpending) || 0]]
+<<if _warn>><br>//Spending more than ¤10000 weekly would be counterproductive//<</if>>
 
 <br>
 <span id="mass">
diff --git a/src/uncategorized/pMercenaryRomeo.tw b/src/uncategorized/pMercenaryRomeo.tw
index c756f111c8c..abea5b3dcb1 100644
--- a/src/uncategorized/pMercenaryRomeo.tw
+++ b/src/uncategorized/pMercenaryRomeo.tw
@@ -75,6 +75,8 @@ One of your mercenaries requests an interview. He's a worn, grey-haired tank of
 	<<replace "#result">>
 	The mercenary cannot believe his ears. After you repeat yourself twice, he leaves to collect your gift, thanking you clumsily. On the video feeds, you see that $activeSlave.slaveName can hardly believe what's happened. <<if $activeSlave.amp != 1>>She hugs him, sobbing into his shoulder. As they walk hand in hand down towards his quarters,<<else>>As he picks up her limbless form to give her a hug,<</if>> she gives the nearest camera a little nod and silently mouths the words 'thank you, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>master<<else>>mistress<</if>>.' You smile to yourself; when they get there they'll find flowers and a paid reservation at the arcology's best restaurant. Soon the story is being told in bars and brothels across the Free City, with you naturally playing @@.green;a starring role.@@ Some days later, you hear a dramatization is being filmed, with an aging action star playing the mercenary, a rising starlet playing $activeSlave.slaveName, and a noted character actor playing you.
 	<<set $rep += 3000>>
+	<<set _poster = "a poster for the movie that was made about the love between one of your mercenaries and " + $activeSlave.slaveName>>
+	<<set $trinkets.push(_poster)>>
 	<<include "Remove activeSlave">>
 	<</replace>>
 <</link>>
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index a3cfb25fc34..34a9a6fb41d 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -17,10 +17,8 @@
 <<set $activeSlave.vagina++>>
 <<set $activeSlave.hips = 2>>
 <<set $activeSlave.butt = random(4,6)>>
-<<set $activeSlave.buttImplant = 0>>
-<<set $activeSlave.boobs = 100*random(16,24)>>
-<<set $activeSlave.boobsImplant = 0>>
-<<set $activeSlave.weight = random(80,100)>>
+<<set $activeSlave.boobs = 100*random(10,18)>>
+<<set $activeSlave.weight = random(60,100)>>
 <<set $activeSlave.behavioralQuirk = "none">>
 <<set $activeSlave.sexualQuirk = "none">>
 
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 7f98e599892..d5ec712dd50 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -886,30 +886,30 @@
 			<<if ($slaves[$i].fetishKnown == 1)>>
 			<<if ($slaves[$i].fetish == "submissive")>>
 				Recently, she's been fantasizing about submitting to big strong men. Her revulsion at the idea of sex with a man @@.green;mellows.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<<elseif ($slaves[$i].fetish == "buttslut")>>
 				Recently, she's been reconsidering her reluctance to be sodomized a man. Her revulsion at the idea of sex with a man @@.green;mellows.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<<elseif ($slaves[$i].fetish == "pregnancy")>>
 				Recently, she's been fantasizing about getting knocked up. Her revulsion at the idea of sex with a man @@.green;mellows.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 			<</if>>
 			<<if ($slaves[$i].sexualQuirk == "adores men")>>
 				She enjoys spending time with men, and starts to @@.green;reconsider her unwillingness to be fucked by men.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 			<<if ($slaves[$i].dick > 0)>>
 			<<if ($slaves[$i].energy >= 40)>>
 			<<if ($slaves[$i].analCount > 0)>>
 				Every time she cums with a dick up her ass, her @@.green;resistance to sex with men is worn away.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 			<</if>>
 			<</if>>
 			<<if ($slaves[$i].devotion > random(1,100))>>
 				The atmosphere in your arcology is so ubiquitously sexual that she @@.green;reconsiders her unwillingness to have sex with men.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 		<<else>>
 			Her weak libido limits natural development of her sexuality.
@@ -919,30 +919,30 @@
 			<<if ($slaves[$i].fetishKnown == 1)>>
 			<<if ($slaves[$i].fetish == "submissive")>>
 				She's found herself enjoying watching big strong men use other slaves recently. She's now @@.green;more attracted to men.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<<elseif ($slaves[$i].fetish == "buttslut")>>
 				She's started fantasizing about cocks being shoved up her butt even when there are no cocks being shoved up her butt. She's now @@.green;more attracted to men.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<<elseif ($slaves[$i].fetish == "pregnancy")>>
 				Her fantasies about pregnancy have become quite vivid; she loves hot cum jetting into her. She's now @@.green;more attracted to men.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 			<</if>>
 			<<if ($slaves[$i].behavioralQuirk == "adores men")>>
 				She enjoys spending time with men, and is now @@.green;more attracted to men.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 			<<if ($slaves[$i].dick > 0)>>
 			<<if ($slaves[$i].energy >= 60)>>
 			<<if ($slaves[$i].analCount > 0)>>
 				Every time she cums to the feeling of a cock thrusting deep inside her, her @@.green;indifference to men is reduced.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 			<</if>>
 			<</if>>
 			<<if ($slaves[$i].devotion > random(1,200))>>
 				The atmosphere in your arcology is so ubiquitously sexual that she has become @@.green;more attracted to men.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 		<<else>>
 			Her poor sex drive limits natural development of her sexuality.
@@ -952,26 +952,26 @@
 			<<if ($slaves[$i].fetishKnown == 1)>>
 			<<if ($slaves[$i].fetish == "submissive")>>
 				She can no longer see a man without fantasizing about how it would feel if he held her down. She's now @@.green;more aroused by men.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<<elseif ($slaves[$i].fetish == "buttslut")>>
 				She can't see a man without doing her best to get his hard cock inside her. She's now @@.green;more aroused by men.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<<elseif ($slaves[$i].fetish == "pregnancy")>>
 				She can't see a man without doing her best to get his hot seed into her body. She's now @@.green;more aroused by men.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 			<</if>>
 			<<if ($slaves[$i].dick > 0)>>
 			<<if ($slaves[$i].energy >= 80)>>
 			<<if ($slaves[$i].analCount > 0)>>
 				She often starts to climax as a cock begins to push inside her, @@.green;deepening her appetite for men.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 			<</if>>
 			<</if>>
 			<<if ($slaves[$i].behavioralQuirk == "adores men")>>
 				She enjoys spending time with men so much that any interaction becomes flirtation; she's now @@.green;more aroused by men.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 		<<else>>
 			Her average libido limits further natural development of her sexuality.
@@ -979,7 +979,7 @@
 	<<else>>
 		<<if ($slaves[$i].energy < 40)>>
 			Her low sex drive @@.red;reduces her extreme attraction to men.@@
-			<<set $slaves[$i].attrXY -= 1>>
+			<<set $slaves[$i].attrXY -= 5>>
 		<</if>>
 	<</if>>
 	<<if ($slaves[$i].attrXX <= 35)>>
@@ -987,30 +987,30 @@
 			<<if ($slaves[$i].fetishKnown == 1)>>
 			<<if ($slaves[$i].fetish == "dom")>>
 				Recently, she's been fantasizing about how it would feel to force herself on some of the cute women all around her. Her revulsion at the idea of sex with a woman @@.green;mellows.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<<elseif ($slaves[$i].fetish == "sadist")>>
 				Recently, she's been fantasizing about how it would feel to abuse a weak female slave. Her revulsion at the idea of sex with a woman @@.green;mellows.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<<elseif ($slaves[$i].fetish == "boobs")>>
 				Recently, she's been fantasizing about other girls' tits. Her revulsion at the idea of sex with a woman @@.green;mellows.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<</if>>
 			<</if>>
 			<<if ($slaves[$i].behavioralQuirk == "adores women")>>
 				She enjoys spending time with women, and starts to @@.green;reconsider her unwillingness to have sex with a woman.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<</if>>
 			<<if $slaves[$i].canAchieveErection>>
 			<<if ($slaves[$i].energy >= 40)>>
 			<<if ($slaves[$i].penetrativeCount > 0)>>
 				Getting to fuck another girl is rare and special, and she @@.green;starts to value getting to have sex with women.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 			<</if>>
 			<</if>>
 			<<if ($slaves[$i].devotion > random(1,100))>>
 				The atmosphere in your arcology is so ubiquitously sexual that she @@.green;reconsiders her unwillingness to have sex with women.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<</if>>
 		<<else>>
 			<<if ($slaves[$i].attrXX > 35)>>Her weak libido limits natural development of her sexuality.<</if>>
@@ -1020,30 +1020,30 @@
 			<<if ($slaves[$i].fetishKnown == 1)>>
 			<<if ($slaves[$i].fetish == "dom")>>
 				She's found herself enjoying the sight of female slaves being forced to fuck recently. She's now @@.green;more attracted to women.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<<elseif ($slaves[$i].fetish == "sadist")>>
 				She's started fantasizing about how a girl might feel, struggling to get away from her. She's now @@.green;more attracted to women.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<<elseif ($slaves[$i].fetish == "boobs")>>
 				Her fantasies about boobs have become quite vivid. She's now @@.green;more attracted to women.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<</if>>
 			<</if>>
 			<<if ($slaves[$i].behavioralQuirk == "adores women")>>
 				She enjoys spending time with women, and is now @@.green;more attracted to women.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<</if>>
 			<<if $slaves[$i].canAchieveErection>>
 			<<if ($slaves[$i].energy >= 60)>>
 			<<if ($slaves[$i].penetrativeCount > 0)>>
 				@@.green;Her indifference to women@@ is worn down on the special occasions that she's allowed to stick her dick in one.
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 			<</if>>
 			<</if>>
 			<<if ($slaves[$i].devotion > random(1,200))>>
 				The atmosphere in your arcology is so ubiquitously sexual that she has become @@.green;more attracted to women.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<</if>>
 		<<else>>
 			<<if ($slaves[$i].attrXX > 65)>>Her poor sex drive limits natural development of her sexuality.<</if>>
@@ -1053,24 +1053,24 @@
 			<<if ($slaves[$i].fetishKnown == 1)>>
 			<<if ($slaves[$i].fetish == "dom")>>
 				She can't see a woman without plotting to dominate her. She's now @@.green;more aroused by women.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<<elseif ($slaves[$i].fetish == "sadist")>>
 				She can't see a woman without doing her best to find a way the rules will allow her to abuse the poor girl. She's now @@.green;more aroused by women.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<<elseif ($slaves[$i].fetish == "boobs")>>
 				She can't see a woman without doing her best to get her hands on her breasts. She's now @@.green;more aroused by women.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<</if>>
 			<</if>>
 			<<if ($slaves[$i].behavioralQuirk == "adores women")>>
 				She enjoys spending time with women so much that any interaction becomes flirtation; she's now @@.green;more aroused by women.@@
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<</if>>
 			<<if $slaves[$i].canAchieveErection>>
 			<<if ($slaves[$i].energy >= 80)>>
 			<<if ($slaves[$i].penetrativeCount > 0)>>
 				She cherishes the special occasions on which she gets to cum inside a girl, @@.green;building her appetite for women.@@
-				<<set $slaves[$i].attrXY += 1>>
+				<<set $slaves[$i].attrXY += 5>>
 			<</if>>
 			<</if>>
 			<</if>>
@@ -1080,22 +1080,22 @@
 	<<else>>
 		<<if ($slaves[$i].energy < 40)>>
 			Her low sex drive @@.red;reduces her extreme attraction to women.@@
-			<<set $slaves[$i].attrXX -= 1>>
+			<<set $slaves[$i].attrXX -= 5>>
 		<</if>>
 	<</if>>
 	<<if ($slaves[$i].energy > 95)>>
 		<<if ($slaves[$i].attrXX < 100)>>
 			<<if ($slaves[$i].attrXY < 100)>>
 				Her nymphomania has a slow but inexorable impact on her sexuality, @@.green;increasing her attraction to everyone.@@
-				<<set $slaves[$i].attrXY += 1>>
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXY += 5>>
+				<<set $slaves[$i].attrXX += 5>>
 			<<else>>
 				Her nymphomania has a slow but inexorable impact on her sexuality, @@.green;increasing her lust for pussy,@@ since she's already crazy about guys.
-				<<set $slaves[$i].attrXX += 1>>
+				<<set $slaves[$i].attrXX += 5>>
 			<</if>>
 		<<elseif ($slaves[$i].attrXY < 100)>>
 			Her nymphomania has a slow but inexorable impact on her sexuality, @@.green;increasing her need for cock,@@ since she's already crazy about the ladies.
-			<<set $slaves[$i].attrXY += 1>>
+			<<set $slaves[$i].attrXY += 5>>
 		<</if>>
 	<</if>>
 <</if>>
@@ -2151,6 +2151,7 @@
 <<if ($slaves[$i].assignment != "serve the public")>>
 <<if ($slaves[$i].assignment != "whore")>>
 <<if ($slaves[$i].assignment != "work a glory hole")>>
+<<if ($slaves[$i].assignment != "be confined in the arcade")>>
 <<if ($slaves[$i].assignment != "work in the brothel")>>
 <<if ($slaves[$i].assignment != "serve in the club")>>
 <<if ($slaves[$i].assignment != "serve in the master suite") || ($masterSuiteUpgradeLuxury < 2)>>
@@ -2169,6 +2170,7 @@
 <</if>>
 <</if>>
 <</if>>
+<</if>>
 
 /* SMART PIERCING EFFECTS */
 
@@ -2195,7 +2197,7 @@
 <<case "women">>
 	<<if $slaves[$i].attrXX < 95>>
 		Her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing successfully @@.green;increases her attraction to girls@@ by pleasuring her when she's around them.
-		<<set $slaves[$i].attrXX += 2+$assistant>>
+		<<set $slaves[$i].attrXX += 4+$assistant+$assistant>>
 		<<if $slaves[$i].energy < 80>>
 			This has the secondary effect of slightly @@.green;enhancing her libido.@@
 			<<set $slaves[$i].energy++>>
@@ -2204,7 +2206,7 @@
 <<case "anti-women">>
 	<<if $slaves[$i].attrXX > 0>>
 		Her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing successfully @@.green;suppresses her attraction to girls@@ by making her private parts very uncomfortable when she's around them.
-		<<set $slaves[$i].attrXX -= Math.clamp($slaves[$i].attrXX-(2+$assistant),0,100)>>
+		<<set $slaves[$i].attrXX -= Math.clamp($slaves[$i].attrXX-(4+$assistant+$assistant),0,100)>>
 		<<if $slaves[$i].energy > 0>>
 			This has the secondary effect of slightly @@.red;reducing her libido.@@
 			<<set $slaves[$i].energy-->>
@@ -2213,7 +2215,7 @@
 <<case "men">>
 	<<if $slaves[$i].attrXY < 95>>
 		Her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing successfully @@.green;increases her attraction to guys@@ by pleasuring her when she's around cocks.
-		<<set $slaves[$i].attrXY += 2+$assistant>>
+		<<set $slaves[$i].attrXY += 4+$assistant+$assistant>>
 		<<if $slaves[$i].energy < 80>>
 			This has the secondary effect of slightly @@.green;enhancing her libido.@@
 			<<set $slaves[$i].energy++>>
@@ -2222,7 +2224,7 @@
 <<case "anti-men">>
 	<<if $slaves[$i].attrXY > 0>>
 		Her smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing successfully @@.green;suppresses her attraction to guys@@ by making her private parts very uncomfortable when she's around them.
-		<<set $slaves[$i].attrXY -= Math.clamp($slaves[$i].attrXY-(2+$assistant),0,100)>>
+		<<set $slaves[$i].attrXY -= Math.clamp($slaves[$i].attrXY-(4+$assistant+$assistant),0,100)>>
 		<<if $slaves[$i].energy > 0>>
 			This has the secondary effect of slightly @@.red;reducing her libido.@@
 			<<set $slaves[$i].energy-->>
@@ -3014,10 +3016,10 @@
 			<<set $slaves[$i].trust += 1>>
 		<<case "MaleAttracted">>
 			Dependence on the hormone-based aphrodisiacs makes $object become @@.green;more attracted to men.@@
-			<<set $slaves[$i].attrXY += 2>>
+			<<set $slaves[$i].attrXY += 5>>
 		<<case "FemaleAttracted">>
 			Dependence on the hormone-based aphrodisiacs makes $object become @@.green;more attracted to women.@@
-			<<set $slaves[$i].attrXX += 2>>
+			<<set $slaves[$i].attrXX += 5>>
 		<<default>>
 			ERROR: bad aphro addict effect: _Effects
 		<</switch>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index a6cfc29663d..8babdbd6d20 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -20,18 +20,16 @@
 		<</for>>
 	<</if>>
 	<<if $activeSlave.mother > 0>>
-		<<for $j = 0; $j < $slaves.length; $j++>>
-			<<if $activeSlave.mother == $slaves[$j].ID>>
-				<<set $relations.push($slaves[$j])>>
-			<</if>>
-		<</for>>
+		<<set _j = $slaves.find(function(s) { return s.ID == $activeSlave.mother; })>>
+		<<if _j != -1>>
+			<<set $relations.push($slaves[_j])>>
+		<</if>>
 	<</if>>
 	<<if $activeSlave.father > 0>>
-		<<for $j = 0; $j < $slaves.length; $j++>>
-			<<if $activeSlave.father == $slaves[$j].ID>>
-				<<set $relations.push($slaves[$j])>>
-			<</if>>
-		<</for>>
+		<<set _j = $slaves.find(function(s) { return s.ID == $activeSlave.father; })>>
+		<<if _j != -1>>
+				<<set $relations.push($slaves[_j])>>
+		<</if>>
 	<</if>>
 	<<set $relation = $relations.random()>>
 	<<if $relation.mother == $activeSlave.ID || $relation.father == $activeSlave.ID>>
@@ -1138,6 +1136,7 @@
 		Her blouse lewdly displays her <<if $activeSlave.boobs < 300>>$activeSlave.nipples nipples<<else>>breasts<</if>>.
 	<<case "a kimono">>
 	<<case "a hijab and abaya">>
+	<<case "a huipil">>
 	<<case "battledress">>
 		<<if $activeSlave.boobs < 300>>
 			As she moves, you can occasionally spot her lack of undergarments.
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index 05798b4c49b..e4c4b540732 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -210,6 +210,8 @@
 	<<case "a huipil">>
 		<<if $activeSlave.boobs > 2000>>
 			$activeSlave.slaveName's breasts are so big that they pull up $possessive huipil uncomfortably high, so $pronoun needs to fold it between them.
+		<<elseif $activeSlave.boobs < 300>>
+			$activeSlave.slaveName's huipil rests on $possessive flat chest.
 		<<else>>
 			$activeSlave.slaveName is wearing $possessive huipil which accentuates her breasts.
 		<</if>>
@@ -2469,7 +2471,7 @@ $pronounCap's got a
 		<<else>>
 			is made to be easily liftable for access to $possessive anus.
 		<</if>>
-	<<case "conservative clothing" "a toga" "huipil" "cutoffs and a t-shirt" "battledress" "slutty business attire" "nice business attire" "a military uniform" "a bunny outfit" "a nice nurse outfit" "a kimono" >>
+	<<case "conservative clothing" "a toga" "a huipil" "cutoffs and a t-shirt" "battledress" "slutty business attire" "nice business attire" "a military uniform" "a bunny outfit" "a nice nurse outfit" "a kimono" >>
 		/* We could use chastity belt descriptions! */
 	<<default>>
 		<<if ($activeSlave.anus > 2)>>
-- 
GitLab