AblativeAbsolute
/
rjw_menstruation
mirror of https://gitgud.io/lutepickle/rjw_menstruation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add new function to test for RJW pregnancy (as opposed to a vanilla animal pregnancy), and refactor GetFarthestPregnancy into the rimworld fallback version

This commit is contained in:
lutepickle 2022-08-21 20:54:27 -07:00
parent 5eb73bfb2e
commit e023938a41
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs
View File

@ -265,7 +265,7 @@ namespace RJW_Menstruation
}
}
// Scenario B: Pregnant, grow in the second half of first trimester
else if (parent.pawn.IsPregnant())
else if (parent.pawn.IsRJWPregnant())
{
float pregnancySize = Mathf.InverseLerp(breastGrowthStart, breastGrowthEnd, parent.pawn.GetFarthestPregnancyProgress()) * MaxBreastIncrement;
if (breastSizeIncreased > pregnancySize)
@ -301,7 +301,7 @@ namespace RJW_Menstruation
float newNippleProgress;
if (ageOfLastBirth + BabyHalfAge * GenDate.TicksPerYear > parent.pawn.ageTracker.AgeBiologicalTicks)
newNippleProgress = 1f;
else if (parent.pawn.IsPregnant())
else if (parent.pawn.IsRJWPregnant())
newNippleProgress = nippleTransitions.Evaluate(parent.pawn.GetFarthestPregnancyProgress());
else
newNippleProgress = 0f;

2
1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/GetGizmos.cs
View File

@ -51,7 +51,7 @@ namespace RJW_Menstruation
"eggs: " + comp.GetNumofEggs + "\n";
}
else description += comp.GetCurStageLabel + "\n";
if (pawn.IsPregnant())
if (pawn.IsRJWPregnant())
{
Hediff_BasePregnancy hediff = comp.Pregnancy;
if (hediff != null && Utility.ShowFetusImage(hediff))

8
1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
View File

@ -135,12 +135,14 @@ namespace RJW_Menstruation
else return false;
}
public static bool IsRJWPregnant(this Pawn pawn)
{
return pawn.health.hediffSet.GetHediffs<Hediff_BasePregnancy>().Any();
}
public static float GetFarthestPregnancyProgress(this Pawn pawn)
{
IEnumerable<Hediff_BasePregnancy> pregnancies = pawn.health.hediffSet.GetHediffs<Hediff_BasePregnancy>();
if (!pregnancies.Any()) return 0;
else return pregnancies.MaxBy(hediff => hediff.GestationProgress)?.GestationProgress ?? 0;
return pawn.health.hediffSet.GetHediffs<Hediff_BasePregnancy>().MaxByWithFallback(hediff => hediff.GestationProgress)?.GestationProgress ?? 0;
}
public static float GetPregnancyProgress(this HediffComp_Menstruation comp)