Display multiple gizmos for multiple wombs

1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/GetGizmos.cs

@@ -88,7 +88,7 @@ namespace RJW_Menstruation
 
             Color c = comp.GetCumMixtureColor;
 
-            Gizmo gizmo = new Gizmo_Womb
+            return new Gizmo_Womb
             {
                 defaultLabel = pawn.LabelShort,
                 defaultDesc = description,
@@ -98,16 +98,14 @@ namespace RJW_Menstruation
                 cumcolor = c,
                 comp = comp,
                 order = 100,
-                hotKey = VariousDefOf.OpenStatusWindowKey,
+                hotKey = comp == pawn.GetFirstMenstruationComp() ? VariousDefOf.OpenStatusWindowKey : null,
+                groupKey = 0,
                 action = delegate
                 {
                     Dialog_WombStatus.ToggleWindow(pawn, comp);
                 }
             };
-
-            return gizmo;
         }
-
     }
 
 

1.3/source/RJW_Menstruation/RJW_Menstruation/UI/Gizmo_Womb.cs

@@ -38,8 +38,11 @@ namespace RJW_Menstruation
 
         }
 
-
+        public override bool GroupsWith(Gizmo other)
-
+        {
+            if (other is Gizmo_Womb womb && womb != this) return false;
+            else return base.GroupsWith(other);
+        }
 
     }
 }

changelogs.txt

@@ -1,8 +1,9 @@
 Version 1.0.7.3
+ - Properly display multiple icons for pawns with multiple wombs.
 
 Version 1.0.7.2
- - Fix errors when trying to open dev actions when HAR is not installed
+ - Fix errors when trying to open dev actions when HAR is not installed.
- - Fix "error processing breasts" for pawns with vanilla pregnancy (e.g. animals)
+ - Fix "error processing breasts" for pawns with vanilla pregnancy (e.g. animals).
  - Removing a vagina won't end a mechanoid implant anymore.
 
 Version 1.0.7.1