Fixed random trait generation to include forced traits from custom xe…

…notype
edbmods · Dec 26, 2022 · 71ecc1c · 71ecc1c
1 parent 7e81e5a
commit 71ecc1c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/Source/CustomPawn.cs b/Source/CustomPawn.cs
@@ -302,14 +302,7 @@ public void InitializeWithPawn(Pawn pawn) {
             InitializeInjuriesAndImplantsFromPawn(pawn);
 
             if (ModsConfig.BiotechActive) {
-                var customXenotypes = ReflectionUtil.GetStaticPropertyValue<List<CustomXenotype>>(typeof(CharacterCardUtility), "CustomXenotypes");
-                foreach (CustomXenotype c in customXenotypes) {
-                    if (GeneUtility.PawnIsCustomXenotype(pawn, c)) {
-                        customXenotype = c;
-                        break;
-                    }
-                }
-                XenotypeDef xenotypeDef = ReflectionUtil.GetFieldValue<XenotypeDef>(pawn.genes, "xenotype");
+                customXenotype = pawn.MatchGenesToCustomXenotype();
                 if (customXenotype != null) {
                     RandomizeCustomXenotype = customXenotype;
                     RandomizeXenotype = null;

diff --git a/Source/ExtensionsPawn.cs b/Source/ExtensionsPawn.cs
@@ -163,5 +163,20 @@ public static void AssignToFaction(this Pawn pawn, Faction faction) {
             field.SetValue(pawn, faction);
         }
 
+        public static CustomXenotype MatchGenesToCustomXenotype(this Pawn pawn) {
+            if (!ModsConfig.BiotechActive) {
+                return null;
+            }
+            var customXenotypes = Reflection.CharacterCardUtility.CustomXenotypes;
+            if (customXenotypes == null) {
+                return null;
+            }
+            foreach (CustomXenotype c in customXenotypes) {
+                if (GeneUtility.PawnIsCustomXenotype(pawn, c)) {
+                    return c;
+                }
+            }
+            return null;
+        }
     }
 }
diff --git a/Source/Randomizer.cs b/Source/Randomizer.cs
@@ -71,10 +71,15 @@ public Pawn GeneratePawnAsCloseToAsPossible(Pawn pawn) {
                 FixedChronologicalAge = pawn.ageTracker.AgeChronologicalYears,
                 FixedGender = pawn.gender,
                 FixedIdeology = pawn.Ideo,
-                DevelopmentalStage = pawn.DevelopmentalStage,
-                ForcedXenotype = pawn.genes?.Xenotype,
-                ForcedCustomXenotype = pawn.genes?.CustomXenotype
+                DevelopmentalStage = pawn.DevelopmentalStage
             };
+            CustomXenotype customXenotype = pawn.MatchGenesToCustomXenotype();
+            if (customXenotype != null) {
+                request.ForcedCustomXenotype = customXenotype;
+            }
+            else {
+                request.ForcedXenotype = pawn.genes?.Xenotype;
+            }
             Pawn result = AttemptToGeneratePawn(request.Request);
             return result;
         }

diff --git a/Source/Reflection.cs b/Source/Reflection.cs
@@ -13,7 +13,13 @@ public static class CharacterCardUtility {
             public static IEnumerable<WorkTags> WorkTagsFrom(WorkTags workTags) {
                 return (IEnumerable<WorkTags>)ReflectionCache.Instance.CharacterCardUtility_WorkTagsFrom.Invoke(null, new object[] { workTags });
             }
+            public static List<CustomXenotype> CustomXenotypes {
+                get {
+                    return ReflectionUtil.GetStaticPropertyValue<List<CustomXenotype>>(typeof(RimWorld.CharacterCardUtility), "CustomXenotypes");
+                }
+            }
         }
+
         public static class ScenPart_StartingAnimal {
             public static IEnumerable<PawnKindDef> RandomPets(RimWorld.ScenPart_StartingAnimal scenPart) {
                 return (IEnumerable<PawnKindDef>)ReflectionCache.Instance.ScenPart_StartingAnimal_RandomPets.Invoke(scenPart, null);