AblativeAbsolute/rjw_menstruation
1
0
Fork 0
mirror of https://gitgud.io/lutepickle/rjw_menstruation.git synced 2024-08-14 22:46:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor GoNextStage to directly take a stage time

Browse source
This commit is contained in:
lutepickle 2023-10-28 10:43:23 -07:00
parent f2a599ab08
commit 441ee1de48
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
View file

@ -1734,8 +1734,7 @@ namespace RJW_Menstruation
GoOvulatoryStage();
else
{
currentIntervalTicks = totalFollicularTicks - currentIntervalTicks; // I.e., the remaining follicular time equals the total minus the bleeding time elapsed
GoNextStage(Stage.Follicular, false);
GoNextStage(Stage.Follicular, totalFollicularTicks - currentIntervalTicks); // I.e., the remaining follicular time equals the total minus the bleeding time elapsed
}
}
else
@ -1800,7 +1799,7 @@ namespace RJW_Menstruation
else
{
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 });
}
public void GoNextStage(Stage nextstage, bool calculateHours = true)
public void GoNextStage(Stage nextstage, int? stageTicks = null)
{
curStageTicks = 0;
if (calculateHours) currentIntervalTicks = PeriodRandomizer(nextstage);
currentIntervalTicks = stageTicks ?? PeriodRandomizer(nextstage);
curStage = nextstage;
}