From b174820e50a5b2d72ae3f5ae63f142ae95251147 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Thu, 29 Sep 2022 09:34:30 -0700 Subject: [PATCH] Hide implanted eggs for hidden fetuses --- 1.3/Assemblies/RJW_Menstruation.dll | Bin 172544 -> 172544 bytes .../HediffComps/MenstruationUtility.cs | 13 +++++-------- changelogs.txt | 1 + 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/1.3/Assemblies/RJW_Menstruation.dll b/1.3/Assemblies/RJW_Menstruation.dll index db0fec8fee9fcaac6ddf242a3999c244f0bd6b88..00444758ae3c1c1d408f67cf7286e773c7bdd88c 100644 GIT binary patch delta 10247 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 delta 10300 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 bqr*DoRF2nr<*`ng8J^>_Q7OaJP?!G$lbBrU diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs index 527adfd..10b78a1 100644 --- a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs +++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs @@ -185,13 +185,7 @@ namespace RJW_Menstruation } public static Texture2D GetEggIcon(this HediffComp_Menstruation comp, bool includeOvary) { - if (comp.Pregnancy != null && !(comp.Pregnancy is Hediff_MechanoidPregnancy)) - { - if (comp.GetPregnancyProgress() < 0.2f) return ContentFinder.Get("Eggs/Egg_Implanted00", true); - else return ContentFinder.Get("Womb/Empty", true); - } - - switch (comp.curStage) + switch (comp.CurrentVisibleStage) { case HediffComp_Menstruation.Stage.Follicular: case HediffComp_Menstruation.Stage.ClimactericFollicular: @@ -230,9 +224,12 @@ namespace RJW_Menstruation return ContentFinder.Get("Eggs/Egg_Fertilizing01", true); } else return ContentFinder.Get("Eggs/Egg", true); + case HediffComp_Menstruation.Stage.Pregnant: + if (comp.Pregnancy is Hediff_MechanoidPregnancy) break; + else if (comp.GetPregnancyProgress() < 0.2f) return ContentFinder.Get("Eggs/Egg_Implanted00", true); + else break; } return ContentFinder.Get("Womb/Empty", true); - } public static void DrawEggOverlay(this HediffComp_Menstruation comp, Rect wombRect, bool includeOvary) diff --git a/changelogs.txt b/changelogs.txt index 1ca0faf..71de676 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -5,6 +5,7 @@ Version 1.0.7.5 - Fix error after the game is loaded with an NPC in estrus off-map. - Fix udders not appearing in the womb dialog with RJW 5.2.2. - Fix missing texture error when insect egged with multiple sizes. + - Don't show an implanted egg if the fetus is supposed to be hidden. - Properly calculate cramp pain falloff again. - Climacteric and menopause are now per-womb, appearing in the womb dialog instead of as hediffs. Any old hediffs should disappear upon loading the save. - Added new property to vaginas to multiply the number of eggs available. Archotech vaginas will have quadruple the normal amount.