From 58b2e4983cdddc6a8a9ecd618da6d76c3d0c082d Mon Sep 17 00:00:00 2001
From: lutepickle <28810-lutepickle@users.noreply.gitgud.io>
Date: Fri, 8 Jul 2022 12:10:52 -0700
Subject: [PATCH] Apply cycle speed properly to ovary power by age

---
 1.3/Assemblies/RJW_Menstruation.dll           | Bin 157184 -> 157184 bytes
 .../HediffComps/HediffComp_InducedOvulator.cs |   2 +-
 .../HediffComps/HediffComp_Menstruation.cs    |   6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/1.3/Assemblies/RJW_Menstruation.dll b/1.3/Assemblies/RJW_Menstruation.dll
index eaa76fce81d802d915d94c83c26bab1f23b58b02..aae63e03b24f60da45699bc335ddc2a56b267b83 100644
GIT binary patch
delta 5566
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
STP~(6k5>Amnl8iM*Y*FexB}?_

delta 5570
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

diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs
index e77497f..7dbfe8f 100644
--- a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs
+++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs
@@ -54,7 +54,7 @@ namespace RJW_Menstruation
         }
 
         // There's really no good way to estimate the number of times it's been induced, so this is all we can do
-        protected override int PawnEggsUsed(int pawnCyclesElapsed, float avglittersize)
+        protected override int PawnEggsUsed(float pawnCyclesElapsed, float avglittersize)
         {
             return 0;
         }
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 07b30a8..f5a1109 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
@@ -959,7 +959,7 @@ namespace RJW_Menstruation
             return breedingRatio * GenDate.DaysPerYear / ((float)(Props.follicularIntervalDays + Props.lutealIntervalDays) / Configurations.CycleAccelerationDefault);
         }
 
-        protected virtual int PawnEggsUsed(int pawnCyclesElapsed, float avglittersize)
+        protected virtual int PawnEggsUsed(float pawnCyclesElapsed, float avglittersize)
         {
             return (int)(pawnCyclesElapsed * avglittersize);
         }
@@ -985,8 +985,8 @@ namespace RJW_Menstruation
             int lifetimeCycles = (int)(raceCyclesPerYear * (fertEndAge - fertStartAge));
             int lifetimeEggs = (int)(lifetimeCycles * avglittersize * Utility.RandGaussianLike(0.70f, 1.30f, 5));
 
-            float pawnCyclesPerYear = raceCyclesPerYear / cycleSpeed;
-            int pawnCyclesElapsed = (int)Mathf.Max((pawn.ageTracker.AgeBiologicalYearsFloat - fertStartAge) * pawnCyclesPerYear, 0.0f);
+            float pawnCyclesPerYear = raceCyclesPerYear * cycleSpeed;
+            float pawnCyclesElapsed = Mathf.Max((pawn.ageTracker.AgeBiologicalYearsFloat - fertStartAge) * pawnCyclesPerYear, 0.0f);
             int pawnEggsUsed = PawnEggsUsed(pawnCyclesElapsed, avglittersize);
 
             return Math.Max(lifetimeEggs - pawnEggsUsed, 0);