Refactor GoNextStage to directly take a stage time
This commit is contained in:
parent
f2a599ab08
commit
441ee1de48
|
@ -1734,8 +1734,7 @@ namespace RJW_Menstruation
|
||||||
GoOvulatoryStage();
|
GoOvulatoryStage();
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
currentIntervalTicks = totalFollicularTicks - currentIntervalTicks; // I.e., the remaining follicular time equals the total minus the bleeding time elapsed
|
GoNextStage(Stage.Follicular, totalFollicularTicks - currentIntervalTicks); // I.e., the remaining follicular time equals the total minus the bleeding time elapsed
|
||||||
GoNextStage(Stage.Follicular, false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1800,7 +1799,7 @@ namespace RJW_Menstruation
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
bool breedingSeason = IsBreedingSeason();
|
bool breedingSeason = IsBreedingSeason();
|
||||||
GoNextStage(breedingSeason ? Stage.Follicular : Stage.Anestrus, breedingSeason);
|
GoNextStage(breedingSeason ? Stage.Follicular : Stage.Anestrus, breedingSeason ? (int?)null : 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1875,10 +1874,10 @@ namespace RJW_Menstruation
|
||||||
TaleRecorder.RecordTale(VariousDefOf.TaleCameInside, new object[] { cummer, Pawn });
|
TaleRecorder.RecordTale(VariousDefOf.TaleCameInside, new object[] { cummer, Pawn });
|
||||||
}
|
}
|
||||||
|
|
||||||
public void GoNextStage(Stage nextstage, bool calculateHours = true)
|
public void GoNextStage(Stage nextstage, int? stageTicks = null)
|
||||||
{
|
{
|
||||||
curStageTicks = 0;
|
curStageTicks = 0;
|
||||||
if (calculateHours) currentIntervalTicks = PeriodRandomizer(nextstage);
|
currentIntervalTicks = stageTicks ?? PeriodRandomizer(nextstage);
|
||||||
curStage = nextstage;
|
curStage = nextstage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue