Merge branch 'dev'

feat(rjw-menstruation): add sortable womb status column to RJW main tab

See merge request lutepickle/rjw_menstruation!18

.gitignore

@@ -343,3 +343,6 @@ healthchecksdb
 *.psd
 *.dds
 *.pdn
+
+Directory.Build.props
+Directory.Build.targets

1.6/Defs/RJWTab/PawnColumnDefs_Menstruation.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+  <PawnColumnDef>
+    <defName>RJWMenstruation_Womb</defName>
+    <headerIcon>Womb/Womb</headerIcon>
+    <headerTip>Open womb status. Click the header to sort by womb presence and cycle stage.</headerTip>
+    <workerClass>RJW_Menstruation.MainTab.PawnColumnWorker_WombStatus</workerClass>
+    <sortable>true</sortable>
+    <width>34</width>
+  </PawnColumnDef>
+</Defs>

1.6/Languages/ChineseTraditional/Keyed/RJW_Menstruation.xml

@@ -166,4 +166,7 @@
     <Description_Absorbed>已吸收</Description_Absorbed>
     <!--Generated at: 2025-01-21-->
     <Stage_Anestrus_Periodic_Desc>子宮處於月經週期之外。經過足夠的時間後，月經週期會恢復。</Stage_Anestrus_Periodic_Desc>
+    <!--Generated at: 2026-02-15-->
+    <Option_ShowInfertileIcon_Desc>對已經不育的子宮顯示子宮圖示</Option_ShowInfertileIcon_Desc>
+    <Option_ShowInfertileIcon_Label>仍然展示不育的子宮狀態</Option_ShowInfertileIcon_Label>
 </LanguageData>

1.6/Patches/RJW_PawnTableDefs.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+  <Operation Class="PatchOperationSequence">
+    <operations>
+      <li Class="PatchOperationInsert">
+        <xpath>/Defs/PawnTableDef[defName="RJW_PawnTable_Colonists"]/columns/li[text()="Pregnant"]</xpath>
+        <value>
+          <li>RJWMenstruation_Womb</li>
+        </value>
+      </li>
+      <li Class="PatchOperationInsert">
+        <xpath>/Defs/PawnTableDef[defName="RJW_PawnTable_Property"]/columns/li[text()="Pregnant"]</xpath>
+        <value>
+          <li>RJWMenstruation_Womb</li>
+        </value>
+      </li>
+    </operations>
+  </Operation>
+</Patch>

1.6/source/RJW_Menstruation/RJW_Menstruation/Cum.cs

@@ -169,6 +169,13 @@ namespace RJW_Menstruation
             Scribe_Values.Look(ref useCustomColor, "useCustomColor", false);
             Scribe_Values.Look(ref customColor, "customColor", default);
             Scribe_Defs.Look(ref filthDef, "filthDef");
+            if (Scribe.mode == LoadSaveMode.PostLoadInit &&
+                (Single.IsInfinity(FertVolume) || Single.IsNaN(FertVolume) || volume < 0f))
+            {
+                Log.Error($"Invalid amount of {pawn}'s cum in a womb");
+                volume = 0;
+                fertility = 0;
+            }
         }
 
         public void MakeThinner(float speed)

1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs

@@ -126,7 +126,7 @@ namespace RJW_Menstruation
         protected int? opcache = null;
         protected float antisperm = 0.0f;
         // RJW pregnancy, or Biotech pregnancy/labor/laborpushing
-        protected Hediff pregnancy = null;
+        protected Hediff pregnancy = null;      // Remove, instead reference per-genital pregnancy list
 
         protected int eggLifeSpanTicks = GenDate.DaysToTicks(2);
         protected EstrusLevel estrusLevel = EstrusLevel.Visible;
@@ -313,7 +313,7 @@ namespace RJW_Menstruation
                 {
                     StatDefOf.Fertility.Worker.ClearCacheForThing(Pawn);    // No effect for now, but a future RW update might add caching for this
                     calculatingOvulationChance = true;
-                    ovulationChance *= PawnCapacityUtility.CalculateCapacityLevel(Pawn.health.hediffSet, xxx.reproduction);
+                    ovulationChance *= PawnCapacityUtility.CalculateCapacityLevel(Pawn.health.hediffSet, xxx.reproduction); // Add genital fertility
                 }
                 finally
                 {                    
@@ -882,6 +882,11 @@ namespace RJW_Menstruation
             return cums?.Find(cum => !cum.notcum && cum.pawn == pawn);
         }
 
+        public IEnumerable<Cum> GetFluids()
+        {
+            return cums ?? Enumerable.Empty<Cum>();
+        }
+
         public IEnumerable<Cum> GetFluids(Pawn pawn)
         {
             return cums?.Where(cum => cum.pawn == pawn) ?? Enumerable.Empty<Cum>();
@@ -1476,7 +1481,7 @@ namespace RJW_Menstruation
                     try
                     {
                         if (Configurations.Debug) Log.Message($"Implanting fertilized egg of {Pawn} into {parent}, father {egg.fertilizer}");
-                        if (pregnancy == null)
+                        if (pregnancy == null)  // Support pregnancy list, maybe split off into function
                         {
                             Configurations.PregnancyType usePregnancy = xxx.is_human(Pawn) ? Configurations.PregnancySource : Configurations.PregnancyType.MultiplePregnancy;
                             switch (usePregnancy)
@@ -1494,7 +1499,7 @@ namespace RJW_Menstruation
 
                                 case Configurations.PregnancyType.MultiplePregnancy:
                                     if (Configurations.Debug) Log.Message($"Creating new menstruation pregnancy");
-                                    pregnancy = Hediff_BasePregnancy.Create<Hediff_MultiplePregnancy>(Pawn, egg.fertilizer);
+                                    pregnancy = Hediff_BasePregnancy.Create<Hediff_MultiplePregnancy>(Pawn, egg.fertilizer);    // Add fertility comp of mother
                                     pregnant = true;
                                     deadeggs.Add(egg);
                                     break;

1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs

@@ -308,11 +308,11 @@ namespace RJW_Menstruation
             return ContentFinder<Texture2D>.Get(icon, true);
         }
 
-        public static Texture2D GetAnalIcon(this Pawn pawn)
+        // comp used by Menstruation Fluids
+        public static Texture2D GetAnalIcon(this Pawn pawn, HediffComp_Menstruation comp)
         {
-            Hediff hediff = pawn.health.hediffSet.hediffs.FirstOrDefault(h => VariousDefOf.AllAnuses.Contains(h.def)) ??
-                pawn.health.hediffSet.hediffs.FirstOrDefault(h => h.def.defName.ToLower().Contains("anus"));
-            if (hediff == null) return ContentFinder<Texture2D>.Get("Genitals/Anal00", true);
+            if (!pawn.GetAnusList().Any()) return ContentFinder<Texture2D>.Get("Genitals/Anal00", true);
+            Hediff hediff = pawn.GetAnusList().MaxBy(a => a.Severity);
 
             string icon = ((CompProperties_Anus)hediff.GetAnusComp()?.props)?.analTex ?? "Genitals/Anal";
             float severity = hediff.Severity;

1.6/source/RJW_Menstruation/RJW_Menstruation/MainTab/PawnColumnWorker_WombStatus.cs

@@ -0,0 +1,138 @@
+using RimWorld;
+using UnityEngine;
+using Verse;
+
+namespace RJW_Menstruation.MainTab
+{
+    public class PawnColumnWorker_WombStatus : PawnColumnWorker
+    {
+        private const float CellIconSize = 24f;
+        private const float ProgressBarHeight = 2f;
+        private const float IconScale = 0.85f;
+        private const int HasVisibleWombOffset = 100;
+
+        public override void DoCell(Rect rect, Pawn pawn, PawnTable table)
+        {
+            HediffComp_Menstruation comp = GetDisplayComp(pawn);
+            if (comp == null) return;
+
+            Gizmo_Womb gizmo = Pawn_GetGizmos.CreateGizmo_WombStatus(pawn, comp);
+            Rect iconRect = new Rect(
+                rect.x + (rect.width - CellIconSize) / 2f,
+                rect.y + Mathf.Max((rect.height - CellIconSize) / 2f, 0f),
+                CellIconSize,
+                CellIconSize);
+
+            DrawCellIcon(iconRect, gizmo);
+
+            if (Mouse.IsOver(iconRect) && !gizmo.defaultDesc.NullOrEmpty())
+            {
+                TooltipHandler.TipRegion(iconRect, gizmo.defaultDesc);
+            }
+
+            if (Widgets.ButtonInvisible(iconRect, doMouseoverSound: false))
+            {
+                Dialog_WombStatus.ToggleWindow(pawn, comp);
+            }
+        }
+
+        public override int GetMinWidth(PawnTable table)
+        {
+            return 30;
+        }
+
+        public override int GetMaxWidth(PawnTable table)
+        {
+            return GetMinWidth(table);
+        }
+
+        public override int GetMinCellHeight(Pawn pawn)
+        {
+            return 30;
+        }
+
+        public override int Compare(Pawn a, Pawn b)
+        {
+            int result = GetSortValue(a).CompareTo(GetSortValue(b));
+            if (result != 0) return result;
+
+            return string.CompareOrdinal(a.LabelShortCap, b.LabelShortCap);
+        }
+
+        private static HediffComp_Menstruation GetDisplayComp(Pawn pawn)
+        {
+            if (!pawn.ShowStatus() || !pawn.ShouldCycle()) return null;
+
+            HediffComp_Menstruation comp = pawn.GetFirstMenstruationComp();
+            if (comp == null) return null;
+
+            if (!Configurations.ShowInfertileIcon &&
+                (comp.CurrentVisibleStage == HediffComp_Menstruation.Stage.Infertile ||
+                 comp.CurrentVisibleStage == HediffComp_Menstruation.Stage.None))
+            {
+                return null;
+            }
+
+            return comp;
+        }
+
+        private static int GetSortValue(Pawn pawn)
+        {
+            if (!pawn.ShowStatus() || !pawn.ShouldCycle()) return int.MinValue;
+
+            HediffComp_Menstruation comp = pawn.GetFirstMenstruationComp();
+            if (comp == null) return int.MinValue + 1;
+
+            return HasVisibleWombOffset + GetStageSortValue(comp.CurrentVisibleStage);
+        }
+
+        private static int GetStageSortValue(HediffComp_Menstruation.Stage stage)
+        {
+            switch (stage)
+            {
+                case HediffComp_Menstruation.Stage.Luteal:
+                    return 9;
+                case HediffComp_Menstruation.Stage.Ovulatory:
+                    return 8;
+                case HediffComp_Menstruation.Stage.Follicular:
+                    return 7;
+                case HediffComp_Menstruation.Stage.Pregnant:
+                    return 6;
+                case HediffComp_Menstruation.Stage.Bleeding:
+                    return 5;
+                case HediffComp_Menstruation.Stage.Recover:
+                    return 4;
+                case HediffComp_Menstruation.Stage.Anestrus:
+                    return 3;
+                case HediffComp_Menstruation.Stage.Infertile:
+                    return 2;
+                case HediffComp_Menstruation.Stage.None:
+                    return 1;
+                default:
+                    return 0;
+            }
+        }
+
+        private static void DrawCellIcon(Rect rect, Gizmo_Womb gizmo)
+        {
+            Texture baseIcon = gizmo.icon ?? BaseContent.BadTex;
+            Texture overlay = gizmo.icon_overlay ?? BaseContent.BadTex;
+
+            Widgets.DrawTextureFitted(rect, baseIcon, IconScale);
+
+            Color oldColor = GUI.color;
+            GUI.color = gizmo.cumcolor;
+            Widgets.DrawTextureFitted(rect, overlay, IconScale);
+            GUI.color = Color.white;
+
+            if (Configurations.DrawEggOverlay)
+            {
+                gizmo.comp.DrawEggOverlay(rect, false);
+            }
+
+            Rect progressRect = new Rect(rect.x + 2f, rect.y, rect.width - 4f, ProgressBarHeight);
+            Widgets.FillableBar(progressRect, gizmo.comp.StageProgress, gizmo.comp.GetStageTexture);
+            GUI.color = oldColor;
+        }
+    }
+}

1.6/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs

@@ -46,7 +46,7 @@ namespace RJW_Menstruation
         }
 
 
-        private static Gizmo CreateGizmo_WombStatus(Pawn pawn, HediffComp_Menstruation comp)
+        internal static Gizmo_Womb CreateGizmo_WombStatus(Pawn pawn, HediffComp_Menstruation comp)
         {
             if (!comp.loaded)
                 comp.Initialize();

1.6/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs

@@ -23,7 +23,7 @@ namespace RJW_Menstruation
 
             if (sextype != xxx.rjwSextype.Vaginal && sextype != xxx.rjwSextype.DoublePenetration) return true;
             if (!mother.ShouldCycle()) return true;
-            if (!InteractionCanCausePregnancy(props)) return false;
+            if (!InteractionCanCausePregnancy(props)) return true;
 
             List<Hediff> pawnparts = Genital_Helper.get_PartsHediffList(father, Genital_Helper.get_genitalsBPR(father));
 

1.6/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj

@@ -90,6 +90,7 @@
     <Compile Include="HediffComps\HediffComp_Breast.cs" />
     <Compile Include="Hediff_MultiplePregnancy.cs" />
     <Compile Include="JobDrivers.cs" />
+    <Compile Include="MainTab\PawnColumnWorker_WombStatus.cs" />
     <Compile Include="UI\Gizmo_Womb.cs" />
     <Compile Include="Patch\Harmony.cs" />
     <Compile Include="HediffComps\HediffComp_Menstruation.cs" />
@@ -178,4 +179,4 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

1.6/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs

@@ -390,7 +390,7 @@ namespace RJW_Menstruation
             Rect genitalAnusLabelRect = new Rect(rect.x, rect.y + fontheight + genitalRectHeight, genitalRectWidth, fontheight);
 
             vagina = pawn.GetGenitalIcon(comp);
-            anal = pawn.GetAnalIcon();
+            anal = pawn.GetAnalIcon(comp);
             GUI.color = new Color(1.00f, 0.47f, 0.47f, 1);
             GUI.Box(rect, "", boxstyle);
             GUI.color = Utility.SafeSkinColor(pawn);

1.6/source/RJW_Menstruation/RJW_Menstruation/Utility.cs

@@ -188,60 +188,9 @@ namespace RJW_Menstruation
 
         public static void DrawBreastIcon(this Pawn pawn, Rect rect)
         {
-            Hediff hediff = pawn.health.hediffSet.hediffs.FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def));
             Texture2D breast, nipple, areola;
-            if (hediff != null)
-            {
-                HediffComp_Breast comp = hediff.TryGetComp<HediffComp_Breast>();
-                string icon;
-                if (comp != null) icon = comp.BreastTex ?? "Breasts/Breast_Breast";
-                else
-                {
-                    breast = ContentFinder<Texture2D>.Get("Breasts/Breast_Breast00", false);
-                    nipple = ContentFinder<Texture2D>.Get("Breasts/Breast_Breast00_Nipple00", false);
-                    areola = ContentFinder<Texture2D>.Get("Breasts/Breast_Breast00_Areola00", false);
-
-                    GUI.color = SafeSkinColor(pawn);
-                    GUI.DrawTexture(rect, breast, ScaleMode.ScaleToFit);
-                    GUI.color = Color.white;
-                    GUI.DrawTexture(rect, areola, ScaleMode.ScaleToFit);
-                    GUI.DrawTexture(rect, nipple, ScaleMode.ScaleToFit);
-                    return;
-                }
-
-                if (hediff.Severity < 0.20f) icon += "_Breast00";
-                else if (hediff.Severity < 0.40f) icon += "_Breast01";
-                else if (hediff.Severity < 0.60f) icon += "_Breast02";
-                else if (hediff.Severity < 0.80f) icon += "_Breast03";
-                else if (hediff.Severity < 1.00f) icon += "_Breast04";
-                else icon += "_Breast05";
-
-                string nippleicon, areolaicon;
-                float nipplesize, areolasize;
-                nipplesize = comp.NippleSize;
-                areolasize = comp.AreolaSize;
-
-                nippleicon = icon + "_Nipple0" + GetNippleIndex(nipplesize);
-                areolaicon = icon + "_Areola0" + GetAreolaIndex(areolasize);
-
-
-                breast = ContentFinder<Texture2D>.Get(icon, false);
-                areola = ContentFinder<Texture2D>.Get(areolaicon, false);
-                nipple = ContentFinder<Texture2D>.Get(nippleicon, false);
-                GUI.color = SafeSkinColor(pawn);
-                GUI.DrawTexture(rect, breast, ScaleMode.ScaleToFit);
-
-                GUI.color = comp.NippleColor;
-                
-                GUI.DrawTexture(rect, areola, ScaleMode.ScaleToFit);
-
-                GUI.DrawTexture(rect, nipple, ScaleMode.ScaleToFit);
-
-
-                if (Configurations.Debug) TooltipHandler.TipRegion(rect, comp.DebugInfo());
-
-            }
-            else
+            int breastCount = pawn.GetBreastList().Count();
+            if (breastCount == 0)
             {
                 breast = ContentFinder<Texture2D>.Get("Breasts/Breast_Breast00", false);
                 nipple = ContentFinder<Texture2D>.Get("Breasts/Breast_Breast00_Nipple00", false);
@@ -251,10 +200,42 @@ namespace RJW_Menstruation
                 GUI.DrawTexture(rect, breast, ScaleMode.ScaleToFit);
                 GUI.color = Color.white;
                 GUI.DrawTexture(rect, areola, ScaleMode.ScaleToFit);
-                GUI.DrawTexture(rect, nipple, ScaleMode.ScaleToFit);
+                GUI.DrawTexture(rect, nipple, ScaleMode.ScaleToFit);                
+                return;
             }
 
+            Hediff hediff = pawn.GetBreastList().MaxBy(h => h.Severity);
+            HediffComp_Breast comp = hediff.TryGetComp<HediffComp_Breast>();
+            string icon;
+            if (breastCount > 1) icon = "Breasts_Udder/Breast";
+            else icon = comp?.BreastTex ?? "Breasts/Breast";
 
+            if (hediff.Severity < 0.20f) icon += "_Breast00";
+            else if (hediff.Severity < 0.40f) icon += "_Breast01";
+            else if (hediff.Severity < 0.60f) icon += "_Breast02";
+            else if (hediff.Severity < 0.80f) icon += "_Breast03";
+            else if (hediff.Severity < 1.00f) icon += "_Breast04";
+            else icon += "_Breast05";
+
+            string nippleicon, areolaicon;
+            float nipplesize, areolasize;
+            nipplesize = comp?.NippleSize ?? 0.4f;
+            areolasize = comp?.AreolaSize ?? 0.4f;
+
+            nippleicon = icon + "_Nipple0" + GetNippleIndex(nipplesize);
+            areolaicon = icon + "_Areola0" + GetAreolaIndex(areolasize);
+
+            breast = ContentFinder<Texture2D>.Get(icon, false);
+            areola = ContentFinder<Texture2D>.Get(areolaicon, false);
+            nipple = ContentFinder<Texture2D>.Get(nippleicon, false);
+            
+            GUI.color = SafeSkinColor(pawn);
+            GUI.DrawTexture(rect, breast, ScaleMode.ScaleToFit);
+            GUI.color = comp?.NippleColor ?? Color.white;                
+            GUI.DrawTexture(rect, areola, ScaleMode.ScaleToFit);
+            GUI.DrawTexture(rect, nipple, ScaleMode.ScaleToFit);
+
+            if (Configurations.Debug && comp != null) TooltipHandler.TipRegion(rect, comp.DebugInfo());
         }
 
         public static int GetNippleIndex(float nipplesize)
@@ -358,7 +339,7 @@ namespace RJW_Menstruation
         }
         public static string GetBreastLabel(this Pawn pawn)
         {
-            Hediff hediff = pawn.health.hediffSet.hediffs.FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def));
+            Hediff hediff = pawn.health.hediffSet.hediffs.Where(h => VariousDefOf.AllBreasts.Contains(h.def)).MaxByWithFallback(h => h.Severity);
             if (hediff != null) return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")";
             else return "";
         }

About/Manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW Menstruation</identifier>
-	<version>1.6.2.1</version>
+	<version>1.6.2.4</version>
 	<dependencies>
 	</dependencies>
 	<incompatibleWith />

changelogs.txt

@@ -1,3 +1,14 @@
+Version 1.6.2.4
+ - Fix error on startup and missing womb status in RJW tab with RJW 6.1.4.
+
+Version 1.6.2.3
+ - Fix multiple breasts not appearing in the menstruation UI.
+ - Status of wombs now appears in RJW main tab, contributed by GhostClinic.
+
+Version 1.6.2.2
+ - Pawns with multiple breasts will now display an udder in the menstruation UI.
+ - Updated Traditional Chinese translation by Hydrogen.
+
 Version 1.6.2.1
  - Modifiers in MenstruationModExtensions in ThingDefs and HediffDefs now function.