From 3a8c28ff165ec8c254ac5e3d92c11d2a49b40c5f Mon Sep 17 00:00:00 2001
From: lutepickle <28810-lutepickle@users.noreply.gitgud.io>
Date: Sat, 10 Sep 2022 09:06:55 -0700
Subject: [PATCH] Refactor luteal a smidge, apply cramp pain to seasonal
 breeders coming into season

---
 .../HediffComps/HediffComp_Menstruation.cs       | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 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 e8ee2a4..1fa40b9 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
@@ -1442,21 +1442,13 @@ namespace RJW_Menstruation
             if (curStageHrs > currentIntervalHours)
             {
                 eggs.Clear();
-                if (Props.bleedingIntervalDays == 0)
-                {
-                    GoNextStage(Stage.Follicular);
-                }
-                else if (EggHealth < 1f / 4f || (EggHealth < 1f / 3f && Rand.Range(0.0f, 1.0f) < 0.3f)) //skips bleeding
+                if (EggHealth < 1f / 4f || (EggHealth < 1f / 3f && Rand.Range(0.0f, 1.0f) < 0.3f)) //skips bleeding
                 {
                     GoNextStage(Stage.Follicular);
                 }
                 else
                 {
-                    GoNextStage(Stage.Bleeding);
-                    if (crampPain >= 0.05f)
-                    {
-                        AddCrampPain();
-                    }
+                    GoFollicularOrBleeding();
                 }
             }
             else if (!eggs.NullOrEmpty())
@@ -1674,6 +1666,10 @@ namespace RJW_Menstruation
             else
             {
                 GoNextStage(Stage.Bleeding);
+                if (crampPain >= 0.05f)
+                {
+                    AddCrampPain();
+                }
             }
         }