AblativeAbsolute
/
rjw_menstruation
mirror of https://gitgud.io/lutepickle/rjw_menstruation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove StayCurrentStage and StayCurrentStageConst, as they don't do anything anymore

This commit is contained in:
lutepickle 2023-10-28 20:09:59 -07:00
parent 0a24b5556f
commit b07d12b8f8
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
View File

@ -1643,7 +1643,6 @@ namespace RJW_Menstruation
estrusflag = true; estrusflag = true;
SetEstrus(); SetEstrus();
} }
StayCurrentStage();
} }
} }
@ -1712,13 +1711,11 @@ namespace RJW_Menstruation
else else
{ {
curStageTicks += TickInterval * Configurations.CycleAcceleration; curStageTicks += TickInterval * Configurations.CycleAcceleration;
StayCurrentStage();
} }
} }
else else
{ {
curStageTicks += TickInterval * Configurations.CycleAcceleration; curStageTicks += TickInterval * Configurations.CycleAcceleration;
StayCurrentStage();
} }
} }
@ -1741,7 +1738,6 @@ namespace RJW_Menstruation
{ {
if (curStageTicks < currentIntervalTicks / 4) BleedOut(); if (curStageTicks < currentIntervalTicks / 4) BleedOut();
curStageTicks += TickInterval * Configurations.CycleAcceleration; curStageTicks += TickInterval * Configurations.CycleAcceleration;
StayCurrentStage();
} }
} }
@ -1757,7 +1753,6 @@ namespace RJW_Menstruation
if (pregnancy != null && Pawn.health.hediffSet.hediffs.Contains(pregnancy)) if (pregnancy != null && Pawn.health.hediffSet.hediffs.Contains(pregnancy))
{ {
curStageTicks += TickInterval; curStageTicks += TickInterval;
StayCurrentStageConst(Stage.Pregnant);
} }
else else
{ {
@ -1786,14 +1781,13 @@ namespace RJW_Menstruation
else else
{ {
curStageTicks += TickInterval * Configurations.CycleAcceleration; curStageTicks += TickInterval * Configurations.CycleAcceleration;
StayCurrentStage();
} }
} }
protected virtual void InfertileAction() protected virtual void InfertileAction()
{ {
if (ShouldBeInfertile()) if (ShouldBeInfertile())
StayCurrentStageConst(Stage.Infertile); return;
else if (IsBreedingSeason()) else if (IsBreedingSeason())
GoNextStage(Stage.Follicular); GoNextStage(Stage.Follicular);
else else
@ -1806,10 +1800,6 @@ namespace RJW_Menstruation
{ {
GoFollicularOrBleeding(); GoFollicularOrBleeding();
} }
else
{
StayCurrentStage();
}
} }
protected virtual void ThoughtCumInside(Pawn cummer) protected virtual void ThoughtCumInside(Pawn cummer)
@ -1883,16 +1873,6 @@ namespace RJW_Menstruation
GoNextStage(Stage.Ovulatory); GoNextStage(Stage.Ovulatory);
} }
//stage can be interrupted in other reasons
protected void StayCurrentStage()
{
}
//stage never changes
protected void StayCurrentStageConst(Stage curstage)
{
}
protected void GoFollicularOrBleeding() protected void GoFollicularOrBleeding()
{ {
if (Props.bleedingIntervalDays == 0 || noBleeding) if (Props.bleedingIntervalDays == 0 || noBleeding)

2
1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs
View File

@ -108,9 +108,7 @@ namespace RJW_Menstruation
{ {
ticksToNextCycle = (int)(averageCycleIntervalTicks * (1 + Rand.Range(-cycleVariability, cycleVariability))); ticksToNextCycle = (int)(averageCycleIntervalTicks * (1 + Rand.Range(-cycleVariability, cycleVariability)));
if (IsBreedingSeason()) GoNextStage(Stage.Follicular); if (IsBreedingSeason()) GoNextStage(Stage.Follicular);
return;
} }
StayCurrentStage();
} }
public override void CopyCycleProperties(HediffComp_Menstruation original) public override void CopyCycleProperties(HediffComp_Menstruation original)