From 70a90ec2e77f54dcc1c6a2925af439320d4a2388 Mon Sep 17 00:00:00 2001
From: amevarashi <kp-karasu@yandex.ru>
Date: Sat, 9 Jul 2022 13:13:33 +0500
Subject: [PATCH] Move last events to overrides

---
 .../Ideology/Patches/RJW_Patch_Ideo.cs        |  8 +------
 RJWSexperience/IdeologyAddon/VariousDefOf.cs  |  2 --
 .../Defs/PreceptDefs/Precepts_Rape.xml        | 22 +++++++++++++++++++
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs b/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs
index 408958d..0aa344a 100644
--- a/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs
+++ b/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs
@@ -102,13 +102,7 @@ namespace RJWSexperience.Ideology.Patches
 			else if (xxx.is_human(partner) && rape)
 			{
 				VariousDefOf.RSI_Raped.RecordEventWithPartner(human, partner);
-
-				if (partner.IsSlave)
-					VariousDefOf.RSI_WasRapedSlave.RecordEventWithPartner(partner, human);
-				else if (partner.IsPrisoner)
-					VariousDefOf.RSI_WasRapedPrisoner.RecordEventWithPartner(partner, human);
-				else
-					VariousDefOf.RSI_WasRaped.RecordEventWithPartner(partner, human);
+				VariousDefOf.RSI_WasRaped.RecordEventWithPartner(partner, human);
 			}
 		}
 
diff --git a/RJWSexperience/IdeologyAddon/VariousDefOf.cs b/RJWSexperience/IdeologyAddon/VariousDefOf.cs
index 307b05e..e80efab 100644
--- a/RJWSexperience/IdeologyAddon/VariousDefOf.cs
+++ b/RJWSexperience/IdeologyAddon/VariousDefOf.cs
@@ -19,8 +19,6 @@ namespace RJWSexperience.Ideology
 		[MayRequireIdeology] public static readonly HistoryEventDef RSI_SexWithAnimal;
 		[MayRequireIdeology] public static readonly HistoryEventDef RSI_Raped;
 		[MayRequireIdeology] public static readonly HistoryEventDef RSI_WasRaped;
-		[MayRequireIdeology] public static readonly HistoryEventDef RSI_WasRapedSlave;
-		[MayRequireIdeology] public static readonly HistoryEventDef RSI_WasRapedPrisoner;
 		[MayRequireIdeology] public static readonly HistoryEventDef RSI_NonIncestuosMarriage;
 		[MayRequireIdeology] public static readonly HistoryEventDef RSI_NonIncestuosSex;
 		[MayRequireIdeology] public static readonly HistoryEventDef RSI_SexWithCorpse;
diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml
index 1e013e0..634dc8f 100644
--- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml
+++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml
@@ -48,6 +48,28 @@
   <HistoryEventDef>
     <defName>RSI_WasRaped</defName>
     <label>was raped</label>
+    <modExtensions>
+      <li Class="RJWSexperience.Ideology.HistoryEvents.DefExtension_PartnerDependentOverrides">
+        <overrideRules>
+          <li>
+            <filter>
+              <doer>
+                <isSlave>true</isSlave>
+              </doer>
+            </filter>
+            <historyEventDef>RSI_WasRapedSlave</historyEventDef>
+          </li>
+          <li>
+            <filter>
+              <doer>
+                <isPrisoner>true</isPrisoner>
+              </doer>
+            </filter>
+            <historyEventDef>RSI_WasRapedPrisoner</historyEventDef>
+          </li>
+        </overrideRules>
+      </li>
+    </modExtensions>
   </HistoryEventDef>
 
   <HistoryEventDef>