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

1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs

@@ -1429,7 +1429,9 @@ namespace RJW_Menstruation
                                     pregnancy = HediffMaker.MakeHediff(HediffDefOf.PregnantHuman, Pawn);
                                     if (Configurations.EnableBiotechTwins)
                                         pregnancy.TryGetComp<HediffComp_PregeneratedBabies>().AddNewBaby(Pawn, egg.fertilizer);
-                                    ((Hediff_Pregnant)pregnancy).SetParents(Pawn, egg.fertilizer, PregnancyUtility.GetInheritedGeneSet(egg.fertilizer, Pawn));
+                                    Pawn father = egg.fertilizer;
+                                    if (Pawn == father) father = null;
+                                    ((Hediff_Pregnant)pregnancy).SetParents(Pawn, father, PregnancyUtility.GetInheritedGeneSet(father, Pawn));
                                     Pawn.health.AddHediff(pregnancy);
                                     pregnant = true;
                                     deadeggs.Add(egg);

1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs

@@ -234,6 +234,7 @@ namespace RJW_Menstruation
                     {
                         Pawn baby = comp.PeekBaby();
                         Pawn thisFather = baby.GetFather() ?? father;
+                        if (thisFather == geneticMother || thisFather == mother) thisFather = null;
                         baby.relations.ClearAllRelations();   // To keep ApplyBirthOutcome from erroring when it tries to set up relations
 
                         PregnancyUtility.ApplyBirthOutcome_NewTemp(thisOutcome, quality, ritual, genes, geneticMother, birtherThing, thisFather, doctor, lordJobRitual, assignments, preventLetter);
@@ -293,6 +294,7 @@ namespace RJW_Menstruation
                     {
                         Pawn baby = comp.PeekBaby();
                         Pawn thisFather = baby.GetFather() ?? father;
+                        if (thisFather == geneticMother || thisFather == mother) thisFather = null;
                         baby.relations.ClearAllRelations();
 
                         PregnancyUtility.ApplyBirthOutcome(outcome, quality, ritual, genes, geneticMother, birtherThing, thisFather, doctor, lordJobRitual, assignments);

About/Manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW Menstruation</identifier>
-	<version>1.5.0.1</version>
+	<version>1.5.0.2</version>
 	<dependencies>
 	</dependencies>
 	<incompatibleWith />