From d0eb2e8383e7c8931f23daf10fa50e7b3e6f640a Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sun, 29 Oct 2023 18:11:51 -0700 Subject: [PATCH] Move the stage time advancement into its own function --- .../HediffComps/HediffComp_Menstruation.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index cf91bda..7186b2d 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -1621,6 +1621,11 @@ namespace RJW_Menstruation Pawn.health.AddHediff(hediff, parent.Part); } + protected void AdvanceStageTime() + { + curStageTicks += TickInterval * Configurations.CycleAcceleration; + } + protected virtual void FollicularAction() { if (!IsBreedingSeason()) @@ -1635,7 +1640,7 @@ namespace RJW_Menstruation } else { - curStageTicks += TickInterval * Configurations.CycleAcceleration; + AdvanceStageTime(); if (!estrusflag && curStageTicks > currentIntervalTicks - Props.estrusDaysBeforeOvulation * GenDate.TicksPerDay) { estrusflag = true; @@ -1648,7 +1653,7 @@ namespace RJW_Menstruation { if (curStageTicks < currentIntervalTicks) { - curStageTicks += TickInterval * Configurations.CycleAcceleration; + AdvanceStageTime(); return; } estrusflag = false; @@ -1708,12 +1713,12 @@ namespace RJW_Menstruation } else { - curStageTicks += TickInterval * Configurations.CycleAcceleration; + AdvanceStageTime(); } } else { - curStageTicks += TickInterval * Configurations.CycleAcceleration; + AdvanceStageTime(); } } @@ -1735,7 +1740,7 @@ namespace RJW_Menstruation else { if (curStageTicks < currentIntervalTicks / 4) BleedOut(); - curStageTicks += TickInterval * Configurations.CycleAcceleration; + AdvanceStageTime(); } } @@ -1778,7 +1783,7 @@ namespace RJW_Menstruation } else { - curStageTicks += TickInterval * Configurations.CycleAcceleration; + AdvanceStageTime(); } }