Merge branch 'dev'

1.4/Patches/Hediffs_PrivateParts_Animal.xml

@@ -11,27 +11,6 @@
 
 <Patch>
 	<Operation Class="PatchOperationAdd">
-		<xpath>/Defs/rjw.HediffDef_PartBase[defName="DogVagina"]</xpath>
-		<value>
-			<comps>
-				<li Class="RJW_Menstruation.CompProperties_Menstruation">
-					<maxCumCapacity>8</maxCumCapacity>
-					<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
-					<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
-					<follicularIntervalDays>14</follicularIntervalDays>
-					<lutealIntervalDays>166</lutealIntervalDays>
-					<bleedingIntervalDays>8</bleedingIntervalDays>
-					<recoveryIntervalDays>15</recoveryIntervalDays>
-					<eggLifespanDays>4</eggLifespanDays>
-					<wombTex>Womb/Womb</wombTex>
-					<vagTex>Genitals/Vagina</vagTex>
-					<estrusDaysBeforeOvulation>9</estrusDaysBeforeOvulation>
-				</li>
-			</comps>
-		</value>
-	</Operation>
-
-	<!--<Operation Class="PatchOperationAdd">
 		<xpath>/Defs/rjw.HediffDef_PartBase[defName="DogVagina"]</xpath>
 		<value>
 			<comps>
@@ -51,7 +30,7 @@
 				</li>
 			</comps>
 		</value>
-	</Operation>-->
+	</Operation>
 	
 	<Operation Class="PatchOperationAdd">
 		<xpath>/Defs/rjw.HediffDef_PartBase[defName="CatVagina"]</xpath>

1.4/source/RJW_Menstruation/RJW_Menstruation/FilthMaker_Colored.cs

@@ -28,10 +28,7 @@ namespace RJW_Menstruation
                         }
                     }
                 }
-                if (filth != null)
+                filth?.AddSources(sources);
-                {
-                    filth.AddSources(sources);
-                }
                 return false;
             }
             if (filth != null)

1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs

@@ -75,7 +75,7 @@ namespace RJW_Menstruation
                     case Stage.Ovulatory:
                         return true;
                     case Stage.Luteal:
-                        return IsEggExist && curStageHrs < EggLifespanHours * 24;
+                        return IsEggExist && curStageHrs < EggLifespanHours;
                     default:
                         return false;
                 }
@@ -93,7 +93,7 @@ namespace RJW_Menstruation
                 case Stage.Ovulatory:
                     return true;
                 case Stage.Luteal:
-                    return IsEggExist && curStageHrs < EggLifespanHours * 24;
+                    return IsEggExist && curStageHrs < EggLifespanHours;
                 default:
                     return false;
             }

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

@@ -498,7 +498,7 @@ namespace RJW_Menstruation
                     case Stage.Ovulatory:
                         return true;
                     case Stage.Luteal:
-                        return curStageHrs < EggLifespanHours * 24;
+                        return curStageHrs < EggLifespanHours;
                     default:
                         return false;
                 }
@@ -744,6 +744,38 @@ namespace RJW_Menstruation
             base.CompPostPostRemoved();
         }
 
+        public override string CompTipStringExtra
+        {
+            get
+            {
+                StringBuilder tip = new StringBuilder();
+                tip.Append(Translations.Dialog_WombInfo01);
+                tip.Append(": ");
+                tip.Append(GetCurStageLabel);
+                string fertInfo = GetFertilizingInfo;
+                if(CurrentVisibleStage == Stage.Luteal && fertInfo.Length > 0)
+                {
+                    tip.AppendLine();
+                    tip.Append(fertInfo);
+                }
+                return tip.ToString();
+            }
+        }
+
+        protected virtual int HoursToNextStage()
+        {
+            return Math.Max(0,(currentIntervalHours - curStageHrs) / Configurations.CycleAcceleration);
+        }
+
+        public override string CompDebugString()
+        {
+            if (curStage == Stage.None || curStage == Stage.Infertile || curStage == Stage.Pregnant) return base.CompDebugString();
+            StringBuilder debugString = new StringBuilder();
+            debugString.Append($"Time to next state: ");
+            debugString.Append(GenDate.ToStringTicksToPeriod(HoursToNextStage() * GenDate.TicksPerHour));
+            return debugString.ToString();
+        }
+
         /// <summary>
         /// Get fluid in womb that not a cum
         /// </summary>
@@ -1200,7 +1232,7 @@ namespace RJW_Menstruation
                 case Stage.Ovulatory:
                     return true;
                 case Stage.Luteal:
-                    return curStageHrs < EggLifespanHours * 24;
+                    return curStageHrs < EggLifespanHours;
                 default:
                     return false;
             }
@@ -1531,7 +1563,7 @@ namespace RJW_Menstruation
             ovulated = (int)eggnum + eggstack;
 
             for (int i = 0; i < ovulated; i++)
-                eggs.Add(new Egg((int)(EggLifespanHours * 24 / CycleFactor)));
+                eggs.Add(new Egg((int)(EggLifespanHours / CycleFactor)));
             ovarypower -= ovulated;
 
             eggstack = 0;

1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs

@@ -57,6 +57,12 @@ namespace RJW_Menstruation
             Scribe_Values.Look(ref averageCycleIntervalHours, "averageCycleIntervalHours", averageCycleIntervalHours, true);
         }
 
+        protected override int HoursToNextStage()
+        {
+            if (curStage == Stage.Anestrus &&  hoursToNextCycle > 0) return hoursToNextCycle / Configurations.CycleAcceleration;
+            else return base.HoursToNextStage();
+        }
+
         protected override void BleedingAction()
         {
             if (curStageHrs >= currentIntervalHours)

1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs

@@ -79,6 +79,7 @@ namespace RJW_Menstruation
                     kind: babyPawnKind,
                     faction: mother.Faction,
                     allowDowned: true,
+                    // fixedLastName seems not to actually do anything, as we eventually end up in PawnBioAndNameGenerator.NameResolvedFrom, which ignores its forcedLastName argument
                     fixedLastName: (string)RandomLastName.Invoke(null, new object[] { mother, mother, xxx.is_human(father) ? father : null }),
                     forceNoIdeo: true,
                     forcedEndogenes: PregnancyUtility.GetInheritedGenes(father, mother),
@@ -207,8 +208,7 @@ namespace RJW_Menstruation
                     do
                     {
                         Pawn baby = comp.babies[0];
-                        Pawn thisFather = baby.GetFather();
+                        Pawn thisFather = baby.GetFather() ?? father;
-                        if (thisFather == null) thisFather = father;
                         baby.relations.ClearAllRelations();   // To keep ApplyBirthOutcome from erroring when it tries to set up relations
 
                         PregnancyUtility.ApplyBirthOutcome(thisOutcome, quality, ritual, genes, geneticMother, birtherThing, thisFather, doctor, lordJobRitual, assignments);
@@ -258,8 +258,7 @@ namespace RJW_Menstruation
                     do
                     {
                         Pawn baby = comp.babies[0];
-                        Pawn thisFather = baby.GetFather();
+                        Pawn thisFather = baby.GetFather() ?? father;
-                        if (thisFather == null) thisFather = father;
                         baby.relations.ClearAllRelations();
 
                         PregnancyUtility.ApplyBirthOutcome(outcome, quality, ritual, genes, geneticMother, birtherThing, thisFather, doctor, lordJobRitual, assignments);

1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs

@@ -151,10 +151,7 @@ namespace RJW_Menstruation
             else if (gestationProgress < 0.8f) icon = fetustex + "04";
             else icon = fetustex + "05";
 
-            Texture2D result = TryGetTwinsIcon(icon, babycount);
+            return TryGetTwinsIcon(icon, babycount) ?? ContentFinder<Texture2D>.Get((icon), true);
-
-            if (result == null) result = ContentFinder<Texture2D>.Get((icon), true);
-            return result;
         }
 
         public static Texture2D TryGetTwinsIcon(string path, int babycount)
@@ -205,10 +202,7 @@ namespace RJW_Menstruation
                 if (hediffs.Count == 1) return ContentFinder<Texture2D>.Get(path + "Womb_Egged_Large", true);
                 else return ContentFinder<Texture2D>.Get(path + "Womb_Egged_ManyMixed", true);
             }
-            Texture2D result = ContentFinder<Texture2D>.Get(path + "Womb_Egged_" + hediffs.Count(), false);
+            return ContentFinder<Texture2D>.Get(path + "Womb_Egged_" + hediffs.Count(), false) ?? ContentFinder<Texture2D>.Get(path + "Womb_Egged_Many", true);
-            if (result == null) result = ContentFinder<Texture2D>.Get(path + "Womb_Egged_Many", true);
-
-            return result;
         }
         public static Texture2D GetWombIcon(this HediffComp_Menstruation comp)
         {
@@ -307,8 +301,8 @@ namespace RJW_Menstruation
 
         public static Texture2D GetAnalIcon(this Pawn pawn, bool drawOrigin = false)
         {
-            Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_anusBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllAnuses.Contains(h.def));
+            Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_anusBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllAnuses.Contains(h.def)) ??
-            if (hediff == null) hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_anusBPR(pawn)).FirstOrDefault(h => h.def.defName.ToLower().Contains("anus"));
+                Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_anusBPR(pawn)).FirstOrDefault(h => h.def.defName.ToLower().Contains("anus"));
             if (hediff == null) return ContentFinder<Texture2D>.Get(("Genitals/Anal00"), true);
 
             string icon;

1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs

@@ -150,8 +150,7 @@ namespace RJW_Menstruation
             if (Configurations.EnableBirthVaginaMorph)
             {
                 // The comp still has the pregnancy attached at this point in the process
-                Hediff vagina = __instance.GetMenstruationCompFromPregnancy()?.parent;
+                Hediff vagina = (__instance.GetMenstruationCompFromPregnancy()?.parent) ?? mother.health.hediffSet.hediffs.FirstOrFallback(x => VariousDefOf.AllVaginas.Contains(x.def));
-                if (vagina == null) vagina = mother.health.hediffSet.hediffs.FirstOrFallback(x => VariousDefOf.AllVaginas.Contains(x.def));
                 if (vagina == null) return;
                 float morph = Mathf.Max(baby.BodySize - Mathf.Pow(vagina.Severity * mother.BodySize, 2), 0f);
                 vagina.Severity += morph * Configurations.VaginaMorphPower;

1.4/source/RJW_Menstruation/RJW_Menstruation/Reflect.cs

@@ -37,20 +37,14 @@ namespace RJW_Menstruation
         {
             BindingFlags flags = BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic;
             FieldInfo fieldInfo = type?.GetField(name, flags);
-            if (fieldInfo != null)
+            fieldInfo?.SetValue(null, value);
-            {
-                fieldInfo.SetValue(null, value);
-            }
         }
 
         public static void SetMemberValue(this object obj, string name, object value)
         {
             BindingFlags flags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
             FieldInfo fieldInfo = obj?.GetType().GetField(name, flags);
-            if (fieldInfo != null)
+            fieldInfo?.SetValue(obj, value);
-            {
-                fieldInfo.SetValue(obj, value);
-            }
         }
 
 

1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs

@@ -66,12 +66,10 @@ namespace RJW_Menstruation
 
         public static float GetCumVolume(this Pawn pawn, List<Hediff> hediffs)
         {
-            CompHediffBodyPart part = hediffs?.FindAll((Hediff hed) => hed.def.defName.ToLower().Contains("penis")).InRandomOrder().FirstOrDefault()?.TryGetComp<CompHediffBodyPart>();
+            CompHediffBodyPart part = (((hediffs?.FindAll((Hediff hed) => hed.def.defName.ToLower().Contains("penis")).InRandomOrder().FirstOrDefault()?.TryGetComp<CompHediffBodyPart>()) ??
-            if (part == null) part = hediffs?.FindAll((Hediff hed) => hed.def.defName.ToLower().Contains("ovipositorf")).InRandomOrder().FirstOrDefault()?.TryGetComp<CompHediffBodyPart>();
+                (hediffs?.FindAll((Hediff hed) => hed.def.defName.ToLower().Contains("ovipositorf")).InRandomOrder().FirstOrDefault()?.TryGetComp<CompHediffBodyPart>())) ??
-            if (part == null) part = hediffs?.FindAll((Hediff hed) => hed.def.defName.ToLower().Contains("ovipositorm")).InRandomOrder().FirstOrDefault()?.TryGetComp<CompHediffBodyPart>();
+                (hediffs?.FindAll((Hediff hed) => hed.def.defName.ToLower().Contains("ovipositorm")).InRandomOrder().FirstOrDefault()?.TryGetComp<CompHediffBodyPart>())) ??
-            if (part == null) part = hediffs?.FindAll((Hediff hed) => hed.def.defName.ToLower().Contains("tentacle")).InRandomOrder().FirstOrDefault()?.TryGetComp<CompHediffBodyPart>();
+                (hediffs?.FindAll((Hediff hed) => hed.def.defName.ToLower().Contains("tentacle")).InRandomOrder().FirstOrDefault()?.TryGetComp<CompHediffBodyPart>());
-
-
             return pawn.GetCumVolume(part);
         }
 
@@ -194,9 +192,8 @@ namespace RJW_Menstruation
 
         public static void DrawBreastIcon(this Pawn pawn, Rect rect)
         {
-            Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def));
+            Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def)) ??
-            if (hediff == null)
+                Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_uddersBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def));
-                hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_uddersBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def));
             Texture2D breast, nipple, areola;
             if (hediff != null)
             {
@@ -359,15 +356,15 @@ namespace RJW_Menstruation
         }
         public static string GetAnusLabel(this Pawn pawn)
         {
-            Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_anusBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllAnuses.Contains(h.def));
+            Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_anusBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllAnuses.Contains(h.def)) ??
-            if (hediff == null) hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_anusBPR(pawn)).FirstOrDefault(h => h.def.defName.ToLower().Contains("anus"));
+                Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_anusBPR(pawn)).FirstOrDefault(h => h.def.defName.ToLower().Contains("anus"));
             if (hediff != null) return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")";
             else return "";
         }
         public static string GetBreastLabel(this Pawn pawn)
         {
-            Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def));
+            Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def)) ??
-            if (hediff == null) hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_uddersBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def));
+                Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_uddersBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def));
             if (hediff != null) return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")";
             else return "";
         }

About/Manifest.xml

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

changelogs.txt

@@ -1,3 +1,9 @@
+Version 1.0.8.7
+ - Fix missing texture when using Milkable Colonists.
+ - Fix estrus and egg lifespan lasting far longer than intended.
+ - Canine vaginas now use the new periodic ovulator cycle.
+ - Hovering over a vagina hediff will show the current state in the tooltip.
+
 Version 1.0.8.6
  - Updated Traditional Chinese translation by Hydrogen.
  - Fix error when trying to terminate a non-Biotech pregnancy.