Merge branch 'DP_fix' into 'dev'

Draft: Fix DP interactions not adding properly cumming in pawns

See merge request lutepickle/rjw_menstruation!15

1.6/Patches/RJW_PawnTableDefs.xml

@@ -2,12 +2,6 @@
 <Patch>
   <Operation Class="PatchOperationSequence">
     <operations>
-      <li Class="PatchOperationInsert">
-        <xpath>/Defs/PawnTableDef[defName="RJW_PawnTable_Humanlikes"]/columns/li[text()="Pregnant"]</xpath>
-        <value>
-          <li>RJWMenstruation_Womb</li>
-        </value>
-      </li>
       <li Class="PatchOperationInsert">
         <xpath>/Defs/PawnTableDef[defName="RJW_PawnTable_Colonists"]/columns/li[text()="Pregnant"]</xpath>
         <value>

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
                 {                    
@@ -966,6 +966,70 @@ namespace RJW_Menstruation
             }
         }
 
+        /// <summary>
+        /// Inject pawn's cum into womb
+        /// </summary>
+        /// <param name="cummer"></param>
+        /// <param name="volume"></param>
+        /// <param name="fertility"></param>
+        /// <param name="precum"></param>
+        public void CumIn(Hediff penis, float volume = -1.0f, float fertility = -1.0f, bool precum = false)
+        {
+            if(!Genital_Helper.is_penis(penis)) return;
+            HediffComp_SexPart comp = penis.TryGetComp<HediffComp_SexPart>();
+            if (volume < 0) volume = Utility.GetCumVolume(penis.pawn, penis.TryGetComp<HediffComp_SexPart>());
+            if (volume <= 0 || float.IsNaN(volume) || float.IsInfinity(volume))
+            {
+                if (!precum) Log.Warning($"{penis.pawn}, {penis} trying to cum inside of {Pawn} with {volume} fluid");
+                return;
+            }
+
+            if (fertility < 0) fertility = (Genital_Helper.is_fertile_penis(penis) && !penis.pawn.SterileGenes()) ? penis.pawn.health.capacities.GetLevel(xxx.reproduction) : 0.0f;
+
+
+            if (!precum && Rand.Chance(PulloutChance(penis.pawn, fertility))) return;
+            if (Pawn.HasIUD()) fertility /= 100f;
+            float cumd = TotalCumPercent;
+            float tmp = TotalCum + volume;
+            if (tmp > CumCapacity)
+            {
+                float cumoutrate = 1 - (CumCapacity / tmp);
+                bool merged = false;
+                if (!cums.NullOrEmpty()) foreach (Cum cum in cums)
+                    {
+                        if (cum.pawn?.Equals(penis.pawn) ?? false)
+                        {
+                            cum.MergeWithCum(volume, fertility);
+                            merged = true;
+                        }
+                        cum.DismishForce(cumoutrate);
+                    }
+                if (!merged) cums.Add(new Cum(penis.pawn, volume * (1 - cumoutrate), fertility));
+            }
+            else
+            {
+
+                bool merged = false;
+                if (!cums.NullOrEmpty()) foreach (Cum cum in cums)
+                    {
+                        if (cum.pawn?.Equals(penis.pawn) ?? false)
+                        {
+                            cum.MergeWithCum(volume, fertility);
+                            merged = true;
+                        }
+                    }
+                if (!merged) cums.Add(new Cum(penis.pawn, volume, fertility));
+            }
+            cumd = TotalCumPercent - cumd;
+
+            if (!precum)
+            {
+                Pawn.records.AddTo(VariousDefOf.AmountofCreampied, volume);
+                AfterCumIn(penis.pawn);
+                AfterFluidIn(cumd);
+            }
+        }
+
         /// <summary>
         /// Inject pawn's fluid into womb
         /// </summary>
@@ -1481,7 +1545,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)
@@ -1499,7 +1563,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/Patch/RJW_Patch.cs

@@ -1,5 +1,6 @@
 using HarmonyLib;
 using RimWorld;
+using RimWorld.Planet;
 using rjw;
 using rjw.Modules.Interactions;
 using System;
@@ -34,7 +35,9 @@ namespace RJW_Menstruation
             {
                 if (MenstruationUtility.UsingCondom(father, mother)) return false;   // Probably unnecessary
 
+                MenstruationImpregnate(father, mother, props);
                 PregnancyHelper.DoImpregnate(father, mother);
+
                 return false;
             }
             else if (Genital_Helper.has_ovipositorM(father, pawnparts))
@@ -70,20 +73,88 @@ namespace RJW_Menstruation
         {
             SexInteraction interaction = props.interaction;
 
-            if (!interaction.HasInteractionTag(SexInteractionTag.Fertilization))
-                return false;
-
-            if (!props.isReceiver)
+            foreach ((var penetrator, var orifice) in props.resolved.Penetrations)
             {
-                return
-                    interaction.Extension.initiatorRequirement.genitalTags.Contains(GenitalTag.CanPenetrate) &&
-                    interaction.Extension.recipientRequirement.genitalFamilies.Contains(GenitalFamily.Vagina);
+                if (penetrator.Owner == props.pawn && orifice.Owner == props.partner && penetrator.HasGenitalTag(GenitalTag.CanFertilize) && orifice.HasGenitalTag(GenitalTag.CanBeFertilized)) return true;
+            }
+            return false;
+        }
+
+        public static void MenstruationImpregnate(Pawn father, Pawn mother, SexProps props)
+        {
+            if (!mother.ShouldCycle()) return;
+            if (props.sexType == xxx.rjwSextype.Vaginal)
+            {
+                HediffComp_Menstruation comp = mother.GetRandomMenstruationComp(true);
+                if (comp == null)
+                {
+                    return;
+                }
+                else if (AndroidsCompatibility.IsAndroid(father) && !AndroidsCompatibility.AndroidPenisFertility(father))
+                {
+                    comp.CumIn(father, father.GetCumVolume(), 0);
+                    return;
+                }
+                else comp.CumIn(father, father.GetCumVolume(), father.SterileGenes() ? 0.0f : father.health.capacities.GetLevel(xxx.reproduction));
+            }
+            else if (props.sexType == xxx.rjwSextype.DoublePenetration)
+            {
+                List<HediffComp_Menstruation> comps = mother.GetMenstruationComps().ToList();
+                List<Hediff> penises = father.GetGenitalsList().Where(h => h.def is HediffDef_SexPart && Genital_Helper.is_penis(h)).ToList();
+                if (comps.NullOrEmpty() || penises.NullOrEmpty())
+                {
+                    return;
+                }
+                else if (AndroidsCompatibility.IsAndroid(father) && !AndroidsCompatibility.AndroidPenisFertility(father))
+                {
+                    List<HediffComp_Menstruation> randComps = comps.OrderByDescending(x => UnityEngine.Random.value).ToList();
+                    List<Hediff> randPenises = penises.OrderByDescending(x => UnityEngine.Random.value).ToList();
+                    if (comps.Count() > 1 && penises.Count() > 1)
+                    {
+                        randComps.ElementAt(0).CumIn(randPenises.ElementAt(0), fertility: 0);
+                        randComps.ElementAt(1).CumIn(randPenises.ElementAt(1), fertility: 0);
+                    }
+                    else if (penises.Count > 1)
+                    {
+                        randComps.ElementAt(0).CumIn(randPenises.ElementAt(0), fertility: 0);
                     }
                     else
                     {
-                return
-                    interaction.Extension.initiatorRequirement.genitalFamilies.Contains(GenitalFamily.Vagina) &&
-                    interaction.Extension.recipientRequirement.genitalTags.Contains(GenitalTag.CanPenetrate);
+                        comps.ElementAt(0).CumIn(father, father.GetCumVolume(), 0);
+                        return;
+                    }
+                    return;
+                }
+                else
+                {
+                    List<HediffComp_Menstruation> dangerComps = comps.OrderByDescending(x => x.IsDangerDay).ThenBy(x => UnityEngine.Random.value).ToList();
+                    if (RJWSettings.DevMode)
+                    {
+                        foreach (HediffComp_Menstruation comp in dangerComps)
+                        {
+                            Log.Message("MenstruationComps: " + comp.parent.Label + " , State:  " + comp.GetCurStageLabel + "  IsDangerDay = " + comp.IsDangerDay);
+                        }
+                    }
+                    List<Hediff> productivePenises = penises.Where(x=>Genital_Helper.is_fertile_penis(x)).OrderByDescending(x => x.TryGetComp<HediffComp_SexPart>().FluidAmount).ToList();
+                    if (RJWSettings.DevMode)
+                    {
+                        foreach (Hediff penis in productivePenises)
+                        {
+                            Log.Message("Penis : " + penis.Label + " , Fluid amount:  " + penis.TryGetComp<HediffComp_SexPart>().FluidAmount);
+                        }
+                    }
+
+                    if (comps.Count() > 1 && penises.Count() > 1)
+                    {
+                        dangerComps.ElementAt(0).CumIn(productivePenises.ElementAt(0));
+                        dangerComps.ElementAt(1).CumIn(productivePenises.ElementAt(1));
+                    }
+                    else if (penises.Count > 1)
+                    {
+                        dangerComps.ElementAt(0).CumIn(productivePenises.ElementAt(0));
+                    }
+                    else dangerComps.ElementAt(0).CumIn(father, father.GetCumVolume(), father.SterileGenes() ? 0.0f : father.health.capacities.GetLevel(xxx.reproduction));
+                }
             }
         }
     }
@@ -104,11 +175,9 @@ namespace RJW_Menstruation
             }
             else if (AndroidsCompatibility.IsAndroid(father) && !AndroidsCompatibility.AndroidPenisFertility(father))
             {
-                comp.CumIn(father, father.GetCumVolume(), 0);
                 return false;
             }
-            else comp.CumIn(father, father.GetCumVolume(), father.SterileGenes() ? 0.0f : father.health.capacities.GetLevel(xxx.reproduction));
-            return false;
+            else return false;
         }
     }
 

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.3</version>
+	<version>1.6.2.4</version>
 	<dependencies>
 	</dependencies>
 	<incompatibleWith />

changelogs.txt

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