Updates to ThoughtDefs

Defs/PreceptDefs/PreceptDef_Exhibitionism.xml

@@ -12,7 +12,7 @@
 		<defName>Exhibitionism_Disapproved</defName>
 		<issue>Exhibitionism</issue>
 		<label>disapproved</label>
-		<description>Being seen having sex is shameful.</description>
+		<description>Being seen having sex is shameful, and embarrassing to witness.</description>
 		<impact>Low</impact>
 		<displayOrderInIssue>30</displayOrderInIssue>
 		<displayOrderInImpact>1000</displayOrderInImpact>
@@ -23,7 +23,7 @@
 		<defName>Exhibitionism_Acceptable</defName>
 		<issue>Exhibitionism</issue>
 		<label>acceptable</label>
-		<description>Having sex out in the open is normal and deserves no special attention.</description>
+		<description>Sex between contenting individuals draws no special attention.</description>
 		<impact>Low</impact>
 		<displayOrderInIssue>20</displayOrderInIssue>
 		<displayOrderInImpact>1000</displayOrderInImpact>
@@ -34,7 +34,7 @@
 		<defName>Exhibitionism_Approved</defName>
 		<issue>Exhibitionism</issue>
 		<label>approved</label>
-		<description>Displays of physical intimacy are to be celebrated.</description>
+		<description>Displays of physical intimacy bring a smile and knowing wink to those who see it.</description>
 		<impact>Medium</impact>
 		<displayOrderInIssue>10</displayOrderInIssue>
 		<displayOrderInImpact>1000</displayOrderInImpact>

Defs/PreceptDefs/PreceptDef_Infidelity.xml

@@ -12,7 +12,7 @@
 		<defName>Infidelity_Heartbreaking</defName>
 		<issue>Infidelity</issue>
 		<label>heartbreaking</label>
-		<description>Infidelity is a betrayal that will not soon be forgiven or forgotten.</description>
+		<description>Infidelity is a betrayal that will not soon be forgiven, or forgotten.</description>
 		<impact>Low</impact>
 		<displayOrderInIssue>30</displayOrderInIssue>
 		<displayOrderInImpact>1000</displayOrderInImpact>
@@ -34,7 +34,7 @@
 		<defName>Infidelity_Acceptable</defName>
 		<issue>Infidelity</issue>
 		<label>acceptable</label>
-		<description>Physical intimacy is something that should be explored freely with others.</description>
+		<description>Physical intimacy is something to be explored freely, including outside the confines of a relationship.</description>
 		<impact>Low</impact>
 		<displayOrderInIssue>10</displayOrderInIssue>
 		<displayOrderInImpact>1000</displayOrderInImpact>

Defs/PreceptDefs/PreceptDef_MasturbationExtension.xml

@@ -5,7 +5,7 @@
 		<defName>Masturbation_Acceptable</defName>
 		<issue>Masturbation</issue>
 		<label>acceptable</label>
-		<description>Masturbation is a normal, healthy activity.</description>
+		<description>Open masturbation is an ordinary activity that deserves no notice.</description>
 		<impact>Low</impact>
 		<displayOrderInIssue>10</displayOrderInIssue>
 		<displayOrderInImpact>1000</displayOrderInImpact>

Defs/SexActReactionDefs.xml

@@ -7,13 +7,19 @@
 		<issueDefName>Necrophilia</issueDefName>
 		<sexActCheck>SexActIsNecrophilia</sexActCheck>
 		<pawnReaction>
-			<defaultThoughtDef>PartookInNecrophilia_Disapproved</defaultThoughtDef>
+			<defaultThoughtDef>PartookInExhibitionism_Disapproved</defaultThoughtDef>
 			<replacementThoughts>
 				<li>
-					<requiredTraits>
+					<requiredPreceptDef>Exhibitionism_Acceptable</requiredPreceptDef>
-						<li>Necrophiliac</li>
+					<replacementThoughtDef>PartookInExhibitionism_Acceptable</replacementThoughtDef>
-					</requiredTraits>
+				</li>
-					<replacementThoughtDef>PartookInNecrophilia_Honorable</replacementThoughtDef>
+				<li>
+					<requiredPreceptDef>Exhibitionism_Approved</requiredPreceptDef>
+					<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
+				</li>			
+				<li>
+					<requiredQuirk>Exhibitionist</requiredQuirk>
+					<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
 				</li>
 			</replacementThoughts>
 		</pawnReaction>
@@ -42,13 +48,19 @@
 		<issueDefName>Bestiality</issueDefName>
 		<sexActCheck>SexActIsBestiality</sexActCheck>
 		<pawnReaction>
-			<defaultThoughtDef>PartookInBestiality_Disapproved</defaultThoughtDef>
+			<defaultThoughtDef>PartookInExhibitionism_Disapproved</defaultThoughtDef>
 			<replacementThoughts>
 				<li>
-					<requiredTraits>
+					<requiredPreceptDef>Exhibitionism_Acceptable</requiredPreceptDef>
-						<li>Zoophile</li>
+					<replacementThoughtDef>PartookInExhibitionism_Acceptable</replacementThoughtDef>
-					</requiredTraits>
+				</li>
-					<replacementThoughtDef>PartookInBestiality_Honorable</replacementThoughtDef>
+				<li>
+					<requiredPreceptDef>Exhibitionism_Approved</requiredPreceptDef>
+					<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
+				</li>			
+				<li>
+					<requiredQuirk>Exhibitionist</requiredQuirk>
+					<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
 				</li>
 			</replacementThoughts>
 		</pawnReaction>
@@ -77,13 +89,19 @@
 		<issueDefName>Rape</issueDefName>
 		<sexActCheck>SexActIsRape</sexActCheck>
 		<pawnReaction>
-			<defaultThoughtDef>PartookInRape_Disapproved</defaultThoughtDef>
+			<defaultThoughtDef>PartookInExhibitionism_Disapproved</defaultThoughtDef>
 			<replacementThoughts>
 				<li>
-					<requiredTraits>
+					<requiredPreceptDef>Exhibitionism_Acceptable</requiredPreceptDef>
-						<li>Rapist</li>
+					<replacementThoughtDef>PartookInExhibitionism_Acceptable</replacementThoughtDef>
-					</requiredTraits>
+				</li>
-					<replacementThoughtDef>PartookInRape_Honorable</replacementThoughtDef>
+				<li>
+					<requiredPreceptDef>Exhibitionism_Approved</requiredPreceptDef>
+					<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
+				</li>			
+				<li>
+					<requiredQuirk>Exhibitionist</requiredQuirk>
+					<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
 				</li>
 			</replacementThoughts>
 		</pawnReaction>
@@ -112,7 +130,18 @@
 		<issueDefName>Infidelity</issueDefName>
 		<sexActCheck>SexActIsInfidelity</sexActCheck>
 		<pawnReaction>
-			<defaultThoughtDef>PartookInInfidelity_Disapproved</defaultThoughtDef>
+			<defaultThoughtDef>PartookInInfidelity_Heartbreaking</defaultThoughtDef>
+			<preceptThoughtDefs>
+				<li>PartookInInfidelity_Heartbreaking</li>
+				<li>PartookInInfidelity_Disapproved</li>
+				<li>PartookInInfidelity_Acceptable</li>
+			</preceptThoughtDefs>
+			<replacementThoughts>
+				<li>
+					<requiredQuirk>Cuckolder</requiredQuirk>
+					<replacementThoughtDef>PartookInInfidelity_Approved</replacementThoughtDef>
+				</li>
+			</replacementThoughts>
 		</pawnReaction>
 		<witnessReaction>
 			<defaultThoughtDef>SawInfidelity_Heartbreaking</defaultThoughtDef>
@@ -135,19 +164,69 @@
 		<issueDefName>HAR_AlienDating</issueDefName>
 		<sexActCheck>SexActIsRape</sexActCheck>
 		<pawnReaction>
-			<defaultThoughtDef>PartookInHAR_AlienDating_Acceptable</defaultThoughtDef>
+			<defaultThoughtDef>PartookInExhibitionism_Disapproved</defaultThoughtDef>
+			<replacementThoughts>
+				<li>
+					<requiredPreceptDef>Exhibitionism_Acceptable</requiredPreceptDef>
+					<replacementThoughtDef>PartookInExhibitionism_Acceptable</replacementThoughtDef>
+				</li>
+				<li>
+					<requiredPreceptDef>Exhibitionism_Approved</requiredPreceptDef>
+					<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
+				</li>			
+				<li>
+					<requiredQuirk>Exhibitionist</requiredQuirk>
+					<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
+				</li>
+			</replacementThoughts>
+		</pawnReaction>
+		<witnessReaction>
+			<defaultThoughtDef>SawExhibitionism_Disapproved</defaultThoughtDef>
+			<preceptThoughtDefs>
+				<li>SawHAR_AlienDating_Prohibited</li>
+				<li>SawHAR_AlienDating_Horrible</li>
+			</preceptThoughtDefs>
 			<replacementThoughts>
 				<li>
 					<requiredTraits>
 						<Xenophobia>1</Xenophobia>
 					</requiredTraits>
-					<replacementThoughtDef>PartookInHAR_AlienDating_Prohibited</replacementThoughtDef>
+					<replacementThoughtDef>SawHAR_AlienDating_Prohibited</replacementThoughtDef>
 				</li>
 				<li>
-					<requiredTraits>
+					<requiredPreceptDef>Exhibitionism_Disapproved</requiredPreceptDef>
-						<Xenophobia>-1</Xenophobia>
+					<replacementThoughtDef>SawExhibitionism_Disapproved</replacementThoughtDef>
-					</requiredTraits>
+				</li>
-					<replacementThoughtDef>PartookInHAR_AlienDating_Know_Honorable</replacementThoughtDef>
+				<li>
+					<requiredPreceptDef>Exhibitionism_Acceptable</requiredPreceptDef>
+					<replacementThoughtDef>SawExhibitionism_Acceptable</replacementThoughtDef>
+				</li>
+				<li>
+					<requiredPreceptDef>Exhibitionism_Approved</requiredPreceptDef>
+					<replacementThoughtDef>SawExhibitionism_Approved</replacementThoughtDef>
+				</li>
+			</replacementThoughts>
+		</witnessReaction>
+	</Privacy_Please.SexActReactionDef>
+	
+	<!--<Privacy_Please.SexActReactionDef>	
+		<defName>reactionToXenophilia</defName>
+		<issueDefName>HAR_AlienDating</issueDefName>
+		<sexActCheck>SexActIsRape</sexActCheck>
+		<pawnReaction>
+			<defaultThoughtDef>PartookInExhibitionism_Disapproved</defaultThoughtDef>
+			<replacementThoughts>
+				<li>
+					<preceptThoughtDefs>Exhibitionism_Approved</preceptThoughtDefs>
+					<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
+				</li>
+				<li>
+					<preceptThoughtDefs>Exhibitionism_Acceptable</preceptThoughtDefs>
+					<replacementThoughtDef>PartookInExhibitionism_Acceptable</replacementThoughtDef>
+				</li>
+				<li>
+					<requiredQuirk>Exhibitionist</requiredQuirk>
+					<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
 				</li>
 			</replacementThoughts>
 		</pawnReaction>
@@ -175,31 +254,26 @@
 				</li>
 			</replacementThoughts>
 		</witnessReaction>
-	</Privacy_Please.SexActReactionDef>
+	</Privacy_Please.SexActReactionDef>-->
 
 	<Privacy_Please.SexActReactionDef>	
 		<defName>reactionToMasturbation</defName>
 		<issueDefName>Masturbation</issueDefName>
 		<sexActCheck>SexActIsMasturbation</sexActCheck>
 		<pawnReaction>
-			<defaultThoughtDef>PartookInMasturbation_Disapproved</defaultThoughtDef>
+			<defaultThoughtDef>PartookInExhibitionism_Disapproved</defaultThoughtDef>
-			<preceptThoughtDefs>
-				<li>PartookInMasturbation_Abhorrent</li>
-				<li>PartookInMasturbation_Disapproved</li>
-				<li>PartookInMasturbation_Acceptable</li>
-			</preceptThoughtDefs>
 			<replacementThoughts>
 				<li>
-					<preceptThoughtDefs>Exhibitionism_Approved</preceptThoughtDefs>
+					<requiredPreceptDef>Exhibitionism_Acceptable</requiredPreceptDef>
-					<replacementThoughtDef>PartookInMasturbation_Exhibitionism_Approved</replacementThoughtDef>
+					<replacementThoughtDef>PartookInExhibitionism_Acceptable</replacementThoughtDef>
 				</li>
 				<li>
-					<preceptThoughtDefs>Exhibitionism_Acceptable</preceptThoughtDefs>
+					<requiredPreceptDef>Exhibitionism_Approved</requiredPreceptDef>
-					<replacementThoughtDef>PartookInMasturbation_Exhibitionism_Acceptable</replacementThoughtDef>
+					<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
-				</li>
+				</li>			
 				<li>
 					<requiredQuirk>Exhibitionist</requiredQuirk>
-					<replacementThoughtDef>PartookInMasturbation_Approved</replacementThoughtDef>
+					<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
 				</li>
 			</replacementThoughts>
 		</pawnReaction>

Defs/ThoughtDefs/ThoughtDefsBeastiality.xml

@@ -10,7 +10,7 @@
 		<stages>
 		  <li>
 			<label>horrified by bestiality</label>
-			<description>How could that violate that poor animal like that?!</description>
+			<description>How could they just... violate... that poor animal like that?</description>
 			<baseMoodEffect>-20</baseMoodEffect>
 		  </li>
 		</stages>
@@ -28,7 +28,7 @@
 		<stages>
 		  <li>
 			<label>disturbed by bestiality</label>
-			<description>Get away from that poor creature!</description>
+			<description>Hey, leave that poor thing alone!</description>
 			<baseMoodEffect>-15</baseMoodEffect>
 		  </li>
 		</stages>
@@ -45,8 +45,8 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>witnessed bestiality</label>
+			<label>upset about bestiality</label>
-			<description>Ew. Just. Ew.</description>
+			<description>That was animal abuse, plain and simple.</description>
 			<baseMoodEffect>-10</baseMoodEffect>
 		  </li>
 		</stages>
@@ -63,9 +63,9 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>saw bestiality</label>
+			<label>witnessed bestiality</label>
-			<description>Um, does your 'friend' want some kibble?</description>
+			<description>That didn't look entirely comfortable.</description>
-			<baseMoodEffect>-4</baseMoodEffect>
+			<baseMoodEffect>-5</baseMoodEffect>
 		  </li>
 		</stages>
 		<nullifyingTraits>
@@ -81,8 +81,8 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>observed bestiality</label>
+			<label>approved of bestiality</label>
-			<description>The bond between us and our animals is strong.</description>
+			<description>The bond between us and our animals makes us strong.</description>
 			<baseMoodEffect>+2</baseMoodEffect>
 		  </li>
 		</stages>

Defs/ThoughtDefs/ThoughtDefsExhibitionism.xml

@@ -7,11 +7,10 @@
 		<thoughtClass>Thought_Memory</thoughtClass>
 		<durationDays>1.0</durationDays>
 		<stackLimit>1</stackLimit>
-		<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
 		<stages>
 			<li>
-				<label>caught lovin'</label>
+				<label>accidental exhibitionist</label>
-				<description>That was soooo awkward!</description>
+				<description>Well, that was awkward...</description>
 				<baseMoodEffect>-8</baseMoodEffect>
 			</li>
 		</stages>
@@ -23,10 +22,9 @@
 		<thoughtClass>Thought_Memory</thoughtClass>
 		<durationDays>1.0</durationDays>
 		<stackLimit>1</stackLimit>
-		<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
 		<stages>
 			<li>
-				<label>caught lovin'</label>
+				<label>uncaring exhibitionist</label>
 				<description>Eh, it's no big deal.</description>
 				<baseMoodEffect>0</baseMoodEffect>
 			</li>
@@ -39,12 +37,11 @@
 		<thoughtClass>Thought_Memory</thoughtClass>
 		<durationDays>1.0</durationDays>
 		<stackLimit>1</stackLimit>
-		<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
 		<stages>
 			<li>
-				<label>exhibitionist caught lovin'</label>
+				<label>excited by exhibitionism</label>
-				<description>Mmm, enjoying the show?</description>
+				<description>Heh, hope they enjoyed the show!</description>
-				<baseMoodEffect>6</baseMoodEffect>
+				<baseMoodEffect>4</baseMoodEffect>
 			</li>
 		</stages>
 		<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
@@ -56,10 +53,9 @@
 		<thoughtClass>Thought_Memory</thoughtClass>
 		<durationDays>1.0</durationDays>
 		<stackLimit>1</stackLimit>
-		<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
 		<stages>
 			<li>
-				<label>walked in on some lovin'</label>
+				<label>accidental voyeur</label>
 				<description>Jeez! Get a room!</description>
 				<baseMoodEffect>-4</baseMoodEffect>
 			</li>
@@ -72,10 +68,9 @@
 		<thoughtClass>Thought_Memory</thoughtClass>
 		<durationDays>1.0</durationDays>
 		<stackLimit>1</stackLimit>
-		<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
 		<stages>
 			<li>
-				<label>passed by some lovin'</label>
+				<label>unfazed voyeur</label>
 				<description>Don't mind me, just passing through.</description>
 				<baseMoodEffect>0</baseMoodEffect>
 			</li>
@@ -88,12 +83,11 @@
 		<thoughtClass>Thought_Memory</thoughtClass>
 		<durationDays>1.0</durationDays>
 		<stackLimit>1</stackLimit>
-		<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
 		<stages>
 			<li>
-				<label>observed some lovin'</label>
+				<label>excited by voyeurism</label>
-				<description>Damn, that's hot!</description>
+				<description>Damn, that was hot!</description>
-				<baseMoodEffect>3</baseMoodEffect>
+				<baseMoodEffect>2</baseMoodEffect>
 			</li>
 		</stages>
 		<reactionToSexDiscovery>Approval</reactionToSexDiscovery>

Defs/ThoughtDefs/ThoughtDefsInfidelity.xml

@@ -10,7 +10,7 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>Caught cheating</label>
+			<label>caught cheating</label>
 			<description>{1}, I'm so sorry. Please, forgive me...</description>
 			<baseMoodEffect>-20</baseMoodEffect>
 		  </li>
@@ -25,8 +25,8 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>Caught cheating</label>
+			<label>caught cheating</label>
-			<description>Sorry, {1}. Please don't be too mad?</description>
+			<description>Um, sorry, {1}. Please don't be too mad?</description>
 			<baseMoodEffect>-10</baseMoodEffect>
 		  </li>
 		</stages>
@@ -40,9 +40,9 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>Caught cheating</label>
+			<label>caught lovin' by partner</label>
-			<description></description>
+			<description>Oh hey babe, you wanna join us?</description>
-			<baseMoodEffect>Oh hey babe, you wanna join us?</baseMoodEffect>
+			<baseMoodEffect>0</baseMoodEffect>
 		  </li>
 		</stages>
 		<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
@@ -55,9 +55,9 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>Cluckold</label>
+			<label>caught lovin' by partner</label>
-			<description></description>
+			<description>Heheh, I'm quite the slut, aren't I?</description>
-			<baseMoodEffect></baseMoodEffect>
+			<baseMoodEffect>5</baseMoodEffect>
 		  </li>
 		</stages>
 		<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
@@ -71,8 +71,8 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label></label>
+			<label>caught partner cheating</label>
-			<description>Filthy degenerates!</description>
+			<description>{1}! How could you do this to me?!</description>
 			<baseMoodEffect>-20</baseMoodEffect>
 		  </li>
 		</stages>
@@ -86,8 +86,8 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label></label>
+			<label>caught partner cheating</label>
-			<description></description>
+			<description>Damn it, {1}! Aren't I enough for you?</description>
 			<baseMoodEffect>-10</baseMoodEffect>
 		  </li>
 		</stages>
@@ -101,9 +101,9 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label></label>
+			<label>caught partner lovin'</label>
-			<description></description>
+			<description>Hey babe, save some of that energy for me later, OK?</description>
-			<baseMoodEffect>-5</baseMoodEffect>
+			<baseMoodEffect>0</baseMoodEffect>
 		  </li>
 		</stages>
 		<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
@@ -116,9 +116,9 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label></label>
+			<label>caught partner lovin'</label>
-			<description></description>
+			<description>Oh, {1}, you wicked thing! I'm gunna have to punish you for this later...</description>
-			<baseMoodEffect></baseMoodEffect>
+			<baseMoodEffect>5</baseMoodEffect>
 		  </li>
 		</stages>
 		<reactionToSexDiscovery>Approval</reactionToSexDiscovery>

Defs/ThoughtDefs/ThoughtDefsMasturbation.xml

@@ -2,71 +2,6 @@
 
 <Defs>
 
-	<!-- Pawn thoughts -->
-	<Privacy_Please.SexActThoughtDef>
-		<defName>PartookInMasturbation_Abhorrent</defName>
-		<durationDays>3</durationDays>
-		<stackLimit>3</stackLimit>
-		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
-		<stages>
-			<li>
-				<label>caught masturbatin'</label>
-				<description>I'm disgusted with myself.</description>
-				<baseMoodEffect>-15</baseMoodEffect>
-			</li>
-		</stages>		
-		<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
-	</Privacy_Please.SexActThoughtDef>
-
-	<Privacy_Please.SexActThoughtDef>
-		<defName>PartookInMasturbation_Disapproved</defName>
-		<thoughtClass>Thought_Memory</thoughtClass>
-		<durationDays>1.0</durationDays>
-		<stackLimit>1</stackLimit>
-		<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
-		<stages>
-			<li>
-				<label>caught masturbatin'</label>
-				<description>I feel nothing but shame.</description>
-				<baseMoodEffect>-5</baseMoodEffect>
-			</li>
-		</stages>
-		<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
-	</Privacy_Please.SexActThoughtDef>
-	
-	<Privacy_Please.SexActThoughtDef>
-		<defName>PartookInMasturbation_Acceptable</defName>
-		<thoughtClass>Thought_Memory</thoughtClass>
-		<durationDays>1.0</durationDays>
-		<stackLimit>1</stackLimit>
-		<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
-		<stages>
-			<li>
-				<label>caught masturbatin'</label>
-				<description>That was a little humiliating.</description>
-				<baseMoodEffect>-5</baseMoodEffect>
-			</li>
-		</stages>
-		<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
-	</Privacy_Please.SexActThoughtDef>
-	
-	<Privacy_Please.SexActThoughtDef>
-		<defName>PartookInMasturbation_Approved</defName>
-		<thoughtClass>Thought_Memory</thoughtClass>
-		<durationDays>1.0</durationDays>
-		<stackLimit>1</stackLimit>
-		<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
-		<stages>
-			<li>
-				<label>exhibitionist caught masturbatin'</label>
-				<description>Come closer, that a good look!</description>
-				<baseMoodEffect>-5</baseMoodEffect>
-			</li>
-		</stages>
-		<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
-	</Privacy_Please.SexActThoughtDef>
-
-	<!-- Witness thoughts -->
 	<Privacy_Please.SexActThoughtDef>
 		<defName>SawMasturbation_Abhorrent</defName>
 		<durationDays>3</durationDays>
@@ -74,9 +9,9 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>disgusted by masturbatin'</label>
+			<label>disgusted by masturbaton</label>
 			<description>You'll go blind if up keep that up!</description>
-			<baseMoodEffect>-15</baseMoodEffect>
+			<baseMoodEffect>-10</baseMoodEffect>
 		  </li>
 		</stages>		
 		<reactionToSexDiscovery>Outrage</reactionToSexDiscovery>
@@ -87,12 +22,11 @@
 		<thoughtClass>Thought_Memory</thoughtClass>
 		<durationDays>3</durationDays>
 		<stackLimit>3</stackLimit>
-		<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
 		<stages>
 			<li>
-				<label>shocked by masturbatin'</label>
+				<label>shocked by masturbation</label>
-				<description>Argh! I'm so sorry!</description>
+				<description>Argh! I'm SO sorry!</description>
-				<baseMoodEffect>-10</baseMoodEffect>
+				<baseMoodEffect>-5</baseMoodEffect>
 			</li>
 		</stages>
 		<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
@@ -103,12 +37,11 @@
 		<thoughtClass>Thought_Memory</thoughtClass>
 		<durationDays>1</durationDays>
 		<stackLimit>1</stackLimit>
-		<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
 		<stages>
 			<li>
 				<label>saw someone masturbatin'</label>
-				<description>Well, that was embarrassing.</description>
+				<description>They better clean up after themselves.</description>
-				<baseMoodEffect>-5</baseMoodEffect>
+				<baseMoodEffect>0</baseMoodEffect>
 			</li>
 		</stages>
 		<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
@@ -119,11 +52,10 @@
 		<thoughtClass>Thought_Memory</thoughtClass>
 		<durationDays>1</durationDays>
 		<stackLimit>1</stackLimit>
-		<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
 		<stages>
 			<li>
-				<label>voyeur saw masturbatin'</label>
+				<label>saw someone masturbatin'</label>
-				<description>I think that awoke something in me...</description>
+				<description>Mmmm, so hot...</description>
 				<baseMoodEffect>3</baseMoodEffect>
 			</li>
 		</stages>

Defs/ThoughtDefs/ThoughtDefsNecrophilia.xml

@@ -28,7 +28,7 @@
 		<stages>
 		  <li>
 			<label>disturbed by necrophilia</label>
-			<description>What were they thinking?!</description>
+			<description>Urgh, so gross! Just what were they thinking?</description>
 			<baseMoodEffect>-15</baseMoodEffect>
 		  </li>
 		</stages>
@@ -45,8 +45,8 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>witnessed necrophilia</label>
+			<label>upset about necrophilia</label>
-			<description>Even the dead get no rest here.</description>
+			<description>Even the dead get no rest here...</description>
 			<baseMoodEffect>-10</baseMoodEffect>
 		  </li>
 		</stages>
@@ -63,9 +63,9 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>saw necrophilia</label>
+			<label>witnessed necrophilia</label>
-			<description>I just hope they bury it when they're done.</description>
+			<description>They better bury what's left when they're done.</description>
-			<baseMoodEffect>-4</baseMoodEffect>
+			<baseMoodEffect>-5</baseMoodEffect>
 		  </li>		  
 		</stages>
 		<nullifyingTraits>
@@ -81,7 +81,7 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>observed necrophilia</label>
+			<label>approved of necrophilia</label>
 			<description>Passion transcends the grave.</description>
 			<baseMoodEffect>+2</baseMoodEffect>
 		  </li>

Defs/ThoughtDefs/ThoughtDefsRape.xml

@@ -10,7 +10,7 @@
 		<stages>
 		  <li>
 			<label>horrified by rape</label>
-			<description>Someone please help that poor soul!</description>
+			<description>Oh God... This can't really be happening...</description>
 			<baseMoodEffect>-20</baseMoodEffect>
 		  </li>
 		</stages>
@@ -28,7 +28,7 @@
 		<stages>
 		  <li>
 			<label>disturbed by rape</label>
-			<description>I feel all shaky.</description>
+			<description>How... how could they just violate someone like that?</description>
 			<baseMoodEffect>-15</baseMoodEffect>
 		  </li>
 		</stages>
@@ -45,8 +45,8 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>witnessed rape</label>
+			<label>upset by rape</label>
-			<description>Is this what life is going to be like here?</description>
+			<description>Is this really what life is going to be like here?</description>
 			<baseMoodEffect>-10</baseMoodEffect>
 		  </li>
 		</stages>
@@ -63,9 +63,9 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>saw rape</label>
+			<label>witnessed rape</label>
-			<description>Ah. Um, carry on...</description>
+			<description>Oh. Um. Carry on?</description>
-			<baseMoodEffect>-4</baseMoodEffect>
+			<baseMoodEffect>-5</baseMoodEffect>
 		  </li>
 		</stages>
 		<nullifyingTraits>
@@ -81,8 +81,8 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>observed rape</label>
+			<label>approved of rape</label>
-			<description>The strong claim their due from the weak.</description>
+			<description>The strong claim the weak.</description>
 			<baseMoodEffect>+2</baseMoodEffect>
 		  </li>
 		</stages>

Defs/ThoughtDefs/ThoughtDefsUnderwear.xml

@@ -8,17 +8,17 @@
     <stages>
       <li>
         <label>exposed underwear</label>
-        <description>People can see my underwear, it's embarassing.</description>
+        <description>People can see my underwear. It's embarassing.</description>
         <baseMoodEffect>-2</baseMoodEffect>
       </li>
 	  <li>
         <label>visible underwear</label>
-        <description>My underwear is showing, but's not a big deal.</description>
+        <description>So what? People need to grow up.</description>
         <baseMoodEffect>0</baseMoodEffect>
       </li>
 	  <li>
         <label>faunting underwear</label>
-        <description>It's a bit thrilling to be showing my underwear off!</description>
+        <description>How risque!</description>
         <baseMoodEffect>1</baseMoodEffect>
       </li>
     </stages>

Defs/ThoughtDefs/ThoughtDefsXenophilia.xml

@@ -11,8 +11,8 @@
 		<stages>
 		  <li>
 			<label>horrified by xenophilia</label>
-			<description>Filthy degenerates!</description>
+			<description>The filthy degenerates!</description>
-			<baseMoodEffect>-15</baseMoodEffect>
+			<baseMoodEffect>-20</baseMoodEffect>
 		  </li>
 		</stages>
 		<nullifyingTraitDegrees>
@@ -30,7 +30,7 @@
 		<stages>
 		  <li>
 			<label>disturbed by xenophilia</label>
-			<description>Oh! That's not right...</description>
+			<description></description>
 			<baseMoodEffect>-10</baseMoodEffect>
 		  </li>
 		</stages>
@@ -41,15 +41,35 @@
 	</Privacy_Please.SexActThoughtDef>
 	
 	<Privacy_Please.SexActThoughtDef>
+		<defName>SawHAR_AlienDating_Disapproved</defName>
+		<durationDays>3</durationDays>
+		<stackLimit>3</stackLimit>
+		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
+		<stages>
+		  <li>
+			<label>upset about xenophilia</label>
+			<description>It's just not right.</description>
+			<baseMoodEffect>-10</baseMoodEffect>
+		  </li>
+		</stages>
+		<nullifyingTraits>
+		  <li>Zoophile</li>
+		</nullifyingTraits>
+		<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
+	</Privacy_Please.SexActThoughtDef>
+	
+	<!-- Exhibitism from this point on -->
+	
+	<!--<Privacy_Please.SexActThoughtDef>
 		<defName>SawHAR_AlienDating_Acceptable</defName>
 		<durationDays>3</durationDays>
 		<stackLimit>3</stackLimit>
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>saw xenophilia</label>
+			<label>witnessed xenophilia</label>
-			<description>Oops, sorry about walking in on you!</description>
+			<description>Oops, sorry about that!</description>
-			<baseMoodEffect>-4</baseMoodEffect>
+			<baseMoodEffect>-5</baseMoodEffect>
 		  </li>
 		</stages>
 		<nullifyingTraitDegrees>
@@ -65,7 +85,7 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>noticed xenophilia</label>
+			<label>amused by xenophilia</label>
 			<description>I wonder what their kids would look like?</description>
 			<baseMoodEffect>+1</baseMoodEffect>
 		  </li>
@@ -83,8 +103,8 @@
 		<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
 		<stages>
 		  <li>
-			<label>observed xenophilia</label>
+			<label>approved of xenophilia</label>
-			<description>A blending of species will make us stronger.</description>
+			<description>Blending our species will make us stronger.</description>
 			<baseMoodEffect>+2</baseMoodEffect>
 		  </li>
 		</stages>
@@ -92,6 +112,6 @@
 		  <Xenophobia>1</Xenophobia>
 		</nullifyingTraitDegrees>
 		<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
-	</Privacy_Please.SexActThoughtDef>
+	</Privacy_Please.SexActThoughtDef>-->
 	
 </Defs>

Languages/English/Keyed/SexualityCardKeys.xml

@@ -7,5 +7,8 @@
 	<CuckoldQuirk><![CDATA[
 	{pawn} gets turned on when watching their partner have sex with others.
 ]]></CuckoldQuirk>
+	<CuckolderQuirk><![CDATA[
+	{pawn} gets a perverse pleasure out of having their partner watching them having sex with others.
+]]></CuckolderQuirk>
 	
 </LanguageData>

Source/Scripts/Utilities/ModDefOf.cs

@@ -12,7 +12,7 @@ namespace Privacy_Please
         public static BodyPartGroupDef ChestBPG;
     }
 
-    [DefOf]
+    /*[DefOf]
     public static class ModThoughtDefOf
     {
         public static ThoughtDef SeenHavingSex;
@@ -24,7 +24,7 @@ namespace Privacy_Please
         public static ThoughtDef SawMasturbation;
         public static ThoughtDef SawMasturbationVoyeur;
         public static ThoughtDef CaughtCheating;
-    }
+    }*/
 
     [DefOf]
     public static class ModPreceptDefOf