AblativeAbsolute
/
RJW-Sexperience
mirror of https://github.com/amevarashi/RJW-Sexperience.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stop redefining incest with precepts

This commit is contained in:
amevarashi 2022-07-02 23:05:19 +05:00
parent a5d2c4fbd8
commit 226c09eca5
7 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RJWSexperience/IdeologyAddon/Harmony.cs
View File

@ -15,10 +15,6 @@ namespace RJWSexperience.Ideology
if (ModLister.HasActiveModWithName("RJW Sexperience"))
{
harmony.Patch(AccessTools.Method("RJWSexperience.PawnExtensions:IsIncest"),
prefix: new HarmonyMethod(typeof(Sexperience_Patch_IsIncest), nameof(Sexperience_Patch_IsIncest.Prefix)),
postfix: null
);
harmony.Patch(AccessTools.Method("RJWSexperience.RJWUtility:ThrowVirginHIstoryEvent"),
prefix: null,
postfix: new HarmonyMethod(typeof(Sexperience_Patch_ThrowVirginHIstoryEvent), nameof(Sexperience_Patch_ThrowVirginHIstoryEvent.Postfix))

5
RJWSexperience/IdeologyAddon/Ideology/IdeoUtility.cs
View File

@ -37,16 +37,15 @@ namespace RJWSexperience.Ideology
return true;
}
public static bool IsIncest(Pawn pawn, Pawn partner)
public static bool IsIncest(Pawn pawn, Pawn partner, bool close)
{
IEnumerable<PawnRelationDef> relations = pawn.GetRelations(partner);
if (relations.EnumerableNullOrEmpty())
return false;
bool wide = pawn.Ideo?.HasPrecept(VariousDefOf.Incestuos_Disapproved_CloseOnly) == true;
foreach (PawnRelationDef relation in relations)
{
if (wide)
if (close)
{
if (relation.incestOpinionOffset < 0)
return true;

7
RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs
View File

@ -114,8 +114,13 @@ namespace RJWSexperience.Ideology.Patches
public static void AfterSexHuman(Pawn human, Pawn partner, bool rape, bool isHumanReceiving = false)
{
if (IdeoUtility.IsIncest(human, partner))
if (IdeoUtility.IsIncest(human, partner, false))
{
if (IdeoUtility.IsIncest(human, partner, true))
{
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RJWSI_CloseRelativeSex.CreateEvent(human));
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RJWSI_CloseRelativeSex.CreateEvent(partner));
}
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RJWSI_IncestuosSex.CreateEvent(human));
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RJWSI_IncestuosSex.CreateEvent(partner));
}

9
RJWSexperience/IdeologyAddon/Ideology/Patches/Rimworld_Patch.cs
View File

@ -12,8 +12,13 @@ namespace RJWSexperience.Ideology.Patches
{
public static void Postfix(Pawn firstPawn, Pawn secondPawn)
{
if (IdeoUtility.IsIncest(firstPawn, secondPawn))
if (IdeoUtility.IsIncest(firstPawn, secondPawn, false))
{
if (IdeoUtility.IsIncest(firstPawn, secondPawn, true))
{
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RJWSI_CloseRelativeMarriage.CreateEvent(firstPawn));
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RJWSI_CloseRelativeMarriage.CreateEvent(secondPawn));
}
Find.HistoryEventsManager.RecordEvent(VariousDefOf.Incestuos_Marriage.CreateEvent(firstPawn));
Find.HistoryEventsManager.RecordEvent(VariousDefOf.Incestuos_Marriage.CreateEvent(secondPawn));
}
@ -31,7 +36,7 @@ namespace RJWSexperience.Ideology.Patches
public static void Postfix(Pawn otherPawn, Pawn ___pawn, ref float __result)
{
Ideo ideo = ___pawn.Ideo;
if (ideo?.HasPrecept(VariousDefOf.Incestuos_IncestOnly) == true && IdeoUtility.IsIncest(___pawn, otherPawn))
if (ideo?.HasPrecept(VariousDefOf.Incestuos_IncestOnly) == true && IdeoUtility.IsIncest(___pawn, otherPawn, false))
{
__result *= 8f;
}

10
RJWSexperience/IdeologyAddon/Ideology/Patches/Sexperience_Patch.cs
View File

@ -31,14 +31,4 @@ namespace RJWSexperience.Ideology.Patches
}
}
}
public static class Sexperience_Patch_IsIncest
{
public static bool Prefix(Pawn pawn, Pawn otherpawn, ref bool __result)
{
__result = IdeoUtility.IsIncest(pawn, otherpawn);
return false;
}
}
}

2
RJWSexperience/IdeologyAddon/VariousDefOf.cs
View File

@ -31,8 +31,10 @@ namespace RJWSexperience.Ideology
[MayRequireIdeology] public static readonly HistoryEventDef OralSex = DefDatabase<HistoryEventDef>.GetNamed("OralSex");
[MayRequireIdeology] public static readonly HistoryEventDef MiscSex = DefDatabase<HistoryEventDef>.GetNamed("MiscSex");
[MayRequireIdeology] public static readonly HistoryEventDef PromiscuousSex = DefDatabase<HistoryEventDef>.GetNamed("PromiscuousSex");
[MayRequireIdeology] public static readonly HistoryEventDef RJWSI_CloseRelativeMarriage = DefDatabase<HistoryEventDef>.GetNamed("RJWSI_CloseRelativeMarriage");
[MayRequireIdeology] public static readonly HistoryEventDef Incestuos_Marriage = DefDatabase<HistoryEventDef>.GetNamed("Incestuos_Marriage");
[MayRequireIdeology] public static readonly HistoryEventDef RJWSI_NonIncestuosMarriage = DefDatabase<HistoryEventDef>.GetNamed("RJWSI_NonIncestuosMarriage");
[MayRequireIdeology] public static readonly HistoryEventDef RJWSI_CloseRelativeSex = DefDatabase<HistoryEventDef>.GetNamed("RJWSI_CloseRelativeSex");
[MayRequireIdeology] public static readonly HistoryEventDef RJWSI_IncestuosSex = DefDatabase<HistoryEventDef>.GetNamed("RJWSI_IncestuosSex");
[MayRequireIdeology] public static readonly HistoryEventDef RJWSI_NonIncestuosSex = DefDatabase<HistoryEventDef>.GetNamed("RJWSI_NonIncestuosSex");
[MayRequireIdeology] public static readonly HistoryEventDef SexWithCorpse = DefDatabase<HistoryEventDef>.GetNamed("SexWithCorpse");

14
RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Incest.xml
View File

@ -8,6 +8,11 @@
<iconPath>UI/Issues/Incest</iconPath>
</IssueDef>
<HistoryEventDef>
<defName>RJWSI_CloseRelativeMarriage</defName>
<label>Marriage between close relatives</label>
</HistoryEventDef>
<HistoryEventDef>
<defName>Incestuos_Marriage</defName>
<label>Incestuos marriage</label>
@ -18,6 +23,11 @@
<label>Non-incestuos marriage</label>
</HistoryEventDef>
<HistoryEventDef>
<defName>RJWSI_CloseRelativeSex</defName>
<label>Sex between close relatives</label>
</HistoryEventDef>
<HistoryEventDef>
<defName>RJWSI_IncestuosSex</defName>
<label>Incestuos sex</label>
@ -52,11 +62,11 @@
<defaultSelectionWeight>100</defaultSelectionWeight>
<comps>
<li Class="PreceptComp_SelfTookMemoryThought">
<eventDef>Incestuos_Marriage</eventDef>
<eventDef>RJWSI_CloseRelativeMarriage</eventDef>
<thought>IncestuosMarriage_Disapproved</thought>
</li>
<li Class="PreceptComp_KnowsMemoryThought">
<eventDef>RJWSI_IncestuosSex</eventDef>
<eventDef>RJWSI_CloseRelativeSex</eventDef>
<thought>Sex_Know_Incest_Disapproved</thought>
</li>
</comps>