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/Configurations.cs

@@ -21,7 +21,7 @@ namespace RJW_Menstruation
         public const int ColonistTickIntervalDefault = GenDate.TicksPerHour;
         public const int NonColonistTickIntervalDefault = GenDate.TicksPerHour;
         public const int AnimalTickIntervalDefault = GenDate.TicksPerHour;
-        public const int TickIntervalMinimum = 20;
+        public const int TickIntervalMinimum = GenTicks.TicksPerRealSecond / 3;
         public const int TickIntervalMaximum = 4 * GenDate.TicksPerHour;
         public const float EnzygoticTwinsChanceDefault = 0.002f;
         public const int EnzygoticTwinsChanceAdjustDefault = 2;

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

@@ -328,7 +328,7 @@ namespace RJW_Menstruation
             }
             else
             {
-                return Pawn.health.capacities.GetLevel(xxx.reproduction) * Props.baseImplantationChanceFactor * FertilityModifier;
+                return Pawn.health.capacities.GetLevel(xxx.reproduction) * Props.baseImplantationChanceFactor * FertilityModifier * (Pawn.IsBreeder() ? 10.0f : 1.0f);
             }
         }
 

1.4/source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_WombStatus.cs

@@ -227,7 +227,7 @@ namespace RJW_Menstruation
                         string feinfo = PregnancyCommon.GetBabyInfo(babiescomp?.babies);
                         string fainfo = PregnancyCommon.GetFatherInfo(babiescomp?.babies, babiescomp.Pawn, true) + "  ";    // Keep all parents known, for now
 
-                        if (feinfo == "Null") feinfo = "1 " + p.Mother.def.label + " " + Translations.Dialog_WombInfo02;
+                        if (feinfo == "Null") feinfo = "1 " + (p.Mother ?? pawn).def.label + " " + Translations.Dialog_WombInfo02;
                         if (fainfo == "Null  ")
                         {
                             string father = p.Father?.LabelShort ?? Translations.Dialog_FatherUnknown;

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");