Skip to content
Snippets Groups Projects
Commit b6942e3c authored by amevarashi's avatar amevarashi
Browse files

Fixed biotech pregnancy not counting for pregnancy precepts

parent 450c835d
No related branches found
No related tags found
No related merge requests found
......@@ -80,5 +80,18 @@ namespace RJWSexperience.Ideology
return bestSeenSize;
}
public static bool IsVisiblyPregnant(Pawn pawn)
{
Hediff pregnancy = PregnancyHelper.GetPregnancy(pawn);
// Currently RJW does not check Biotech pregnancy
if (pregnancy == null && VariousDefOf.PregnantHuman != null)
{
pregnancy = pawn.health.hediffSet.GetFirstHediffOfDef(HediffDefOf.PregnantHuman);
}
return pregnancy?.Visible == true;
}
}
}
using RimWorld;
using rjw;
using Verse;
namespace RJWSexperience.Ideology.PreceptWorkers
......@@ -15,7 +14,7 @@ namespace RJWSexperience.Ideology.PreceptWorkers
/// <returns></returns>
protected override ThoughtState ShouldHaveThought(Pawn p)
{
return p?.DevelopmentalStage == DevelopmentalStage.Adult && PregnancyHelper.GetPregnancy(p)?.Visible != true;
return p?.DevelopmentalStage == DevelopmentalStage.Adult && !IdeoUtility.IsVisiblyPregnant(p);
}
}
}
using RimWorld;
using rjw;
using Verse;
namespace RJWSexperience.Ideology.PreceptWorkers
......@@ -18,7 +17,7 @@ namespace RJWSexperience.Ideology.PreceptWorkers
{
return otherPawn?.DevelopmentalStage == DevelopmentalStage.Adult &&
p?.DevelopmentalStage == DevelopmentalStage.Adult &&
PregnancyHelper.GetPregnancy(otherPawn)?.Visible != true;
!IdeoUtility.IsVisiblyPregnant(otherPawn);
}
}
}
using RimWorld;
using rjw;
using Verse;
namespace RJWSexperience.Ideology.PreceptWorkers
......@@ -15,7 +14,7 @@ namespace RJWSexperience.Ideology.PreceptWorkers
/// <returns></returns>
protected override ThoughtState ShouldHaveThought(Pawn p)
{
return p?.DevelopmentalStage == DevelopmentalStage.Adult && PregnancyHelper.GetPregnancy(p)?.Visible == true;
return p?.DevelopmentalStage == DevelopmentalStage.Adult && IdeoUtility.IsVisiblyPregnant(p);
}
}
}
using RimWorld;
using rjw;
using Verse;
namespace RJWSexperience.Ideology.PreceptWorkers
......@@ -18,7 +17,7 @@ namespace RJWSexperience.Ideology.PreceptWorkers
{
return otherPawn?.DevelopmentalStage == DevelopmentalStage.Adult &&
p?.DevelopmentalStage == DevelopmentalStage.Adult &&
PregnancyHelper.GetPregnancy(otherPawn)?.Visible == true;
IdeoUtility.IsVisiblyPregnant(otherPawn);
}
}
}
......@@ -22,5 +22,6 @@ namespace RJWSexperience.Ideology
[MayRequireIdeology] public static readonly PreceptDef Submissive_Male;
[MayRequireIdeology] public static readonly PreceptDef Submissive_Female;
[MayRequireIdeology] public static readonly PreceptDef ProselyzingByOrgasm;
[MayRequireBiotech] public static readonly HediffDef PregnantHuman;
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment