From 93566b5fa32218089f91f69a122c11edbede51ab Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Tue, 10 Jan 2023 05:46:16 -0800 Subject: [PATCH] Call ResolveAllGraphics unconditionally for babies. Also copy skinColorOverride for twins --- .../HediffComps/HediffComp_PregeneratedBabies.cs | 4 ++-- .../RJW_Menstruation/Hediff_MultiplePregnancy.cs | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs index 5f94980..549686d 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs @@ -98,8 +98,7 @@ namespace RJW_Menstruation { if (i == 0) { - if (baby.IsHAR()) - baby.Drawer.renderer.graphics.ResolveAllGraphics(); + baby.Drawer.renderer.graphics.ResolveAllGraphics(); firstbaby = baby; request.FixedGender = baby.gender; request.ForcedEndogenes = baby.genes?.Endogenes.Select(gene => gene.def).ToList(); @@ -114,6 +113,7 @@ namespace RJW_Menstruation baby.story.hairDef = firstbaby.story.hairDef; baby.story.bodyType = firstbaby.story.bodyType; baby.story.furDef = firstbaby.story.furDef; + baby.story.skinColorOverride = firstbaby.story.skinColorOverride; } if (baby.genes != null) diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs index 0d44d2e..d831af1 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs @@ -334,9 +334,10 @@ namespace RJW_Menstruation if (division > 1) { if (i == 0) - { - if (baby.IsHAR()) // Have HAR determine the first baby's properties - baby.Drawer.renderer.graphics.ResolveAllGraphics(); + { + // HAR and some xenotype mods don't randomize graphics until it's rendered + // So poke it early + baby.Drawer.renderer.graphics.ResolveAllGraphics(); firstbaby = baby; request.FixedGender = baby.gender; request.ForcedEndogenes = baby.genes?.Endogenes.Select(gene => gene.def).ToList(); @@ -351,6 +352,7 @@ namespace RJW_Menstruation baby.story.hairDef = firstbaby.story.hairDef; baby.story.bodyType = firstbaby.story.bodyType; baby.story.furDef = firstbaby.story.furDef; + baby.story.skinColorOverride = firstbaby.story.skinColorOverride; } if (baby.genes != null && ModsConfig.BiotechActive)