Switch some comp stages to GoNextStage

This commit is contained in:
lutepickle 2023-03-06 17:05:01 -08:00
parent 98cfa23b88
commit 4504d02245
4 changed files with 7 additions and 7 deletions

Binary file not shown.

View File

@ -10,7 +10,7 @@ namespace RJW_Menstruation
private static void SetFollicular(Pawn p) private static void SetFollicular(Pawn p)
{ {
foreach (HediffComp_Menstruation comp in p.GetMenstruationComps()) foreach (HediffComp_Menstruation comp in p.GetMenstruationComps())
comp.curStage = HediffComp_Menstruation.Stage.Follicular; comp.GoNextStage(HediffComp_Menstruation.Stage.Follicular);
Messages.Message($"{p} is now follicular", p, MessageTypeDefOf.NeutralEvent, false); Messages.Message($"{p} is now follicular", p, MessageTypeDefOf.NeutralEvent, false);
} }
@ -18,7 +18,7 @@ namespace RJW_Menstruation
private static void SetOvulatory(Pawn p) private static void SetOvulatory(Pawn p)
{ {
foreach (HediffComp_Menstruation comp in p.GetMenstruationComps()) foreach (HediffComp_Menstruation comp in p.GetMenstruationComps())
comp.curStage = HediffComp_Menstruation.Stage.Ovulatory; comp.GoNextStage(HediffComp_Menstruation.Stage.Ovulatory);
Messages.Message($"{p} is now ovulatory", p, MessageTypeDefOf.NeutralEvent, false); Messages.Message($"{p} is now ovulatory", p, MessageTypeDefOf.NeutralEvent, false);
} }
@ -26,7 +26,7 @@ namespace RJW_Menstruation
private static void SetLuteal(Pawn p) private static void SetLuteal(Pawn p)
{ {
foreach (HediffComp_Menstruation comp in p.GetMenstruationComps()) foreach (HediffComp_Menstruation comp in p.GetMenstruationComps())
comp.curStage = HediffComp_Menstruation.Stage.Luteal; comp.GoNextStage(HediffComp_Menstruation.Stage.Luteal);
Messages.Message($"{p} is now luteal", p, MessageTypeDefOf.NeutralEvent, false); Messages.Message($"{p} is now luteal", p, MessageTypeDefOf.NeutralEvent, false);
} }
@ -34,7 +34,7 @@ namespace RJW_Menstruation
private static void SetBleeding(Pawn p) private static void SetBleeding(Pawn p)
{ {
foreach (HediffComp_Menstruation comp in p.GetMenstruationComps()) foreach (HediffComp_Menstruation comp in p.GetMenstruationComps())
comp.curStage = HediffComp_Menstruation.Stage.Bleeding; comp.GoNextStage(HediffComp_Menstruation.Stage.Bleeding);
Messages.Message($"{p} is now bleeding", p, MessageTypeDefOf.NeutralEvent, false); Messages.Message($"{p} is now bleeding", p, MessageTypeDefOf.NeutralEvent, false);
} }
/* /*

View File

@ -16,7 +16,7 @@ namespace RJW_Menstruation
) )
{ {
comp.SetEstrus(); comp.SetEstrus();
comp.curStage = HediffComp_Menstruation.Stage.Ovulatory; comp.GoNextStage(HediffComp_Menstruation.Stage.Ovulatory);
comp.ovarypower--; comp.ovarypower--;
} }
} }
@ -32,7 +32,7 @@ namespace RJW_Menstruation
) )
{ {
comp.SetEstrus(); comp.SetEstrus();
comp.curStage = HediffComp_Menstruation.Stage.Ovulatory; comp.GoNextStage(HediffComp_Menstruation.Stage.Ovulatory);
comp.eggstack += ingested.stackCount - 1; comp.eggstack += ingested.stackCount - 1;
} }
} }

View File

@ -1822,7 +1822,7 @@ namespace RJW_Menstruation
TaleRecorder.RecordTale(VariousDefOf.TaleCameInside, new object[] { cummer, Pawn }); TaleRecorder.RecordTale(VariousDefOf.TaleCameInside, new object[] { cummer, Pawn });
} }
protected void GoNextStage(Stage nextstage, bool calculateHours = true) public void GoNextStage(Stage nextstage, bool calculateHours = true)
{ {
curStageHrs = 0; curStageHrs = 0;
if (calculateHours) currentIntervalHours = PeriodRandomizer(nextstage); if (calculateHours) currentIntervalHours = PeriodRandomizer(nextstage);