Merge branch 'dev' into 'dev'

Udder size 01 image

See merge request lutepickle/rjw_menstruation!17

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/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;
         }
     }

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,6 @@
+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.