Merge branch 'dev' into 'dev'

Breast fullness is not displayed and the "milk yourself" action is not invoked on a pawn when the rjw-mc-biotech mod is present

See merge request lutepickle/rjw_menstruation!6

1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs

@@ -123,8 +123,8 @@ namespace RJW_Menstruation
         protected string customwombtex = null;
         protected string customvagtex = null;
         protected bool estrusflag = false;
-        protected float ovulationChanceCache = -1.0f;   // Dirtied every simulation
-        protected float implantationChanceCache = -1.0f;
+        protected float? ovulationChanceCache = null;   // Dirtied every simulation
+        protected float? implantationChanceCache = null;
         protected int opcache = -1;
         protected float antisperm = 0.0f;
         // RJW pregnancy, or Biotech pregnancy/labor/laborpushing
@@ -259,7 +259,7 @@ namespace RJW_Menstruation
         }
         public float TotalFertCum
         {
-            get => cums?.Sum(cum => cum.FertVolume) ?? 0;
+            get => cums?.Where(cum => CumCanFertilize(cum)).Sum(cum => cum.FertVolume) ?? 0;
         }
         public float TotalCumPercent
         {
@@ -289,7 +289,7 @@ namespace RJW_Menstruation
         private bool calculatingOvulationChance = false;
         public bool CalculatingOvulationChance { get => calculatingOvulationChance; }
 
-        protected float CalculatedOvulationChance()
+        private float CalculatedOvulationChance()
         {
             float ovulationChance = 1.0f;
             if (EggHealth <= 0.0f) return 0.0f;
@@ -315,7 +315,7 @@ namespace RJW_Menstruation
             return ovulationChance;
         }
 
-        protected float CalculatedImplantChance()
+        private float CalculatedImplantChance()
         {
             if (ModsConfig.BiotechActive && xxx.is_human(Pawn))
             {
@@ -336,8 +336,8 @@ namespace RJW_Menstruation
         {
             get
             {
-                if (ovulationChanceCache < 0.0f) ovulationChanceCache = CalculatedOvulationChance();
-                return ovulationChanceCache;
+                if (ovulationChanceCache == null) ovulationChanceCache = CalculatedOvulationChance();
+                return ovulationChanceCache.Value;
             }
         }
 
@@ -346,8 +346,8 @@ namespace RJW_Menstruation
         {
             get
             {
-                if (implantationChanceCache < 0.0f) implantationChanceCache = CalculatedImplantChance();
-                return implantationChanceCache;
+                if (implantationChanceCache == null) implantationChanceCache = CalculatedImplantChance();
+                return implantationChanceCache.Value;
             }
         }
 
@@ -1266,8 +1266,8 @@ namespace RJW_Menstruation
 
         protected virtual void BeforeSimulator()
         {
-            ovulationChanceCache = -1.0f;
-            implantationChanceCache = -1.0f;
+            ovulationChanceCache = null;
+            implantationChanceCache = null;
             CumOut();
         }
 
@@ -1335,10 +1335,18 @@ namespace RJW_Menstruation
             }
         }
 
+        public bool CumCanFertilize(Cum cum)
+        {
+            return !cum.notcum &&
+                cum.FertVolume > 0 &&
+                !(cum.pawn?.Destroyed ?? true) &&
+                (RJWPregnancySettings.bestial_pregnancy_enabled || xxx.is_animal(Pawn) == xxx.is_animal(cum.pawn));
+        }
+
         protected Pawn Fertilize()
         {
             if (cums.NullOrEmpty()) return null;
-            List<Cum> eligibleCum = cums.FindAll(cum => !cum.notcum && cum.FertVolume > 0 && !(cum.pawn?.Destroyed ?? true) && (RJWPregnancySettings.bestial_pregnancy_enabled || xxx.is_animal(Pawn) == xxx.is_animal(cum.pawn)));
+            List<Cum> eligibleCum = cums.FindAll(cum => CumCanFertilize(cum));
             if (eligibleCum.Count == 0) return null;
 
             float totalFertPower = eligibleCum.Sum(cum => cum.FertVolume);

1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Pheromones.cs

@@ -1,6 +1,7 @@
 
 
 using RimWorld;
+using RimWorld.Planet;
 using rjw;
 using System;
 using System.Collections.Generic;
@@ -46,6 +47,8 @@ namespace RJW_Menstruation
 
         protected IEnumerable<Pawn> AffectedPawns()
         {
+            if(Pawn.GetCaravan() is Caravan caravan)
+                foreach (Pawn p in caravan.PawnsListForReading.Where(p => p != Pawn)) yield return p;
             Map mapHeld = Pawn.MapHeld;
             if (mapHeld == null) yield break;
             foreach (Pawn pawn in mapHeld.mapPawns.AllPawnsSpawned)

1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs

@@ -276,7 +276,10 @@ namespace RJW_Menstruation
             float res = 0;
             if (VariousDefOf.Hediff_Heavy_Lactating_Permanent != null)
             {
-                if (pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Heavy_Lactating_Permanent)) milkcomp = pawn.AllComps.FirstOrDefault(x => x.GetType().ToString().ToLower().Contains("hypermilkable"));
+                if (pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Heavy_Lactating_Permanent)
+                    || pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Lactating_Permanent)
+                    || pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Lactating_Natural)
+                    || pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Lactating_Drug)) milkcomp = pawn.AllComps.FirstOrDefault(x => x.GetType().ToString().ToLower().Contains("milkablehuman"));
                 else milkcomp = pawn.AllComps.FirstOrDefault(x => x.GetType().ToString().ToLower().Contains("milkable"));
             }
             else

1.4/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs

@@ -158,7 +158,7 @@ namespace RJW_Menstruation
         public static readonly HediffDef Hediff_Lactating_Natural = DefDatabase<HediffDef>.GetNamedSilentFail("Lactating_Natural");
         public static readonly HediffDef Hediff_Lactating_Permanent = DefDatabase<HediffDef>.GetNamedSilentFail("Lactating_Permanent");
         public static readonly HediffDef Hediff_Heavy_Lactating_Permanent = DefDatabase<HediffDef>.GetNamedSilentFail("Heavy_Lactating_Permanent");
-        public static readonly JobDef Job_LactateSelf_MC = DefDatabase<JobDef>.GetNamedSilentFail("LactateSelf_MC");
+        public static readonly JobDef Job_LactateSelf_MC = DefDatabase<JobDef>.GetNamedSilentFail("MilkSelf");
 
         // Defs from Sexperience Ideology
         public static readonly PreceptDef Pregnancy_Elevated = DefDatabase<PreceptDef>.GetNamedSilentFail("Pregnancy_Elevated");

changelogs.txt

@@ -1,5 +1,6 @@
 Version 1.0.9.4
  - Added graphics for the menstruation genes with thanks to Alpenglow.
+ - Pawns in estrus now give their pheromones to their caravan-mates.
  - Pawns with the egglaying genes from Erin's Corvyia and Outland - Genetics no longer have a menstrual cycle.
 
 Version 1.0.9.3