From de3790315e8f7033710b25ee1dffdff9c245085e Mon Sep 17 00:00:00 2001 From: amevarashi Date: Fri, 8 Jul 2022 22:50:04 +0500 Subject: [PATCH] Remove code for tagged events --- .../Ideology/HistoryEvents/ArgsNamesCustom.cs | 1 - .../Ideology/HistoryEvents/Tag.cs | 13 ---- .../PreceptComp_KnowsMemoryThoughtTagged.cs | 41 ------------ .../PreceptComp_SelftTookThoughtExtended.cs | 63 ------------------- .../IdeologyAddon/Ideology/RJWUtility_Ideo.cs | 5 -- .../IdeologyAddon/IdeologyAddon.csproj | 3 - 6 files changed, 126 deletions(-) delete mode 100644 RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/Tag.cs delete mode 100644 RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_KnowsMemoryThoughtTagged.cs delete mode 100644 RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_SelftTookThoughtExtended.cs diff --git a/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/ArgsNamesCustom.cs b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/ArgsNamesCustom.cs index 2f1fbfe..26c9507 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/ArgsNamesCustom.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/ArgsNamesCustom.cs @@ -2,7 +2,6 @@ { public static class ArgsNamesCustom { - public const string Tag = "TAG"; public const string Partner = "PARTNER"; } } diff --git a/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/Tag.cs b/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/Tag.cs deleted file mode 100644 index b2bc486..0000000 --- a/RJWSexperience/IdeologyAddon/Ideology/HistoryEvents/Tag.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Verse; - -namespace RJWSexperience.Ideology.HistoryEvents -{ - public static class Tag - { - public const string BeenRaped = "[BeenRaped]"; - public const string Rape = "[Rape]"; - public const string NotSpouse = "[NotSpouse]"; - - public static string Gender(Pawn pawn) => "[" + pawn.gender + "]"; - } -} diff --git a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_KnowsMemoryThoughtTagged.cs b/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_KnowsMemoryThoughtTagged.cs deleted file mode 100644 index dd2521f..0000000 --- a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_KnowsMemoryThoughtTagged.cs +++ /dev/null @@ -1,41 +0,0 @@ -using RimWorld; -using System.Diagnostics.CodeAnalysis; -using Verse; - -namespace RJWSexperience.Ideology.Precepts -{ - public class PreceptComp_KnowsMemoryThoughtTagged : PreceptComp_KnowsMemoryThought - { - [SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")] - public string tag; - [SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")] - public bool exclusive = false; - [SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")] - public bool applyonpartner = false; - - public PreceptComp_KnowsMemoryThoughtTagged() { } - - public override void Notify_MemberWitnessedAction(HistoryEvent ev, Precept precept, Pawn member) - { - if (!applyonpartner && ev.args.TryGetArg(HistoryEvents.ArgsNamesCustom.Partner, out Pawn pawn) && pawn == member) - { - return; - } - if (tag != null) - { - if (ev.args.TryGetArg(HistoryEvents.ArgsNamesCustom.Tag, out string tags)) - { - if (IdeoUtility.ContainAll(tags, tag.Replace(" ", "").Split(',')) ^ exclusive) base.Notify_MemberWitnessedAction(ev, precept, member); - } - else if (exclusive) - { - base.Notify_MemberWitnessedAction(ev, precept, member); - } - } - else - { - base.Notify_MemberWitnessedAction(ev, precept, member); - } - } - } -} diff --git a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_SelftTookThoughtExtended.cs b/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_SelftTookThoughtExtended.cs deleted file mode 100644 index fdb72b5..0000000 --- a/RJWSexperience/IdeologyAddon/Ideology/Precepts/PreceptComp_SelftTookThoughtExtended.cs +++ /dev/null @@ -1,63 +0,0 @@ -using RimWorld; -using System.Diagnostics.CodeAnalysis; -using Verse; - -namespace RJWSexperience.Ideology.Precepts -{ - public class PreceptComp_SelfTookThoughtTagged : PreceptComp_SelfTookMemoryThought - { - [SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")] - public string tag; - [SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")] - public bool exclusive = false; - - public override void Notify_MemberTookAction(HistoryEvent ev, Precept precept, bool canApplySelfTookThoughts) - { - if (tag != null) - { - if (ev.args.TryGetArg(HistoryEvents.ArgsNamesCustom.Tag, out string tags)) - { - if (IdeoUtility.ContainAll(tags, tag.Replace(" ", "").Split(',')) ^ exclusive) - { - TookThought(ev, precept, canApplySelfTookThoughts); - } - } - else if (exclusive) - { - TookThought(ev, precept, canApplySelfTookThoughts); - } - } - else - { - TookThought(ev, precept, canApplySelfTookThoughts); - } - } - - protected virtual void TookThought(HistoryEvent ev, Precept precept, bool canApplySelfTookThoughts) - { - if (ev.def != this.eventDef || !canApplySelfTookThoughts) - { - return; - } - Pawn arg = ev.args.GetArg(HistoryEventArgsNames.Doer); - 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) - { - return; - } - Thought_Memory thought_Memory = ThoughtMaker.MakeThought(this.thought, precept); - if (thought_Memory is Thought_KilledInnocentAnimal thought_KilledInnocentAnimal && ev.args.TryGetArg(HistoryEventArgsNames.Victim, out Pawn animal)) - { - thought_KilledInnocentAnimal.SetAnimal(animal); - } - if (thought_Memory is Thought_MemoryObservation thought_MemoryObservation && ev.args.TryGetArg(HistoryEventArgsNames.Subject, out Corpse target)) - { - thought_MemoryObservation.Target = target; - } - arg.needs.mood.thoughts.memories.TryGainMemory(thought_Memory, partner); - } - } - } -} diff --git a/RJWSexperience/IdeologyAddon/Ideology/RJWUtility_Ideo.cs b/RJWSexperience/IdeologyAddon/Ideology/RJWUtility_Ideo.cs index 7b08b09..8efc34f 100644 --- a/RJWSexperience/IdeologyAddon/Ideology/RJWUtility_Ideo.cs +++ b/RJWSexperience/IdeologyAddon/Ideology/RJWUtility_Ideo.cs @@ -22,11 +22,6 @@ namespace RJWSexperience.Ideology Find.HistoryEventsManager.RecordEvent(def.CreateEventWithPartner(pawn, partner)); } - public static HistoryEvent CreateTaggedEvent(this HistoryEventDef def, Pawn pawn, string tag, Pawn 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) { return new HistoryEvent(def, pawn.Named(HistoryEventArgsNames.Doer)); diff --git a/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj b/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj index 50114e7..bbe876e 100644 --- a/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj +++ b/RJWSexperience/IdeologyAddon/IdeologyAddon.csproj @@ -49,7 +49,6 @@ - @@ -65,11 +64,9 @@ - -