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

Change HistoryEventDef name prefix

This commit is contained in:
amevarashi 2022-07-03 11:40:57 +05:00
parent 226c09eca5
commit 2c574ffc75
4 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,21 +114,9 @@ namespace RJWSexperience.Ideology.Patches
public static void AfterSexHuman(Pawn human, Pawn partner, bool rape, bool isHumanReceiving = false)
{
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));
}
else
{
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RJWSI_NonIncestuosSex.CreateEvent(human));
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RJWSI_NonIncestuosSex.CreateEvent(partner));
}
HistoryEventDef incestEvent = GetIncestTypeEvent(human, partner);
Find.HistoryEventsManager.RecordEvent(incestEvent.CreateEvent(human));
Find.HistoryEventsManager.RecordEvent(incestEvent.CreateEvent(partner));
if (partner.IsAnimal())
{
@ -178,6 +166,17 @@ namespace RJWSexperience.Ideology.Patches
}
}
private static HistoryEventDef GetIncestTypeEvent(Pawn pawn, Pawn partner)
{
if (IdeoUtility.IsIncest(pawn, partner, true))
return VariousDefOf.RSI_CloseRelativeSex;
if (IdeoUtility.IsIncest(pawn, partner, false))
return VariousDefOf.RSI_IncestuosSex;
return VariousDefOf.RSI_NonIncestuosSex;
}
public static void RapeEffectSlave(Pawn victim)
{
Need_Suppression suppression = victim.needs.TryGetNeed<Need_Suppression>();

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

@ -16,16 +16,16 @@ namespace RJWSexperience.Ideology.Patches
{
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.RSI_CloseRelativeMarriage.CreateEvent(firstPawn));
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RSI_CloseRelativeMarriage.CreateEvent(secondPawn));
}
Find.HistoryEventsManager.RecordEvent(VariousDefOf.Incestuos_Marriage.CreateEvent(firstPawn));
Find.HistoryEventsManager.RecordEvent(VariousDefOf.Incestuos_Marriage.CreateEvent(secondPawn));
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RSI_IncestuosMarriage.CreateEvent(firstPawn));
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RSI_IncestuosMarriage.CreateEvent(secondPawn));
}
else
{
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RJWSI_NonIncestuosMarriage.CreateEvent(firstPawn));
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RJWSI_NonIncestuosMarriage.CreateEvent(secondPawn));
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RSI_NonIncestuosMarriage.CreateEvent(firstPawn));
Find.HistoryEventsManager.RecordEvent(VariousDefOf.RSI_NonIncestuosMarriage.CreateEvent(secondPawn));
}
}
}

12
RJWSexperience/IdeologyAddon/VariousDefOf.cs
View File

@ -31,12 +31,12 @@ 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 RSI_CloseRelativeMarriage = DefDatabase<HistoryEventDef>.GetNamed("RSI_CloseRelativeMarriage");
[MayRequireIdeology] public static readonly HistoryEventDef RSI_IncestuosMarriage = DefDatabase<HistoryEventDef>.GetNamed("RSI_IncestuosMarriage");
[MayRequireIdeology] public static readonly HistoryEventDef RSI_NonIncestuosMarriage = DefDatabase<HistoryEventDef>.GetNamed("RSI_NonIncestuosMarriage");
[MayRequireIdeology] public static readonly HistoryEventDef RSI_CloseRelativeSex = DefDatabase<HistoryEventDef>.GetNamed("RSI_CloseRelativeSex");
[MayRequireIdeology] public static readonly HistoryEventDef RSI_IncestuosSex = DefDatabase<HistoryEventDef>.GetNamed("RSI_IncestuosSex");
[MayRequireIdeology] public static readonly HistoryEventDef RSI_NonIncestuosSex = DefDatabase<HistoryEventDef>.GetNamed("RSI_NonIncestuosSex");
[MayRequireIdeology] public static readonly HistoryEventDef SexWithCorpse = DefDatabase<HistoryEventDef>.GetNamed("SexWithCorpse");
[MayRequireIdeology] public static readonly HistoryEventDef Virgin_TakenF = DefDatabase<HistoryEventDef>.GetNamed("Virgin_TakenF");
[MayRequireIdeology] public static readonly HistoryEventDef Virgin_TakenM = DefDatabase<HistoryEventDef>.GetNamed("Virgin_TakenM");

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

@ -9,32 +9,32 @@
</IssueDef>
<HistoryEventDef>
<defName>RJWSI_CloseRelativeMarriage</defName>
<defName>RSI_CloseRelativeMarriage</defName>
<label>Marriage between close relatives</label>
</HistoryEventDef>
<HistoryEventDef>
<defName>Incestuos_Marriage</defName>
<defName>RSI_IncestuosMarriage</defName>
<label>Incestuos marriage</label>
</HistoryEventDef>
<HistoryEventDef>
<defName>RJWSI_NonIncestuosMarriage</defName>
<defName>RSI_NonIncestuosMarriage</defName>
<label>Non-incestuos marriage</label>
</HistoryEventDef>
<HistoryEventDef>
<defName>RJWSI_CloseRelativeSex</defName>
<defName>RSI_CloseRelativeSex</defName>
<label>Sex between close relatives</label>
</HistoryEventDef>
<HistoryEventDef>
<defName>RJWSI_IncestuosSex</defName>
<defName>RSI_IncestuosSex</defName>
<label>Incestuos sex</label>
</HistoryEventDef>
<HistoryEventDef>
<defName>RJWSI_NonIncestuosSex</defName>
<defName>RSI_NonIncestuosSex</defName>
<label>Non-incestuos sex</label>
</HistoryEventDef>
@ -62,11 +62,11 @@
<defaultSelectionWeight>100</defaultSelectionWeight>
<comps>
<li Class="PreceptComp_SelfTookMemoryThought">
<eventDef>RJWSI_CloseRelativeMarriage</eventDef>
<eventDef>RSI_CloseRelativeMarriage</eventDef>
<thought>IncestuosMarriage_Disapproved</thought>
</li>
<li Class="PreceptComp_KnowsMemoryThought">
<eventDef>RJWSI_CloseRelativeSex</eventDef>
<eventDef>RSI_CloseRelativeSex</eventDef>
<thought>Sex_Know_Incest_Disapproved</thought>
</li>
</comps>
@ -107,15 +107,15 @@
<defaultSelectionWeight>100</defaultSelectionWeight>
<comps>
<li Class="PreceptComp_SelfTookMemoryThought">
<eventDef>Incestuos_Marriage</eventDef>
<eventDef>RSI_IncestuosMarriage</eventDef>
<thought>IncestuosMarriage_Disapproved</thought>
</li>
<li Class="PreceptComp_KnowsMemoryThought">
<eventDef>Incestuos_Marriage</eventDef>
<eventDef>RSI_IncestuosMarriage</eventDef>
<thought>Sex_Know_IncestMarriage_Disapproved</thought>
</li>
<li Class="PreceptComp_KnowsMemoryThought">
<eventDef>RJWSI_IncestuosSex</eventDef>
<eventDef>RSI_IncestuosSex</eventDef>
<thought>Sex_Know_Incest_Disapproved</thought>
</li>
</comps>
@ -164,15 +164,15 @@
<defaultSelectionWeight>100</defaultSelectionWeight>
<comps>
<li Class="PreceptComp_SelfTookMemoryThought">
<eventDef>Incestuos_Marriage</eventDef>
<eventDef>RSI_IncestuosMarriage</eventDef>
<thought>IncestuosMarriage_Forbidden</thought>
</li>
<li Class="PreceptComp_KnowsMemoryThought">
<eventDef>Incestuos_Marriage</eventDef>
<eventDef>RSI_IncestuosMarriage</eventDef>
<thought>Sex_Know_IncestMarriage_Forbidden</thought>
</li>
<li Class="PreceptComp_KnowsMemoryThought">
<eventDef>RJWSI_IncestuosSex</eventDef>
<eventDef>RSI_IncestuosSex</eventDef>
<thought>Sex_Know_Incest_Forbidden</thought>
</li>
</comps>
@ -223,11 +223,11 @@
</conflictingMemes>
<comps>
<li Class="PreceptComp_KnowsMemoryThought">
<eventDef>RJWSI_NonIncestuosMarriage</eventDef>
<eventDef>RSI_NonIncestuosMarriage</eventDef>
<thought>Sex_Know_IncestMarriage_Violated</thought>
</li>
<li Class="PreceptComp_KnowsMemoryThought">
<eventDef>RJWSI_NonIncestuosSex</eventDef>
<eventDef>RSI_NonIncestuosSex</eventDef>
<thought>Sex_Know_Incest_Violated</thought>
</li>
</comps>