From 1133255b0a459c90b5b35a6741dfda1140b1c0ae Mon Sep 17 00:00:00 2001
From: lutepickle <28810-lutepickle@users.noreply.gitgud.io>
Date: Sun, 10 Jul 2022 08:05:08 -0700
Subject: [PATCH] Rearrange LutealAction to let the stage end with fertilized
 eggs

---
 1.3/Assemblies/RJW_Menstruation.dll           | Bin 157184 -> 157696 bytes
 .../HediffComps/HediffComp_Menstruation.cs    |  49 +++++++++---------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/1.3/Assemblies/RJW_Menstruation.dll b/1.3/Assemblies/RJW_Menstruation.dll
index 151a8a95071338ca32d66d9114c4797e3b850bf1..4861c81a241c6f9ccbd0d944aa1e392f48c950e0 100644
GIT binary patch
delta 5378
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
YO+ht&>83wDOl)LLw+z#7a18ePKN=s$fB*mh

delta 5369
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
MjI3;%YPyC013O#4u>b%7

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 fb83513..067825e 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
@@ -1392,30 +1392,7 @@ namespace RJW_Menstruation
                 RemoveClimactericEffect();
                 StayCurrentStage();
             }
-            else if (!eggs.NullOrEmpty())
-            {
-                FertilizationCheck();
-                EggDecay();
-                if (Implant())
-                {
-                    if (Breast != null)
-                    {
-                        Breast.PregnancyTransition();
-                    }
-                    GoNextStage(Stage.Pregnant);
-                }
-                else
-                {
-                    curStageHrs += Configurations.CycleAcceleration;
-                    StayCurrentStage();
-                }
-            }
-            else if (curStageHrs <= currentIntervalHours)
-            {
-                curStageHrs += Configurations.CycleAcceleration;
-                StayCurrentStage();
-            }
-            else
+            else if (curStageHrs > currentIntervalHours)
             {
                 eggs.Clear();
                 if (Props.bleedingIntervalDays == 0)
@@ -1435,6 +1412,30 @@ namespace RJW_Menstruation
                     GoNextStage(climacteric ? Stage.ClimactericBleeding : Stage.Bleeding);
                 }
             }
+            else if (!eggs.NullOrEmpty())
+            {
+                FertilizationCheck();
+                EggDecay();
+                if (Implant())
+                {
+                    if (Breast != null)
+                    {
+                        Breast.PregnancyTransition();
+                    }
+                    GoNextStage(Stage.Pregnant);
+                }
+                else
+                {
+                    curStageHrs += Configurations.CycleAcceleration;
+                    StayCurrentStage();
+                }
+            }
+            else
+            {
+                curStageHrs += Configurations.CycleAcceleration;
+                StayCurrentStage();
+            }
+            
         }
 
         protected virtual void BleedingAction(bool climacteric)