Merge branch 'UI_vag_label_fix' into 'dev'

Fix UI so it displays the type of the linked vagina hediff

See merge request lutepickle/rjw_menstruation!14

1.6/source/RJW_Menstruation/RJW_Menstruation/Patch/Biotech_Patch.cs

@@ -1,10 +1,12 @@
 using HarmonyLib;
 using RimWorld;
+using rjw;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
+using UnityEngine;
 using Verse;
 
 namespace RJW_Menstruation
@@ -50,6 +52,14 @@ namespace RJW_Menstruation
         {
             HediffComp_Menstruation comp = __instance.GetMenstruationCompFromPregnancy();
             if (comp == null) return;
+            if (Configurations.EnableBirthVaginaMorph)
+            {
+                HediffComp_SexPart vaginaComp = comp.parent?.TryGetComp<HediffComp_SexPart>();
+                if (vaginaComp == null) return;
+                float morph = Mathf.Max(LifeStageDefOf.HumanlikeBaby.bodySizeFactor - Mathf.Pow(vaginaComp.Size, 2), 0f);
+                vaginaComp.baseSize += morph * Configurations.VaginaMorphPower;
+                vaginaComp.UpdateSeverity();
+            }
             comp.Pregnancy = null;
         }
     }

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

@@ -400,7 +400,7 @@ namespace RJW_Menstruation
             GUI.DrawTexture(genitalIconRect, vagina, ScaleMode.ScaleToFit);
 
             GUI.color = Color.white;
-            GUI.Label(genitalVaginaLabelRect, pawn.GetVaginaLabel(), fontstylecenter);
+            GUI.Label(genitalVaginaLabelRect, comp.GetVaginaLabel(), fontstylecenter);
             GUI.Label(genitalAnusLabelRect, pawn.GetAnusLabel(), fontstylecenter);
         }
 

1.6/source/RJW_Menstruation/RJW_Menstruation/Utility.cs

@@ -325,10 +325,10 @@ namespace RJW_Menstruation
         }
 
 
-        public static string GetVaginaLabel(this Pawn pawn)
+        public static string GetVaginaLabel(this HediffComp_Menstruation comp)
         {
-            Hediff hediff = pawn.health.hediffSet.hediffs.Find(h => VariousDefOf.AllVaginas.Contains(h.def));
+            Hediff hediff = comp.parent;
-            return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")" + "\n" + xxx.CountOfSex.LabelCap.CapitalizeFirst() + ": " + pawn.records.GetAsInt(xxx.CountOfSex);
+            return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")" + "\n" + xxx.CountOfSex.LabelCap.CapitalizeFirst() + ": " + comp.parent.pawn.records.GetAsInt(xxx.CountOfSex);
         }
         public static string GetAnusLabel(this Pawn pawn)
         {

changelogs.txt

@@ -1,4 +1,5 @@
 Version 1.6.2.5
+ - The vagina morph after birth setting will now apply to Biotech pregnancies.
 
 Version 1.6.2.4
  - Fix error on startup and missing womb status in RJW tab with RJW 6.1.4.