diff --git a/1.3/Assemblies/RJW_Menstruation.dll b/1.3/Assemblies/RJW_Menstruation.dll index eaa76fc..aae63e0 100644 Binary files a/1.3/Assemblies/RJW_Menstruation.dll and b/1.3/Assemblies/RJW_Menstruation.dll differ 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);