diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index 325db98..0621e5c 100644 Binary files a/1.4/Assemblies/RJW_Menstruation.dll and b/1.4/Assemblies/RJW_Menstruation.dll differ diff --git a/1.4/Languages/English/Keyed/RJW_Menstruation.xml b/1.4/Languages/English/Keyed/RJW_Menstruation.xml index f28203c..6302b25 100644 --- a/1.4/Languages/English/Keyed/RJW_Menstruation.xml +++ b/1.4/Languages/English/Keyed/RJW_Menstruation.xml @@ -57,7 +57,7 @@ Cycle acceleration Accelerate menstruation cycle This can cause early menopause and infertility. Setting this lower than x12 is recommended. Rimworld's timescale: x6(default) Debug - Show debug information. + Show debug information. Also overrides "Fetus information level" to All. Womb status Draw womb icon in status window. Vagina and breast status @@ -68,7 +68,7 @@ Show only image of a fetus after discovered pregnancy. Do not show any information about a fetus. Enable menopause - Enable menopause effect that makes pawn infertile when they run out of eggs If you have problems with long lived races, turn off this option. + Enable menopause effect that makes pawn infertile in time progress If you have problems with long life races, turn off this option. Use multiple pregnancy Use multiple pregnancy instead RJW's default pregnancy Disable this option if you are in trouble with impregnation RJW pregnancy should be turned on. Enable hetero ovular twins diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs index 1d5eb60..b0d8b79 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs @@ -246,14 +246,8 @@ namespace RJW_Menstruation protected void CalculateBreastSize() { - // Ageless pawns can't depend on the chrono age, so just disable their growth entirely - if (Pawn.ageTracker.BiologicalTicksPerTick <= 0f && breastSizeIncreased > 0) - { - ShrinkBreasts(); - debugGrowthStatus = "Base size (ageless)"; - } - // The youngest child is less than halfway into babyhood: Full size - else if (ageOfLastBirth + BabyHalfAge * GenDate.TicksPerYear > Pawn.ageTracker.AgeBiologicalTicks) + // Scenario A: the youngest child is less than halfway into babyhood: Full size + if (ageOfLastBirth + BabyHalfAge * GenDate.TicksPerYear > Pawn.ageTracker.AgeBiologicalTicks) { debugGrowthStatus = "Full size due to young child"; if (breastSizeIncreased < MaxBreastIncrement) @@ -262,7 +256,7 @@ namespace RJW_Menstruation breastSizeIncreased = MaxBreastIncrement; } } - // Pregnant, grow in the second half of first trimester + // Scenario B: Pregnant, grow in the second half of first trimester else if (Pawn.IsRJWPregnant() || Pawn.IsBiotechPregnant()) { float pregnancySize = Mathf.InverseLerp(breastGrowthStart, breastGrowthEnd, Pawn.GetFarthestPregnancyProgress()) * MaxBreastIncrement; @@ -285,7 +279,7 @@ namespace RJW_Menstruation } else debugGrowthStatus = "Pregnant and full size"; } - // Not (or very early) pregnant and youngest child nonexistent or more than halfway into babyhood, time to shrink + // Scenario C: Not (or very early) pregnant and youngest child nonexistent or more than halfway into babyhood, time to shrink else if (breastSizeIncreased > 0) { debugGrowthStatus = "Shrinking due to no pregnancy nor young child"; @@ -297,9 +291,7 @@ namespace RJW_Menstruation protected void CalculateNipples() { float newNippleProgress; - if (Pawn.ageTracker.BiologicalTicksPerTick <= 0f) - newNippleProgress = 0f; - else if (ageOfLastBirth + BabyHalfAge * GenDate.TicksPerYear > Pawn.ageTracker.AgeBiologicalTicks) + if (ageOfLastBirth + BabyHalfAge * GenDate.TicksPerYear > Pawn.ageTracker.AgeBiologicalTicks) newNippleProgress = 1f; else if (Pawn.IsRJWPregnant() || Pawn.IsBiotechPregnant()) newNippleProgress = nippleTransitions.Evaluate(Pawn.GetFarthestPregnancyProgress()); diff --git a/changelogs.txt b/changelogs.txt index a798296..237beb1 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -5,7 +5,6 @@ Version 1.0.8.5 - Some males will release small amounts of semen into a womb during vaginal sex before their actual ejaculation. - Babies born from multiple pregnancy will properly produce the prompt to name them. - Hopefully improve compatibility with xenotype inhertiance-altering mods for multiple pregnancy. - - Pawns that have stopped aging will no longer have larger breasts during and after pregnancy. - Experimental "periodic ovulator" cycle type, currently not used. See Patches/Hediffs_Private_Parts_Animal.xml. Version 1.0.8.4