Call ResolveAllGraphics unconditionally for babies. Also copy skinColorOverride for twins

This commit is contained in:
lutepickle 2023-01-10 05:46:16 -08:00
parent d34c96315a
commit 93566b5fa3
2 changed files with 7 additions and 5 deletions

View File

@ -98,8 +98,7 @@ namespace RJW_Menstruation
{ {
if (i == 0) if (i == 0)
{ {
if (baby.IsHAR()) baby.Drawer.renderer.graphics.ResolveAllGraphics();
baby.Drawer.renderer.graphics.ResolveAllGraphics();
firstbaby = baby; firstbaby = baby;
request.FixedGender = baby.gender; request.FixedGender = baby.gender;
request.ForcedEndogenes = baby.genes?.Endogenes.Select(gene => gene.def).ToList(); 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.hairDef = firstbaby.story.hairDef;
baby.story.bodyType = firstbaby.story.bodyType; baby.story.bodyType = firstbaby.story.bodyType;
baby.story.furDef = firstbaby.story.furDef; baby.story.furDef = firstbaby.story.furDef;
baby.story.skinColorOverride = firstbaby.story.skinColorOverride;
} }
if (baby.genes != null) if (baby.genes != null)

View File

@ -334,9 +334,10 @@ namespace RJW_Menstruation
if (division > 1) if (division > 1)
{ {
if (i == 0) if (i == 0)
{ {
if (baby.IsHAR()) // Have HAR determine the first baby's properties // HAR and some xenotype mods don't randomize graphics until it's rendered
baby.Drawer.renderer.graphics.ResolveAllGraphics(); // So poke it early
baby.Drawer.renderer.graphics.ResolveAllGraphics();
firstbaby = baby; firstbaby = baby;
request.FixedGender = baby.gender; request.FixedGender = baby.gender;
request.ForcedEndogenes = baby.genes?.Endogenes.Select(gene => gene.def).ToList(); 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.hairDef = firstbaby.story.hairDef;
baby.story.bodyType = firstbaby.story.bodyType; baby.story.bodyType = firstbaby.story.bodyType;
baby.story.furDef = firstbaby.story.furDef; baby.story.furDef = firstbaby.story.furDef;
baby.story.skinColorOverride = firstbaby.story.skinColorOverride;
} }
if (baby.genes != null && ModsConfig.BiotechActive) if (baby.genes != null && ModsConfig.BiotechActive)