From 225e1fe1438fffe963198a17a0033982bf578a5c Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sat, 5 Nov 2022 07:59:44 -0700 Subject: [PATCH] Add a sterile genes check in the infertile and recovery actions --- 1.4/Assemblies/RJW_Menstruation.dll | Bin 190464 -> 190464 bytes .../HediffComps/HediffComp_Menstruation.cs | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index 7aadb4a5fbf1f8731c1f912e16b4f90e689b98f6..ae8c52ba284c8a72fca49db319166c470cead3a8 100644 GIT binary patch delta 6556 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 RunhwbwEmv`fZQIT{|B6ZF1G*x diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index 6e225e8..29b54cc 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -1550,7 +1550,7 @@ namespace RJW_Menstruation { if (curStageHrs >= currentIntervalHours) { - if (Pawn.health.capacities.GetLevel(xxx.reproduction) == 0 || EggHealth <= 0) + if (Pawn.health.capacities.GetLevel(xxx.reproduction) == 0 || EggHealth <= 0 || Pawn.SterileGenes()) { GoNextStage(Stage.Infertile); } @@ -1572,7 +1572,7 @@ namespace RJW_Menstruation protected virtual void InfertileAction() { - if (Pawn.health.capacities.GetLevel(xxx.reproduction) <= 0 || EggHealth <= 0) + if (Pawn.health.capacities.GetLevel(xxx.reproduction) <= 0 || EggHealth <= 0 || Pawn.SterileGenes()) { StayCurrentStageConst(Stage.Infertile); }