Merge pull request #909 from Tachyonite/dev

Update
Tachyonite · Jun 22, 2024 · 92c984c · 92c984c
2 parents 9a20ce4 + 2cdf600
commit 92c984c
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/1.4/Defs/MorphsAndMutationDefs/Shared/SkinMutations.xml b/1.4/Defs/MorphsAndMutationDefs/Shared/SkinMutations.xml
@@ -253,7 +253,7 @@
 
 	<Pawnmorph.Hediffs.MutationDef Name="ThrumboFurredLimb" ParentName="AbstractFurredLimb">
 		<defName>EtherThrumboFurredLimb</defName>
-		<label>thumbo fur</label>
+		<label>thrumbo fur</label>
 		<classInfluence>ThrumboMorph</classInfluence>
 		<mutationMemory>EtherThickFurLimb</mutationMemory>
 		<stagePatches>

diff --git a/1.5/Defs/MorphsAndMutationDefs/Animal/Reptile/Ophidia/Cobra/Cobra_Hybrid.xml b/1.5/Defs/MorphsAndMutationDefs/Animal/Reptile/Ophidia/Cobra/Cobra_Hybrid.xml
@@ -524,6 +524,8 @@
         </race>
         <alienRace>
             <generalSettings>
+                <allowHumanBios>true</allowHumanBios>
+                <corpseCategory>CorpsesHumanlike</corpseCategory>
                 <humanRecipeImport>true</humanRecipeImport>
                 <alienPartGenerator>
                     <headTypes>
@@ -534,6 +536,13 @@
                         <li>Female_AverageWide</li>
                         <li>Female_AveragePointy</li>
                     </headTypes>
+                    <bodyTypes>
+                        <li>Male</li>
+                        <li>Female</li>
+                        <li>Thin</li>
+                        <li>Hulk</li>
+                        <li>Fat</li>
+                    </bodyTypes>
                     <colorChannels>
                         <li>
                             <name>hair</name>
@@ -554,16 +563,25 @@
 								</options>
 							</second>
                         </li>
+                        <li>
+                            <name>SkinHair</name>
+                            <first Class="AlienRace.ColorGenerator_CustomAlienChannel">
+                                <colorChannel>skin_1</colorChannel>
+                            </first>
+                            <second Class="AlienRace.ColorGenerator_CustomAlienChannel">
+                                <colorChannel>hair_1</colorChannel>
+                            </second>
+                        </li>
                     </colorChannels>
                     <bodyAddons>
                         <li>
                             <path>Parts/Cobra/Cobra_Tail</path>
+                            <colorChannel>SkinHair</colorChannel>
                             <conditions>
                                 <BodyPart>
                                     <bodyPart>TailLeg</bodyPart>
                                     <drawWithoutPart>false</drawWithoutPart>
                                 </BodyPart>
-                                <Hediff>EtherSnakeTail</Hediff>
                                 <Posture>
                                     <drawnStanding>true</drawnStanding>
                                     <drawnLaying>true</drawnLaying>

diff --git a/1.5/Defs/MorphsAndMutationDefs/Shared/SkinMutations.xml b/1.5/Defs/MorphsAndMutationDefs/Shared/SkinMutations.xml
@@ -253,7 +253,7 @@
 
 	<Pawnmorph.Hediffs.MutationDef Name="ThrumboFurredLimb" ParentName="AbstractFurredLimb">
 		<defName>EtherThrumboFurredLimb</defName>
-		<label>thumbo fur</label>
+		<label>thrumbo fur</label>
 		<classInfluence>ThrumboMorph</classInfluence>
 		<mutationMemory>EtherThickFurLimb</mutationMemory>
 		<stagePatches>

diff --git a/Source/Dependencies/AlienRace.dll b/Source/Dependencies/AlienRace.dll
diff --git a/Source/Pawnmorphs/Esoteria/Hybrids/RaceGenerator.cs b/Source/Pawnmorphs/Esoteria/Hybrids/RaceGenerator.cs
@@ -264,8 +264,8 @@ private static IEnumerable<ThingDef_AlienRace> GenerateAllImpliedRaces()
 
 
 
-				CreateImplicitMeshes(race);
 				race.ResolveReferences();
+				CreateImplicitMeshes(race);
 				yield return race;
 			}
 

diff --git a/Source/Pawnmorphs/Esoteria/Hybrids/RaceShiftUtilities.cs b/Source/Pawnmorphs/Esoteria/Hybrids/RaceShiftUtilities.cs
@@ -488,6 +488,9 @@ private static void ValidateExplicitRaceChange(Pawn pawn, ThingDef race, ThingDe
 					}
 
 
+					var alienComp = pawn.GetComp<AlienPartGenerator.AlienComp>();
+					AccessTools.Field(typeof(AlienPartGenerator.AlienComp), "nodeProps").SetValue(alienComp, null);
+
 					ValidateGraphicsPaths(pawn, oldARace, aRace);
 					ValidateGenes(pawn, oldARace, aRace);
 					HPatches.PawnPatches.QueueRaceCheck(pawn);
@@ -507,7 +510,6 @@ private static void ValidateExplicitRaceChange(Pawn pawn, ThingDef race, ThingDe
 
 		private static void ValidateGenes([NotNull] Pawn pawn, [NotNull] ThingDef_AlienRace oldRace, [NotNull] ThingDef_AlienRace race)
 		{
-			var alienComp = pawn.GetComp<AlienPartGenerator.AlienComp>();
 			if (ThingDefOf.Human == race)
 			{
 				// Reversion