Properly put periodic ovulators into anestrus after recovering from birth

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

@@ -1459,7 +1459,7 @@ namespace RJW_Menstruation
                                     break;
                                 case Hediff_BasePregnancy _:
                                 default:
-                                    if (Configurations.Debug) Log.Message($"Not adding to existing pregnancy {pregnancy?.GetUniqueLoadID()}");
+                                    if (Configurations.Debug) Log.Message($"Not adding to existing pregnancy {pregnancy.GetUniqueLoadID()}");
                                     pregnant = true;
                                     deadeggs.Add(egg);
                                     break;
@@ -1480,7 +1480,7 @@ namespace RJW_Menstruation
                         float interspeciesFactor = InterspeciesImplantFactor(egg.fertilizer);
                         float implantChance = Configurations.ImplantationChance * ImplantChance * interspeciesFactor;
                         Log.Message($"Fertilized egg of {Pawn} failed to implant (chance {implantChance.ToStringPercent()}, " +
-                            (interspeciesFactor != 1.0f ? $"interspecies factor {interspeciesFactor.ToStringPercent()}, " : "") +
+                            ((!Mathf.Approximately(interspeciesFactor, 1.0f)) ? $"interspecies factor {interspeciesFactor.ToStringPercent()}, " : "") +
                             $"father {egg.fertilizer})");
                     }
                     deadeggs.Add(egg);

1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs

@@ -92,6 +92,13 @@ namespace RJW_Menstruation
                 ticksToNextCycle = (int)Utility.VariationRange(averageCycleIntervalTicks, cycleVariability) / 2;
         }
 
+        protected override void RecoverAction()
+        {
+            base.RecoverAction();
+            if (curStage != Stage.Recover)
+                GoNextStage(Stage.Anestrus);
+        }
+
         protected override void AnestrusAction()
         {
             if (ticksToNextCycle <= 0 && IsBreedingSeason())

changelogs.txt

@@ -1,6 +1,7 @@
 Version 1.5.0.0
  - Support for RimWorld 1.5. All future changes to Menstruation will only be for RimWorld 1.5.
  - Not yet compatible with Animal Genetics. Compatibility will be re-enabled after it is updated for RimWorld 1.5.
+ - Inactive genes will no longer be applied to wombs.
 
 Version 1.0.9.4
  - Added graphics for the menstruation genes with thanks to Alpenglow.