From baed7acc4cb17032b09aaf1abd28f4af67a1062d Mon Sep 17 00:00:00 2001
From: amevarashi <kp-karasu@yandex.ru>
Date: Tue, 19 Jul 2022 16:25:25 +0500
Subject: [PATCH] Rename HistoryEventDef mod extensions

---
 ...pendentOverrides.cs => DefExtension_EventOverrides.cs} | 4 ++--
 ...SecondaryEvents.cs => DefExtension_SecondaryEvents.cs} | 4 ++--
 .../HistoryEvents/HistoryEventDefExtensionMethods.cs      | 8 ++++----
 .../{PartnerDependentRule.cs => TwoPawnEventRule.cs}      | 2 +-
 RJWSexperience/IdeologyAddon/IdeologyAddon.csproj         | 6 +++---
 .../Defs/PreceptDefs/Precepts_Bestiality.xml              | 2 +-
 .../Defs/PreceptDefs/Precepts_Incest.xml                  | 4 ++--
 .../Defs/PreceptDefs/Precepts_Rape.xml                    | 4 ++--
 .../Defs/PreceptDefs/Precepts_Virginity.xml               | 2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)
 rename RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/{DefExtension_PartnerDependentOverrides.cs => DefExtension_EventOverrides.cs} (64%)
 rename RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/{DefExtension_PartnerDependentSecondaryEvents.cs => DefExtension_SecondaryEvents.cs} (63%)
 rename RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/{PartnerDependentRule.cs => TwoPawnEventRule.cs} (94%)

diff --git a/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_PartnerDependentOverrides.cs b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_EventOverrides.cs
similarity index 64%
rename from RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_PartnerDependentOverrides.cs
rename to RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_EventOverrides.cs
index dc36d58..9f090b7 100644
--- a/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_PartnerDependentOverrides.cs
+++ b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_EventOverrides.cs
@@ -4,9 +4,9 @@ using Verse;
 
 namespace RJWSexperience.Ideology.HistoryEvents
 {
-	public class DefExtension_PartnerDependentOverrides : DefModExtension
+	public class DefExtension_EventOverrides : DefModExtension
 	{
 		[SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")]
-		public List<PartnerDependentRule> overrideRules = new List<PartnerDependentRule>();
+		public List<TwoPawnEventRule> overrideRules = new List<TwoPawnEventRule>();
 	}
 }
diff --git a/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_PartnerDependentSecondaryEvents.cs b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_SecondaryEvents.cs
similarity index 63%
rename from RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_PartnerDependentSecondaryEvents.cs
rename to RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_SecondaryEvents.cs
index 42c2a76..70bb22a 100644
--- a/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_PartnerDependentSecondaryEvents.cs
+++ b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_SecondaryEvents.cs
@@ -4,9 +4,9 @@ using Verse;
 
 namespace RJWSexperience.Ideology.HistoryEvents
 {
-	public class DefExtension_PartnerDependentSecondaryEvents : DefModExtension
+	public class DefExtension_SecondaryEvents : DefModExtension
 	{
 		[SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")]
-		public List<PartnerDependentRule> generationRules = new List<PartnerDependentRule>();
+		public List<TwoPawnEventRule> generationRules = new List<TwoPawnEventRule>();
 	}
 }
diff --git a/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/HistoryEventDefExtensionMethods.cs b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/HistoryEventDefExtensionMethods.cs
index c874129..6579a75 100644
--- a/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/HistoryEventDefExtensionMethods.cs
+++ b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/HistoryEventDefExtensionMethods.cs
@@ -7,11 +7,11 @@ namespace RJWSexperience.Ideology.HistoryEvents
 	{
 		public static void RecordEventWithPartner(this HistoryEventDef def, Pawn pawn, Pawn partner)
 		{
-			DefExtension_PartnerDependentSecondaryEvents secondaryEvents = def.GetModExtension<DefExtension_PartnerDependentSecondaryEvents>();
+			DefExtension_SecondaryEvents secondaryEvents = def.GetModExtension<DefExtension_SecondaryEvents>();
 
 			if (secondaryEvents != null)
 			{
-				foreach (PartnerDependentRule rule in secondaryEvents.generationRules)
+				foreach (TwoPawnEventRule rule in secondaryEvents.generationRules)
 				{
 					if (rule.Applies(pawn, partner))
 						rule.historyEventDef.RecordEventWithPartner(pawn, partner);
@@ -28,12 +28,12 @@ namespace RJWSexperience.Ideology.HistoryEvents
 
 		public static HistoryEvent CreateEventWithPartner(this HistoryEventDef def, Pawn pawn, Pawn partner)
 		{
-			DefExtension_PartnerDependentOverrides overrides = def.GetModExtension<DefExtension_PartnerDependentOverrides>();
+			DefExtension_EventOverrides overrides = def.GetModExtension<DefExtension_EventOverrides>();
 
 			if (overrides == null)
 				return new HistoryEvent(def, pawn.Named(HistoryEventArgsNames.Doer), partner.Named(ArgsNamesCustom.Partner));
 
-			foreach (PartnerDependentRule rule in overrides.overrideRules)
+			foreach (TwoPawnEventRule rule in overrides.overrideRules)
 			{
 				if (rule.Applies(pawn, partner))
 					return rule.historyEventDef.CreateEventWithPartner(pawn, partner);
diff --git a/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/PartnerDependentRule.cs b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/TwoPawnEventRule.cs
similarity index 94%
rename from RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/PartnerDependentRule.cs
rename to RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/TwoPawnEventRule.cs
index 11d0ca0..dc61b89 100644
--- a/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/PartnerDependentRule.cs
+++ b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/TwoPawnEventRule.cs
@@ -4,7 +4,7 @@ using Verse;
 
 namespace RJWSexperience.Ideology.HistoryEvents
 {
-	public class PartnerDependentRule
+	public class TwoPawnEventRule
 	{
 		[SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")]
 		public HistoryEventDef historyEventDef;
diff --git a/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj b/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj
index c0e65c1..7fe8379 100644
--- a/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj
+++ b/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj
@@ -43,9 +43,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="Ideology\HistoryEvents\DefExtension_PartnerDependentSecondaryEvents.cs" />
-    <Compile Include="Ideology\HistoryEvents\DefExtension_PartnerDependentOverrides.cs" />
-    <Compile Include="Ideology\HistoryEvents\PartnerDependentRule.cs" />
+    <Compile Include="Ideology\HistoryEvents\DefExtension_SecondaryEvents.cs" />
+    <Compile Include="Ideology\HistoryEvents\DefExtension_EventOverrides.cs" />
+    <Compile Include="Ideology\HistoryEvents\TwoPawnEventRule.cs" />
     <Compile Include="Ideology\InteractionDefExtension_HistoryEvents.cs" />
     <Compile Include="Ideology\GoodwillSituationWorker_MemeCompatibility.cs" />
     <Compile Include="Harmony.cs" />
diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Bestiality.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Bestiality.xml
index db81b03..a6eebe4 100644
--- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Bestiality.xml
+++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Bestiality.xml
@@ -12,7 +12,7 @@
     <defName>RSI_SexWithAnimal</defName>
     <label>sex with animal</label>
     <modExtensions>
-      <li Class="RJWSexperience.Ideology.HistoryEvents.DefExtension_PartnerDependentSecondaryEvents">
+      <li Class="RJWSexperience.Ideology.HistoryEvents.DefExtension_SecondaryEvents">
         <generationRules>
           <li>
             <filter>
diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Incest.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Incest.xml
index ad5f08f..df0e490 100644
--- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Incest.xml
+++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Incest.xml
@@ -22,7 +22,7 @@
     <defName>RSI_NonIncestuosMarriage</defName>
     <label>Non-incestuos marriage</label>
     <modExtensions>
-      <li Class="RJWSexperience.Ideology.HistoryEvents.DefExtension_PartnerDependentOverrides">
+      <li Class="RJWSexperience.Ideology.HistoryEvents.DefExtension_EventOverrides">
         <overrideRules>
           <li>
             <filter>
@@ -85,7 +85,7 @@
     <defName>RSI_NonIncestuosSex</defName>
     <label>Non-incestuos sex</label>
     <modExtensions>
-      <li Class="RJWSexperience.Ideology.HistoryEvents.DefExtension_PartnerDependentOverrides">
+      <li Class="RJWSexperience.Ideology.HistoryEvents.DefExtension_EventOverrides">
         <overrideRules>
           <li>
             <filter>
diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml
index 634dc8f..da2cfd4 100644
--- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml
+++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Rape.xml
@@ -12,7 +12,7 @@
     <defName>RSI_Raped</defName>
     <label>raped</label>
     <modExtensions>
-      <li Class="RJWSexperience.Ideology.HistoryEvents.DefExtension_PartnerDependentOverrides">
+      <li Class="RJWSexperience.Ideology.HistoryEvents.DefExtension_EventOverrides">
         <overrideRules>
           <li>
             <filter>
@@ -49,7 +49,7 @@
     <defName>RSI_WasRaped</defName>
     <label>was raped</label>
     <modExtensions>
-      <li Class="RJWSexperience.Ideology.HistoryEvents.DefExtension_PartnerDependentOverrides">
+      <li Class="RJWSexperience.Ideology.HistoryEvents.DefExtension_EventOverrides">
         <overrideRules>
           <li>
             <filter>
diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Virginity.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Virginity.xml
index 459c3d5..50baa70 100644
--- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Virginity.xml
+++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Virginity.xml
@@ -17,7 +17,7 @@
     <defName>RSI_VirginTaken</defName>
     <label>virgin taken</label>
     <modExtensions>
-      <li Class="RJWSexperience.Ideology.HistoryEvents.DefExtension_PartnerDependentSecondaryEvents">
+      <li Class="RJWSexperience.Ideology.HistoryEvents.DefExtension_SecondaryEvents">
         <generationRules>
           <li>
             <filter>