diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index a9ecec5..f943796 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -251,11 +251,27 @@ namespace RJW_Menstruation return mixedcolor; } } + + public Stage CurrentVisibleStage + { + get + { + if (curStage == Stage.Pregnant) + { + if (Configurations.InfoDetail == Configurations.DetailLevel.All || (PregnancyHelper.GetPregnancy(parent.pawn)?.Visible ?? false)) + return Stage.Pregnant; + else + return Stage.Luteal; + } + return curStage; + } + } + public string GetCurStageLabel { get { - switch (curStage) + switch (CurrentVisibleStage) { case Stage.Follicular: return Translations.Stage_Follicular; @@ -268,8 +284,7 @@ namespace RJW_Menstruation case Stage.Fertilized: return Translations.Stage_Fertilized; case Stage.Pregnant: - if (Configurations.InfoDetail == Configurations.DetailLevel.All || (PregnancyHelper.GetPregnancy(parent.pawn)?.Visible ?? false)) return Translations.Stage_Pregnant; - else return Translations.Stage_Luteal; + return Translations.Stage_Pregnant; case Stage.Recover: return Translations.Stage_Recover; case Stage.None: @@ -483,7 +498,7 @@ namespace RJW_Menstruation { get { - if (!StageTexture.TryGetValue(curStage, out Texture2D tex)) tex = TextureCache.TzeentchTexture; + if (!StageTexture.TryGetValue(CurrentVisibleStage, out Texture2D tex)) tex = TextureCache.TzeentchTexture; return tex; } }