Compare commits
4 Commits
d483924c47
...
f5ec31f8e7
Author | SHA1 | Date |
---|---|---|
amevarashi | f5ec31f8e7 | |
amevarashi | b6942e3c10 | |
amevarashi | 450c835d2b | |
amevarashi | bf7f6a29fb |
Binary file not shown.
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<Manifest>
|
||||
<identifier>RJWSexperienceIdeology</identifier>
|
||||
<version>1.0.1.0</version>
|
||||
<version>1.0.1.1</version>
|
||||
<dependencies>
|
||||
<li>RimJobWorld >= 5.3.0</li>
|
||||
</dependencies>
|
||||
|
|
|
@ -1,3 +1,9 @@
|
|||
## Version 1.0.1.1
|
||||
* Fixed Ideology overwriting Sexperience's mod settings label
|
||||
* Fixed submissive gender can't be marked for comfort
|
||||
* Fixed new precepts adding thoughts to children
|
||||
* Fixed Sexual Proselyzing precept
|
||||
* Fixed biotech pregnancy not counting for pregnancy precepts
|
||||
## Version 1.0.1.0
|
||||
* Rimworld 1.4
|
||||
### by Twonki
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -238,7 +238,7 @@ namespace RJWSexperience.Ideology.Patches
|
|||
public static void Postfix(SexProps props)
|
||||
{
|
||||
// ShortCuts: Exit Early if Pawn or Partner are null (can happen with Animals or Masturbation)
|
||||
if (props.pawn != null && props.hasPartner())
|
||||
if (props.pawn == null || !props.hasPartner())
|
||||
return;
|
||||
|
||||
if (props.partner.Ideo?.HasPrecept(VariousDefOf.ProselyzingByOrgasm) == true)
|
||||
|
|
|
@ -22,7 +22,7 @@ namespace RJWSexperience.Ideology.PreceptWorkers
|
|||
|
||||
protected override ThoughtState ShouldHaveThought(Pawn p)
|
||||
{
|
||||
if (p != null && Genital_Helper.get_AllPartsHediffList(p).Count > 0)
|
||||
if (p?.DevelopmentalStage == DevelopmentalStage.Adult && Genital_Helper.get_AllPartsHediffList(p).Count > 0)
|
||||
{
|
||||
float bestSize = IdeoUtility.GetGenitalSize(p);
|
||||
return ThoughtState.ActiveAtStage(StageFromValue.GetStageIndex(bestSize));
|
||||
|
|
|
@ -23,7 +23,9 @@ namespace RJWSexperience.Ideology.PreceptWorkers
|
|||
// Important Note: For the Social Worker, we measure otherPawns genitalia
|
||||
protected override ThoughtState ShouldHaveThought(Pawn p, Pawn otherPawn)
|
||||
{
|
||||
if (otherPawn != null && Genital_Helper.get_AllPartsHediffList(otherPawn).Count > 0)
|
||||
if (otherPawn?.DevelopmentalStage == DevelopmentalStage.Adult &&
|
||||
p?.DevelopmentalStage == DevelopmentalStage.Adult &&
|
||||
Genital_Helper.get_AllPartsHediffList(otherPawn).Count > 0)
|
||||
{
|
||||
float bestSize = IdeoUtility.GetGenitalSize(otherPawn);
|
||||
return ThoughtState.ActiveAtStage(StageFromValue.GetStageIndex(bestSize));
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
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 PregnancyHelper.GetPregnancy(p)?.Visible != true;
|
||||
return p?.DevelopmentalStage == DevelopmentalStage.Adult && !IdeoUtility.IsVisiblyPregnant(p);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
using RimWorld;
|
||||
using rjw;
|
||||
using Verse;
|
||||
|
||||
namespace RJWSexperience.Ideology.PreceptWorkers
|
||||
|
@ -16,7 +15,9 @@ namespace RJWSexperience.Ideology.PreceptWorkers
|
|||
/// <returns></returns>
|
||||
protected override ThoughtState ShouldHaveThought(Pawn p, Pawn otherPawn)
|
||||
{
|
||||
return PregnancyHelper.GetPregnancy(otherPawn)?.Visible != true;
|
||||
return otherPawn?.DevelopmentalStage == DevelopmentalStage.Adult &&
|
||||
p?.DevelopmentalStage == DevelopmentalStage.Adult &&
|
||||
!IdeoUtility.IsVisiblyPregnant(otherPawn);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
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 PregnancyHelper.GetPregnancy(p)?.Visible == true;
|
||||
return p?.DevelopmentalStage == DevelopmentalStage.Adult && IdeoUtility.IsVisiblyPregnant(p);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
using RimWorld;
|
||||
using rjw;
|
||||
using Verse;
|
||||
|
||||
namespace RJWSexperience.Ideology.PreceptWorkers
|
||||
|
@ -16,7 +15,9 @@ namespace RJWSexperience.Ideology.PreceptWorkers
|
|||
/// <returns></returns>
|
||||
protected override ThoughtState ShouldHaveThought(Pawn p, Pawn otherPawn)
|
||||
{
|
||||
return PregnancyHelper.GetPregnancy(otherPawn)?.Visible == true;
|
||||
return otherPawn?.DevelopmentalStage == DevelopmentalStage.Adult &&
|
||||
p?.DevelopmentalStage == DevelopmentalStage.Adult &&
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue