AblativeAbsolute/rjw_menstruation
1
0
Fork 0
mirror of https://gitgud.io/lutepickle/rjw_menstruation.git synced 2024-08-14 22:46:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Catch pawns that are pregnant but not with BasePregnancy (e.g. vanilla animal pregnancy)

Browse source
This commit is contained in:
lutepickle 2022-08-17 06:37:30 -07:00
parent 177f941d93
commit d98a102d44
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs
View file

@ -306,6 +306,8 @@ namespace RJW_Menstruation
else else
newNippleProgress = 0f; newNippleProgress = 0f;
if (newNippleProgress < 0) newNippleProgress = 0;
if (newNippleProgress == nippleProgress) return; // Nothing to change if (newNippleProgress == nippleProgress) return; // Nothing to change
else if (newNippleProgress > nippleProgress) else if (newNippleProgress > nippleProgress)
{ {

5
1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs
View file

@ -57,8 +57,9 @@ namespace RJW_Menstruation
if (__state == null || __state.Pregnancy != null) return; if (__state == null || __state.Pregnancy != null) return;
// It was pregnant, but not anymore. This probably means the pregnancy was destroyed by e.g. a mech implant // It was pregnant, but not anymore. This probably means the pregnancy was destroyed by e.g. a mech implant
Pawn pawn = props.partner; Pawn pawn = props.partner;
Hediff_BasePregnancy newestPregnancy = pawn.health.hediffSet.GetHediffs<Hediff_BasePregnancy>().MaxBy(hediff => hediff.loadID); IEnumerable<Hediff_BasePregnancy> pregnancies = pawn.health.hediffSet.GetHediffs<Hediff_BasePregnancy>();
if (newestPregnancy == null) return; if (!pregnancies.Any()) return;
Hediff_BasePregnancy newestPregnancy = pregnancies.MaxBy(hediff => hediff.loadID);
if (pawn.GetMenstruationComps().Any(comp => comp.Pregnancy == newestPregnancy)) return; // One of the wombs did get it if (pawn.GetMenstruationComps().Any(comp => comp.Pregnancy == newestPregnancy)) return; // One of the wombs did get it
else __state.Pregnancy = newestPregnancy; else __state.Pregnancy = newestPregnancy;

4
1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
View file

@ -138,7 +138,9 @@ namespace RJW_Menstruation
public static float GetFarthestPregnancyProgress(this Pawn pawn) public static float GetFarthestPregnancyProgress(this Pawn pawn)
{ {
return pawn.health.hediffSet.GetHediffs<Hediff_BasePregnancy>().MaxBy(hediff => hediff.GestationProgress)?.GestationProgress ?? -1; IEnumerable<Hediff_BasePregnancy> pregnancies = pawn.health.hediffSet.GetHediffs<Hediff_BasePregnancy>();
if (!pregnancies.Any()) return -1;
else return pregnancies.MaxBy(hediff => hediff.GestationProgress)?.GestationProgress ?? -1;
} }
public static float GetPregnancyProgress(this HediffComp_Menstruation comp) public static float GetPregnancyProgress(this HediffComp_Menstruation comp)