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/HediffComps/HediffComp_Menstruation.cs

@@ -1971,7 +1971,7 @@ namespace RJW_Menstruation
             }
         }
 
-        protected float InterspeciesImplantFactor(Pawn fertilizer)
+        public float InterspeciesImplantFactor(Pawn fertilizer)
         {
             if (fertilizer.def.defName == Pawn.def.defName) return 1.0f;
             else

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)
         {

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.4</version>
+	<version>1.6.2.5</version>
 	<dependencies>
 	</dependencies>
 	<incompatibleWith />

changelogs.txt

@@ -1,3 +1,5 @@
+Version 1.6.2.5
+
 Version 1.6.2.4
  - Fix error on startup and missing womb status in RJW tab with RJW 6.1.4.