From 9d83860d559708cc7cbc9f401f1a9b0a66813a5f Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Fri, 3 Jun 2022 07:57:48 -0700 Subject: [PATCH] Have the first fertilized graphic go off of just the CycleFactor --- 1.3/Assemblies/RJW_Menstruation.dll | Bin 155648 -> 155648 bytes .../HediffComps/MenstruationUtility.cs | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/1.3/Assemblies/RJW_Menstruation.dll b/1.3/Assemblies/RJW_Menstruation.dll index 603dd2c603baf5ff3ab8418062bbb46a165c64e0..9add6e367c1ff5e169ee867eddfdd6c5c81f5361 100644 GIT binary patch delta 8346 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 0) { - if (fertstage <= Math.Max(comp.CycleFactor, 24.0f)) return ContentFinder.Get("Eggs/Egg_Fertilizing02", true); + if (fertstage <= comp.CycleFactor) return ContentFinder.Get("Eggs/Egg_Fertilizing02", true); if (fertstage <= 18) return ContentFinder.Get("Eggs/Egg_Fertilized00", true); else if (fertstage <= 54) return ContentFinder.Get("Eggs/Egg_Fertilized01", true); else return ContentFinder.Get("Eggs/Egg_Fertilized02", true);