From f63a66efd052fcc797a91f929822a0ba061ac970 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Fri, 12 Aug 2022 08:47:03 -0700 Subject: [PATCH] Properly set the current interval hours on pregnancies. Again. --- .../RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index 58d4930..fdb3c07 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -1202,14 +1202,12 @@ namespace RJW_Menstruation PregnancyHelper.PregnancyDecider(parent.pawn, egg.fertilizer); // I hate having to do this, but it gets the newest pregnancy pregnancy = parent.pawn.health.hediffSet.GetHediffs().MaxBy(hediff => hediff.loadID); - currentIntervalHours = (int)pregnancy?.GestationHours(); pregnant = true; break; } else { pregnancy = Hediff_BasePregnancy.Create(parent.pawn, egg.fertilizer); - currentIntervalHours = (int)pregnancy?.GestationHours(); pregnant = true; deadeggs.Add(egg); } @@ -1695,6 +1693,8 @@ namespace RJW_Menstruation return (int)(Props.bleedingIntervalDays * 24 * (1 + Rand.Range(-cycleVariability, cycleVariability) * 0.5f * variabilityFactor) / (1 + (cycleSpeed - 1) * 0.5f)); case Stage.Recover: return (int)(Props.recoveryIntervalDays * 24 * Rand.Range(-0.05f, 0.05f)); + case Stage.Pregnant: + return (int)MenstruationUtility.GestationHours(pregnancy); default: // Often unused return 1; }