Compare commits

..

No commits in common. "8d507a5e69bc6c3e5bb8534cac0c27af4e92d5a7" and "190173d87dee5d8a4e92227972a8447205bcee16" have entirely different histories.

4 changed files with 7 additions and 16 deletions

Binary file not shown.

View file

@ -57,7 +57,7 @@
<Option7_Label>Cycle acceleration</Option7_Label> <Option7_Label>Cycle acceleration</Option7_Label>
<Option7_Desc>Accelerate menstruation cycle&#10;This can cause early menopause and infertility.&#10;Setting this lower than x12 is recommended.&#10;Rimworld's timescale: x6(default)</Option7_Desc> <Option7_Desc>Accelerate menstruation cycle&#10;This can cause early menopause and infertility.&#10;Setting this lower than x12 is recommended.&#10;Rimworld's timescale: x6(default)</Option7_Desc>
<Option8_Label>Debug</Option8_Label> <Option8_Label>Debug</Option8_Label>
<Option8_Desc>Show debug information.</Option8_Desc> <Option8_Desc>Show debug information.&#10;Also overrides "Fetus information level" to All.</Option8_Desc>
<Option9_Label>Womb status</Option9_Label> <Option9_Label>Womb status</Option9_Label>
<Option9_Desc>Draw womb icon in status window.</Option9_Desc> <Option9_Desc>Draw womb icon in status window.</Option9_Desc>
<Option10_Label>Vagina and breast status</Option10_Label> <Option10_Label>Vagina and breast status</Option10_Label>
@ -68,7 +68,7 @@
<Option11_Desc_3>Show only image of a fetus after discovered pregnancy.</Option11_Desc_3> <Option11_Desc_3>Show only image of a fetus after discovered pregnancy.</Option11_Desc_3>
<Option11_Desc_4>Do not show any information about a fetus.</Option11_Desc_4> <Option11_Desc_4>Do not show any information about a fetus.</Option11_Desc_4>
<Option12_Label>Enable menopause</Option12_Label> <Option12_Label>Enable menopause</Option12_Label>
<Option12_Desc>Enable menopause effect that makes pawn infertile when they run out of eggs&#10;If you have problems with long lived races, turn off this option.</Option12_Desc> <Option12_Desc>Enable menopause effect that makes pawn infertile in time progress&#10;If you have problems with long life races, turn off this option.</Option12_Desc>
<Option13_Label>Use multiple pregnancy</Option13_Label> <Option13_Label>Use multiple pregnancy</Option13_Label>
<Option13_Desc>Use multiple pregnancy instead RJW's default pregnancy&#10;Disable this option if you are in trouble with impregnation&#10;RJW pregnancy should be turned on.</Option13_Desc> <Option13_Desc>Use multiple pregnancy instead RJW's default pregnancy&#10;Disable this option if you are in trouble with impregnation&#10;RJW pregnancy should be turned on.</Option13_Desc>
<Option14_Label>Enable hetero ovular twins</Option14_Label> <Option14_Label>Enable hetero ovular twins</Option14_Label>

View file

@ -246,14 +246,8 @@ namespace RJW_Menstruation
protected void CalculateBreastSize() protected void CalculateBreastSize()
{ {
// Ageless pawns can't depend on the chrono age, so just disable their growth entirely // Scenario A: the youngest child is less than halfway into babyhood: Full size
if (Pawn.ageTracker.BiologicalTicksPerTick <= 0f && breastSizeIncreased > 0) if (ageOfLastBirth + BabyHalfAge * GenDate.TicksPerYear > Pawn.ageTracker.AgeBiologicalTicks)
{
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)
{ {
debugGrowthStatus = "Full size due to young child"; debugGrowthStatus = "Full size due to young child";
if (breastSizeIncreased < MaxBreastIncrement) if (breastSizeIncreased < MaxBreastIncrement)
@ -262,7 +256,7 @@ namespace RJW_Menstruation
breastSizeIncreased = MaxBreastIncrement; 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()) else if (Pawn.IsRJWPregnant() || Pawn.IsBiotechPregnant())
{ {
float pregnancySize = Mathf.InverseLerp(breastGrowthStart, breastGrowthEnd, Pawn.GetFarthestPregnancyProgress()) * MaxBreastIncrement; float pregnancySize = Mathf.InverseLerp(breastGrowthStart, breastGrowthEnd, Pawn.GetFarthestPregnancyProgress()) * MaxBreastIncrement;
@ -285,7 +279,7 @@ namespace RJW_Menstruation
} }
else debugGrowthStatus = "Pregnant and full size"; 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) else if (breastSizeIncreased > 0)
{ {
debugGrowthStatus = "Shrinking due to no pregnancy nor young child"; debugGrowthStatus = "Shrinking due to no pregnancy nor young child";
@ -297,9 +291,7 @@ namespace RJW_Menstruation
protected void CalculateNipples() protected void CalculateNipples()
{ {
float newNippleProgress; float newNippleProgress;
if (Pawn.ageTracker.BiologicalTicksPerTick <= 0f) if (ageOfLastBirth + BabyHalfAge * GenDate.TicksPerYear > Pawn.ageTracker.AgeBiologicalTicks)
newNippleProgress = 0f;
else if (ageOfLastBirth + BabyHalfAge * GenDate.TicksPerYear > Pawn.ageTracker.AgeBiologicalTicks)
newNippleProgress = 1f; newNippleProgress = 1f;
else if (Pawn.IsRJWPregnant() || Pawn.IsBiotechPregnant()) else if (Pawn.IsRJWPregnant() || Pawn.IsBiotechPregnant())
newNippleProgress = nippleTransitions.Evaluate(Pawn.GetFarthestPregnancyProgress()); newNippleProgress = nippleTransitions.Evaluate(Pawn.GetFarthestPregnancyProgress());

View file

@ -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. - 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. - Babies born from multiple pregnancy will properly produce the prompt to name them.
- Hopefully improve compatibility with xenotype inhertiance-altering mods for multiple pregnancy. - 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. - Experimental "periodic ovulator" cycle type, currently not used. See Patches/Hediffs_Private_Parts_Animal.xml.
Version 1.0.8.4 Version 1.0.8.4