From 997628c5e87bdf223cd0f34d2be1f94f09e3827c Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Thu, 26 Apr 2018 19:51:47 -0400
Subject: [PATCH] clothing fetish effects

---
 devNotes/VersionChangeLog-Premod+LoliMod.txt |   6 +-
 src/uncategorized/saLongTermEffects.tw       | 200 ++++++++++++-------
 2 files changed, 134 insertions(+), 72 deletions(-)

diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 63d9500c7ac..382778c7070 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,8 +4,12 @@
 
 4/26/2018
 
+	74
+	-fixed an obnoxious bug that worked its way back into walkPast
+	-added clothing-fetish interactions for monokini and naked apron
+
 	73
-	-boduguard once again told to stop fighting herself in the pit
+	-bodyguard once again told to stop fighting herself in the pit
 	-spire apartments now work
 	-fixes
 
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 4df723662bf..52bb1a1fb3e 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -134,17 +134,17 @@
 <<case "no clothing">>
 <<if $slaves[$i].devotion >= -20>>
 	<<if ($slaves[$i].fetish == "humiliation") && ($slaves[$i].fetishKnown == 0)>>
-	She pretends to be embarrassed by her nudity but seems to get off on it. @@.lightcoral;She's into humiliation.@@
-	<<set $slaves[$i].fetishKnown = 1>>
+		She pretends to be embarrassed by her nudity but seems to get off on it. @@.lightcoral;She's into humiliation.@@
+		<<set $slaves[$i].fetishKnown = 1>>
 	<<elseif ($slaves[$i].fetish == "humiliation") && ($slaves[$i].fetishStrength > 60)>>
-	She pretends to be embarrassed by her nudity but @@.hotpink;openly gets off on it.@@
-	<<set $slaves[$i].devotion += 2>>
+		She pretends to be embarrassed by her nudity but @@.hotpink;openly gets off on it.@@
+		<<set $slaves[$i].devotion += 2>>
 	<<elseif ($slaves[$i].fetish == "humiliation")>>
-	She pretends to be embarrassed by her nudity but @@.hotpink;secretly gets off on it.@@
-	<<set $slaves[$i].devotion += 1>>
+		She pretends to be embarrassed by her nudity but @@.hotpink;secretly gets off on it.@@
+		<<set $slaves[$i].devotion += 1>>
 	<<elseif ($slaves[$i].energy > 95)>>
-	Her libido is so strong that she @@.hotpink;enjoys being naked and available.@@
-	<<set $slaves[$i].devotion += 1>>
+		Her libido is so strong that she @@.hotpink;enjoys being naked and available.@@
+		<<set $slaves[$i].devotion += 1>>
 	<</if>>
 <</if>>
 <<case "a penitent nuns habit">>
@@ -155,96 +155,154 @@
 		<<set $slaves[$i].fetishKnown = 1>>
 	<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
 		<<if $fetishChangeChance > random(0,100)>>
-		Her chafed skin makes sex an agonizing prospect. She learns to come in spite of, and then @@.lightcoral;because of the pain.@@
-		<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
+			Her chafed skin makes sex an agonizing prospect. She learns to come in spite of, and then @@.lightcoral;because of the pain.@@
+			<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
 		<</if>>
 	<</if>>
 <<case "uncomfortable straps">>
-	<<if ($slaves[$i].devotion >= -20) && ($slaves[$i].fetish == "masochist")>>
-	The uncomfortable straps she's wearing constantly give her little twinges of pain, @@.hotpink;titillating her.@@
-	<<set $slaves[$i].devotion += 2>>
+	<<if ($slaves[$i].devotion >= -20) && ($slaves[$i].fetish == "masochist") && $slaves[$i].fetishKnown == 1>>
+		The uncomfortable straps she's wearing constantly give her little twinges of pain, @@.hotpink;titillating her.@@
+		<<set $slaves[$i].devotion += 2>>
 	<<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -50)>>
-	The uncomfortable straps she's wearing keep her @@.hotpink;servile@@ and @@.gold;afraid.@@
-	<<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>>
-	<<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>>
-		The straps pinch and constrict her whenever she's used.  She seems to get off on the discomfort; she's a  @@.lightcoral;natural masochist.@@
-		<<set $slaves[$i].fetishKnown = 1>>
-	<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
-		<<if $fetishChangeChance > random(0,100)>>
-		The straps pinch and constrict her whenever she's used.  She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@
-		<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
+		The uncomfortable straps she's wearing keep her @@.hotpink;servile@@ and @@.gold;afraid.@@
+		<<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>>
+		<<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>>
+			The straps pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@
+			<<set $slaves[$i].fetishKnown = 1>>
+		<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
+			<<if $fetishChangeChance > random(0,100)>>
+				The straps pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@
+				<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
+			<</if>>
 		<</if>>
-	<</if>>
 	<<else>>
-	<<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>>
-		Her straps pinch and constrict her whenever she's used.  She seems to get off on the discomfort; she's a  @@.lightcoral;natural masochist.@@
-		<<set $slaves[$i].fetishKnown = 1>>
-	<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
-		<<if $fetishChangeChance > random(0,100)>>
-		Her straps pinch and constrict her whenever she's used.  She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@
-		<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
+		<<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>>
+			Her straps pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@
+			<<set $slaves[$i].fetishKnown = 1>>
+		<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
+			<<if $fetishChangeChance > random(0,100)>>
+				Her straps pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@
+				<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
+			<</if>>
 		<</if>>
 	<</if>>
-	<</if>>
 <<case "chains">>
-	<<if ($slaves[$i].devotion >= -20) && ($slaves[$i].fetish == "masochist")>>
-	The chains she's wearing constantly give her little twinges of pain, @@.hotpink;titillating her.@@
-	<<set $slaves[$i].devotion += 2>>
+	<<if ($slaves[$i].devotion >= -20) && ($slaves[$i].fetish == "masochist") && $slaves[$i].fetishKnown == 1>>
+		The chains she's wearing constantly give her little twinges of pain, @@.hotpink;titillating her.@@
+		<<set $slaves[$i].devotion += 2>>
 	<<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -50)>>
-	The chains she's wearing keep her @@.hotpink;servile@@ and @@.gold;afraid.@@
-	<<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>>
-	<<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>>
-		Her chains pinch and constrict her whenever she's used.  She seems to get off on the discomfort; she's a  @@.lightcoral;natural masochist.@@
-		<<set $slaves[$i].fetishKnown = 1>>
-	<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
-		<<if $fetishChangeChance > random(0,100)>>
-		Her chains pinch and constrict her whenever she's used.  She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@
-		<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
+		The chains she's wearing keep her @@.hotpink;servile@@ and @@.gold;afraid.@@
+		<<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>>
+		<<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>>
+			Her chains pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@
+			<<set $slaves[$i].fetishKnown = 1>>
+		<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
+			<<if $fetishChangeChance > random(0,100)>>
+				Her chains pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@
+				<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
+			<</if>>
 		<</if>>
-	<</if>>
 	<<else>>
-	<<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>>
-		Her chains pinch and constrict her whenever she's used.  She seems to get off on the discomfort; she's a  @@.lightcoral;natural masochist.@@
-		<<set $slaves[$i].fetishKnown = 1>>
-	<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
-		<<if $fetishChangeChance > random(0,100)>>
-		Her chains pinch and constrict her whenever she's used.  She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@
-		<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
+		<<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>>
+			Her chains pinch and constrict her whenever she's used.  She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@
+			<<set $slaves[$i].fetishKnown = 1>>
+		<<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>>
+			<<if $fetishChangeChance > random(0,100)>>
+				Her chains pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@
+				<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
+			<</if>>
 		<</if>>
 	<</if>>
-	<</if>>
 <<case "restrictive latex">>
 	<<if ($slaves[$i].devotion >= 20) && ($slaves[$i].trust >= -50) && ($slaves[$i].fetish == "submissive")>>
-	<<if ($slaves[$i].fetishStrength > 60)>>
-	As a submissive she @@.hotpink;openly enjoys being immured in latex.@@
-	<<set $slaves[$i].devotion += 2>>
-	<<else>>
-	Her submissive tendencies help her @@.hotpink;enjoy being immured in latex.@@
-	<<set $slaves[$i].devotion += 1>>
-	<</if>>
+		<<if $slaves[$i].fetishKnown == 0>>
+			The latex she's wearing limits her world to your input and control. She seems to get off on the lack of control; she's a @@.lightcoral;total submissive.@@
+			<<set $slaves[$i].fetishKnown = 1>>
+		<<elseif ($slaves[$i].fetishStrength > 60)>>
+			As a submissive she @@.hotpink;openly enjoys being immured in latex.@@
+			<<set $slaves[$i].devotion += 2>>
+		<<else>>
+			Her submissive tendencies help her @@.hotpink;enjoy being immured in latex.@@
+			<<set $slaves[$i].devotion += 1>>
+		<</if>>
 	<<elseif ($slaves[$i].devotion < -20)>>
-	The latex she's wearing limits her world to @@.hotpink;your input and control@@ and @@.gold;fear@@ of unexpected pain.
-	<<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>>
+		The latex she's wearing limits her world to @@.hotpink;your input and control@@ and @@.gold;fear@@ of unexpected pain.
+		<<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>>
 	<</if>>
 <<case "shibari ropes">>
 	<<if ($slaves[$i].devotion >= 20) && ($slaves[$i].trust >= -50) && ($slaves[$i].fetish == "submissive")>>
-	<<if ($slaves[$i].fetishStrength > 60)>>
-	As a submissive she @@.hotpink;openly enjoys wearing binding ropes as clothing.@@
-	<<set $slaves[$i].devotion += 2>>
-	<<else>>
-	Her submissive tendencies help her @@.hotpink;enjoy wearing binding ropes as clothing.@@
-	<<set $slaves[$i].devotion += 1>>
-	<</if>>
+		<<if $slaves[$i].fetishKnown == 0>>
+			The ropes she's wearing restrict her and leave her completely helpless. She seems to get off on the lack of control; she's a @@.lightcoral;natural submissive.@@
+			<<set $slaves[$i].fetishKnown = 1>>
+		<<elseif ($slaves[$i].fetishStrength > 60)>>
+			As a submissive she @@.hotpink;openly enjoys wearing binding ropes as clothing.@@
+			<<set $slaves[$i].devotion += 2>>
+		<<else>>
+			Her submissive tendencies help her @@.hotpink;enjoy wearing binding ropes as clothing.@@
+			<<set $slaves[$i].devotion += 1>>
+		<</if>>
 	<<elseif ($slaves[$i].devotion < -20)>>
-	The ropes she's wearing restrict her without pain, rendering her @@.hotpink;susceptible to control@@ and @@.gold;afraid.@@
-	<<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>>
+		The ropes she's wearing restrict her without pain, rendering her @@.hotpink;susceptible to control@@ and @@.gold;afraid.@@
+		<<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>>
+	<</if>>
+<<case "an apron">>
+	<<if $slaves[$i].fetish == "submissive">>
+		<<if ($slaves[$i].fetishKnown == 0)>>
+			She pretends to be embarrassed by wearing nothing but an apron, but seems to get off on how it invites other to take control and use her. @@.lightcoral;She's a natural submissive.@@
+			<<set $slaves[$i].fetishKnown = 1>>
+		<<else>>
+			She pretends to be embarrassed by wearing nothing but an apron but @@.hotpink;secretly gets off@@ on how it invites men to bend her over and put her in her place.
+			<<set $slaves[$i].devotion += 1>>
+		<</if>>
+	<<elseif $slaves[$i].fetish == "humiliation">>
+		<<if ($slaves[$i].fetishKnown == 0)>>
+			She pretends to be embarrassed by her extremely revealing clothing but seems to get off on it. @@.lightcoral;She's into humiliation.@@
+			<<set $slaves[$i].fetishKnown = 1>>
+		<<elseif ($slaves[$i].fetishStrength > 60)>>
+			She pretends to be embarrassed by her extremely revealing clothing but @@.hotpink;openly gets off on it.@@
+			<<set $slaves[$i].devotion += 2>>
+		<<else>>
+			She pretends to be embarrassed by her extremely revealing clothing but @@.hotpink;secretly gets off on it.@@
+			<<set $slaves[$i].devotion += 1>>
+		<</if>>
+	<<elseif $slaves[$i].fetish == "pregnancy" && ($slaves[$i].bellyPreg >= 1500 || $slaves[$i].bellyImplant >= 1500)>>
+		<<if ($slaves[$i].fetishKnown == 0)>>
+			She pretends to be embarrassed over only having an apron to cover her gravid swell but seems to get off on it. @@.lightcoral;She's a pregnancy fetishist.@@
+			<<set $slaves[$i].fetishKnown = 1>>
+		<<elseif ($slaves[$i].fetishStrength > 60)>>
+			She @@.hotpink;openly gets off@@ from how motherly she looks wearing nothing but an apron over her <<if $slaves[$i].bellyPreg > 100>>increasingly <</if>>gravid frame.
+			<<set $slaves[$i].devotion += 2>>
+		<<else>>
+			She @@.hotpink;secretly gets off@@ from how motherly she feels wearing nothing but an apron over her <<if $slaves[$i].bellyPreg > 100>>increasingly <</if>>gravid frame.
+			<<set $slaves[$i].devotion += 1>>
+		<</if>>
+	<<elseif ($slaves[$i].devotion <= 20)>>
+		She is @@.mediumorchid;inappropriately proud@@ of the nice clothes she's wearing, @@.mediumaquamarine;building her confidence.@@
+		<<set $slaves[$i].devotion -= 5, $slaves[$i].trust += 3>>
+	<<else>>
+		She is @@.hotpink;proud@@ and @@.mediumaquamarine;confident@@ of the nice clothes she's wearing.
+		<<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
 	<</if>>
 <<default>>
 	<<if ($slaves[$i].devotion <= 20)>>
 		She is @@.mediumorchid;inappropriately proud@@ of the nice clothes she's wearing, @@.mediumaquamarine;building her confidence.@@
 		<<set $slaves[$i].devotion -= 5, $slaves[$i].trust += 3>>
+	<<elseif $slaves[$i].fetish == "boobs" && $slaves[$i].clothes == "a monokini">>
+		<<if ($slaves[$i].fetishKnown == 0)>>
+			She pretends to be embarrassed by how her monokini draws attention to her breasts but @@.hotpink;seems to get off on it.@@
+			<<set $slaves[$i].devotion += 1>>
+		<<elseif ($slaves[$i].fetishStrength > 60)>>
+			She pretends to be embarrassed by her clearly exposed breasts but @@.hotpink;openly gets off on it.@@
+			<<set $slaves[$i].devotion += 2>>
+		<<else>>
+			She pretends to be embarrassed by her clearly exposed breasts but @@.hotpink;secretly gets off on it.@@
+			<<set $slaves[$i].devotion += 1>>
+		<</if>>
 	<<elseif $slaves[$i].fetish == "humiliation" && ($slaves[$i].clothes == "a string bikini" || $slaves[$i].clothes == "clubslut netting")>>
-		<<if ($slaves[$i].fetishStrength > 60)>>
+		<<if ($slaves[$i].fetishKnown == 0)>>
+			She pretends to be embarrassed by her extremely revealing clothing but seems to get off on it. @@.lightcoral;She's into humiliation.@@
+			<<set $slaves[$i].fetishKnown = 1>>
+		<<elseif ($slaves[$i].fetishStrength > 60)>>
 			She pretends to be embarrassed by her extremely revealing clothing but @@.hotpink;openly gets off on it.@@
 			<<set $slaves[$i].devotion += 2>>
 		<<else>>
-- 
GitLab