diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index 9933165..c6ae6ba 100644 Binary files a/1.4/Assemblies/RJW_Menstruation.dll and b/1.4/Assemblies/RJW_Menstruation.dll differ diff --git a/1.4/MilkModule/Assemblies/MilkModule.dll b/1.4/MilkModule/Assemblies/MilkModule.dll index 66a2076..a0d00f9 100644 Binary files a/1.4/MilkModule/Assemblies/MilkModule.dll and b/1.4/MilkModule/Assemblies/MilkModule.dll differ diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs index 40a157f..43e2717 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs @@ -115,16 +115,25 @@ namespace RJW_Menstruation if (hediff is Hediff_MechanoidPregnancy) return ContentFinder.Get(("Womb/Mechanoid_Fluid"), true); - ThingDef babydef = comp.Pawn.def; - HediffComp_PregeneratedBabies babiescomp = hediff?.TryGetComp(); - if (babiescomp?.HasBaby ?? false) - babydef = babiescomp.babies.First().def; float gestationProgress = comp.StageProgress; - int babycount = hediff is Hediff_BasePregnancy preg ? preg.babies.Count : 1; - if (hediff is Hediff_BasePregnancy h) + ThingDef babydef; + int babycount; + HediffComp_PregeneratedBabies babiescomp = hediff?.TryGetComp(); + if (hediff is Hediff_BasePregnancy preg) { - babydef = h.babies?.FirstOrDefault()?.def ?? ThingDefOf.Human; + babydef = preg.babies?.FirstOrDefault()?.def ?? ThingDefOf.Human; + babycount = preg.babies?.Count ?? 1; + } + else if (babiescomp?.HasBaby ?? false) + { + babydef = babiescomp.babies.First().def; + babycount = babiescomp.babies.Count; + } + else + { + babydef = comp.Pawn.def; + babycount = 1; } string fetustex = babydef.GetModExtension()?.fetusTexPath ?? "Fetus/Fetus_Default";