From 5e164b74df21def0f1de26060664026546521ac5 Mon Sep 17 00:00:00 2001
From: lutepickle <28810-lutepickle@users.noreply.gitgud.io>
Date: Thu, 7 Jul 2022 06:55:44 -0700
Subject: [PATCH] Remove obsolete RJW_Sire/RJW_Pup relations

---
 1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs  | 9 ++-------
 .../RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs    | 3 ---
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
index 095b740..41f4603 100644
--- a/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
+++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
@@ -422,13 +422,8 @@ namespace RJW_Menstruation
         {
             Pawn res = pawn.GetFather();
             if (res != null) return res;
-            else
-            {
-                
-                res = pawn.relations?.GetFirstDirectRelationPawn(PawnRelationDefOf.Parent, x => x != mother) ?? null;
-                if (res == null) res = pawn.relations?.GetFirstDirectRelationPawn(VariousDefOf.Relation_birthgiver, x => x != mother) ?? null;
-                return res;
-            }
+            else res = pawn.relations?.GetFirstDirectRelationPawn(PawnRelationDefOf.Parent, x => x != mother) ?? null;
+            return res;
         }
 
         public static float RandGaussianLike(float min, float max, int iterations = 3)
diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs
index 40ac6df..d250dcf 100644
--- a/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs
+++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs
@@ -22,9 +22,6 @@ namespace RJW_Menstruation
         public static readonly HediffDef Hediff_Estrus_Concealed = DefDatabase<HediffDef>.GetNamed("Hediff_Estrus_Concealed");
         public static readonly HediffDef Hediff_ASA = DefDatabase<HediffDef>.GetNamed("Hediff_ASA");
         public static readonly StatDef MaxAbsorbable = DefDatabase<StatDef>.GetNamed("MaxAbsorbable");
-        // Obsolete, kept for compatibility for now
-        public static readonly PawnRelationDef Relation_birthgiver = DefDatabase<PawnRelationDef>.AllDefs.FirstOrDefault(d => d.defName == "RJW_Sire");
-        public static readonly PawnRelationDef Relation_spawn = DefDatabase<PawnRelationDef>.AllDefs.FirstOrDefault(d => d.defName == "RJW_Pup");
         public static readonly NeedDef SexNeed = DefDatabase<NeedDef>.GetNamed("Sex");
         public static readonly JobDef VaginaWashing = DefDatabase<JobDef>.GetNamed("VaginaWashing");
         public static readonly JobDef Job_LactateSelf = DefDatabase<JobDef>.GetNamed("LactateSelf");