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 c006334..39d7d7c 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs @@ -451,16 +451,6 @@ namespace RJW_Menstruation return baby; } - public PawnKindDef GetRacesPawnKind(Pawn pawn) - { - if (pawn == null) return null; - if (pawn.kindDef?.race == pawn.def) return pawn.kindDef; - return VariousDefOf.AllKinds.Find(kind => kind.race == pawn.def && kind.defName.Contains("Colonist")) ?? - VariousDefOf.AllKinds.Find(kind => kind.race == pawn.def) ?? - pawn.def.race?.AnyPawnKind ?? - pawn.kindDef; - } - /// /// Decide pawnkind from mother and father /// Come from RJW @@ -470,8 +460,8 @@ namespace RJW_Menstruation /// public PawnKindDef BabyPawnKindDecider(Pawn mother, Pawn father) { - PawnKindDef motherKindDef = GetRacesPawnKind(mother); - PawnKindDef fatherKindDef = GetRacesPawnKind(father); + PawnKindDef motherKindDef = Utility.GetRacesPawnKind(mother); + PawnKindDef fatherKindDef = Utility.GetRacesPawnKind(father); PawnKindDef spawn_kind_def = motherKindDef; diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs index 5f1ef99..5d7bbc6 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs @@ -49,8 +49,15 @@ namespace RJW_Menstruation { public static System.Random random = new System.Random(Environment.TickCount); - - + public static PawnKindDef GetRacesPawnKind(Pawn pawn) + { + if (pawn == null) return null; + if (pawn.kindDef?.race == pawn.def) return pawn.kindDef; + return VariousDefOf.AllKinds.Find(kind => kind.race == pawn.def && kind.defName.Contains("Colonist")) ?? + VariousDefOf.AllKinds.Find(kind => kind.race == pawn.def) ?? + pawn.def.race?.AnyPawnKind ?? + pawn.kindDef; + } public static float GetCumVolume(this Pawn pawn) {