Hide implanted eggs for hidden fetuses

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<Texture2D>.Get("Eggs/Egg_Implanted00", true);
-                else return ContentFinder<Texture2D>.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<Texture2D>.Get("Eggs/Egg_Fertilizing01", true);
                     }
                     else return ContentFinder<Texture2D>.Get("Eggs/Egg", true);
+                case HediffComp_Menstruation.Stage.Pregnant:
+                    if (comp.Pregnancy is Hediff_MechanoidPregnancy) break;
+                    else if (comp.GetPregnancyProgress() < 0.2f) return ContentFinder<Texture2D>.Get("Eggs/Egg_Implanted00", true);
+                    else break;
             }
             return ContentFinder<Texture2D>.Get("Womb/Empty", true);
-
         }
 
         public static void DrawEggOverlay(this HediffComp_Menstruation comp, Rect wombRect, bool includeOvary)

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.