Cleanup

DiplomacyTeam · Jun 1, 2022 · 7a21a71 · 7a21a71
1 parent d7b71c7
commit 7a21a71
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 24 deletions.
diff --git a/src/Bannerlord.Diplomacy/CivilWar/Factions/RebelFaction.cs b/src/Bannerlord.Diplomacy/CivilWar/Factions/RebelFaction.cs
@@ -21,19 +21,19 @@ public abstract class RebelFaction
     {
         [SaveableProperty(1)] public Clan SponsorClan { get; private set; }
 
-        [SaveableField(2)] [UsedImplicitly] private List<Clan> _participatingClans;
+        [SaveableField(2)][UsedImplicitly] private List<Clan> _participatingClans;
 
-        [SaveableProperty(3)] [UsedImplicitly] public Kingdom ParentKingdom { get; private set; }
+        [SaveableProperty(3)][UsedImplicitly] public Kingdom ParentKingdom { get; private set; }
 
         [SaveableProperty(4)] public Kingdom? RebelKingdom { get; private set; }
 
         [SaveableProperty(5)] public bool AtWar { get; set; }
 
-        [SaveableProperty(6)] [UsedImplicitly] public CampaignTime DateStarted { get; private set; }
+        [SaveableProperty(6)][UsedImplicitly] public CampaignTime DateStarted { get; private set; }
 
         [SaveableProperty(7)] public TextObject Name { get; private set; }
 
-        [SaveableProperty(8)] [UsedImplicitly] public Dictionary<Town, Clan> OriginalFiefOwners { get; private set; }
+        [SaveableProperty(8)][UsedImplicitly] public Dictionary<Town, Clan> OriginalFiefOwners { get; private set; }
 
         public abstract RebelDemandType RebelDemandType { get; }
 

diff --git a/src/Bannerlord.Diplomacy/ExpansionismManager.cs b/src/Bannerlord.Diplomacy/ExpansionismManager.cs
@@ -12,7 +12,7 @@ namespace Diplomacy
 {
     internal sealed class ExpansionismManager
     {
-        [SaveableField(1)] [UsedImplicitly] private Dictionary<IFaction, float> _expansionism;
+        [SaveableField(1)][UsedImplicitly] private Dictionary<IFaction, float> _expansionism;
 
         public static ExpansionismManager? Instance { get; private set; }
         public float SiegeExpansionism => Settings.Instance!.ExpanisonismPerSiege;

diff --git a/src/Bannerlord.Diplomacy/Messengers/Messenger.cs b/src/Bannerlord.Diplomacy/Messengers/Messenger.cs
@@ -8,9 +8,9 @@ namespace Diplomacy.Messengers
 {
     internal class Messenger
     {
-        [SaveableProperty(1)] [UsedImplicitly] public CampaignTime DispatchTime { get; private set; }
+        [SaveableProperty(1)][UsedImplicitly] public CampaignTime DispatchTime { get; private set; }
 
-        [SaveableProperty(2)] [UsedImplicitly] public Hero TargetHero { get; private set; }
+        [SaveableProperty(2)][UsedImplicitly] public Hero TargetHero { get; private set; }
 
         [SaveableProperty(3)] public Vec2 CurrentPosition { get; set; }
 

diff --git a/src/Bannerlord.Diplomacy/Messengers/MessengerManager.cs b/src/Bannerlord.Diplomacy/Messengers/MessengerManager.cs
@@ -31,7 +31,7 @@ internal sealed class MessengerManager : IMissionListener
         private Messenger? _activeMessenger;
         private Mission? _currentMission;
 
-        [SaveableField(1)] [UsedImplicitly] private List<Messenger> _messengers;
+        [SaveableField(1)][UsedImplicitly] private List<Messenger> _messengers;
 
         public MBReadOnlyList<Messenger> Messengers { get; private set; }
 

diff --git a/src/Bannerlord.Diplomacy/Patches/DefaultEncyclopediaFactionPagePatch.cs b/src/Bannerlord.Diplomacy/Patches/DefaultEncyclopediaFactionPagePatch.cs
@@ -22,7 +22,7 @@ private static IEnumerable<EncyclopediaListItem> PassThroughPostfix(IEnumerable<
         {
             foreach (var item in values.ToList())
             {
-                var kingdom = (Kingdom)item.Object;
+                var kingdom = (Kingdom) item.Object;
                 if (kingdom.IsRebelKingdom() && kingdom.IsEliminated)
                 {
                     continue;

diff --git a/src/Bannerlord.Diplomacy/Patches/KingdomDecisionProposalBehaviorPatch.cs b/src/Bannerlord.Diplomacy/Patches/KingdomDecisionProposalBehaviorPatch.cs
@@ -5,8 +5,8 @@
 using System.Collections.Generic;
 
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.Election;
 using TaleWorlds.CampaignSystem.CampaignBehaviors;
+using TaleWorlds.CampaignSystem.Election;
 
 namespace Diplomacy.Patches
 {

diff --git a/src/Bannerlord.Diplomacy/Patches/UrbanCharactersCampaignBehaviorPatch.cs b/src/Bannerlord.Diplomacy/Patches/UrbanCharactersCampaignBehaviorPatch.cs
@@ -1,4 +1,5 @@
-using HarmonyLib;
+/*
+using HarmonyLib;
 
 using JetBrains.Annotations;
 
@@ -9,10 +10,11 @@
 
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.CampaignBehaviors;
+*/
 
+// Outdated since e1.7.2?
 namespace Diplomacy.Patches
 {
-    // Outdated since e1.7.2?
     /*
     [HarmonyPatch(typeof(UrbanCharactersCampaignBehavior))]
     [UsedImplicitly]

diff --git a/src/Bannerlord.Diplomacy/SubModule.cs b/src/Bannerlord.Diplomacy/SubModule.cs
@@ -5,8 +5,6 @@
 using Diplomacy.Event;
 using Diplomacy.PatchTools;
 
-using HarmonyLib;
-
 using Microsoft.Extensions.Logging;
 
 using Serilog.Events;
@@ -51,7 +49,6 @@ protected override void OnSubModuleLoad()
             Log = LogFactory.Get<SubModule>();
 
             PatchManager.PatchAll(HarmonyDomain);
-            //new Harmony(HarmonyDomain).PatchAll(); // Will only keep this around while I convert all the remaining annotated patches.
         }
 
         protected override void OnSubModuleUnloaded()

diff --git a/src/Bannerlord.Diplomacy/ViewModel/DonateGoldVM.cs b/src/Bannerlord.Diplomacy/ViewModel/DonateGoldVM.cs
@@ -64,7 +64,7 @@ public string RelationGain
             }
         }
 
-        [DataSourceProperty] [UsedImplicitly] public float MinValue { get; }
+        [DataSourceProperty][UsedImplicitly] public float MinValue { get; }
 
         [DataSourceProperty]
         public int IntValue
@@ -80,11 +80,11 @@ public int IntValue
             }
         }
 
-        [DataSourceProperty] [UsedImplicitly] public string AcceptText { get; } = new TextObject(StringConstants.Accept).ToString();
+        [DataSourceProperty][UsedImplicitly] public string AcceptText { get; } = new TextObject(StringConstants.Accept).ToString();
 
-        [DataSourceProperty] [UsedImplicitly] public string CancelText { get; } = GameTexts.FindText("str_cancel").ToString();
+        [DataSourceProperty][UsedImplicitly] public string CancelText { get; } = GameTexts.FindText("str_cancel").ToString();
 
-        [DataSourceProperty] [UsedImplicitly] public string TitleText { get; } = new TextObject("{=Gzq6VHPt}Donate Gold").ToString();
+        [DataSourceProperty][UsedImplicitly] public string TitleText { get; } = new TextObject("{=Gzq6VHPt}Donate Gold").ToString();
 
         public DonateGoldVM(Clan clan, Action onFinalize)
         {

diff --git a/src/Bannerlord.Diplomacy/ViewModel/EncyclopediaFactionPageVMExtensionVM.cs b/src/Bannerlord.Diplomacy/ViewModel/EncyclopediaFactionPageVMExtensionVM.cs
@@ -8,7 +8,6 @@
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.ViewModelCollection.Encyclopedia;
 using TaleWorlds.CampaignSystem.ViewModelCollection.Encyclopedia.EncyclopediaItems;
-using TaleWorlds.Engine.Screens;
 using TaleWorlds.Library;
 using TaleWorlds.Localization;
 using TaleWorlds.ScreenSystem;

diff --git a/src/Bannerlord.Diplomacy/ViewModel/EncyclopediaHeroPageVMExtensionVM.cs b/src/Bannerlord.Diplomacy/ViewModel/EncyclopediaHeroPageVMExtensionVM.cs
@@ -8,7 +8,6 @@
 
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.ViewModelCollection.Encyclopedia;
-using TaleWorlds.Engine.Screens;
 using TaleWorlds.Library;
 using TaleWorlds.Localization;
 using TaleWorlds.ScreenSystem;

diff --git a/src/Bannerlord.Diplomacy/ViewModel/WarExhaustionMapIndicatorItemVM.cs b/src/Bannerlord.Diplomacy/ViewModel/WarExhaustionMapIndicatorItemVM.cs
@@ -4,7 +4,6 @@
 
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.Core;
-using TaleWorlds.Engine.Screens;
 using TaleWorlds.Library;
 using TaleWorlds.ScreenSystem;
 

diff --git a/src/Bannerlord.Diplomacy/ViewModelMixin/KingdomTruceItemVmMixin.cs b/src/Bannerlord.Diplomacy/ViewModelMixin/KingdomTruceItemVmMixin.cs
@@ -251,7 +251,7 @@ public BasicTooltipViewModel? NonAggressionPactScoreHint
 
         [DataSourceProperty] public string AllianceActionName { get; }
 
-        [DataSourceProperty] [UsedImplicitly] public bool IsGoldCostVisible { get; }
+        [DataSourceProperty][UsedImplicitly] public bool IsGoldCostVisible { get; }
 
         [DataSourceProperty] public string NonAggressionPactHelpText { get; }
 

diff --git a/src/Bannerlord.Diplomacy/ViewModelMixin/KingdomWarItemVMMixin.cs b/src/Bannerlord.Diplomacy/ViewModelMixin/KingdomWarItemVMMixin.cs
@@ -60,7 +60,7 @@ public int GoldCost
             }
         }
 
-        [DataSourceProperty] [UsedImplicitly] public bool IsGoldCostVisible { get; } = true;
+        [DataSourceProperty][UsedImplicitly] public bool IsGoldCostVisible { get; } = true;
 
         [DataSourceProperty]
         public bool IsOptionAvailable