From d186afa8ba60f4393a9f2361e65214ede519c68f Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sat, 2 Jul 2022 07:51:23 -0700 Subject: [PATCH] Give animal children the standard mother/father relations instead of the old RJW_Sire/RJW_Pup ones --- 1.3/Assemblies/RJW_Menstruation.dll | Bin 158208 -> 158208 bytes .../Hediff_MultiplePregnancy.cs | 16 ++++------------ .../RJW_Menstruation/VariousDefOf.cs | 1 + 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/1.3/Assemblies/RJW_Menstruation.dll b/1.3/Assemblies/RJW_Menstruation.dll index ba57e6b3a724c748672011fe3338512568433c6f..230fe1a944ee6d8a775d1ba683121d004df007f1 100644 GIT binary patch delta 6916 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 delta 6966 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 Xws%amHT&4gqPGX7*?vY&wEuqr&@-&Z diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs index 1e0b9ca..73521e2 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs @@ -423,7 +423,7 @@ namespace RJW_Menstruation Pawn baby = PawnGenerator.GeneratePawn(request); if (baby != null) { - if (xxx.is_human(baby)) + if (xxx.is_human(baby) || (baby.relations != null && !RJWSettings.Disable_bestiality_pregnancy_relations)) { baby.SetMother(mother); if (mother != father) @@ -434,23 +434,15 @@ namespace RJW_Menstruation baby.relations.AddDirectRelation(PawnRelationDefOf.Parent, father); } } - + } + if (xxx.is_human(baby)) + { // Ensure the same inherited traits are chosen each run // Has to happen right here so GeneratePawn up there still gets unique results Rand.PushState(traitSeed); // With a seed just to make sure that fraternal twins *don't* get trait-duped UpdateTraits(baby, parentTraits); Rand.PopState(); } - else if (baby.relations != null && !RJWSettings.Disable_bestiality_pregnancy_relations) - { - baby.relations.AddDirectRelation(VariousDefOf.Relation_birthgiver, mother); - mother.relations.AddDirectRelation(VariousDefOf.Relation_spawn, baby); - if (mother != father) - { - baby.relations.AddDirectRelation(VariousDefOf.Relation_birthgiver, father); - father.relations.AddDirectRelation(VariousDefOf.Relation_spawn, baby); - } - } } else Log.Error("Baby not generated. Request: " + request.ToString()); return baby; diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs index cb1faee..40ac6df 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs @@ -22,6 +22,7 @@ namespace RJW_Menstruation public static readonly HediffDef Hediff_Estrus_Concealed = DefDatabase.GetNamed("Hediff_Estrus_Concealed"); public static readonly HediffDef Hediff_ASA = DefDatabase.GetNamed("Hediff_ASA"); public static readonly StatDef MaxAbsorbable = DefDatabase.GetNamed("MaxAbsorbable"); + // Obsolete, kept for compatibility for now public static readonly PawnRelationDef Relation_birthgiver = DefDatabase.AllDefs.FirstOrDefault(d => d.defName == "RJW_Sire"); public static readonly PawnRelationDef Relation_spawn = DefDatabase.AllDefs.FirstOrDefault(d => d.defName == "RJW_Pup"); public static readonly NeedDef SexNeed = DefDatabase.GetNamed("Sex");