From 5abdf52dbe6f26b04357fd50b957ff644f485702 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Thu, 2 Mar 2023 14:42:49 -0800 Subject: [PATCH] Use GoNextStage more to properly reset curStageHrs --- 1.4/Assemblies/RJW_Menstruation.dll | Bin 220160 -> 220160 bytes .../HediffComps/HediffComp_Menstruation.cs | 6 +++--- .../HediffComp_PeriodicOvulator.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index 23a7e14e4b03d081227accbbe10ed623667bc19c..021595445b33f934e44731e370a69ccf2a947942 100644 GIT binary patch delta 8299 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 24 * (Props.follicularIntervalDays + Props.lutealIntervalDays) / cycleSpeed) - curStage = Stage.Anestrus; + GoNextStage(Stage.Anestrus); } }