Moved precepts romanceChanceFactor to DefExtention

1.4/Defs/PreceptDefs/Precepts_Incest.xml

@@ -27,16 +27,9 @@
           <li>
             <filter>
               <relations>
-                <hasOneOfRelations>
-                  <li>Parent</li>
-                  <li>Child</li>
-                  <li>Sibling</li>
-                  <li>HalfSibling</li>
-                  <li>Grandparent</li>
-                  <li>Grandchild</li>
-                  <li>NephewOrNiece</li>
-                  <li>UncleOrAunt</li>
-                </hasOneOfRelations>
+                <hasOneOfRelationDegrees>
+                  <li>CloseRelative</li>
+                </hasOneOfRelationDegrees>
               </relations>
             </filter>
             <historyEventDef>RSI_CloseRelativeMarriage</historyEventDef>
@@ -44,7 +37,9 @@
           <li>
             <filter>
               <relations>
-                <isBloodRelated>true</isBloodRelated>
+                <hasOneOfRelationDegrees>
+                  <li>FarRelative</li>
+                </hasOneOfRelationDegrees>
               </relations>
             </filter>
             <historyEventDef>RSI_IncestuosMarriage</historyEventDef>
@@ -73,16 +68,9 @@
           <li>
             <filter>
               <relations>
-                <hasOneOfRelations>
-                  <li>Parent</li>
-                  <li>Child</li>
-                  <li>Sibling</li>
-                  <li>HalfSibling</li>
-                  <li>Grandparent</li>
-                  <li>Grandchild</li>
-                  <li>NephewOrNiece</li>
-                  <li>UncleOrAunt</li>
-                </hasOneOfRelations>
+                <hasOneOfRelationDegrees>
+                  <li>CloseRelative</li>
+                </hasOneOfRelationDegrees>
               </relations>
             </filter>
             <historyEventDef>RSI_CloseRelativeSex</historyEventDef>
@@ -90,7 +78,9 @@
           <li>
             <filter>
               <relations>
-                <isBloodRelated>true</isBloodRelated>
+                <hasOneOfRelationDegrees>
+                  <li>FarRelative</li>
+                </hasOneOfRelationDegrees>
               </relations>
             </filter>
             <historyEventDef>RSI_IncestuosSex</historyEventDef>
@@ -118,6 +108,20 @@
           <li>FarRelative</li>
           <li>NotRelated</li>
         </allowManualRomanceOnlyFor>
+        <bloodRelationDegreeRomanceFactors>
+          <li>
+            <bloodRelationDegree>CloseRelative</bloodRelationDegree>
+            <romanceChanceFactor>1</romanceChanceFactor>
+          </li>
+          <li>
+            <bloodRelationDegree>FarRelative</bloodRelationDegree>
+            <romanceChanceFactor>1</romanceChanceFactor>
+          </li>
+          <li>
+            <bloodRelationDegree>NotRelated</bloodRelationDegree>
+            <romanceChanceFactor>1</romanceChanceFactor>
+          </li>
+        </bloodRelationDegreeRomanceFactors>
       </li>
     </modExtensions>
   </PreceptDef>
@@ -147,16 +151,9 @@
           <li>
             <filter>
               <relations>
-                <hasOneOfRelations>
-                  <li>Parent</li>
-                  <li>Child</li>
-                  <li>Sibling</li>
-                  <li>HalfSibling</li>
-                  <li>Grandparent</li>
-                  <li>Grandchild</li>
-                  <li>NephewOrNiece</li>
-                  <li>UncleOrAunt</li>
-                </hasOneOfRelations>
+                <hasOneOfRelationDegrees>
+                  <li>CloseRelative</li>
+                </hasOneOfRelationDegrees>
                 <hasNoneOfRelations>
                   <li>Spouse</li>
                 </hasNoneOfRelations>
@@ -171,6 +168,16 @@
           <li>FarRelative</li>
           <li>NotRelated</li>
         </allowManualRomanceOnlyFor>
+        <bloodRelationDegreeRomanceFactors>
+          <li>
+            <bloodRelationDegree>FarRelative</bloodRelationDegree>
+            <romanceChanceFactor>1</romanceChanceFactor>
+          </li>
+          <li>
+            <bloodRelationDegree>NotRelated</bloodRelationDegree>
+            <romanceChanceFactor>1</romanceChanceFactor>
+          </li>
+        </bloodRelationDegreeRomanceFactors>
       </li>
     </modExtensions>
   </PreceptDef>
@@ -204,7 +211,10 @@
           <li>
             <filter>
               <relations>
-                <isBloodRelated>true</isBloodRelated>
+                <hasOneOfRelationDegrees>
+                  <li>CloseRelative</li>
+                  <li>FarRelative</li>
+                </hasOneOfRelationDegrees>
                 <hasNoneOfRelations>
                   <li>Spouse</li>
                 </hasNoneOfRelations>
@@ -246,7 +256,10 @@
           <li>
             <filter>
               <relations>
-                <isBloodRelated>true</isBloodRelated>
+                <hasOneOfRelationDegrees>
+                  <li>CloseRelative</li>
+                  <li>FarRelative</li>
+                </hasOneOfRelationDegrees>
                 <hasNoneOfRelations>
                   <li>Spouse</li>
                 </hasNoneOfRelations>
@@ -256,6 +269,18 @@
           </li>
         </rules>
       </li>
+      <li Class="RJWSexperience.Ideology.Precepts.DefExtension_Incest">
+        <bloodRelationDegreeRomanceFactors>
+          <li>
+            <bloodRelationDegree>CloseRelative</bloodRelationDegree>
+            <romanceChanceFactor>0.03</romanceChanceFactor> <!-- same as vanilla "parent" -->
+          </li>
+          <li>
+            <bloodRelationDegree>FarRelative</bloodRelationDegree>
+            <romanceChanceFactor>0.03</romanceChanceFactor>
+          </li>
+        </bloodRelationDegreeRomanceFactors>
+      </li>
     </modExtensions>
   </PreceptDef>
 
@@ -283,7 +308,9 @@
           <li>
             <filter>
               <relations>
-                <isBloodRelated>false</isBloodRelated>
+                <hasOneOfRelationDegrees>
+                  <li>NotRelated</li>
+                </hasOneOfRelationDegrees>
               </relations>
             </filter>
             <multiplier>0.1</multiplier>
@@ -295,6 +322,20 @@
           <li>CloseRelative</li>
           <li>FarRelative</li>
         </allowManualRomanceOnlyFor>
+        <bloodRelationDegreeRomanceFactors>
+          <li>
+            <bloodRelationDegree>CloseRelative</bloodRelationDegree>
+            <romanceChanceFactor>1</romanceChanceFactor>
+          </li>
+          <li>
+            <bloodRelationDegree>FarRelative</bloodRelationDegree>
+            <romanceChanceFactor>1</romanceChanceFactor>
+          </li>
+          <li>
+            <bloodRelationDegree>NotRelated</bloodRelationDegree>
+            <romanceChanceFactor>0.03</romanceChanceFactor>
+          </li>
+        </bloodRelationDegreeRomanceFactors>
       </li>
     </modExtensions>
   </PreceptDef>

Source/IdeologyAddon/Filters/RelationFilter.cs

@@ -1,7 +1,6 @@
 using RimWorld;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using Verse;
 
 namespace RJWSexperience.Ideology.Filters
@@ -13,14 +12,14 @@ namespace RJWSexperience.Ideology.Filters
 	public class RelationFilter
 	{
 		public bool? isVeneratedAnimal;
-		public bool? isAlien;
-		public bool? isBloodRelated;
 		public List<PawnRelationDef> hasOneOfRelations;
 		public List<PawnRelationDef> hasNoneOfRelations;
+		public List<BloodRelationDegree> hasOneOfRelationDegrees;
 
 		private bool initialized = false;
 		private HashSet<PawnRelationDef> hasOneOfRelationsHashed;
 		private HashSet<PawnRelationDef> hasNoneOfRelationsHashed;
+		private HashSet<BloodRelationDegree> hasOneOfRelationDegreesHashed;
 
 		/// <summary>
 		/// Check if the pair of pawns fits filter conditions
@@ -31,9 +30,6 @@ namespace RJWSexperience.Ideology.Filters
 			if (isVeneratedAnimal != null && isVeneratedAnimal != pawn.Ideo.IsVeneratedAnimal(partner))
 				return false;
 
-			//if (isAlien != null && isAlien != partner)
-			//	return false;
-
 			if (!CheckRelations(pawn, partner))
 				return false;
 
@@ -45,13 +41,15 @@ namespace RJWSexperience.Ideology.Filters
 			if (!initialized)
 				Initialize();
 
-			if (hasNoneOfRelationsHashed == null && hasOneOfRelationsHashed == null && isBloodRelated == null)
+			if (hasNoneOfRelationsHashed == null && hasOneOfRelationsHashed == null && hasOneOfRelationDegreesHashed == null)
 				return true;
 
-			IEnumerable<PawnRelationDef> relations = pawn.GetRelations(partner);
-
-			if (isBloodRelated != null && isBloodRelated != relations.Any(def => def.familyByBloodRelation))
+			if (hasOneOfRelationDegreesHashed != null && !hasOneOfRelationDegreesHashed.Contains(RelationHelpers.GetBloodRelationDegree(pawn, partner)))
+			{
 				return false;
+			}
+
+			IEnumerable<PawnRelationDef> relations = pawn.GetRelations(partner);
 
 			if (hasOneOfRelationsHashed != null)
 			{
@@ -78,6 +76,9 @@ namespace RJWSexperience.Ideology.Filters
 			if (!hasOneOfRelations.NullOrEmpty())
 				hasOneOfRelationsHashed = new HashSet<PawnRelationDef>(hasOneOfRelations);
 
+			if (!hasOneOfRelationDegrees.NullOrEmpty())
+				hasOneOfRelationDegreesHashed = new HashSet<BloodRelationDegree>(hasOneOfRelationDegrees);
+
 			initialized = true;
 		}
 	}

Source/IdeologyAddon/Harmony.cs

@@ -1,25 +1,14 @@
-using HarmonyLib;
-using RJWSexperience.Ideology.Patches;
-using System.Reflection;
+using System.Reflection;
 using Verse;
 
 namespace RJWSexperience.Ideology
 {
 	[StaticConstructorOnStartup]
-	internal static class First
+	internal static class Harmony
 	{
-		static First()
+		static Harmony()
 		{
-			var harmony = new Harmony("RJW_Sexperience.Ideology");
-			harmony.PatchAll(Assembly.GetExecutingAssembly());
-
-			if (ModLister.HasActiveModWithName("RJW Sexperience"))
-			{
-				harmony.Patch(AccessTools.Method("RJWSexperience.RJWUtility:ThrowVirginHistoryEvent"),
-					prefix: null,
-					postfix: new HarmonyMethod(typeof(Sexperience_Patch_ThrowVirginHistoryEvent), nameof(Sexperience_Patch_ThrowVirginHistoryEvent.Postfix))
-					);
-			}
+			new HarmonyLib.Harmony("RJW_Sexperience.Ideology").PatchAll(Assembly.GetExecutingAssembly());
 		}
 	}
 }

Source/IdeologyAddon/Patches/Sexperience_Patch.cs

@@ -1,11 +1,15 @@
-using rjw;
+using HarmonyLib;
+using rjw;
 using RJWSexperience.Ideology.HistoryEvents;
 using Verse;
 
 namespace RJWSexperience.Ideology.Patches
 {
+	[HarmonyPatch("RJWSexperience.RJWUtility", "ThrowVirginHistoryEvent")]
 	public static class Sexperience_Patch_ThrowVirginHistoryEvent
 	{
+		public static bool Prepare() => ModsConfig.IsActive("rjw.sexperience");
+
 		public static void Postfix(Pawn exVirgin, Pawn partner, SexProps props, int degree)
 		{
 			const int femaleAfterSurgery = 1;

Source/IdeologyAddon/Precepts/DefExtension_Incest.cs

@@ -1,5 +1,4 @@
-using RJWSexperience.Ideology.Filters;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Verse;
 
@@ -12,5 +11,63 @@ namespace RJWSexperience.Ideology.Precepts
 	public class DefExtension_Incest : DefModExtension
 	{
 		public List<BloodRelationDegree> allowManualRomanceOnlyFor;
+		public List<BloodRelationDegreeFactor> bloodRelationDegreeRomanceFactors;
+
+		private Dictionary<BloodRelationDegree, float> _relationDegreeFactorsDict;
+
+		public bool TryGetRomanceChanceFactor(BloodRelationDegree relationDegree, out float romanceChanceFactor)
+		{
+			if (bloodRelationDegreeRomanceFactors.NullOrEmpty())
+			{
+				romanceChanceFactor = 1f;
+				return false;
+			}
+
+			if (_relationDegreeFactorsDict == null)
+			{
+				_relationDegreeFactorsDict = new Dictionary<BloodRelationDegree, float>();
+				foreach (BloodRelationDegreeFactor relationDegreeFactor in bloodRelationDegreeRomanceFactors)
+				{
+					_relationDegreeFactorsDict.Add((BloodRelationDegree)relationDegreeFactor.bloodRelationDegree, relationDegreeFactor.romanceChanceFactor);
+				}
+			}
+
+			return _relationDegreeFactorsDict.TryGetValue(relationDegree, out romanceChanceFactor);
+		}
+
+		public override IEnumerable<string> ConfigErrors()
+		{
+			foreach (string error in base.ConfigErrors())
+			{
+				yield return error;
+			}
+
+			foreach (BloodRelationDegreeFactor factor in bloodRelationDegreeRomanceFactors)
+			{
+				foreach(string error in factor.ConfigErrors())
+				{
+					yield return error;
+				}
+			}
+		}
+
+		public class BloodRelationDegreeFactor
+		{
+			public BloodRelationDegree? bloodRelationDegree;
+			public float romanceChanceFactor;
+
+			public IEnumerable<string> ConfigErrors()
+			{
+				if (bloodRelationDegree == null)
+				{
+					yield return "<bloodRelationDegree> is empty";
+				}
+
+				if (romanceChanceFactor == 0f)
+				{
+					yield return "<romanceChanceFactor> should be > 0";
+				}
+			}
+		}
 	}
 }

Source/IdeologyAddon/RelationHelpers.cs

@@ -11,6 +11,11 @@ namespace RJWSexperience.Ideology
 		/// </summary>
 		public static BloodRelationDegree GetBloodRelationDegree(Pawn pawn, Pawn partner)
 		{
+			if (!pawn.relations.FamilyByBlood.Contains(partner))
+			{
+				return BloodRelationDegree.NotRelated;
+			}
+
 			PawnRelationDef closestBloodRelation = pawn
 				.GetRelations(partner)
 				?.Where(def => def.familyByBloodRelation)

Source/IdeologyAddon/RomanceChanceFactorHelpers.cs

@@ -1,4 +1,5 @@
 using RimWorld;
+using RJWSexperience.Ideology.Precepts;
 using System.Collections.Generic;
 using System.Linq;
 using Verse;
@@ -17,13 +18,11 @@ namespace RJWSexperience.Ideology
 		/// </summary>
 		public static float GetRomanceChanceFactor(Pawn pawn, Pawn partner)
 		{
-			IEnumerable<PawnRelationDef> relations = pawn.GetRelations(partner).Where(def => def.familyByBloodRelation);
-			PreceptDef incestuousPrecept = pawn.Ideo?.PreceptsListForReading.Select(precept => precept.def).FirstOrFallback(def => def.issue == VariousDefOf.Incestuos);
 			float romanceChanceFactor = 1f;
 
-			if (!relations.Any())
+			if (!pawn.relations.FamilyByBlood.Contains(partner))
 			{
-				if (incestuousPrecept == RsiPreceptDefOf.Incestuos_IncestOnly)
+				if (pawn.Ideo?.HasPrecept(RsiPreceptDefOf.Incestuos_IncestOnly) == true)
 				{
 					return parentRomanceChanceFactor;
 				}
@@ -33,6 +32,8 @@ namespace RJWSexperience.Ideology
 				}
 			}
 
+			PreceptDef incestuousPrecept = pawn.Ideo?.PreceptsListForReading.Select(precept => precept.def).FirstOrFallback(def => def.issue == VariousDefOf.Incestuos);
+			IEnumerable<PawnRelationDef> relations = pawn.GetRelations(partner).Where(def => def.familyByBloodRelation);
 			foreach (PawnRelationDef relationDef in relations)
 			{
 				romanceChanceFactor *= GetRomanceChanceFactor(relationDef, incestuousPrecept);
@@ -46,43 +47,23 @@ namespace RJWSexperience.Ideology
 		/// </summary>
 		public static float GetRomanceChanceFactor(PawnRelationDef relationDef, PreceptDef incestuousPrecept)
 		{
-			if (incestuousPrecept == null || incestuousPrecept == RsiPreceptDefOf.Incestuos_Disapproved) // Default game setup
+			if (incestuousPrecept == null)
 			{
 				return relationDef.romanceChanceFactor;
 			}
 
-			if (incestuousPrecept == RsiPreceptDefOf.Incestuos_Free)
-			{
-				return 1f;
-			}
-			else if (incestuousPrecept == RsiPreceptDefOf.Incestuos_Disapproved_CloseOnly)
-			{
-				if (relationDef.familyByBloodRelation && relationDef.importance > PawnRelationDefOf.Cousin.importance)
+			var incestDefExt = incestuousPrecept.GetModExtension<DefExtension_Incest>();
+
+			if (incestDefExt == null)
 			{
 				return relationDef.romanceChanceFactor;
 			}
-				else
+
+			BloodRelationDegree relationDegree = RelationHelpers.GetBloodRelationDegree(relationDef);
+
+			if (incestDefExt.TryGetRomanceChanceFactor(relationDegree, out var romanceChanceOverride))
 			{
-					return 1f;
-				}
-			}
-			else if (incestuousPrecept == RsiPreceptDefOf.Incestuos_Forbidden)
-			{
-				if (relationDef.familyByBloodRelation)
-				{
-					return parentRomanceChanceFactor;
-				}
-			}
-			else if (incestuousPrecept == RsiPreceptDefOf.Incestuos_IncestOnly)
-			{
-				if (!relationDef.familyByBloodRelation)
-				{
-					return parentRomanceChanceFactor;
-				}
-				else
-				{
-					return 1f;
-				}
+				return romanceChanceOverride;
 			}
 
 			return relationDef.romanceChanceFactor;

Source/IdeologyAddon/RsiPreceptDefOf.cs

@@ -5,10 +5,6 @@ namespace RJWSexperience.Ideology
 	[DefOf]
 	public static class RsiPreceptDefOf
 	{
-		public static readonly PreceptDef Incestuos_Free;
-		public static readonly PreceptDef Incestuos_Disapproved_CloseOnly;
-		public static readonly PreceptDef Incestuos_Disapproved;
-		public static readonly PreceptDef Incestuos_Forbidden;
 		public static readonly PreceptDef Incestuos_IncestOnly;
 		public static readonly PreceptDef Bestiality_OnlyVenerated;
 		public static readonly PreceptDef BabyFaction_AlwaysFather;