From b07d12b8f808295eb71b51e690a0258bcf4fe253 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sat, 28 Oct 2023 20:09:59 -0700 Subject: [PATCH] Remove StayCurrentStage and StayCurrentStageConst, as they don't do anything anymore --- .../HediffComps/HediffComp_Menstruation.cs | 22 +------------------ .../HediffComp_PeriodicOvulator.cs | 2 -- 2 files changed, 1 insertion(+), 23 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 7408214..84a26aa 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 @@ -1643,7 +1643,6 @@ namespace RJW_Menstruation estrusflag = true; SetEstrus(); } - StayCurrentStage(); } } @@ -1712,13 +1711,11 @@ namespace RJW_Menstruation else { curStageTicks += TickInterval * Configurations.CycleAcceleration; - StayCurrentStage(); } } else { curStageTicks += TickInterval * Configurations.CycleAcceleration; - StayCurrentStage(); } } @@ -1741,7 +1738,6 @@ namespace RJW_Menstruation { if (curStageTicks < currentIntervalTicks / 4) BleedOut(); curStageTicks += TickInterval * Configurations.CycleAcceleration; - StayCurrentStage(); } } @@ -1757,7 +1753,6 @@ namespace RJW_Menstruation if (pregnancy != null && Pawn.health.hediffSet.hediffs.Contains(pregnancy)) { curStageTicks += TickInterval; - StayCurrentStageConst(Stage.Pregnant); } else { @@ -1786,14 +1781,13 @@ namespace RJW_Menstruation else { curStageTicks += TickInterval * Configurations.CycleAcceleration; - StayCurrentStage(); } } protected virtual void InfertileAction() { if (ShouldBeInfertile()) - StayCurrentStageConst(Stage.Infertile); + return; else if (IsBreedingSeason()) GoNextStage(Stage.Follicular); else @@ -1806,10 +1800,6 @@ namespace RJW_Menstruation { GoFollicularOrBleeding(); } - else - { - StayCurrentStage(); - } } protected virtual void ThoughtCumInside(Pawn cummer) @@ -1883,16 +1873,6 @@ namespace RJW_Menstruation GoNextStage(Stage.Ovulatory); } - //stage can be interrupted in other reasons - protected void StayCurrentStage() - { - } - - //stage never changes - protected void StayCurrentStageConst(Stage curstage) - { - } - protected void GoFollicularOrBleeding() { if (Props.bleedingIntervalDays == 0 || noBleeding) diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs index 098567f..0741ade 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs @@ -108,9 +108,7 @@ namespace RJW_Menstruation { ticksToNextCycle = (int)(averageCycleIntervalTicks * (1 + Rand.Range(-cycleVariability, cycleVariability))); if (IsBreedingSeason()) GoNextStage(Stage.Follicular); - return; } - StayCurrentStage(); } public override void CopyCycleProperties(HediffComp_Menstruation original)