diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index 5f42dbb..2e09816 100644 Binary files a/1.4/Assemblies/RJW_Menstruation.dll and b/1.4/Assemblies/RJW_Menstruation.dll differ diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/DebugActions.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/DebugActions.cs index 3a8fdb5..fe98f5a 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/DebugActions.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/DebugActions.cs @@ -10,7 +10,7 @@ namespace RJW_Menstruation private static void SetFollicular(Pawn p) { 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); } @@ -18,7 +18,7 @@ namespace RJW_Menstruation private static void SetOvulatory(Pawn p) { 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); } @@ -26,7 +26,7 @@ namespace RJW_Menstruation private static void SetLuteal(Pawn p) { 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); } @@ -34,7 +34,7 @@ namespace RJW_Menstruation private static void SetBleeding(Pawn p) { 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); } /* diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs index 6e8c375..7b0ab74 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs @@ -16,7 +16,7 @@ namespace RJW_Menstruation ) { comp.SetEstrus(); - comp.curStage = HediffComp_Menstruation.Stage.Ovulatory; + comp.GoNextStage(HediffComp_Menstruation.Stage.Ovulatory); comp.ovarypower--; } } @@ -32,7 +32,7 @@ namespace RJW_Menstruation ) { comp.SetEstrus(); - comp.curStage = HediffComp_Menstruation.Stage.Ovulatory; + comp.GoNextStage(HediffComp_Menstruation.Stage.Ovulatory); comp.eggstack += ingested.stackCount - 1; } } 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 dcb47c6..cf2fbaa 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 @@ -1822,7 +1822,7 @@ namespace RJW_Menstruation 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; if (calculateHours) currentIntervalHours = PeriodRandomizer(nextstage);