From 6a1978414d23b917e48bc185db0766f941c2b5ba Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 3 Jul 2022 20:49:53 +0500 Subject: [PATCH] Create HistoryEvents namespace and folder --- .../ArgsNamesCustom.cs} | 4 ++-- ...DefExtension_PartnerDependentOverrides.cs} | 4 ++-- .../{HETag.cs => HistoryEvents/Tag.cs} | 4 ++-- .../Ideology/Patches/RJW_Patch_Ideo.cs | 21 ++++++++++--------- .../Ideology/Patches/Sexperience_Patch.cs | 15 ++++++------- .../PreceptComp_KnowsMemoryThoughtTagged.cs | 4 ++-- .../PreceptComp_SelftTookThoughtExtended.cs | 6 ++---- .../IdeologyAddon/IdeologyAddon.csproj | 6 +++--- .../Defs/PreceptDefs/Precepts_Incest.xml | 4 ++-- 9 files changed, 34 insertions(+), 34 deletions(-) rename RJWSexperience/IdeologyAddon/Ideology/{HistoryEventArgsNamesCustom.cs => HistoryEvents/ArgsNamesCustom.cs} (50%) rename RJWSexperience/IdeologyAddon/Ideology/{HistoryEventDefExtension_PartnerDependentOverrides.cs => HistoryEvents/DefExtension_PartnerDependentOverrides.cs} (88%) rename RJWSexperience/IdeologyAddon/Ideology/{HETag.cs => HistoryEvents/Tag.cs} (76%) diff --git a/RJWSexperience/IdeologyAddon/Ideology/HistoryEventArgsNamesCustom.cs b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/ArgsNamesCustom.cs similarity index 50% rename from RJWSexperience/IdeologyAddon/Ideology/HistoryEventArgsNamesCustom.cs rename to RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/ArgsNamesCustom.cs index a601bf3..2f1fbfe 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/HistoryEventArgsNamesCustom.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/ArgsNamesCustom.cs @@ -1,6 +1,6 @@ -namespace RJWSexperience.Ideology +namespace RJWSexperience.Ideology.HistoryEvents { - public static class HistoryEventArgsNamesCustom + public static class ArgsNamesCustom { public const string Tag = "TAG"; public const string Partner = "PARTNER"; diff --git a/RJWSexperience/IdeologyAddon/Ideology/HistoryEventDefExtension_PartnerDependentOverrides.cs b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_PartnerDependentOverrides.cs similarity index 88% rename from RJWSexperience/IdeologyAddon/Ideology/HistoryEventDefExtension_PartnerDependentOverrides.cs rename to RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_PartnerDependentOverrides.cs index 3879d27..dd11834 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/HistoryEventDefExtension_PartnerDependentOverrides.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/DefExtension_PartnerDependentOverrides.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Verse; -namespace RJWSexperience.Ideology +namespace RJWSexperience.Ideology.HistoryEvents { - public class HistoryEventDefExtension_PartnerDependentOverrides : DefModExtension + public class DefExtension_PartnerDependentOverrides : DefModExtension { [SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")] public List overrideRules = new List(); diff --git a/RJWSexperience/IdeologyAddon/Ideology/HETag.cs b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/Tag.cs similarity index 76% rename from RJWSexperience/IdeologyAddon/Ideology/HETag.cs rename to RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/Tag.cs index 0ed28d1..b2bc486 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/HETag.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/Tag.cs @@ -1,8 +1,8 @@ using Verse; -namespace RJWSexperience.Ideology +namespace RJWSexperience.Ideology.HistoryEvents { - public static class HETag + public static class Tag { public const string BeenRaped = "[BeenRaped]"; public const string Rape = "[Rape]"; diff --git a/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs b/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs index 606b461..c5f7eab 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Patches/RJW_Patch_Ideo.cs @@ -3,6 +3,7 @@ using RimWorld; using rjw; using rjw.Modules.Interactions.Internals.Implementation; using rjw.Modules.Interactions.Objects; +using RJWSexperience.Ideology.HistoryEvents; using RJWSexperience.Ideology.Precepts; using System; using System.Collections.Generic; @@ -14,7 +15,7 @@ namespace RJWSexperience.Ideology.Patches { public static HistoryEvent CreateTaggedEvent(this HistoryEventDef def, Pawn pawn, string tag, Pawn partner) { - return new HistoryEvent(def, pawn.Named(HistoryEventArgsNames.Doer), tag.Named(HistoryEventArgsNamesCustom.Tag), partner.Named(HistoryEventArgsNamesCustom.Partner)); + return new HistoryEvent(def, pawn.Named(HistoryEventArgsNames.Doer), tag.Named(ArgsNamesCustom.Tag), partner.Named(ArgsNamesCustom.Partner)); } public static HistoryEvent CreateEvent(this HistoryEventDef def, Pawn pawn) @@ -24,10 +25,10 @@ namespace RJWSexperience.Ideology.Patches public static HistoryEvent CreateEventWithPartner(this HistoryEventDef def, Pawn pawn, Pawn partner) { - HistoryEventDefExtension_PartnerDependentOverrides overrides = def.GetModExtension(); + DefExtension_PartnerDependentOverrides overrides = def.GetModExtension(); if (overrides == null) - return new HistoryEvent(def, pawn.Named(HistoryEventArgsNames.Doer), partner.Named(HistoryEventArgsNamesCustom.Partner)); + return new HistoryEvent(def, pawn.Named(HistoryEventArgsNames.Doer), partner.Named(ArgsNamesCustom.Partner)); foreach (var rule in overrides.overrideRules) { @@ -35,7 +36,7 @@ namespace RJWSexperience.Ideology.Patches return rule.historyEventDef.CreateEventWithPartner(pawn, partner); } - return new HistoryEvent(def, pawn.Named(HistoryEventArgsNames.Doer), partner.Named(HistoryEventArgsNamesCustom.Partner)); + return new HistoryEvent(def, pawn.Named(HistoryEventArgsNames.Doer), partner.Named(ArgsNamesCustom.Partner)); } public static Faction GetFactionUsingPrecept(this Pawn baby, out Ideo ideo) @@ -168,18 +169,18 @@ namespace RJWSexperience.Ideology.Patches { if (partner.IsSlave) { - Find.HistoryEventsManager.RecordEvent(VariousDefOf.RapedSlave.CreateTaggedEvent(human, HETag.Rape + HETag.Gender(human), partner)); - Find.HistoryEventsManager.RecordEvent(VariousDefOf.WasRapedSlave.CreateTaggedEvent(partner, HETag.BeenRaped + HETag.Gender(partner), human)); + Find.HistoryEventsManager.RecordEvent(VariousDefOf.RapedSlave.CreateTaggedEvent(human, Tag.Rape + Tag.Gender(human), partner)); + Find.HistoryEventsManager.RecordEvent(VariousDefOf.WasRapedSlave.CreateTaggedEvent(partner, Tag.BeenRaped + Tag.Gender(partner), human)); } else if (partner.IsPrisoner) { - Find.HistoryEventsManager.RecordEvent(VariousDefOf.RapedPrisoner.CreateTaggedEvent(human, HETag.Rape + HETag.Gender(human), partner)); - Find.HistoryEventsManager.RecordEvent(VariousDefOf.WasRapedPrisoner.CreateTaggedEvent(partner, HETag.BeenRaped + HETag.Gender(partner), human)); + Find.HistoryEventsManager.RecordEvent(VariousDefOf.RapedPrisoner.CreateTaggedEvent(human, Tag.Rape + Tag.Gender(human), partner)); + Find.HistoryEventsManager.RecordEvent(VariousDefOf.WasRapedPrisoner.CreateTaggedEvent(partner, Tag.BeenRaped + Tag.Gender(partner), human)); } else { - Find.HistoryEventsManager.RecordEvent(VariousDefOf.Raped.CreateTaggedEvent(human, HETag.Rape + HETag.Gender(human), partner)); - Find.HistoryEventsManager.RecordEvent(VariousDefOf.WasRaped.CreateTaggedEvent(partner, HETag.BeenRaped + HETag.Gender(partner), human)); + Find.HistoryEventsManager.RecordEvent(VariousDefOf.Raped.CreateTaggedEvent(human, Tag.Rape + Tag.Gender(human), partner)); + Find.HistoryEventsManager.RecordEvent(VariousDefOf.WasRaped.CreateTaggedEvent(partner, Tag.BeenRaped + Tag.Gender(partner), human)); } } } diff --git a/RJWSexperience/IdeologyAddon/Ideology/Patches/Sexperience_Patch.cs b/RJWSexperience/IdeologyAddon/Ideology/Patches/Sexperience_Patch.cs index d8ccc78..23b566e 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Patches/Sexperience_Patch.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Patches/Sexperience_Patch.cs @@ -1,5 +1,6 @@ using RimWorld; using rjw; +using RJWSexperience.Ideology.HistoryEvents; using Verse; namespace RJWSexperience.Ideology.Patches @@ -11,23 +12,23 @@ namespace RJWSexperience.Ideology.Patches string tag = ""; if (props.isRape) { - if (pawn == props.pawn && props.isRapist) tag += HETag.Rape; - else tag += HETag.BeenRaped; + if (pawn == props.pawn && props.isRapist) tag += Tag.Rape; + else tag += Tag.BeenRaped; } if (!pawn.relations.DirectRelationExists(PawnRelationDefOf.Spouse, partner)) { - tag += HETag.NotSpouse; + tag += Tag.NotSpouse; } if (pawn.gender == Gender.Male) { - if (degree > 1) Find.HistoryEventsManager.RecordEvent(VariousDefOf.Virgin_TakenM.CreateTaggedEvent(pawn, tag + HETag.Gender(pawn), partner)); - Find.HistoryEventsManager.RecordEvent(VariousDefOf.Virgin_TookM.CreateTaggedEvent(partner, tag + HETag.Gender(pawn), pawn)); + if (degree > 1) Find.HistoryEventsManager.RecordEvent(VariousDefOf.Virgin_TakenM.CreateTaggedEvent(pawn, tag + Tag.Gender(pawn), partner)); + Find.HistoryEventsManager.RecordEvent(VariousDefOf.Virgin_TookM.CreateTaggedEvent(partner, tag + Tag.Gender(pawn), pawn)); } else { - if (degree > 1) Find.HistoryEventsManager.RecordEvent(VariousDefOf.Virgin_TakenF.CreateTaggedEvent(pawn, tag + HETag.Gender(pawn), partner)); - Find.HistoryEventsManager.RecordEvent(VariousDefOf.Virgin_TookF.CreateTaggedEvent(partner, tag + HETag.Gender(pawn), pawn)); + if (degree > 1) Find.HistoryEventsManager.RecordEvent(VariousDefOf.Virgin_TakenF.CreateTaggedEvent(pawn, tag + Tag.Gender(pawn), partner)); + Find.HistoryEventsManager.RecordEvent(VariousDefOf.Virgin_TookF.CreateTaggedEvent(partner, tag + Tag.Gender(pawn), pawn)); } } } diff --git a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_KnowsMemoryThoughtTagged.cs b/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_KnowsMemoryThoughtTagged.cs index d402214..dd2521f 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_KnowsMemoryThoughtTagged.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_KnowsMemoryThoughtTagged.cs @@ -17,13 +17,13 @@ namespace RJWSexperience.Ideology.Precepts public override void Notify_MemberWitnessedAction(HistoryEvent ev, Precept precept, Pawn member) { - if (!applyonpartner && ev.args.TryGetArg(HistoryEventArgsNamesCustom.Partner, out Pawn pawn) && pawn == member) + if (!applyonpartner && ev.args.TryGetArg(HistoryEvents.ArgsNamesCustom.Partner, out Pawn pawn) && pawn == member) { return; } if (tag != null) { - if (ev.args.TryGetArg(HistoryEventArgsNamesCustom.Tag, out string tags)) + if (ev.args.TryGetArg(HistoryEvents.ArgsNamesCustom.Tag, out string tags)) { if (IdeoUtility.ContainAll(tags, tag.Replace(" ", "").Split(',')) ^ exclusive) base.Notify_MemberWitnessedAction(ev, precept, member); } diff --git a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_SelftTookThoughtExtended.cs b/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_SelftTookThoughtExtended.cs index 5130a36..fdb72b5 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_SelftTookThoughtExtended.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_SelftTookThoughtExtended.cs @@ -11,13 +11,11 @@ namespace RJWSexperience.Ideology.Precepts [SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")] public bool exclusive = false; - public PreceptComp_SelfTookThoughtTagged() { } - public override void Notify_MemberTookAction(HistoryEvent ev, Precept precept, bool canApplySelfTookThoughts) { if (tag != null) { - if (ev.args.TryGetArg(HistoryEventArgsNamesCustom.Tag, out string tags)) + if (ev.args.TryGetArg(HistoryEvents.ArgsNamesCustom.Tag, out string tags)) { if (IdeoUtility.ContainAll(tags, tag.Replace(" ", "").Split(',')) ^ exclusive) { @@ -42,7 +40,7 @@ namespace RJWSexperience.Ideology.Precepts return; } Pawn arg = ev.args.GetArg(HistoryEventArgsNames.Doer); - Pawn partner = ev.args.GetArg(HistoryEventArgsNamesCustom.Partner); + Pawn partner = ev.args.GetArg(HistoryEvents.ArgsNamesCustom.Partner); if (arg.needs?.mood != null && (!this.onlyForNonSlaves || !arg.IsSlave)) { if (this.thought.minExpectationForNegativeThought != null && ExpectationsUtility.CurrentExpectationFor(arg).order < this.thought.minExpectationForNegativeThought.order) diff --git a/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj b/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj index e374324..31e264f 100644 --- a/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj +++ b/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj @@ -43,12 +43,12 @@ - + - - + + diff --git a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Incest.xml b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Incest.xml index e97d4aa..77d3604 100644 --- a/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Incest.xml +++ b/RJWSexperience_Ideology/Defs/PreceptDefs/Precepts_Incest.xml @@ -22,7 +22,7 @@ RSI_NonIncestuosMarriage -
  • +
  • @@ -81,7 +81,7 @@ RSI_NonIncestuosSex -
  • +