diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs index a6c8a4e..6e8c375 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/DrugOutcomeDoers.cs @@ -12,8 +12,6 @@ namespace RJW_Menstruation foreach (HediffComp_Menstruation comp in pawn.GetMenstruationComps()) if (comp.curStage.Equals(HediffComp_Menstruation.Stage.Follicular) || comp.curStage.Equals(HediffComp_Menstruation.Stage.Luteal) - || comp.curStage.Equals(HediffComp_Menstruation.Stage.ClimactericFollicular) - || comp.curStage.Equals(HediffComp_Menstruation.Stage.ClimactericLuteal) || comp.curStage.Equals(HediffComp_Menstruation.Stage.Anestrus) ) { @@ -30,7 +28,6 @@ namespace RJW_Menstruation { foreach (HediffComp_Menstruation comp in pawn.GetMenstruationComps()) if (comp.curStage.Equals(HediffComp_Menstruation.Stage.Follicular) - || comp.curStage.Equals(HediffComp_Menstruation.Stage.ClimactericFollicular) || comp.curStage.Equals(HediffComp_Menstruation.Stage.Anestrus) ) { diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs index 6440a27..a1ab09a 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_InducedOvulator.cs @@ -23,8 +23,6 @@ namespace RJW_Menstruation { case Stage.Follicular: return Translations.Stage_Follicular_Induced_Desc + (EggHealth < 1f ? Translations.Stage_Climacteric_Desc : ""); - case Stage.ClimactericFollicular: - return Translations.Stage_Follicular_Induced_Desc + " " + Translations.Stage_Climacteric_Desc; default: return base.GetCurStageDesc; } @@ -60,7 +58,6 @@ namespace RJW_Menstruation switch (curStage) { case Stage.Follicular: - case Stage.ClimactericFollicular: GoNextStage(Stage.Ovulatory); break; } @@ -75,11 +72,9 @@ namespace RJW_Menstruation switch (curStage) { case Stage.Follicular: - case Stage.ClimactericFollicular: case Stage.Ovulatory: return true; case Stage.Luteal: - case Stage.ClimactericLuteal: return IsEggExist && curStageHrs < Props.eggLifespanDays * 24; default: return false; @@ -94,12 +89,10 @@ namespace RJW_Menstruation switch (curStage) { case Stage.Follicular: - case Stage.ClimactericFollicular: return curStageHrs > currentIntervalHours - Props.estrusDaysBeforeOvulation * 24; case Stage.Ovulatory: return true; case Stage.Luteal: - case Stage.ClimactericLuteal: return IsEggExist && curStageHrs < Props.eggLifespanDays * 24; default: return false; 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 4fc30f6..df87497 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 @@ -88,9 +88,6 @@ namespace RJW_Menstruation Recover, None, Young, - ClimactericFollicular, // obsolete - ClimactericLuteal, // obsolete - ClimactericBleeding, // obsolete Anestrus } @@ -104,11 +101,8 @@ namespace RJW_Menstruation public static readonly Dictionary StageTexture = new Dictionary() { { Stage.Follicular, TextureCache.FollicularTexture }, - { Stage.ClimactericFollicular, TextureCache.FollicularTexture }, { Stage.Luteal, TextureCache.LutealTexture }, - { Stage.ClimactericLuteal, TextureCache.LutealTexture }, { Stage.Bleeding, TextureCache.BleedingTexture }, - { Stage.ClimactericBleeding, TextureCache.BleedingTexture }, { Stage.Pregnant, TextureCache.PregnantTexture }, { Stage.Recover, TextureCache.RecoverTexture } }; @@ -356,12 +350,6 @@ namespace RJW_Menstruation case Stage.Young: if (EggHealth <= 0f) return Translations.Stage_Menopause; else return Translations.Stage_None; - case Stage.ClimactericFollicular: - return Translations.Stage_Follicular + " - " + Translations.Stage_Climacteric; - case Stage.ClimactericLuteal: - return Translations.Stage_Luteal + " - " + Translations.Stage_Climacteric; - case Stage.ClimactericBleeding: - return Translations.Stage_Bleeding + " - " + Translations.Stage_Climacteric; case Stage.Anestrus: return Translations.Stage_Anestrus; default: @@ -392,12 +380,6 @@ namespace RJW_Menstruation case Stage.Young: if (EggHealth <= 0f) return Translations.Stage_Menopause_Desc; else return Translations.Stage_None_Desc; - case Stage.ClimactericFollicular: - return Translations.Stage_Follicular_Desc + " " + Translations.Stage_Climacteric_Desc; - case Stage.ClimactericLuteal: - return Translations.Stage_Luteal_Desc + " " + Translations.Stage_Climacteric_Desc; - case Stage.ClimactericBleeding: - return Translations.Stage_Bleeding_Desc + " " + Translations.Stage_Climacteric_Desc; case Stage.Anestrus: return Translations.Stage_Anestrus_Desc; default: @@ -493,12 +475,10 @@ namespace RJW_Menstruation switch (curStage) { case Stage.Follicular: - case Stage.ClimactericFollicular: return curStageHrs > 0.7f * currentIntervalHours; case Stage.Ovulatory: return true; case Stage.Luteal: - case Stage.ClimactericLuteal: return curStageHrs < Props.eggLifespanDays * 24; default: return false; @@ -643,10 +623,6 @@ namespace RJW_Menstruation CumOut(); - if (curStage == Stage.ClimactericFollicular) curStage = Stage.Follicular; - else if (curStage == Stage.ClimactericLuteal) curStage = Stage.Luteal; - else if (curStage == Stage.ClimactericBleeding) curStage = Stage.Bleeding; - if (pregnancy == null && (Pawn.health.capacities.GetLevel(xxx.reproduction) <= 0) || EggHealth <= 0) curStage = Stage.Young; switch (curStage) { @@ -1132,12 +1108,10 @@ namespace RJW_Menstruation switch (curStage) { case Stage.Follicular: - case Stage.ClimactericFollicular: return curStageHrs > currentIntervalHours - Props.estrusDaysBeforeOvulation * 24; case Stage.Ovulatory: return true; case Stage.Luteal: - case Stage.ClimactericLuteal: return curStageHrs < Props.eggLifespanDays * 24; default: return false; @@ -1692,13 +1666,10 @@ namespace RJW_Menstruation switch (stage) { case Stage.Follicular: - case Stage.ClimactericFollicular: return (int)(Props.follicularIntervalDays * 24 * (1 + Rand.Range(-cycleVariability, cycleVariability) * 1.5f * variabilityFactor) / (1 + (cycleSpeed - 1) * 1.5f)); case Stage.Luteal: - case Stage.ClimactericLuteal: return (int)(Props.lutealIntervalDays * 24 * (1 + Rand.Range(-cycleVariability, cycleVariability) * 0.5f * variabilityFactor) / (1 + (cycleSpeed - 1) * 0.5f)); case Stage.Bleeding: - case Stage.ClimactericBleeding: return (int)(Props.bleedingIntervalDays * 24 * (1 + Rand.Range(-cycleVariability, cycleVariability) * 0.5f * variabilityFactor) / (1 + (cycleSpeed - 1) * 0.5f)); case Stage.Recover: return (int)(Props.recoveryIntervalDays * 24 * Rand.Range(0.95f, 1.05f)); diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs index 3190463..a24fefe 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs @@ -179,7 +179,7 @@ namespace RJW_Menstruation if (wombtex != null) return wombtex; string icon = comp.WombTex; HediffComp_Menstruation.Stage stage = comp.curStage; - if (stage == HediffComp_Menstruation.Stage.Bleeding || stage == HediffComp_Menstruation.Stage.ClimactericBleeding) icon += "_Bleeding"; + if (stage == HediffComp_Menstruation.Stage.Bleeding) icon += "_Bleeding"; wombtex = ContentFinder.Get(icon, true); @@ -190,7 +190,6 @@ namespace RJW_Menstruation switch (comp.CurrentVisibleStage) { case HediffComp_Menstruation.Stage.Follicular: - case HediffComp_Menstruation.Stage.ClimactericFollicular: if (!includeOvary) break; if (comp is HediffComp_InducedOvulator) { @@ -208,7 +207,6 @@ namespace RJW_Menstruation if (!includeOvary) break; return ContentFinder.Get("Ovaries/Ovary_02", true); case HediffComp_Menstruation.Stage.Luteal: - case HediffComp_Menstruation.Stage.ClimactericLuteal: if (!comp.IsEggExist) break; int fertstage = comp.IsFertilized; if (fertstage >= 0)