From 068e8dc71bb469a86447d95fffaaedba0c8db75c Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 2 Apr 2020 17:32:12 -0400
Subject: [PATCH] Various little tweaks

---
 src/npc/interaction/fFeelings.tw     | 159 ++++++++++++++-------------
 src/uncategorized/seWeddingDouble.tw |   4 +
 src/uncategorized/seWeddingSingle.tw |   2 +
 3 files changed, 90 insertions(+), 75 deletions(-)

diff --git a/src/npc/interaction/fFeelings.tw b/src/npc/interaction/fFeelings.tw
index f635b1a82ef..30631c8d618 100644
--- a/src/npc/interaction/fFeelings.tw
+++ b/src/npc/interaction/fFeelings.tw
@@ -685,33 +685,40 @@ My favorite part of my body i<<s>>
 <</if>>
 
 <<if (getSlave($AS).dick > 0)>>
-<<if (getSlave($AS).balls == 0)>>
-	<<if (getSlave($AS).fetishKnown == 1)>>
-		<<if (getSlave($AS).energy > 95)>>
-			I like being gelded." $He giggles. "I don't have to be hard to get fucked!
-		<<elseif (getSlave($AS).fetishStrength > 60)>>
-			<<switch getSlave($AS).fetish>>
-			<<case "submissive">>
-				I don't mind being clipped. I like belong on the bottom.
-			<<case "masochist">>
-				Being gelded," $he shivers, "hurt<<s>> <<s>>ometime<<s>>. Make<<s>> people want to hurt you. I like it.
-			<<case "humiliation">>
-				I don't mind being clipped." $He shivers. "Everyone know<<s>>! It'<<s>> <<s>>o embarra<<ss>>ing.
-			<<case "dom">>
-				I <<s>>ometime<<s>> mi<<ss>> my ball<<s>>. It'<<s>> harder to be dominant without them.
-			<<case "sadist">>
-				I <<s>>ometime<<s>> mi<<ss>> my ball<<s>>. I <<s>>till fanta<<s>>i<<z>>e about raping the other girl<<s>>.
-			<<case "pregnancy">>
-				I <<s>>ometime<<s>> mi<<ss>> my ball<<s>>. I <<s>>till fanta<<s>>i<<z>>e about getting the other girl<<s>> pregnant.
-			<<case "cumslut">>
-				I barely cum without my ball<<s>>. I mi<<ss>>, you know, cleaning up after my<<s>>elf. With my mouth.
-			<<case "buttslut">>
-				I really like being clipped. I think it'<<s>> le<<ss>> di<<s>>tracting, you know, from my butthole. <<if getSlave($AS).prostate > 0>>And I <<s>>till have my pro<<s>>tate which i<<s>> what matter<<s>>.<</if>>
-			<<case "boobs">>
-				I don't mind being clipped. Between that and my boob<<s>> I feel like a ni<<c>>e little <<s>>lave $girl.
-			<</switch>>
-		<<elseif (getSlave($AS).attrKnown == 1) && (getSlave($AS).attrXX > 80)>>
-			I <<s>>ometime<<s>> mi<<ss>> my ball<<s>>. I <<s>>till fanta<<s>>i<<z>>e about boning the other girl<<s>>.
+	<<if (getSlave($AS).balls == 0)>>
+		<<if (getSlave($AS).fetishKnown == 1)>>
+			<<if (getSlave($AS).energy > 95)>>
+				I like being gelded." $He giggles. "I don't have to be hard to get fucked!
+			<<elseif (getSlave($AS).fetishStrength > 60)>>
+				<<switch getSlave($AS).fetish>>
+				<<case "submissive">>
+					I don't mind being clipped. I like belong on the bottom.
+				<<case "masochist">>
+					Being gelded," $he shivers, "hurt<<s>> <<s>>ometime<<s>>. Make<<s>> people want to hurt you. I like it.
+				<<case "humiliation">>
+					I don't mind being clipped." $He shivers. "Everyone know<<s>>! It'<<s>> <<s>>o embarra<<ss>>ing.
+				<<case "dom">>
+					I <<s>>ometime<<s>> mi<<ss>> my ball<<s>>. It'<<s>> harder to be dominant without them.
+				<<case "sadist">>
+					I <<s>>ometime<<s>> mi<<ss>> my ball<<s>>. I <<s>>till fanta<<s>>i<<z>>e about raping the other girl<<s>>.
+				<<case "pregnancy">>
+					I <<s>>ometime<<s>> mi<<ss>> my ball<<s>>. I <<s>>till fanta<<s>>i<<z>>e about getting the other girl<<s>> pregnant.
+				<<case "cumslut">>
+					I barely cum without my ball<<s>>. I mi<<ss>>, you know, cleaning up after my<<s>>elf. With my mouth.
+				<<case "buttslut">>
+					I really like being clipped. I think it'<<s>> le<<ss>> di<<s>>tracting, you know, from my butthole. <<if getSlave($AS).prostate > 0>>And I <<s>>till have my pro<<s>>tate which i<<s>> what matter<<s>>.<</if>>
+				<<case "boobs">>
+					I don't mind being clipped. Between that and my boob<<s>> I feel like a ni<<c>>e little <<s>>lave $girl.
+				<</switch>>
+			<<elseif (getSlave($AS).attrKnown == 1) && (getSlave($AS).attrXX > 80)>>
+				I <<s>>ometime<<s>> mi<<ss>> my ball<<s>>. I <<s>>till fanta<<s>>i<<z>>e about boning the other girl<<s>>.
+			<<else>>
+				<<if getSlave($AS).devotion > 75>>
+					I love being your gelded <<s>>lave $girl, <<Master>>.
+				<<else>>
+					To be hone<<s>>t, <<Master>>, I do mi<<ss>> having ball<<s>>, <<s>>ometime<<s>>.
+				<</if>>
+			<</if>>
 		<<else>>
 			<<if getSlave($AS).devotion > 75>>
 				I love being your gelded <<s>>lave $girl, <<Master>>.
@@ -719,67 +726,69 @@ My favorite part of my body i<<s>>
 				To be hone<<s>>t, <<Master>>, I do mi<<ss>> having ball<<s>>, <<s>>ometime<<s>>.
 			<</if>>
 		<</if>>
-	<<else>>
-		<<if getSlave($AS).devotion > 75>>
-			I love being your gelded <<s>>lave $girl, <<Master>>.
+	<<elseif (getSlave($AS).hormoneBalance >= 200)>>
+		<<if (getSlave($AS).fetishKnown == 1)>>
+			<<if (getSlave($AS).energy > 95)>>
+				I <<s>>ometime<<s>> wi<<sh>> I could <<s>>till get hard." $He looks pensive. "Actually, I don't really care, getting fucked i<<s>> ni<<c>>e too.
+			<<elseif (getSlave($AS).fetishStrength > 60)>>
+				<<switch getSlave($AS).fetish>>
+				<<case "submissive">>
+					I don't mind the hormone<<s>> keeping me <<s>>oft. I like getting fucked, anyway.
+				<<case "masochist">>
+					I don't mind the hormone<<s>> keeping me <<s>>oft. I think it encourage<<s>> people to treat me like I de<<s>>erve.
+				<<case "humiliation">>
+					I don't mind being impotent." $He shivers. "Everyone know<<s>>! It'<<s>> <<s>>o embarra<<ss>>ing.
+				<<case "dom">>
+					I wi<<sh>> the hormone<<s>> didn't <<s>>top me from getting hard. It'<<s>> tough to be dominant when I'm all <<s>>oft.
+				<<case "sadist">>
+					I wi<<sh>> the hormone<<s>> didn't <<s>>top me from getting hard. I <<s>>till fanta<<s>>i<<z>>e about raping the other girl<<s>>.
+				<<case "cumslut">>
+					I cum a lot le<<ss>> on the<<s>>e hormone<<s>>. I mi<<ss>>, you know, cleaning up after my<<s>>elf. With my mouth.
+				<<case "buttslut">>
+					I don't mind the hormone<<s>> keeping me <<s>>oft. I prefer taking it, anyway." $He turns and sticks $his ass out. "Up the butt.
+				<<case "boobs">>
+					I don't mind the hormone<<s>> keeping me <<s>>oft. Between that and my boob<<s>> I feel like a cute <<s>>lave girl.
+				<<case "pregnancy">>
+					I wi<<sh>> the hormone<<s>> didn't <<s>>top me from getting hard. I <<s>>till fanta<<s>>i<<z>>e about getting the other girl<<s>> pregnant.
+				<</switch>>
+			<<elseif (getSlave($AS).attrKnown == 1) && (getSlave($AS).attrXX > 80)>>
+				I wi<<sh>> the hormone<<s>> didn't <<s>>top me from getting hard. I <<s>>till fanta<<s>>i<<z>>e about boning the other girl<<s>>.
+			<<else>>
+				<<if getSlave($AS).devotion > 75>>
+					I love you, <<Master>>, <<s>>o I don't mind how the hormone<<s>> I'm on keep me <<s>>oft, if that'<<s>> how you want me.
+				<<else>>
+					I <<s>>ometime<<s>> wi<<sh>> the hormone<<s>> I'm on would let me get hard.
+				<</if>>
+			<</if>>
 		<<else>>
-			To be hone<<s>>t, <<Master>>, I do mi<<ss>> having ball<<s>>, <<s>>ometime<<s>>.
+			<<if getSlave($AS).devotion > 75>>
+				I love you, <<Master>>, <<s>>o I don't mind how the hormone<<s>> I'm on keep me <<s>>oft, if that'<<s>> how you want me.
+			<<else>>
+				I <<s>>ometime<<s>> wi<<sh>> the hormone<<s>> I'm on would let me get hard.
+			<</if>>
 		<</if>>
-	<</if>>
-<<elseif (getSlave($AS).hormoneBalance >= 200)>>
+	<</if>> /* closes balls check */
+<<elseif getSlave($AS).pubertyXX == 0 && (getSlave($AS).ovaries == 1 || getSlave($AS).mpreg == 1)>>
 	<<if (getSlave($AS).fetishKnown == 1)>>
-	<<if (getSlave($AS).energy > 95)>>
-		I <<s>>ometime<<s>> wi<<sh>> I could <<s>>till get hard." $He looks pensive. "Actually, I don't really care, getting fucked i<<s>> ni<<c>>e too.
-	<<elseif (getSlave($AS).fetishStrength > 60)>>
-		<<switch getSlave($AS).fetish>>
-		<<case "submissive">>
-			I don't mind the hormone<<s>> keeping me <<s>>oft. I like getting fucked, anyway.
-		<<case "masochist">>
-			I don't mind the hormone<<s>> keeping me <<s>>oft. I think it encourage<<s>> people to treat me like I de<<s>>erve.
-		<<case "humiliation">>
-			I don't mind being impotent." $He shivers. "Everyone know<<s>>! It'<<s>> <<s>>o embarra<<ss>>ing.
-		<<case "dom">>
-			I wi<<sh>> the hormone<<s>> didn't <<s>>top me from getting hard. It'<<s>> tough to be dominant when I'm all <<s>>oft.
-		<<case "sadist">>
-			I wi<<sh>> the hormone<<s>> didn't <<s>>top me from getting hard. I <<s>>till fanta<<s>>i<<z>>e about raping the other girl<<s>>.
-		<<case "cumslut">>
-			I cum a lot le<<ss>> on the<<s>>e hormone<<s>>. I mi<<ss>>, you know, cleaning up after my<<s>>elf. With my mouth.
-		<<case "buttslut">>
-			I don't mind the hormone<<s>> keeping me <<s>>oft. I prefer taking it, anyway." $He turns and sticks $his ass out. "Up the butt.
-		<<case "boobs">>
-			I don't mind the hormone<<s>> keeping me <<s>>oft. Between that and my boob<<s>> I feel like a cute <<s>>lave girl.
-		<<case "pregnancy">>
-			I wi<<sh>> the hormone<<s>> didn't <<s>>top me from getting hard. I <<s>>till fanta<<s>>i<<z>>e about getting the other girl<<s>> pregnant.
-		<</switch>>
-	<<elseif (getSlave($AS).attrKnown == 1) && (getSlave($AS).attrXX > 80)>>
-		I wi<<sh>> the hormone<<s>> didn't <<s>>top me from getting hard. I <<s>>till fanta<<s>>i<<z>>e about boning the other girl<<s>>.
-	<<else>>
-		<<if getSlave($AS).devotion > 75>>
-			I love you, <<Master>>, <<s>>o I don't mind how the hormone<<s>> I'm on keep me <<s>>oft, if that'<<s>> how you want me.
-		<<else>>
-			I <<s>>ometime<<s>> wi<<sh>> the hormone<<s>> I'm on would let me get hard.
+		<<if (getSlave($AS).fetish == "pregnancy") && (getSlave($AS).fetishStrength > 60)>>
+			I fanta<<s>>i<<z>>e about my belly getting heavy with pregnan<<c>>y and my only wi<<sh>> is that you never let one of my egg<<s>> go to wa<<s>>te.
 		<</if>>
 	<</if>>
-	<<else>>
-		<<if getSlave($AS).devotion > 75>>
-			I love you, <<Master>>, <<s>>o I don't mind how the hormone<<s>> I'm on keep me <<s>>oft, if that'<<s>> how you want me.
-		<<else>>
-			I <<s>>ometime<<s>> wi<<sh>> the hormone<<s>> I'm on would let me get hard.
+<<elseif getSlave($AS).mpreg == 1>>
+	<<if (getSlave($AS).fetishKnown == 1)>>
+		<<if (getSlave($AS).fetish == "pregnancy") && (getSlave($AS).fetishStrength > 0)>>
+			I fanta<<s>>i<<z>>e about my belly getting heavy with pregnan<<c>>y, and I'm <<s>>o glad you made me able to get pregnant!
+			<<if getSlave($AS).preg == -1>>
+				Now if only <<s>>omeone were to forget to give me my contra<<c>>eptive<<s>> before we got to doing it...
+			<</if>>
 		<</if>>
 	<</if>>
-<</if>> /* closes balls check */
 <<elseif getSlave($AS).preg == -1>>
 	<<if (getSlave($AS).fetishKnown == 1)>>
 		<<if (getSlave($AS).fetish == "pregnancy") && (getSlave($AS).fetishStrength > 60)>>
 			I fanta<<s>>i<<z>>e about my belly getting heavy with pregnan<<c>>y, but I know it won't happen while I'm on contra<<c>>eptive<<s>>.
 		<</if>>
 	<</if>>
-<<elseif getSlave($AS).mpreg == 1>>
-	<<if (getSlave($AS).fetishKnown == 1)>>
-		<<if (getSlave($AS).fetish == "pregnancy") && (getSlave($AS).fetishStrength > 0)>>
-			I fanta<<s>>i<<z>>e about my belly getting heavy with pregnancy, and I'm <<s>>o glad you made me able to get pregnant!
-		<</if>>
-	<</if>>
 <</if>> /* closes dick check */
 
 <<if Math.abs(getSlave($AS).hormoneBalance) >= 200>>
diff --git a/src/uncategorized/seWeddingDouble.tw b/src/uncategorized/seWeddingDouble.tw
index 868ace6ab08..e7ac818551e 100644
--- a/src/uncategorized/seWeddingDouble.tw
+++ b/src/uncategorized/seWeddingDouble.tw
@@ -64,6 +64,8 @@
 			<<else>>
 				as close to you as $he could.
 			<</if>>
+		<<else>>
+			as close to you as $he could.
 		<</if>>
 	<<elseif _slave1.devotion < -20 && _slave1.trust > 20>>
 		<<if _slave1.relationship == -1>>
@@ -325,6 +327,8 @@
 			<<else>>
 				as close to you as _he2 could.
 			<</if>>
+		<<else>>
+			as close to you as $he could.
 		<</if>>
 	<<elseif _slave2.devotion < -20 && _slave2.trust > 20>>
 		<<if _slave2.relationship == -1>>
diff --git a/src/uncategorized/seWeddingSingle.tw b/src/uncategorized/seWeddingSingle.tw
index c9d5d186894..912b3ff277b 100644
--- a/src/uncategorized/seWeddingSingle.tw
+++ b/src/uncategorized/seWeddingSingle.tw
@@ -42,6 +42,8 @@ In the days leading up to your wedding, $slaves[_wedS].slaveName spent $his time
 		<<else>>
 			as close to you as $he could.
 		<</if>>
+	<<else>>
+		as close to you as $he could.
 	<</if>>
 <<elseif $slaves[_wedS].devotion < -20 && $slaves[_wedS].trust > 20>>
 	<<if $slaves[_wedS].relationship == -1>>
-- 
GitLab