From b7157940c4dfee1e611db9218f9876f3b12cf3fd Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 17 Jun 2021 16:16:15 +0200
Subject: [PATCH 001/177] Restart branch 'beta-develop' from develop

---
 Directory.Build.props | 6 +++---
 Launch.run.xml        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index f68aabd1..065e98a3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,13 +1,13 @@
 <Project>
   <PropertyGroup>
     <Version>2.3.0.0</Version>
-    <GameVersion>1.5.9</GameVersion>
-    <GameBranch>Stable</GameBranch>
+    <GameVersion>1.6.0</GameVersion>
+    <GameBranch>Beta</GameBranch>
     <AdditionalInfo></AdditionalInfo>
     <HarmonyVersion>2.0.4</HarmonyVersion>
     <MCMVersion>4.3</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
-    <GameFolder>C:\SteamCMD\mb2b_stable</GameFolder>
+    <GameFolder>C:\SteamCMD\mb2b_beta</GameFolder>
   </PropertyGroup>
 </Project>
diff --git a/Launch.run.xml b/Launch.run.xml
index 32f5cc6a..40c211c9 100644
--- a/Launch.run.xml
+++ b/Launch.run.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Launch" type="RunExe" factoryName=".NET Executable">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../../../../SteamCMD/mb2b_stable/bin/Win64_Shipping_Client/Bannerlord.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../../../../SteamCMD/mb2b_beta/bin/Win64_Shipping_Client/Bannerlord.exe" />
     <option name="PROGRAM_PARAMETERS" value="/singleplayer _MODULES_*Bannerlord.Harmony*Bannerlord.ButterLib*Bannerlord.UIExtenderEx*Bannerlord.MBOptionScreen*Native*SandBoxCore*CustomBattle*SandBox*StoryMode*Cheats*_MODULES_" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../SteamCMD/mb2b_stable/bin/Win64_Shipping_Client" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../SteamCMD/mb2b_beta/bin/Win64_Shipping_Client" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />

From d24174a40cd8481792889b35f9a74ed512aaca23 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 17 Jun 2021 16:37:01 +0200
Subject: [PATCH 002/177] Restart branch 'beta' from master


From a8d4587793216a42a97348f1074c74085ff67073 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 17 Jun 2021 17:46:41 +0200
Subject: [PATCH 003/177] Fix Character Attributes cheats for beta

---
 .../General/CharacterAttributesCheatPatch.cs  | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/Patches/General/CharacterAttributesCheatPatch.cs b/Patches/General/CharacterAttributesCheatPatch.cs
index 7bf2527e..63e71956 100644
--- a/Patches/General/CharacterAttributesCheatPatch.cs
+++ b/Patches/General/CharacterAttributesCheatPatch.cs
@@ -1,9 +1,9 @@
-using System;
-using BannerlordCheats.Extensions;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using SandBox.GauntletUI;
+using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
 using TaleWorlds.Core;
 using TaleWorlds.Engine.Screens;
@@ -29,12 +29,12 @@ public static void OnApplicationTick()
 
                     var currentHero = charVM.CurrentCharacter.Hero;
 
-                    currentHero.SetAttributeValue(CharacterAttributesEnum.Control, 10);
-                    currentHero.SetAttributeValue(CharacterAttributesEnum.Cunning, 10);
-                    currentHero.SetAttributeValue(CharacterAttributesEnum.Endurance, 10);
-                    currentHero.SetAttributeValue(CharacterAttributesEnum.Intelligence, 10);
-                    currentHero.SetAttributeValue(CharacterAttributesEnum.Social, 10);
-                    currentHero.SetAttributeValue(CharacterAttributesEnum.Vigor, 10);
+                    CharacterAttributesCheatPatch.SetMaximum(currentHero, DefaultCharacterAttributes.Control);
+                    CharacterAttributesCheatPatch.SetMaximum(currentHero, DefaultCharacterAttributes.Cunning);
+                    CharacterAttributesCheatPatch.SetMaximum(currentHero, DefaultCharacterAttributes.Endurance);
+                    CharacterAttributesCheatPatch.SetMaximum(currentHero, DefaultCharacterAttributes.Intelligence);
+                    CharacterAttributesCheatPatch.SetMaximum(currentHero, DefaultCharacterAttributes.Social);
+                    CharacterAttributesCheatPatch.SetMaximum(currentHero, DefaultCharacterAttributes.Vigor);
 
                     charVM.RefreshValues();
 
@@ -44,46 +44,53 @@ public static void OnApplicationTick()
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D1))
                 {
-                    CharacterAttributesCheatPatch.AddPoint(CharacterAttributesEnum.Vigor);
+                    CharacterAttributesCheatPatch.AddPoint(DefaultCharacterAttributes.Vigor);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D2))
                 {
-                    CharacterAttributesCheatPatch.AddPoint(CharacterAttributesEnum.Control);
+                    CharacterAttributesCheatPatch.AddPoint(DefaultCharacterAttributes.Control);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D3))
                 {
-                    CharacterAttributesCheatPatch.AddPoint(CharacterAttributesEnum.Endurance);
+                    CharacterAttributesCheatPatch.AddPoint(DefaultCharacterAttributes.Endurance);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D4))
                 {
-                    CharacterAttributesCheatPatch.AddPoint(CharacterAttributesEnum.Cunning);
+                    CharacterAttributesCheatPatch.AddPoint(DefaultCharacterAttributes.Cunning);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D5))
                 {
-                    CharacterAttributesCheatPatch.AddPoint(CharacterAttributesEnum.Social);
+                    CharacterAttributesCheatPatch.AddPoint(DefaultCharacterAttributes.Social);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D6))
                 {
-                    CharacterAttributesCheatPatch.AddPoint(CharacterAttributesEnum.Intelligence);
+                    CharacterAttributesCheatPatch.AddPoint(DefaultCharacterAttributes.Intelligence);
                 }
             }
         }
 
-        private static void AddPoint(CharacterAttributesEnum type)
+        private static void SetMaximum(Hero hero, CharacterAttribute attribute)
+        {
+            var changeAmount = 10 - hero.GetAttributeValue(attribute);
+
+            hero.HeroDeveloper.AddAttribute(attribute, changeAmount, false);
+        }
+
+        private static void AddPoint(CharacterAttribute attribute)
         {
             var charVM = ScreenManager.TopScreen.GetViewModel<CharacterDeveloperVM>();
 
             var currentHero = charVM.CurrentCharacter.Hero;
 
-            var oldValue = currentHero.GetAttributeValue(type);
+            var oldValue = currentHero.GetAttributeValue(attribute);
 
             if (oldValue >= 10) { return; }
 
-            currentHero.SetAttributeValue(type, oldValue + 1);
+            currentHero.HeroDeveloper.AddAttribute(attribute, 1, false);
 
             charVM.RefreshValues();
 
-            var message = string.Format(L10N.GetText("AddAttributePointMessage"), Enum.GetName(typeof(CharacterAttributesEnum), type), currentHero.Name);
+            var message = string.Format(L10N.GetText("AddAttributePointMessage"), attribute.Name, currentHero.Name);
 
             InformationManager.DisplayMessage(new InformationMessage(message, Color.White));
         }

From 9b0e4a63f10d6933fc95b7b5f4d3c65f64c37cab Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 17 Jun 2021 17:48:15 +0200
Subject: [PATCH 004/177] Fix Renown Reward Multiplier cheat for beta

---
 Patches/Combat/BattleInfluenceGainPatch.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Patches/Combat/BattleInfluenceGainPatch.cs b/Patches/Combat/BattleInfluenceGainPatch.cs
index 351f9c88..376a3c1b 100644
--- a/Patches/Combat/BattleInfluenceGainPatch.cs
+++ b/Patches/Combat/BattleInfluenceGainPatch.cs
@@ -10,12 +10,16 @@ namespace BannerlordCheats.Patches.Combat
     public static class BattleInfluenceGainPatch
     {
         [HarmonyPostfix]
-        public static void CalculateInfluenceGain(ref PartyBase party, ref float influenceValueOfBattle, ref float contributionShare, ref ExplainedNumber result, ref float __result)
+        public static void CalculateInfluenceGain(
+            ref PartyBase party,
+            ref float influenceValueOfBattle,
+            ref float contributionShare,
+            ref ExplainedNumber __result)
         {
             if (party.IsPlayerParty()
                 && BannerlordCheatsSettings.TryGetModifiedValue(x => x.InfluenceRewardMultiplier, out var influenceRewardMultiplier))
             {
-                __result *= influenceRewardMultiplier;
+                __result.AddMultiplier(influenceRewardMultiplier);
             }
         }
     }

From 5fb1ca79aabb03e064dd3886929a98c6af2f12b2 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 17 Jun 2021 17:48:59 +0200
Subject: [PATCH 005/177] Fix Renown Reward Multiplier cheat for beta

---
 Patches/Combat/BattleRenownGainPatch.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Patches/Combat/BattleRenownGainPatch.cs b/Patches/Combat/BattleRenownGainPatch.cs
index 593ca7a8..6ab69497 100644
--- a/Patches/Combat/BattleRenownGainPatch.cs
+++ b/Patches/Combat/BattleRenownGainPatch.cs
@@ -10,12 +10,16 @@ namespace BannerlordCheats.Patches.Combat
     public static class BattleRenownGainPatch
     {
         [HarmonyPostfix]
-        public static void CalculateRenownGain(ref PartyBase party, ref float renownValueOfBattle, ref float contributionShare, ref ExplainedNumber result, ref float __result)
+        public static void CalculateRenownGain(
+            ref PartyBase party,
+            ref float renownValueOfBattle,
+            ref float contributionShare,
+            ref ExplainedNumber __result)
         {
             if (party.IsPlayerParty()
                 && BannerlordCheatsSettings.TryGetModifiedValue(x => x.RenownRewardMultiplier, out var renownRewardMultiplier))
             {
-                __result *= renownRewardMultiplier;
+                __result.AddMultiplier(renownRewardMultiplier);
             }
         }
     }

From 9a251c35165edb3a3b2a12ac293f92fcf4b2a566 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 21 Jun 2021 18:48:26 +0200
Subject: [PATCH 006/177] Disable Free Troop Recruitment cheat for beta

---
 Patches/Settlements/FreeTroopRecruitment.cs | 28 ++++++++++-----------
 Settings/BannerlordCheatsSettings.cs        |  6 ++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Patches/Settlements/FreeTroopRecruitment.cs b/Patches/Settlements/FreeTroopRecruitment.cs
index d55b1adb..074ad2f8 100644
--- a/Patches/Settlements/FreeTroopRecruitment.cs
+++ b/Patches/Settlements/FreeTroopRecruitment.cs
@@ -6,18 +6,18 @@
 
 namespace BannerlordCheats.Patches.Settlements
 {
-    [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTroopRecruitmentCost))]
-    public static class FreeTroopRecruitment
-    {
-        [HarmonyPostfix]
-        public static void GetTroopRecruitmentCost(CharacterObject troop, Hero buyerHero, bool withoutItemCost, ref int __result)
-        {
-            if (buyerHero.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.FreeTroopRecruitment, out var freeTroopRecruitment)
-                && freeTroopRecruitment)
-            {
-                __result = 1;
-            }
-        }
-    }
+    // [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTroopRecruitmentCost))]
+    // public static class FreeTroopRecruitment
+    // {
+    //     [HarmonyPostfix]
+    //     public static void GetTroopRecruitmentCost(CharacterObject troop, Hero buyerHero, bool withoutItemCost, ref int __result)
+    //     {
+    //         if (buyerHero.IsPlayer()
+    //             && BannerlordCheatsSettings.TryGetModifiedValue(x => x.FreeTroopRecruitment, out var freeTroopRecruitment)
+    //             && freeTroopRecruitment)
+    //         {
+    //             __result = 1;
+    //         }
+    //     }
+    // }
 }
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index e876b559..a5aa40f1 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -453,9 +453,9 @@ public static bool TryGetModifiedValue<T>(Expression<Func<BannerlordCheatsSettin
         [LocalizedSettingPropertyBool(nameof(OneDayConstruction))]
         public bool OneDayConstruction { get; set; } = false;
 
-        [LocalizedSettingPropertyGroup(SettlementsGroupName)]
-        [LocalizedSettingPropertyBool(nameof(FreeTroopRecruitment))]
-        public bool FreeTroopRecruitment { get; set; } = false;
+        // [LocalizedSettingPropertyGroup(SettlementsGroupName)]
+        // [LocalizedSettingPropertyBool(nameof(FreeTroopRecruitment))]
+        // public bool FreeTroopRecruitment { get; set; } = false;
 
         [LocalizedSettingPropertyGroup(SettlementsGroupName)]
         [LocalizedSettingPropertyPercent(nameof(ItemTradingCostPercentage))]

From e45952c44c1e45f9b2a99c8c89952812723d8446 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 21 Jun 2021 18:49:33 +0200
Subject: [PATCH 007/177] Disable Troop Wages Percentage cheat for beta

---
 Patches/Party/NoTroopWagesPatch.cs   | 26 +++++++++++++-------------
 Settings/BannerlordCheatsSettings.cs |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Patches/Party/NoTroopWagesPatch.cs b/Patches/Party/NoTroopWagesPatch.cs
index 1fbf8603..a371aaf7 100644
--- a/Patches/Party/NoTroopWagesPatch.cs
+++ b/Patches/Party/NoTroopWagesPatch.cs
@@ -6,17 +6,17 @@
 
 namespace BannerlordCheats.Patches.Party
 {
-    [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTotalWage))]
-    public static class NoTroopWagesPatch
-    {
-        [HarmonyPostfix]
-        public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
-        {
-            if (mobileParty.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.TroopWagesPercentage, out var troopWagesPercentage))
-            {
-                __result.AddPercentage(troopWagesPercentage);
-            }
-        }
-    }
+    // [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTotalWage))]
+    // public static class NoTroopWagesPatch
+    // {
+    //     [HarmonyPostfix]
+    //     public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
+    //     {
+    //         if (mobileParty.IsPlayerParty()
+    //             && BannerlordCheatsSettings.TryGetModifiedValue(x => x.TroopWagesPercentage, out var troopWagesPercentage))
+    //         {
+    //             __result.AddPercentage(troopWagesPercentage);
+    //         }
+    //     }
+    // }
 }
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index a5aa40f1..42ab6685 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -301,9 +301,9 @@ public static bool TryGetModifiedValue<T>(Expression<Func<BannerlordCheatsSettin
         [LocalizedSettingPropertyPercent(nameof(FoodConsumptionPercentage))]
         public float FoodConsumptionPercentage { get; set; } = 100.0f;
 
-        [LocalizedSettingPropertyGroup(PartyGroupName)]
-        [LocalizedSettingPropertyPercent(nameof(TroopWagesPercentage))]
-        public float TroopWagesPercentage { get; set; } = 100.0f;
+        // [LocalizedSettingPropertyGroup(PartyGroupName)]
+        // [LocalizedSettingPropertyPercent(nameof(TroopWagesPercentage))]
+        // public float TroopWagesPercentage { get; set; } = 100.0f;
 
         [LocalizedSettingPropertyGroup(PartyGroupName)]
         [LocalizedSettingPropertyBool(nameof(FreeTroopUpgrades))]

From 9fc4a543be89f5d7a25c74744c14d6a4959e1a04 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 21 Jun 2021 18:50:12 +0200
Subject: [PATCH 008/177] Disable Garrison Wages Percentage cheat for beta

---
 Patches/Settlements/GarrisonWagesPatch.cs | 28 +++++++++++------------
 Settings/BannerlordCheatsSettings.cs      |  6 ++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Patches/Settlements/GarrisonWagesPatch.cs b/Patches/Settlements/GarrisonWagesPatch.cs
index 4034d8f6..970dabed 100644
--- a/Patches/Settlements/GarrisonWagesPatch.cs
+++ b/Patches/Settlements/GarrisonWagesPatch.cs
@@ -6,18 +6,18 @@
 
 namespace BannerlordCheats.Patches.Settlements
 {
-    [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTotalWage))]
-    public static class GarrisonWagesPatch
-    {
-        [HarmonyPostfix]
-        public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
-        {
-            if (mobileParty.IsGarrison
-                && mobileParty.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.GarrisonWagesPercentage, out var garrisonWagesPercentage))
-            {
-                __result.AddPercentage(garrisonWagesPercentage);
-            }
-        }
-    }
+    // [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTotalWage))]
+    // public static class GarrisonWagesPatch
+    // {
+    //     [HarmonyPostfix]
+    //     public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
+    //     {
+    //         if (mobileParty.IsGarrison
+    //             && mobileParty.IsPlayerParty()
+    //             && BannerlordCheatsSettings.TryGetModifiedValue(x => x.GarrisonWagesPercentage, out var garrisonWagesPercentage))
+    //         {
+    //             __result.AddPercentage(garrisonWagesPercentage);
+    //         }
+    //     }
+    // }
 }
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 42ab6685..491fa16a 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -493,9 +493,9 @@ public static bool TryGetModifiedValue<T>(Expression<Func<BannerlordCheatsSettin
         [LocalizedSettingPropertyInteger(nameof(DailyHearthsBonus), minValue: 0, maxValue: 10000)]
         public int DailyHearthsBonus { get; set; } = 0;
 
-        [LocalizedSettingPropertyGroup(SettlementsGroupName)]
-        [LocalizedSettingPropertyPercent(nameof(GarrisonWagesPercentage))]
-        public float GarrisonWagesPercentage { get; set; } = 100.0f;
+        // [LocalizedSettingPropertyGroup(SettlementsGroupName)]
+        // [LocalizedSettingPropertyPercent(nameof(GarrisonWagesPercentage))]
+        // public float GarrisonWagesPercentage { get; set; } = 100.0f;
 
         [LocalizedSettingPropertyGroup(SettlementsGroupName)]
         [LocalizedSettingPropertyBool(nameof(NeverRequireCivilianEquipment))]

From 964234212ce4b937f30c0ed8bb9273006f8dd75f Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 21 Jun 2021 18:53:08 +0200
Subject: [PATCH 009/177] Disable Map Speed Multiplier cheat for beta

---
 .../DefaultPartySpeedCalculatingModelPatch.cs | 26 +++++++++----------
 Settings/BannerlordCheatsSettings.cs          |  6 ++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Patches/Map/DefaultPartySpeedCalculatingModelPatch.cs b/Patches/Map/DefaultPartySpeedCalculatingModelPatch.cs
index 90123d50..4f79031f 100644
--- a/Patches/Map/DefaultPartySpeedCalculatingModelPatch.cs
+++ b/Patches/Map/DefaultPartySpeedCalculatingModelPatch.cs
@@ -6,17 +6,17 @@
 
 namespace BannerlordCheats.Patches.Map
 {
-    [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
-    public static class DefaultPartySpeedCalculatingModelPatch
-    {
-        [HarmonyPostfix]
-        public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
-        {
-            if (mobileParty.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.MapSpeedMultiplier, out var mapSpeedMultiplier))
-            {
-                __result.AddMultiplier(mapSpeedMultiplier);
-            }
-        }
-    }
+    // [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
+    // public static class DefaultPartySpeedCalculatingModelPatch
+    // {
+    //     [HarmonyPostfix]
+    //     public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
+    //     {
+    //         if (mobileParty.IsPlayerParty()
+    //             && BannerlordCheatsSettings.TryGetModifiedValue(x => x.MapSpeedMultiplier, out var mapSpeedMultiplier))
+    //         {
+    //             __result.AddMultiplier(mapSpeedMultiplier);
+    //         }
+    //     }
+    // }
 }
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 491fa16a..ab4f0b41 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -121,9 +121,9 @@ public static bool TryGetModifiedValue<T>(Expression<Func<BannerlordCheatsSettin
 
         #region Map
 
-        [LocalizedSettingPropertyGroup(MapGroupName)]
-        [LocalizedSettingPropertyFloatingInteger(nameof(MapSpeedMultiplier), minValue: 1.0f, maxValue: 100.0f)]
-        public float MapSpeedMultiplier { get; set; } = 1.0f;
+        // [LocalizedSettingPropertyGroup(MapGroupName)]
+        // [LocalizedSettingPropertyFloatingInteger(nameof(MapSpeedMultiplier), minValue: 1.0f, maxValue: 100.0f)]
+        // public float MapSpeedMultiplier { get; set; } = 1.0f;
 
         [LocalizedSettingPropertyGroup(MapGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(MapVisibilityMultiplier), minValue: 1.0f, maxValue: 100.0f)]

From 15cf2c7d5b7fa224929113fec0804eb9d26f1ba6 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 21 Jun 2021 18:54:34 +0200
Subject: [PATCH 010/177] Disable NPC Map Speed Percentage cheat for beta

---
 Patches/Map/SlowDownPartiesOnMap.cs  | 26 +++++++++++++-------------
 Settings/BannerlordCheatsSettings.cs |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Patches/Map/SlowDownPartiesOnMap.cs b/Patches/Map/SlowDownPartiesOnMap.cs
index 8c067616..aa32c070 100644
--- a/Patches/Map/SlowDownPartiesOnMap.cs
+++ b/Patches/Map/SlowDownPartiesOnMap.cs
@@ -6,17 +6,17 @@
 
 namespace BannerlordCheats.Patches.Map
 {
-    [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
-    public static class SlowDownPartiesOnMap
-    {
-        [HarmonyPostfix]
-        public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
-        {
-            if (!mobileParty.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NpcMapSpeedPercentage, out var npcMapSpeedPercentage))
-            {
-                __result.AddPercentage(npcMapSpeedPercentage);
-            }
-        }
-    }
+    // [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
+    // public static class SlowDownPartiesOnMap
+    // {
+    //     [HarmonyPostfix]
+    //     public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
+    //     {
+    //         if (!mobileParty.IsPlayerParty()
+    //             && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NpcMapSpeedPercentage, out var npcMapSpeedPercentage))
+    //         {
+    //             __result.AddPercentage(npcMapSpeedPercentage);
+    //         }
+    //     }
+    // }
 }
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index ab4f0b41..6ea8b5d4 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -129,9 +129,9 @@ public static bool TryGetModifiedValue<T>(Expression<Func<BannerlordCheatsSettin
         [LocalizedSettingPropertyFloatingInteger(nameof(MapVisibilityMultiplier), minValue: 1.0f, maxValue: 100.0f)]
         public float MapVisibilityMultiplier { get; set; } = 1.0f;
 
-        [LocalizedSettingPropertyGroup(MapGroupName)]
-        [LocalizedSettingPropertyPercent(nameof(NpcMapSpeedPercentage))]
-        public float NpcMapSpeedPercentage { get; set; } = 100.0f;
+        // [LocalizedSettingPropertyGroup(MapGroupName)]
+        // [LocalizedSettingPropertyPercent(nameof(NpcMapSpeedPercentage))]
+        // public float NpcMapSpeedPercentage { get; set; } = 100.0f;
 
         [LocalizedSettingPropertyGroup(MapGroupName)]
         [LocalizedSettingPropertyBool(nameof(PartyInvisibleOnMap))]

From 2e1926600166d4c9a3c7311b3f7a3b875f4a5e4b Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 22 Jun 2021 21:14:06 +0200
Subject: [PATCH 011/177] Update to v2.4

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 065e98a3..a08a0a98 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.3.0.0</Version>
+    <Version>2.4.0.0</Version>
     <GameVersion>1.6.0</GameVersion>
     <GameBranch>Beta</GameBranch>
     <AdditionalInfo></AdditionalInfo>

From 34bb7f00d17adc490e5293ce495b26a86d317a49 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 22 Jun 2021 21:16:26 +0200
Subject: [PATCH 012/177] Remove native cheat mode override

---
 L10N.resx                                 |  6 ------
 Patches/General/CheatModeOverridePatch.cs | 19 -------------------
 Settings/BannerlordCheatsSettings.cs      |  4 ----
 3 files changed, 29 deletions(-)
 delete mode 100644 Patches/General/CheatModeOverridePatch.cs

diff --git a/L10N.resx b/L10N.resx
index 34c2e62d..4d6dfc2a 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -780,12 +780,6 @@
   <data name="DecisionOverrideInfluenceCostPercentage_Desc" xml:space="preserve">
     <value>Percentage of influence cost to override a kingdom decision. 100% means full cost, 0% means no influence cost.</value>
   </data>
-  <data name="OverrideCheatMode_Name" xml:space="preserve">
-    <value>Force Enable Native Cheat Mode</value>
-  </data>
-  <data name="OverrideCheatMode_Desc" xml:space="preserve">
-    <value>Set to true to enable the native cheat mode during gameplay. You can leave the value in engine_config.txt on 0.</value>
-  </data>
   <data name="EnableHotkeyTips_Name" xml:space="preserve">
     <value>Enable Hotkey Tips</value>
   </data>
diff --git a/Patches/General/CheatModeOverridePatch.cs b/Patches/General/CheatModeOverridePatch.cs
deleted file mode 100644
index 7d41460b..00000000
--- a/Patches/General/CheatModeOverridePatch.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using BannerlordCheats.Settings;
-using HarmonyLib;
-using TaleWorlds.Core;
-
-namespace BannerlordCheats.Patches.General
-{
-    [HarmonyPatch(typeof(Game), nameof(Game.CheatMode), MethodType.Getter)]
-    public static class CheatModeOverridePatch
-    {
-        [HarmonyPostfix]
-        public static void CheatMode(ref bool __result)
-        {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.OverrideCheatMode, out var overrideCheatMode))
-            {
-                __result |= overrideCheatMode;
-            }
-        }
-    }
-}
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 6ea8b5d4..bece5cf8 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -113,10 +113,6 @@ public static bool TryGetModifiedValue<T>(Expression<Func<BannerlordCheatsSettin
         [LocalizedSettingPropertyBool(nameof(EnableHotkeyTips))]
         public bool EnableHotkeyTips { get; set; } = false;
 
-        [LocalizedSettingPropertyGroup(GeneralGroupName)]
-        [LocalizedSettingPropertyBool(nameof(OverrideCheatMode))]
-        public bool OverrideCheatMode { get; set; } = false;
-
         #endregion General
 
         #region Map

From 81c88ee87a6e5ddc1ec8465ea2922cef3ccb7f48 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 22 Jun 2021 21:24:25 +0200
Subject: [PATCH 013/177] Add Native Item Spawning cheat

---
 L10N.resx                                    |  6 +++
 Patches/Inventory/NativeItemSpawningPatch.cs | 39 ++++++++++++++++++++
 Settings/BannerlordCheatsSettings.cs         |  4 ++
 3 files changed, 49 insertions(+)
 create mode 100644 Patches/Inventory/NativeItemSpawningPatch.cs

diff --git a/L10N.resx b/L10N.resx
index 4d6dfc2a..4c1a9c5b 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -792,4 +792,10 @@
   <data name="CompanionDeathPercentage_Desc" xml:space="preserve">
     <value>Percentage of chance of player companions dying during combat. 100% means default chance, 0% means companions never die.</value>
   </data>
+  <data name="NativeItemSpawning_Name" xml:space="preserve">
+    <value>Spawn Items</value>
+  </data>
+  <data name="NativeItemSpawning_Desc" xml:space="preserve">
+    <value>Check to enable item spawning just like in native cheat mode. Open the inventory to see all items in the game, drag to your inventory to spawn them.</value>
+  </data>
 </root>
diff --git a/Patches/Inventory/NativeItemSpawningPatch.cs b/Patches/Inventory/NativeItemSpawningPatch.cs
new file mode 100644
index 00000000..a17c8c08
--- /dev/null
+++ b/Patches/Inventory/NativeItemSpawningPatch.cs
@@ -0,0 +1,39 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.Core;
+using TaleWorlds.Localization;
+
+namespace BannerlordCheats.Patches.Inventory
+{
+    [HarmonyPatch(typeof(InventoryLogic), nameof(InventoryLogic.Initialize), typeof(ItemRoster), typeof(MobileParty), typeof(bool), typeof(bool), typeof(CharacterObject), typeof(InventoryManager.InventoryCategoryType), typeof(IMarketData), typeof(bool), typeof(TextObject))]
+    public static class NativeItemSpawningPatch
+    {
+        [HarmonyPostfix]
+        public static void Initialize(
+            ref ItemRoster leftItemRoster,
+            ref MobileParty party,
+            ref bool isTrading,
+            ref bool isSpecialActionsPermitted,
+            ref CharacterObject initialCharacterOfRightRoster,
+            ref InventoryManager.InventoryCategoryType merchantItemType,
+            ref IMarketData marketData,
+            ref bool useBasePrices,
+            ref TextObject leftRosterName)
+        {
+            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.NativeItemSpawning, out _)
+                && party.IsPlayerParty()
+                && !isTrading
+                && !Game.Current.CheatMode)
+            {
+                var objectTypeList = Game.Current.ObjectManager.GetObjectTypeList<ItemObject>();
+                for (var index = 0; index != objectTypeList.Count; ++index)
+                {
+                    var itemObject = objectTypeList[index];
+                    leftItemRoster.AddToCounts(itemObject, 10);
+                }
+            }
+        }
+    }
+}
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index bece5cf8..1c7cb898 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -273,6 +273,10 @@ public static bool TryGetModifiedValue<T>(Expression<Func<BannerlordCheatsSettin
         [LocalizedSettingPropertyInteger(nameof(ExtraInventoryCapacity), minValue: 0, maxValue: 1000000)]
         public int ExtraInventoryCapacity { get; set; } = 0;
 
+        [LocalizedSettingPropertyGroup(InventoryGroupName)]
+        [LocalizedSettingPropertyBool(nameof(NativeItemSpawning))]
+        public bool NativeItemSpawning { get; set; } = false;
+
         #endregion Inventory
 
         #region Party

From 565a1f61184aecf98e0d4eeede2050f8328fd806 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 22 Jun 2021 21:40:07 +0200
Subject: [PATCH 014/177] Fix Native Item Spawning checks order

---
 Patches/Inventory/NativeItemSpawningPatch.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Patches/Inventory/NativeItemSpawningPatch.cs b/Patches/Inventory/NativeItemSpawningPatch.cs
index a17c8c08..e7b28107 100644
--- a/Patches/Inventory/NativeItemSpawningPatch.cs
+++ b/Patches/Inventory/NativeItemSpawningPatch.cs
@@ -22,10 +22,11 @@ public static void Initialize(
             ref bool useBasePrices,
             ref TextObject leftRosterName)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.NativeItemSpawning, out _)
-                && party.IsPlayerParty()
+            if (party.IsPlayerParty()
                 && !isTrading
-                && !Game.Current.CheatMode)
+                && !Game.Current.CheatMode
+                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NativeItemSpawning, out var nativeItemSpawning
+                && nativeItemSpawning)
             {
                 var objectTypeList = Game.Current.ObjectManager.GetObjectTypeList<ItemObject>();
                 for (var index = 0; index != objectTypeList.Count; ++index)

From efd47ab2667c7a4eca1b4f223fc7660cb6dea90f Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 22 Jun 2021 23:23:35 +0200
Subject: [PATCH 015/177] Fix typo

---
 Patches/Inventory/NativeItemSpawningPatch.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Patches/Inventory/NativeItemSpawningPatch.cs b/Patches/Inventory/NativeItemSpawningPatch.cs
index e7b28107..37b386ab 100644
--- a/Patches/Inventory/NativeItemSpawningPatch.cs
+++ b/Patches/Inventory/NativeItemSpawningPatch.cs
@@ -25,7 +25,7 @@ public static void Initialize(
             if (party.IsPlayerParty()
                 && !isTrading
                 && !Game.Current.CheatMode
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NativeItemSpawning, out var nativeItemSpawning
+                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NativeItemSpawning, out var nativeItemSpawning)
                 && nativeItemSpawning)
             {
                 var objectTypeList = Game.Current.ObjectManager.GetObjectTypeList<ItemObject>();

From 097970d005a4c5064ca2cca92639f929c04b56bb Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 23 Jun 2021 12:18:34 +0200
Subject: [PATCH 016/177] Remove One Day Construction cheat

---
 L10N.resx                                     |  6 -----
 .../Settlements/OneDayConstructionPatch.cs    | 23 -------------------
 Settings/BannerlordCheatsSettings.cs          |  4 ----
 3 files changed, 33 deletions(-)
 delete mode 100644 Patches/Settlements/OneDayConstructionPatch.cs

diff --git a/L10N.resx b/L10N.resx
index 4c1a9c5b..0400eea7 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -384,12 +384,6 @@
   <data name="DisguiseAlwaysWorks_Desc" xml:space="preserve">
     <value>Sneaking into settlements always succeeds.</value>
   </data>
-  <data name="OneDayConstruction_Name" xml:space="preserve">
-    <value>One Day Construction</value>
-  </data>
-  <data name="OneDayConstruction_Desc" xml:space="preserve">
-    <value>Buildings in player settlements are constructed in one day.</value>
-  </data>
   <data name="SmithingEnergyCostPercentage_Name" xml:space="preserve">
     <value>Energy Cost Percentage</value>
   </data>
diff --git a/Patches/Settlements/OneDayConstructionPatch.cs b/Patches/Settlements/OneDayConstructionPatch.cs
deleted file mode 100644
index 22886bbb..00000000
--- a/Patches/Settlements/OneDayConstructionPatch.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using BannerlordCheats.Extensions;
-using BannerlordCheats.Settings;
-using HarmonyLib;
-using TaleWorlds.CampaignSystem;
-
-namespace BannerlordCheats.Patches.Settlements
-{
-    [HarmonyPatch(typeof(Town), nameof(Town.Construction), MethodType.Getter)]
-    public static class OneDayConstructionPatch
-    {
-        [HarmonyPostfix]
-        public static void Construction(ref Town __instance, ref float __result)
-        {
-            if (__instance.IsPlayerTown()
-                && !__instance.CurrentBuilding.IsCurrentlyDefault
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.OneDayConstruction, out var oneDayConstruction)
-                && oneDayConstruction)
-            {
-                __result = __instance.CurrentBuilding.GetConstructionCost();
-            }
-        }
-    }
-}
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 1c7cb898..f354e910 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -449,10 +449,6 @@ public static bool TryGetModifiedValue<T>(Expression<Func<BannerlordCheatsSettin
         [LocalizedSettingPropertyBool(nameof(DisguiseAlwaysWorks))]
         public bool DisguiseAlwaysWorks { get; set; } = false;
 
-        [LocalizedSettingPropertyGroup(SettlementsGroupName)]
-        [LocalizedSettingPropertyBool(nameof(OneDayConstruction))]
-        public bool OneDayConstruction { get; set; } = false;
-
         // [LocalizedSettingPropertyGroup(SettlementsGroupName)]
         // [LocalizedSettingPropertyBool(nameof(FreeTroopRecruitment))]
         // public bool FreeTroopRecruitment { get; set; } = false;

From 63d191dc93c2d1c1be97b5508e8402a0e3041e85 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 23 Jun 2021 12:23:10 +0200
Subject: [PATCH 017/177] Add Construction Power Multiplier cheat

---
 L10N.resx                                     |  6 +++++
 .../ConstructionPowerMultiplier.cs            | 25 +++++++++++++++++++
 Settings/BannerlordCheatsSettings.cs          |  4 +++
 3 files changed, 35 insertions(+)
 create mode 100644 Patches/Settlements/ConstructionPowerMultiplier.cs

diff --git a/L10N.resx b/L10N.resx
index 0400eea7..e32a1858 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -792,4 +792,10 @@
   <data name="NativeItemSpawning_Desc" xml:space="preserve">
     <value>Check to enable item spawning just like in native cheat mode. Open the inventory to see all items in the game, drag to your inventory to spawn them.</value>
   </data>
+  <data name="ConstructionPowerMultiplier_Name" xml:space="preserve">
+    <value>Construction Power Multiplier</value>
+  </data>
+  <data name="ConstructionPowerMultiplier_Desc" xml:space="preserve">
+    <value>Factor by which the construction power of player towns is multiplied. A factor of 1 means default construction power.</value>
+  </data>
 </root>
diff --git a/Patches/Settlements/ConstructionPowerMultiplier.cs b/Patches/Settlements/ConstructionPowerMultiplier.cs
new file mode 100644
index 00000000..c86efc44
--- /dev/null
+++ b/Patches/Settlements/ConstructionPowerMultiplier.cs
@@ -0,0 +1,25 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+
+namespace BannerlordCheats.Patches.Settlements
+{
+    [HarmonyPatch(typeof(DefaultBuildingConstructionModel), nameof(DefaultBuildingConstructionModel.CalculateDailyConstructionPower))]
+    public static class ConstructionPowerMultiplier
+    {
+        [HarmonyPostfix]
+        public static void CalculateDailyConstructionPower(
+            ref Town town,
+            ref bool includeDescriptions,
+            ref ExplainedNumber __result)
+        {
+            if (town.IsPlayerTown()
+                && BannerlordCheatsSettings.TryGetModifiedValue(settings => settings.ConstructionPowerMultiplier, out var constructionPowerMultiplier))
+            {
+                __result.AddMultiplier(constructionPowerMultiplier);
+            }
+        }
+    }
+}
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index f354e910..d84655e9 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -497,6 +497,10 @@ public static bool TryGetModifiedValue<T>(Expression<Func<BannerlordCheatsSettin
         [LocalizedSettingPropertyBool(nameof(NeverRequireCivilianEquipment))]
         public bool NeverRequireCivilianEquipment { get; set; } = false;
 
+        [LocalizedSettingPropertyGroup(SettlementsGroupName)]
+        [LocalizedSettingPropertyFloatingInteger(nameof(ConstructionPowerMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
+        public float ConstructionPowerMultiplier { get; set; } = 1.0f;
+
         #endregion Settlements
 
         #region Smithing

From bfa3469c7cc5c21e0fac5b8986e455271ce8adbd Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 24 Jun 2021 14:24:26 +0200
Subject: [PATCH 018/177] Disable Construction Power Multiplier cheat for beta

---
 .../ConstructionPowerMultiplier.cs            | 32 +++++++++----------
 Settings/BannerlordCheatsSettings.cs          |  6 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Patches/Settlements/ConstructionPowerMultiplier.cs b/Patches/Settlements/ConstructionPowerMultiplier.cs
index c86efc44..45c518dd 100644
--- a/Patches/Settlements/ConstructionPowerMultiplier.cs
+++ b/Patches/Settlements/ConstructionPowerMultiplier.cs
@@ -6,20 +6,20 @@
 
 namespace BannerlordCheats.Patches.Settlements
 {
-    [HarmonyPatch(typeof(DefaultBuildingConstructionModel), nameof(DefaultBuildingConstructionModel.CalculateDailyConstructionPower))]
-    public static class ConstructionPowerMultiplier
-    {
-        [HarmonyPostfix]
-        public static void CalculateDailyConstructionPower(
-            ref Town town,
-            ref bool includeDescriptions,
-            ref ExplainedNumber __result)
-        {
-            if (town.IsPlayerTown()
-                && BannerlordCheatsSettings.TryGetModifiedValue(settings => settings.ConstructionPowerMultiplier, out var constructionPowerMultiplier))
-            {
-                __result.AddMultiplier(constructionPowerMultiplier);
-            }
-        }
-    }
+    // [HarmonyPatch(typeof(DefaultBuildingConstructionModel), nameof(DefaultBuildingConstructionModel.CalculateDailyConstructionPower))]
+    // public static class ConstructionPowerMultiplier
+    // {
+    //     [HarmonyPostfix]
+    //     public static void CalculateDailyConstructionPower(
+    //         ref Town town,
+    //         ref bool includeDescriptions,
+    //         ref ExplainedNumber __result)
+    //     {
+    //         if (town.IsPlayerTown()
+    //             && BannerlordCheatsSettings.TryGetModifiedValue(settings => settings.ConstructionPowerMultiplier, out var constructionPowerMultiplier))
+    //         {
+    //             __result.AddMultiplier(constructionPowerMultiplier);
+    //         }
+    //     }
+    // }
 }
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index d84655e9..9083dc5a 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -497,9 +497,9 @@ public static bool TryGetModifiedValue<T>(Expression<Func<BannerlordCheatsSettin
         [LocalizedSettingPropertyBool(nameof(NeverRequireCivilianEquipment))]
         public bool NeverRequireCivilianEquipment { get; set; } = false;
 
-        [LocalizedSettingPropertyGroup(SettlementsGroupName)]
-        [LocalizedSettingPropertyFloatingInteger(nameof(ConstructionPowerMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
-        public float ConstructionPowerMultiplier { get; set; } = 1.0f;
+        // [LocalizedSettingPropertyGroup(SettlementsGroupName)]
+        // [LocalizedSettingPropertyFloatingInteger(nameof(ConstructionPowerMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
+        // public float ConstructionPowerMultiplier { get; set; } = 1.0f;
 
         #endregion Settlements
 

From 5f7a4ef0f7080541cad70bbc930056986cc1531d Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 29 Jun 2021 11:26:26 +0200
Subject: [PATCH 019/177] Rename files and classes to fit cheat names

---
 ...Patch.cs => ArmyCohesionLossPercentage.cs} |  2 +-
 ...ch.cs => ArmyFoodConsumptionPercentage.cs} |  2 +-
 ...s => FactionArmyCohesionLossPercentage.cs} |  2 +-
 ...tyLimitPatch.cs => ExtraClanPartyLimit.cs} |  2 +-
 ...artySizePatch.cs => ExtraClanPartySize.cs} |  2 +-
 ...onLimitPatch.cs => ExtraCompanionLimit.cs} |  2 +-
 ...hrough.cs => AlwaysCrushThroughShields.cs} |  2 +-
 ...ysKnockDownPatch.cs => AlwaysKnockDown.cs} |  2 +-
 ...nPatch.cs => AlwaysWinBattleSimulation.cs} |  2 +-
 ...mitPatch.cs => BanditHideoutTroopLimit.cs} |  2 +-
 ...iplierPatch.cs => CombatZoomMultiplier.cs} |  2 +-
 ...gePatch.cs => CompanionDeathPercentage.cs} |  2 +-
 Patches/Combat/DamageTakenPercentage.cs       |  2 +-
 ...ngAwayPatch.cs => EnemiesNoRunningAway.cs} |  2 +-
 .../EnemyLordCombatDeathPercentageBattle.cs   | 26 +++++++++
 ...emyLordCombatDeathPercentageSimulation.cs} | 24 +-------
 ...FriendlyLordCombatDeathPercentageBattle.cs | 26 +++++++++
 ...dlyLordCombatDeathPercentageSimulation.cs} | 24 +-------
 .../{HealthRegen.cs => HealthRegeneration.cs} |  2 +-
 ...nPatch.cs => InfluenceRewardMultiplier.cs} |  2 +-
 ...eloadPatch.cs => InstantCrossbowReload.cs} |  2 +-
 ...vincibilityCheatPatch.cs => Invincible.cs} |  2 +-
 ...NoRunningAwayPatch.cs => NoRunningAway.cs} |  2 +-
 Patches/Combat/NoTroopSacrificeBreakIn.cs     | 23 ++++++++
 Patches/Combat/NoTroopSacrificeBreakOut.cs    | 23 ++++++++
 Patches/Combat/NoTroopSacrificePatch.cs       | 55 -------------------
 Patches/Combat/NoTroopSacrificeRunaway.cs     | 24 ++++++++
 .../{OneHitKillPatch.cs => OneHitKill.cs}     |  2 +-
 ...lthRegen.cs => PartyHealthRegeneration.cs} |  6 +-
 ...CheatPatch.cs => PartyHeroesInvincible.cs} |  2 +-
 ...bilityCheatPatch.cs => PartyInvincible.cs} |  2 +-
 ...yOneHitKillPatch.cs => PartyOneHitKill.cs} |  2 +-
 ...yKnockoutPatch.cs => PartyOnlyKnockout.cs} |  2 +-
 ...ciblePatch.cs => PlayerHorseInvincible.cs} |  2 +-
 ...tch.cs => RenownRewardMultiplierBattle.cs} |  2 +-
 ...cs => RenownRewardMultiplierTournament.cs} |  2 +-
 Patches/Combat/SliceThroughEveryonePassive.cs | 27 +++++++++
 ...Patch.cs => SliceThroughEveryoneWeapon.cs} | 22 +-------
 ...ch.cs => CompanionExperienceMultiplier.cs} |  2 +-
 ....cs => CompanionLearningRateMultiplier.cs} |  2 +-
 ...iplierPatch.cs => ExperienceMultiplier.cs} |  2 +-
 ...ntPatch.cs => FreeFocusPointAssignment.cs} |  2 +-
 ...ierPatch.cs => LearningLimitMultiplier.cs} |  2 +-
 ...lierPatch.cs => LearningRateMultiplier.cs} |  2 +-
 ...rPatch.cs => TroopExperienceMultiplier.cs} |  2 +-
 .../General/EnableHotkeyTipsEncyclopedia.cs   | 25 +++++++++
 ...ipsPatch.cs => EnableHotkeyTipsScreens.cs} | 21 +------
 ... => EnableHotkeysAddEncyclopediaTroops.cs} |  6 +-
 ...CheatPatch.cs => EnableHotkeysAddItems.cs} |  6 +-
 ...cs => EnableHotkeysCharacterAttributes.cs} |  2 +-
 ...tch.cs => EnableHotkeysCharacterPoints.cs} |  2 +-
 ...heatPatch.cs => EnableHotkeysInfluence.cs} |  2 +-
 ...neyCheatPatch.cs => EnableHotkeysMoney.cs} |  2 +-
 ...eatPatch.cs => EnableHotkeysTroopCount.cs} |  6 +-
 ...tch.cs => EnableHotkeysTroopExperience.cs} |  2 +-
 ...odelPatch.cs => ExtraInventoryCapacity.cs} |  2 +-
 ...SpawningPatch.cs => NativeItemSpawning.cs} |  2 +-
 ...ecisionOverrideInfluenceCostPercentage.cs} |  2 +-
 ....cs => KingdomDecisionWeightMultiplier.cs} |  2 +-
 ...tingPatch.cs => NoCrimeRatingForCrimes.cs} |  2 +-
 ...oRelationshipLossOnDecisionArmyDisband.cs} |  2 +-
 ...elationshipLossOnDecisionExpellingClan.cs} |  2 +-
 ...ationshipLossOnDecisionKingdomDecision.cs} |  2 +-
 ...ingModelPatch.cs => MapSpeedMultiplier.cs} |  2 +-
 ...delPatch.cs => MapVisibilityMultiplier.cs} |  2 +-
 ...rtiesOnMap.cs => NpcMapSpeedPercentage.cs} |  2 +-
 ...eLimitPatch.cs => ExtraPartyMemberSize.cs} |  2 +-
 ...artyMoralePatch.cs => ExtraPartyMorale.cs} |  2 +-
 ...imitPatch.cs => ExtraPartyPrisonerSize.cs} |  2 +-
 ...nPatch.cs => FoodConsumptionPercentage.cs} |  2 +-
 ...ngPricePatch.cs => FreeCompanionHiring.cs} |  2 +-
 ...pUpgradesPatch.cs => FreeTroopUpgrades.cs} |  2 +-
 ...Patch.cs => InstantPrisonerRecruitment.cs} |  2 +-
 ...onerEscapePatch.cs => NoPrisonerEscape.cs} |  2 +-
 ...tch.cs => PartyHealingMultiplierHeroes.cs} | 18 +-----
 Patches/Party/PartyHealingMultiplierTroops.cs | 22 ++++++++
 ...pWagesPatch.cs => TroopWagesPercentage.cs} |  2 +-
 ...ntFoodStocksPatch.cs => DailyFoodBonus.cs} |  2 +-
 ...onGrowthPatch.cs => DailyGarrisonBonus.cs} |  2 +-
 .../{HearthsPatch.cs => DailyHearthsBonus.cs} |  2 +-
 .../{LoyaltyPatch.cs => DailyLoyaltyBonus.cs} |  2 +-
 Patches/Settlements/DailyMilitiaBonusTown.cs  | 21 +++++++
 ...thPatch.cs => DailyMilitiaBonusVillage.cs} | 18 +-----
 ...perityPatch.cs => DailyProsperityBonus.cs} |  2 +-
 ...SecurityPatch.cs => DailySecurityBonus.cs} |  2 +-
 ...ysWorksPatch.cs => DisguiseAlwaysWorks.cs} |  2 +-
 ...gesPatch.cs => GarrisonWagesPercentage.cs} |  2 +-
 ...entage.cs => ItemTradingCostPercentage.cs} |  2 +-
 ...nt.cs => NeverRequireCivilianEquipment.cs} |  2 +-
 ...s => EnemySiegeBuildingSpeedPercentage.cs} |  3 +-
 ...tch.cs => SiegeBuildingSpeedMultiplier.cs} |  2 +-
 ...apons.cs => CraftedWeaponModifierBonus.cs} |  2 +-
 ...ialsPatch.cs => SmithingCostPercentage.cs} |  2 +-
 ...tch.cs => SmithingDifficultyPercentage.cs} |  2 +-
 ...> SmithingEnergyCostPercentageRefining.cs} |  2 +-
 ...> SmithingEnergyCostPercentageSmelting.cs} |  2 +-
 ...> SmithingEnergyCostPercentageSmithing.cs} |  2 +-
 ...artsUnlockedPatch.cs => UnlockAllParts.cs} |  2 +-
 ...tch.cs => WorkshopBuyingCostPercentage.cs} |  2 +-
 ...h.cs => WorkshopDailyExpensePercentage.cs} |  2 +-
 ...ch.cs => WorkshopSellingCostMultiplier.cs} |  2 +-
 ...ch.cs => WorkshopUpgradeCostPercentage.cs} |  2 +-
 102 files changed, 321 insertions(+), 267 deletions(-)
 rename Patches/Army/{ArmyCohesionPatch.cs => ArmyCohesionLossPercentage.cs} (93%)
 rename Patches/Army/{NoArmyFoodConsumptionPatch.cs => ArmyFoodConsumptionPercentage.cs} (94%)
 rename Patches/Army/{FactionArmyCohesionLossPatch.cs => FactionArmyCohesionLossPercentage.cs} (93%)
 rename Patches/Clan/{ClanPartyLimitPatch.cs => ExtraClanPartyLimit.cs} (94%)
 rename Patches/Clan/{ExtraClanPartySizePatch.cs => ExtraClanPartySize.cs} (94%)
 rename Patches/Clan/{CompanionLimitPatch.cs => ExtraCompanionLimit.cs} (93%)
 rename Patches/Combat/{AlwaysCrushThrough.cs => AlwaysCrushThroughShields.cs} (95%)
 rename Patches/Combat/{AlwaysKnockDownPatch.cs => AlwaysKnockDown.cs} (95%)
 rename Patches/Combat/{AlwaysWinBattleSimulationPatch.cs => AlwaysWinBattleSimulation.cs} (94%)
 rename Patches/Combat/{BanditHideoutTroopLimitPatch.cs => BanditHideoutTroopLimit.cs} (92%)
 rename Patches/Combat/{CombatZoomMultiplierPatch.cs => CombatZoomMultiplier.cs} (93%)
 rename Patches/Combat/{CompanionDeathPercentagePatch.cs => CompanionDeathPercentage.cs} (94%)
 rename Patches/Combat/{EnemiesNoRunningAwayPatch.cs => EnemiesNoRunningAway.cs} (93%)
 create mode 100644 Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
 rename Patches/Combat/{NoEnemyLordCombatDeathPatch.cs => EnemyLordCombatDeathPercentageSimulation.cs} (52%)
 create mode 100644 Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
 rename Patches/Combat/{NoFriendlyLordCombatDeathPatch.cs => FriendlyLordCombatDeathPercentageSimulation.cs} (52%)
 rename Patches/Combat/{HealthRegen.cs => HealthRegeneration.cs} (96%)
 rename Patches/Combat/{BattleInfluenceGainPatch.cs => InfluenceRewardMultiplier.cs} (94%)
 rename Patches/Combat/{InstantCrossbowReloadPatch.cs => InstantCrossbowReload.cs} (93%)
 rename Patches/Combat/{InvincibilityCheatPatch.cs => Invincible.cs} (92%)
 rename Patches/Combat/{NoRunningAwayPatch.cs => NoRunningAway.cs} (94%)
 create mode 100644 Patches/Combat/NoTroopSacrificeBreakIn.cs
 create mode 100644 Patches/Combat/NoTroopSacrificeBreakOut.cs
 delete mode 100644 Patches/Combat/NoTroopSacrificePatch.cs
 create mode 100644 Patches/Combat/NoTroopSacrificeRunaway.cs
 rename Patches/Combat/{OneHitKillPatch.cs => OneHitKill.cs} (95%)
 rename Patches/Combat/{PartyHealthRegen.cs => PartyHealthRegeneration.cs} (89%)
 rename Patches/Combat/{PartyHeroesInvincibilityCheatPatch.cs => PartyHeroesInvincible.cs} (93%)
 rename Patches/Combat/{PartyInvincibilityCheatPatch.cs => PartyInvincible.cs} (93%)
 rename Patches/Combat/{PartyOneHitKillPatch.cs => PartyOneHitKill.cs} (95%)
 rename Patches/Combat/{PartyOnlyKnockoutPatch.cs => PartyOnlyKnockout.cs} (95%)
 rename Patches/Combat/{PlayerHorseInvinciblePatch.cs => PlayerHorseInvincible.cs} (93%)
 rename Patches/Combat/{BattleRenownGainPatch.cs => RenownRewardMultiplierBattle.cs} (94%)
 rename Patches/Combat/{TournamentRenownPatch.cs => RenownRewardMultiplierTournament.cs} (92%)
 create mode 100644 Patches/Combat/SliceThroughEveryonePassive.cs
 rename Patches/Combat/{AlwaysSliceThroughPatch.cs => SliceThroughEveryoneWeapon.cs} (54%)
 rename Patches/Experience/{CompanionExperienceMultiplierPatch.cs => CompanionExperienceMultiplier.cs} (92%)
 rename Patches/Experience/{CompanionLearningRateMultiplierPatch.cs => CompanionLearningRateMultiplier.cs} (93%)
 rename Patches/Experience/{ExperienceMultiplierPatch.cs => ExperienceMultiplier.cs} (93%)
 rename Patches/Experience/{FreeFocusAssignmentPatch.cs => FreeFocusPointAssignment.cs} (92%)
 rename Patches/Experience/{LearningLimitMultiplierPatch.cs => LearningLimitMultiplier.cs} (94%)
 rename Patches/Experience/{LearningRateMultiplierPatch.cs => LearningRateMultiplier.cs} (94%)
 rename Patches/Experience/{TroopExperienceMultiplierPatch.cs => TroopExperienceMultiplier.cs} (95%)
 create mode 100644 Patches/General/EnableHotkeyTipsEncyclopedia.cs
 rename Patches/General/{HotkeyTipsPatch.cs => EnableHotkeyTipsScreens.cs} (72%)
 rename Patches/General/{AddTroopFromEncyclopediaPatch.cs => EnableHotkeysAddEncyclopediaTroops.cs} (86%)
 rename Patches/General/{AddItemsCheatPatch.cs => EnableHotkeysAddItems.cs} (92%)
 rename Patches/General/{CharacterAttributesCheatPatch.cs => EnableHotkeysCharacterAttributes.cs} (98%)
 rename Patches/General/{AddCharacterPointsPatch.cs => EnableHotkeysCharacterPoints.cs} (97%)
 rename Patches/General/{InfluenceCheatPatch.cs => EnableHotkeysInfluence.cs} (95%)
 rename Patches/General/{MoneyCheatPatch.cs => EnableHotkeysMoney.cs} (97%)
 rename Patches/General/{TroopCountCheatPatch.cs => EnableHotkeysTroopCount.cs} (92%)
 rename Patches/General/{TroopExperienceCheatPatch.cs => EnableHotkeysTroopExperience.cs} (97%)
 rename Patches/Inventory/{DefaultInventoryCapacityModelPatch.cs => ExtraInventoryCapacity.cs} (94%)
 rename Patches/Inventory/{NativeItemSpawningPatch.cs => NativeItemSpawning.cs} (97%)
 rename Patches/Kingdom/{DecisionOverrideInfluenceCostPatch.cs => DecisionOverrideInfluenceCostPercentage.cs} (94%)
 rename Patches/Kingdom/{ForceKingdomDecisionPatch.cs => KingdomDecisionWeightMultiplier.cs} (92%)
 rename Patches/Kingdom/{NoCrimeRatingPatch.cs => NoCrimeRatingForCrimes.cs} (93%)
 rename Patches/Kingdom/{NoRelationshipLossOnArmyDisband.cs => NoRelationshipLossOnDecisionArmyDisband.cs} (91%)
 rename Patches/Kingdom/{NoRelationshipLossOnExpellingClan.cs => NoRelationshipLossOnDecisionExpellingClan.cs} (91%)
 rename Patches/Kingdom/{NoRelationshipLossOnDecisionPatch.cs => NoRelationshipLossOnDecisionKingdomDecision.cs} (91%)
 rename Patches/Map/{DefaultPartySpeedCalculatingModelPatch.cs => MapSpeedMultiplier.cs} (92%)
 rename Patches/Map/{DefaultMapVisibilityModelPatch.cs => MapVisibilityMultiplier.cs} (93%)
 rename Patches/Map/{SlowDownPartiesOnMap.cs => NpcMapSpeedPercentage.cs} (94%)
 rename Patches/Party/{PartyMemberSizeLimitPatch.cs => ExtraPartyMemberSize.cs} (93%)
 rename Patches/Party/{PartyMoralePatch.cs => ExtraPartyMorale.cs} (94%)
 rename Patches/Party/{PartyPrisonerSizeLimitPatch.cs => ExtraPartyPrisonerSize.cs} (93%)
 rename Patches/Party/{NoFoodConsumptionPatch.cs => FoodConsumptionPercentage.cs} (94%)
 rename Patches/Party/{CompanionHiringPricePatch.cs => FreeCompanionHiring.cs} (93%)
 rename Patches/Party/{FreeTroopUpgradesPatch.cs => FreeTroopUpgrades.cs} (94%)
 rename Patches/Party/{RecruitPrisonersPatch.cs => InstantPrisonerRecruitment.cs} (94%)
 rename Patches/Party/{NoPrisonerEscapePatch.cs => NoPrisonerEscape.cs} (94%)
 rename Patches/Party/{PartyHealingPatch.cs => PartyHealingMultiplierHeroes.cs} (54%)
 create mode 100644 Patches/Party/PartyHealingMultiplierTroops.cs
 rename Patches/Party/{NoTroopWagesPatch.cs => TroopWagesPercentage.cs} (94%)
 rename Patches/Settlements/{SettlementFoodStocksPatch.cs => DailyFoodBonus.cs} (91%)
 rename Patches/Settlements/{GarrisonGrowthPatch.cs => DailyGarrisonBonus.cs} (93%)
 rename Patches/Settlements/{HearthsPatch.cs => DailyHearthsBonus.cs} (93%)
 rename Patches/Settlements/{LoyaltyPatch.cs => DailyLoyaltyBonus.cs} (93%)
 create mode 100644 Patches/Settlements/DailyMilitiaBonusTown.cs
 rename Patches/Settlements/{MilitiaGrowthPatch.cs => DailyMilitiaBonusVillage.cs} (53%)
 rename Patches/Settlements/{ProsperityPatch.cs => DailyProsperityBonus.cs} (93%)
 rename Patches/Settlements/{SecurityPatch.cs => DailySecurityBonus.cs} (93%)
 rename Patches/Settlements/{DisguiseAlwaysWorksPatch.cs => DisguiseAlwaysWorks.cs} (93%)
 rename Patches/Settlements/{GarrisonWagesPatch.cs => GarrisonWagesPercentage.cs} (94%)
 rename Patches/Settlements/{TradeCostPercentage.cs => ItemTradingCostPercentage.cs} (95%)
 rename Patches/Settlements/{EnterWithFullEquipment.cs => NeverRequireCivilianEquipment.cs} (92%)
 rename Patches/Sieges/{EnemySiegeBuildSpeed.cs => EnemySiegeBuildingSpeedPercentage.cs} (96%)
 rename Patches/Sieges/{DefaultSiegeEventModelPatch.cs => SiegeBuildingSpeedMultiplier.cs} (94%)
 rename Patches/Smithing/{SmithPerfectWeapons.cs => CraftedWeaponModifierBonus.cs} (97%)
 rename Patches/Smithing/{SmithingMaterialsPatch.cs => SmithingCostPercentage.cs} (95%)
 rename Patches/Smithing/{NoSmithingDifficultyPatch.cs => SmithingDifficultyPercentage.cs} (93%)
 rename Patches/Smithing/{RefiningEnergyCostPatch.cs => SmithingEnergyCostPercentageRefining.cs} (93%)
 rename Patches/Smithing/{SmeltingEnergyCostPatch.cs => SmithingEnergyCostPercentageSmelting.cs} (93%)
 rename Patches/Smithing/{SmithingEnergyCostPatch.cs => SmithingEnergyCostPercentageSmithing.cs} (93%)
 rename Patches/Smithing/{AllPartsUnlockedPatch.cs => UnlockAllParts.cs} (93%)
 rename Patches/Workshops/{WorkshopBuyingCostPatch.cs => WorkshopBuyingCostPercentage.cs} (93%)
 rename Patches/Workshops/{WorkshopDailyExpensePatch.cs => WorkshopDailyExpensePercentage.cs} (92%)
 rename Patches/Workshops/{WorkshopSellingCostPatch.cs => WorkshopSellingCostMultiplier.cs} (92%)
 rename Patches/Workshops/{WorkshopUpgradeCostPatch.cs => WorkshopUpgradeCostPercentage.cs} (92%)

diff --git a/Patches/Army/ArmyCohesionPatch.cs b/Patches/Army/ArmyCohesionLossPercentage.cs
similarity index 93%
rename from Patches/Army/ArmyCohesionPatch.cs
rename to Patches/Army/ArmyCohesionLossPercentage.cs
index 3e5e8fb5..c8abf45d 100644
--- a/Patches/Army/ArmyCohesionPatch.cs
+++ b/Patches/Army/ArmyCohesionLossPercentage.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Army
 {
     [HarmonyPatch(typeof(ArmyObj), nameof(ArmyObj.CohesionChange), MethodType.Getter)]
-    public static class ArmyCohesionPatch
+    public static class ArmyCohesionLossPercentage
     {
         [HarmonyPostfix]
         public static void CohesionChange(ref ArmyObj __instance, ref float __result)
diff --git a/Patches/Army/NoArmyFoodConsumptionPatch.cs b/Patches/Army/ArmyFoodConsumptionPercentage.cs
similarity index 94%
rename from Patches/Army/NoArmyFoodConsumptionPatch.cs
rename to Patches/Army/ArmyFoodConsumptionPercentage.cs
index c9a7e6bf..04dbb6a0 100644
--- a/Patches/Army/NoArmyFoodConsumptionPatch.cs
+++ b/Patches/Army/ArmyFoodConsumptionPercentage.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Army
 {
     [HarmonyPatch(typeof(DefaultMobilePartyFoodConsumptionModel), nameof(DefaultMobilePartyFoodConsumptionModel.CalculateDailyFoodConsumptionf))]
-    public static class NoArmyFoodConsumptionPatch
+    public static class ArmyFoodConsumptionPercentage
     {
         [HarmonyPostfix]
         public static void CalculateDailyFoodConsumptionf(ref MobileParty party, ref bool includeDescription, ref ExplainedNumber __result)
diff --git a/Patches/Army/FactionArmyCohesionLossPatch.cs b/Patches/Army/FactionArmyCohesionLossPercentage.cs
similarity index 93%
rename from Patches/Army/FactionArmyCohesionLossPatch.cs
rename to Patches/Army/FactionArmyCohesionLossPercentage.cs
index c0ac569e..b6fc80b5 100644
--- a/Patches/Army/FactionArmyCohesionLossPatch.cs
+++ b/Patches/Army/FactionArmyCohesionLossPercentage.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Army
 {
     [HarmonyPatch(typeof(ArmyObj), nameof(ArmyObj.CohesionChange), MethodType.Getter)]
-    public static class FactionArmyCohesionLossPatch
+    public static class FactionArmyCohesionLossPercentage
     {
         [HarmonyPostfix]
         public static void CohesionChange(ref ArmyObj __instance, ref float __result)
diff --git a/Patches/Clan/ClanPartyLimitPatch.cs b/Patches/Clan/ExtraClanPartyLimit.cs
similarity index 94%
rename from Patches/Clan/ClanPartyLimitPatch.cs
rename to Patches/Clan/ExtraClanPartyLimit.cs
index 12689f2a..b9c80c2d 100644
--- a/Patches/Clan/ClanPartyLimitPatch.cs
+++ b/Patches/Clan/ExtraClanPartyLimit.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Clan
 {
     [HarmonyPatch(typeof(DefaultClanTierModel), nameof(DefaultClanTierModel.GetPartyLimitForTier))]
-    public static class ClanPartyLimitPatch
+    public static class ExtraClanPartyLimit
     {
         [HarmonyPostfix]
         public static void GetPartyLimitForTier(TaleWorlds.CampaignSystem.Clan clan, int clanTierToCheck, ref int __result)
diff --git a/Patches/Clan/ExtraClanPartySizePatch.cs b/Patches/Clan/ExtraClanPartySize.cs
similarity index 94%
rename from Patches/Clan/ExtraClanPartySizePatch.cs
rename to Patches/Clan/ExtraClanPartySize.cs
index 818f4920..5a6a6d53 100644
--- a/Patches/Clan/ExtraClanPartySizePatch.cs
+++ b/Patches/Clan/ExtraClanPartySize.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Clan
 {
     [HarmonyPatch(typeof(DefaultPartySizeLimitModel), nameof(DefaultPartySizeLimitModel.GetPartyMemberSizeLimit))]
-    public static class ExtraClanPartySizePatch
+    public static class ExtraClanPartySize
     {
         [HarmonyPostfix]
         public static void GetPartyMemberSizeLimit(ref PartyBase party, ref bool includeDescriptions, ref ExplainedNumber __result)
diff --git a/Patches/Clan/CompanionLimitPatch.cs b/Patches/Clan/ExtraCompanionLimit.cs
similarity index 93%
rename from Patches/Clan/CompanionLimitPatch.cs
rename to Patches/Clan/ExtraCompanionLimit.cs
index 0c280833..a7cea909 100644
--- a/Patches/Clan/CompanionLimitPatch.cs
+++ b/Patches/Clan/ExtraCompanionLimit.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Clan
 {
     [HarmonyPatch(typeof(DefaultClanTierModel), nameof(DefaultClanTierModel.GetCompanionLimit))]
-    public static class CompanionLimitPatch
+    public static class ExtraCompanionLimit
     {
         [HarmonyPostfix]
         public static void GetCompanionLimit(ref TaleWorlds.CampaignSystem.Clan clan, ref int __result)
diff --git a/Patches/Combat/AlwaysCrushThrough.cs b/Patches/Combat/AlwaysCrushThroughShields.cs
similarity index 95%
rename from Patches/Combat/AlwaysCrushThrough.cs
rename to Patches/Combat/AlwaysCrushThroughShields.cs
index f213a3bc..aae3f0c8 100644
--- a/Patches/Combat/AlwaysCrushThrough.cs
+++ b/Patches/Combat/AlwaysCrushThroughShields.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.DecideCrushedThrough))]
-    public class AlwaysCrushThrough
+    public class AlwaysCrushThroughShields
     {
         [HarmonyPostfix]
         public static void DecideCrushedThrough(Agent attackerAgent, Agent defenderAgent, float totalAttackEnergy, Agent.UsageDirection attackDirection, StrikeType strikeType, WeaponComponentData defendItem, bool isPassiveUsage, ref bool __result)
diff --git a/Patches/Combat/AlwaysKnockDownPatch.cs b/Patches/Combat/AlwaysKnockDown.cs
similarity index 95%
rename from Patches/Combat/AlwaysKnockDownPatch.cs
rename to Patches/Combat/AlwaysKnockDown.cs
index 7b3516cb..b8b12568 100644
--- a/Patches/Combat/AlwaysKnockDownPatch.cs
+++ b/Patches/Combat/AlwaysKnockDown.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(Mission), "DecideAgentKnockedByBlow")]
-    public static class AlwaysKnockDownPatch
+    public static class AlwaysKnockDown
     {
         [HarmonyPostfix]
         public static void DecideAgentKnockedByBlow(
diff --git a/Patches/Combat/AlwaysWinBattleSimulationPatch.cs b/Patches/Combat/AlwaysWinBattleSimulation.cs
similarity index 94%
rename from Patches/Combat/AlwaysWinBattleSimulationPatch.cs
rename to Patches/Combat/AlwaysWinBattleSimulation.cs
index 93d773e9..2b4ceb2a 100644
--- a/Patches/Combat/AlwaysWinBattleSimulationPatch.cs
+++ b/Patches/Combat/AlwaysWinBattleSimulation.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(DefaultCombatSimulationModel), nameof(DefaultCombatSimulationModel.SimulateHit))]
-    public static class AlwaysWinBattleSimulationPatch
+    public static class AlwaysWinBattleSimulation
     {
         [HarmonyPostfix]
         public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterObject struckTroop, ref PartyBase strikerParty, ref PartyBase struckParty, ref float strikerAdvantage, ref MapEvent battle, ref int __result)
diff --git a/Patches/Combat/BanditHideoutTroopLimitPatch.cs b/Patches/Combat/BanditHideoutTroopLimit.cs
similarity index 92%
rename from Patches/Combat/BanditHideoutTroopLimitPatch.cs
rename to Patches/Combat/BanditHideoutTroopLimit.cs
index cc771404..ab42ea14 100644
--- a/Patches/Combat/BanditHideoutTroopLimitPatch.cs
+++ b/Patches/Combat/BanditHideoutTroopLimit.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(DefaultBanditDensityModel), nameof(DefaultBanditDensityModel.GetPlayerMaximumTroopCountForHideoutMission))]
-    public static class BanditHideoutTroopLimitPatch
+    public static class BanditHideoutTroopLimit
     {
         [HarmonyPostfix]
         public static void GetPlayerMaximumTroopCountForHideoutMission(ref MobileParty party, ref int __result)
diff --git a/Patches/Combat/CombatZoomMultiplierPatch.cs b/Patches/Combat/CombatZoomMultiplier.cs
similarity index 93%
rename from Patches/Combat/CombatZoomMultiplierPatch.cs
rename to Patches/Combat/CombatZoomMultiplier.cs
index fdf06b26..c032e839 100644
--- a/Patches/Combat/CombatZoomMultiplierPatch.cs
+++ b/Patches/Combat/CombatZoomMultiplier.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(SandboxAgentStatCalculateModel), nameof(SandboxAgentStatCalculateModel.GetMaxCameraZoom))]
-    public static class CombatZoomMultiplierPatch
+    public static class CombatZoomMultiplier
     {
         [HarmonyPostfix]
         public static void CrossbowReloadSpeed(ref Agent agent, ref float __result)
diff --git a/Patches/Combat/CompanionDeathPercentagePatch.cs b/Patches/Combat/CompanionDeathPercentage.cs
similarity index 94%
rename from Patches/Combat/CompanionDeathPercentagePatch.cs
rename to Patches/Combat/CompanionDeathPercentage.cs
index 13489e64..aa9bc7c5 100644
--- a/Patches/Combat/CompanionDeathPercentagePatch.cs
+++ b/Patches/Combat/CompanionDeathPercentage.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
-    public static class CompanionDeathPercentagePatch
+    public static class CompanionDeathPercentage
     {
         [HarmonyPostfix]
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
diff --git a/Patches/Combat/DamageTakenPercentage.cs b/Patches/Combat/DamageTakenPercentage.cs
index 73c68c68..699669f2 100644
--- a/Patches/Combat/DamageTakenPercentage.cs
+++ b/Patches/Combat/DamageTakenPercentage.cs
@@ -9,7 +9,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.CalculateDamage))]
-    public static class DamageTakenFactor
+    public static class DamageTakenPercentage
     {
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
diff --git a/Patches/Combat/EnemiesNoRunningAwayPatch.cs b/Patches/Combat/EnemiesNoRunningAway.cs
similarity index 93%
rename from Patches/Combat/EnemiesNoRunningAwayPatch.cs
rename to Patches/Combat/EnemiesNoRunningAway.cs
index bbb8731b..b044253d 100644
--- a/Patches/Combat/EnemiesNoRunningAwayPatch.cs
+++ b/Patches/Combat/EnemiesNoRunningAway.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(DefaultBattleMoraleModel), nameof(DefaultBattleMoraleModel.CalculateMoraleChangeToCharacter))]
-    public static class EnemiesNoRunningAwayPatch
+    public static class EnemiesNoRunningAway
     {
         [HarmonyPostfix]
         public static void CalculateMoraleChangeToCharacter(Agent agent, float moraleChange, float distance, ref float __result)
diff --git a/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
new file mode 100644
index 00000000..f2294001
--- /dev/null
+++ b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
@@ -0,0 +1,26 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using SandBox;
+using TaleWorlds.Core;
+using TaleWorlds.MountAndBlade;
+
+namespace BannerlordCheats.Patches.Combat
+{
+    [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
+    public static class EnemyLordCombatDeathPercentageBattle
+    {
+        [HarmonyPostfix]
+        public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
+        {
+            if (effectedAgent.IsHero()
+                && effectedAgent.IsPlayerEnemy()
+                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnemyLordCombatDeathPercentage, out var enemyLordCombatDeathPercentage))
+            {
+                var factor = enemyLordCombatDeathPercentage / 100f;
+
+                __result *= factor;
+            }
+        }
+    }
+}
diff --git a/Patches/Combat/NoEnemyLordCombatDeathPatch.cs b/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
similarity index 52%
rename from Patches/Combat/NoEnemyLordCombatDeathPatch.cs
rename to Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
index 4b24b50e..06bb8437 100644
--- a/Patches/Combat/NoEnemyLordCombatDeathPatch.cs
+++ b/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
@@ -2,33 +2,13 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
-using SandBox;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
-using TaleWorlds.Core;
-using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
-    public static class NoEnemyLordCombatDeathPatch
-    {
-        [HarmonyPostfix]
-        public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
-        {
-            if (effectedAgent.IsHero()
-                && effectedAgent.IsPlayerEnemy()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnemyLordCombatDeathPercentage, out var enemyLordCombatDeathPercentage))
-            {
-                var factor = enemyLordCombatDeathPercentage / 100f;
-
-                __result *= factor;
-            }
-        }
-    }
-
     [HarmonyPatch(typeof(DefaultCombatSimulationModel), nameof(DefaultCombatSimulationModel.SimulateHit))]
-    public static class NoEnemyLordCombatDeathSimulationPatch
+    public static class EnemyLordCombatDeathPercentageSimulation
     {
         [HarmonyPostfix]
         public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterObject struckTroop, ref PartyBase strikerParty, ref PartyBase struckParty, ref float strikerAdvantage, ref MapEvent battle, ref int __result)
@@ -43,4 +23,4 @@ public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterOb
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
new file mode 100644
index 00000000..5d418639
--- /dev/null
+++ b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
@@ -0,0 +1,26 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using SandBox;
+using TaleWorlds.Core;
+using TaleWorlds.MountAndBlade;
+
+namespace BannerlordCheats.Patches.Combat
+{
+    [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
+    public static class FriendlyLordCombatDeathPercentageBattle
+    {
+        [HarmonyPostfix]
+        public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
+        {
+            if (effectedAgent.IsHero()
+                &&effectedAgent.IsPlayerAlly()
+                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.FriendlyLordCombatDeathPercentage, out var friendlyLordCombatDeathPercentage))
+            {
+                var factor = friendlyLordCombatDeathPercentage / 100f;
+
+                __result *= factor;
+            }
+        }
+    }
+}
diff --git a/Patches/Combat/NoFriendlyLordCombatDeathPatch.cs b/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
similarity index 52%
rename from Patches/Combat/NoFriendlyLordCombatDeathPatch.cs
rename to Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
index 0e9c2c56..47690dc1 100644
--- a/Patches/Combat/NoFriendlyLordCombatDeathPatch.cs
+++ b/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
@@ -2,33 +2,13 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
-using SandBox;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
-using TaleWorlds.Core;
-using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
-    public static class NoFriendlyLordCombatDeathPatch
-    {
-        [HarmonyPostfix]
-        public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
-        {
-            if (effectedAgent.IsHero()
-                &&effectedAgent.IsPlayerAlly()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.FriendlyLordCombatDeathPercentage, out var friendlyLordCombatDeathPercentage))
-            {
-                var factor = friendlyLordCombatDeathPercentage / 100f;
-
-                __result *= factor;
-            }
-        }
-    }
-
     [HarmonyPatch(typeof(DefaultCombatSimulationModel), nameof(DefaultCombatSimulationModel.SimulateHit))]
-    public static class NoFriendlyLordCombatDeathSimulationPatch
+    public static class FriendlyLordCombatDeathPercentageSimulation
     {
         [HarmonyPostfix]
         public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterObject struckTroop, ref PartyBase strikerParty, ref PartyBase struckParty, ref float strikerAdvantage, ref MapEvent battle, ref int __result)
@@ -43,4 +23,4 @@ public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterOb
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Patches/Combat/HealthRegen.cs b/Patches/Combat/HealthRegeneration.cs
similarity index 96%
rename from Patches/Combat/HealthRegen.cs
rename to Patches/Combat/HealthRegeneration.cs
index f29dae6a..4e521fb0 100644
--- a/Patches/Combat/HealthRegen.cs
+++ b/Patches/Combat/HealthRegeneration.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
-    public static class HealthRegen
+    public static class HealthRegeneration
     {
         private static int? LastSet = null;
 
diff --git a/Patches/Combat/BattleInfluenceGainPatch.cs b/Patches/Combat/InfluenceRewardMultiplier.cs
similarity index 94%
rename from Patches/Combat/BattleInfluenceGainPatch.cs
rename to Patches/Combat/InfluenceRewardMultiplier.cs
index 376a3c1b..743ac05f 100644
--- a/Patches/Combat/BattleInfluenceGainPatch.cs
+++ b/Patches/Combat/InfluenceRewardMultiplier.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(DefaultBattleRewardModel), nameof(DefaultBattleRewardModel.CalculateInfluenceGain))]
-    public static class BattleInfluenceGainPatch
+    public static class InfluenceRewardMultiplier
     {
         [HarmonyPostfix]
         public static void CalculateInfluenceGain(
diff --git a/Patches/Combat/InstantCrossbowReloadPatch.cs b/Patches/Combat/InstantCrossbowReload.cs
similarity index 93%
rename from Patches/Combat/InstantCrossbowReloadPatch.cs
rename to Patches/Combat/InstantCrossbowReload.cs
index 64ddd8ff..dbda8661 100644
--- a/Patches/Combat/InstantCrossbowReloadPatch.cs
+++ b/Patches/Combat/InstantCrossbowReload.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(SandboxAgentStatCalculateModel), "GetPerkEffectsOnAgent")]
-    public static class InstantCrossbowReloadPatch
+    public static class InstantCrossbowReload
     {
         [HarmonyPrefix]
         public static void GetPerkEffectsOnAgent(ref Agent agent, ref AgentDrivenProperties agentDrivenProperties, ref WeaponComponentData rightHandEquippedItem)
diff --git a/Patches/Combat/InvincibilityCheatPatch.cs b/Patches/Combat/Invincible.cs
similarity index 92%
rename from Patches/Combat/InvincibilityCheatPatch.cs
rename to Patches/Combat/Invincible.cs
index 0f4c4731..d36021cc 100644
--- a/Patches/Combat/InvincibilityCheatPatch.cs
+++ b/Patches/Combat/Invincible.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(Agent), nameof(Agent.Invulnerable), MethodType.Getter)]
-    public static class InvincibilityCheatPatch
+    public static class Invincible
     {
         [HarmonyPostfix]
         public static void Invulnerable(ref Agent __instance, ref bool __result)
diff --git a/Patches/Combat/NoRunningAwayPatch.cs b/Patches/Combat/NoRunningAway.cs
similarity index 94%
rename from Patches/Combat/NoRunningAwayPatch.cs
rename to Patches/Combat/NoRunningAway.cs
index 6e4d95e9..67cdbf8b 100644
--- a/Patches/Combat/NoRunningAwayPatch.cs
+++ b/Patches/Combat/NoRunningAway.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(DefaultBattleMoraleModel), nameof(DefaultBattleMoraleModel.CalculateMoraleChangeToCharacter))]
-    public static class NoRunningAwayPatch
+    public static class NoRunningAway
     {
         [HarmonyPostfix]
         public static void CalculateMoraleChangeToCharacter(Agent agent, float moraleChange, float distance, ref float __result)
diff --git a/Patches/Combat/NoTroopSacrificeBreakIn.cs b/Patches/Combat/NoTroopSacrificeBreakIn.cs
new file mode 100644
index 00000000..b30bc79d
--- /dev/null
+++ b/Patches/Combat/NoTroopSacrificeBreakIn.cs
@@ -0,0 +1,23 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+
+namespace BannerlordCheats.Patches.Combat
+{
+    [HarmonyPatch(typeof(DefaultTroopSacrificeModel), nameof(DefaultTroopSacrificeModel.GetLostTroopCountForBreakingInBesiegedSettlement))]
+    public static class NoTroopSacrificeBreakIn
+    {
+        [HarmonyPostfix]
+        public static void GetLostTroopCountForBreakingInBesiegedSettlement(MobileParty party, SiegeEvent siegeEvent, ref int __result)
+        {
+            if (party.IsPlayerParty()
+                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoTroopSacrifice, out var noTroopSacrifice)
+                && noTroopSacrifice)
+            {
+                __result = 0;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Patches/Combat/NoTroopSacrificeBreakOut.cs b/Patches/Combat/NoTroopSacrificeBreakOut.cs
new file mode 100644
index 00000000..5ede335d
--- /dev/null
+++ b/Patches/Combat/NoTroopSacrificeBreakOut.cs
@@ -0,0 +1,23 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+
+namespace BannerlordCheats.Patches.Combat
+{
+    [HarmonyPatch(typeof(DefaultTroopSacrificeModel), nameof(DefaultTroopSacrificeModel.GetLostTroopCountForBreakingOutOfBesiegedSettlement))]
+    public static class NoTroopSacrificeBreakOut
+    {
+        [HarmonyPostfix]
+        public static void GetLostTroopCountForBreakingOutOfBesiegedSettlement(MobileParty party, SiegeEvent siegeEvent, ref int __result)
+        {
+            if (party.IsPlayerParty()
+                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoTroopSacrifice, out var noTroopSacrifice)
+                && noTroopSacrifice)
+            {
+                __result = 0;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Patches/Combat/NoTroopSacrificePatch.cs b/Patches/Combat/NoTroopSacrificePatch.cs
deleted file mode 100644
index 90076bb4..00000000
--- a/Patches/Combat/NoTroopSacrificePatch.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using BannerlordCheats.Extensions;
-using BannerlordCheats.Settings;
-using HarmonyLib;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
-using TaleWorlds.Core;
-
-namespace BannerlordCheats.Patches.Combat
-{
-    [HarmonyPatch(typeof(DefaultTroopSacrificeModel), nameof(DefaultTroopSacrificeModel.GetNumberOfTroopsSacrificedForTryingToGetAway))]
-    public static class NoTroopSacrificePatchRunaway
-    {
-        [HarmonyPostfix]
-        public static void GetNumberOfTroopsSacrificedForTryingToGetAway(BattleSideEnum battleSide, MapEvent mapEvent, ref int __result)
-        {
-            if (mapEvent.IsPlayerMapEvent
-                && battleSide == mapEvent.PlayerSide
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoTroopSacrifice, out var noTroopSacrifice)
-                && noTroopSacrifice)
-            {
-                __result = 0;
-            }
-        }
-    }
-
-    [HarmonyPatch(typeof(DefaultTroopSacrificeModel), nameof(DefaultTroopSacrificeModel.GetLostTroopCountForBreakingInBesiegedSettlement))]
-    public static class NoTroopSacrificePatchBreakIn
-    {
-        [HarmonyPostfix]
-        public static void GetLostTroopCountForBreakingInBesiegedSettlement(MobileParty party, SiegeEvent siegeEvent, ref int __result)
-        {
-            if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoTroopSacrifice, out var noTroopSacrifice)
-                && noTroopSacrifice)
-            {
-                __result = 0;
-            }
-        }
-    }
-
-    [HarmonyPatch(typeof(DefaultTroopSacrificeModel), nameof(DefaultTroopSacrificeModel.GetLostTroopCountForBreakingOutOfBesiegedSettlement))]
-    public static class NoTroopSacrificePatchBreakOut
-    {
-        [HarmonyPostfix]
-        public static void GetLostTroopCountForBreakingOutOfBesiegedSettlement(MobileParty party, SiegeEvent siegeEvent, ref int __result)
-        {
-            if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoTroopSacrifice, out var noTroopSacrifice)
-                && noTroopSacrifice)
-            {
-                __result = 0;
-            }
-        }
-    }
-}
diff --git a/Patches/Combat/NoTroopSacrificeRunaway.cs b/Patches/Combat/NoTroopSacrificeRunaway.cs
new file mode 100644
index 00000000..52787c35
--- /dev/null
+++ b/Patches/Combat/NoTroopSacrificeRunaway.cs
@@ -0,0 +1,24 @@
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.Core;
+
+namespace BannerlordCheats.Patches.Combat
+{
+    [HarmonyPatch(typeof(DefaultTroopSacrificeModel), nameof(DefaultTroopSacrificeModel.GetNumberOfTroopsSacrificedForTryingToGetAway))]
+    public static class NoTroopSacrificeRunaway
+    {
+        [HarmonyPostfix]
+        public static void GetNumberOfTroopsSacrificedForTryingToGetAway(BattleSideEnum battleSide, MapEvent mapEvent, ref int __result)
+        {
+            if (mapEvent.IsPlayerMapEvent
+                && battleSide == mapEvent.PlayerSide
+                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoTroopSacrifice, out var noTroopSacrifice)
+                && noTroopSacrifice)
+            {
+                __result = 0;
+            }
+        }
+    }
+}
diff --git a/Patches/Combat/OneHitKillPatch.cs b/Patches/Combat/OneHitKill.cs
similarity index 95%
rename from Patches/Combat/OneHitKillPatch.cs
rename to Patches/Combat/OneHitKill.cs
index 340149df..3846a0a5 100644
--- a/Patches/Combat/OneHitKillPatch.cs
+++ b/Patches/Combat/OneHitKill.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.CalculateDamage))]
-    public static class OneHitKillPatch
+    public static class OneHitKill
     {
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
diff --git a/Patches/Combat/PartyHealthRegen.cs b/Patches/Combat/PartyHealthRegeneration.cs
similarity index 89%
rename from Patches/Combat/PartyHealthRegen.cs
rename to Patches/Combat/PartyHealthRegeneration.cs
index 5e3820c9..a4b6b0a3 100644
--- a/Patches/Combat/PartyHealthRegen.cs
+++ b/Patches/Combat/PartyHealthRegeneration.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
-    public static class PartyHealthRegen
+    public static class PartyHealthRegeneration
     {
         private static int? LastSet = null;
 
@@ -22,9 +22,9 @@ public static void OnApplicationTick(float dt)
             {
                 var now = DateTime.Now.Second;
 
-                if (PartyHealthRegen.LastSet == null || now != PartyHealthRegen.LastSet)
+                if (PartyHealthRegeneration.LastSet == null || now != PartyHealthRegeneration.LastSet)
                 {
-                    PartyHealthRegen.LastSet = now;
+                    PartyHealthRegeneration.LastSet = now;
 
                     var playerPartyAgents = Mission.Current.PlayerTeam.ActiveAgents
                         .Where(x => x.Health > 0
diff --git a/Patches/Combat/PartyHeroesInvincibilityCheatPatch.cs b/Patches/Combat/PartyHeroesInvincible.cs
similarity index 93%
rename from Patches/Combat/PartyHeroesInvincibilityCheatPatch.cs
rename to Patches/Combat/PartyHeroesInvincible.cs
index 9690b1fa..18d574b6 100644
--- a/Patches/Combat/PartyHeroesInvincibilityCheatPatch.cs
+++ b/Patches/Combat/PartyHeroesInvincible.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(Agent), nameof(Agent.Invulnerable), MethodType.Getter)]
-    public static class PartyHeroesInvincibilityCheatPatch
+    public static class PartyHeroesInvincible
     {
         [HarmonyPostfix]
         public static void Invulnerable(ref Agent __instance, ref bool __result)
diff --git a/Patches/Combat/PartyInvincibilityCheatPatch.cs b/Patches/Combat/PartyInvincible.cs
similarity index 93%
rename from Patches/Combat/PartyInvincibilityCheatPatch.cs
rename to Patches/Combat/PartyInvincible.cs
index c832822a..783dd38e 100644
--- a/Patches/Combat/PartyInvincibilityCheatPatch.cs
+++ b/Patches/Combat/PartyInvincible.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(Agent), nameof(Agent.Invulnerable), MethodType.Getter)]
-    public static class PartyInvincibilityCheatPatch
+    public static class PartyInvincible
     {
         [HarmonyPostfix]
         public static void Invulnerable(ref Agent __instance, ref bool __result)
diff --git a/Patches/Combat/PartyOneHitKillPatch.cs b/Patches/Combat/PartyOneHitKill.cs
similarity index 95%
rename from Patches/Combat/PartyOneHitKillPatch.cs
rename to Patches/Combat/PartyOneHitKill.cs
index 4cde2352..82a213eb 100644
--- a/Patches/Combat/PartyOneHitKillPatch.cs
+++ b/Patches/Combat/PartyOneHitKill.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.CalculateDamage))]
-    public static class PartyOneHitKillPatch
+    public static class PartyOneHitKill
     {
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
diff --git a/Patches/Combat/PartyOnlyKnockoutPatch.cs b/Patches/Combat/PartyOnlyKnockout.cs
similarity index 95%
rename from Patches/Combat/PartyOnlyKnockoutPatch.cs
rename to Patches/Combat/PartyOnlyKnockout.cs
index dfc7c060..7d8b5feb 100644
--- a/Patches/Combat/PartyOnlyKnockoutPatch.cs
+++ b/Patches/Combat/PartyOnlyKnockout.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
-    public static class PartyOnlyKnockoutPatch
+    public static class PartyOnlyKnockout
     {
         [HarmonyPostfix]
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
diff --git a/Patches/Combat/PlayerHorseInvinciblePatch.cs b/Patches/Combat/PlayerHorseInvincible.cs
similarity index 93%
rename from Patches/Combat/PlayerHorseInvinciblePatch.cs
rename to Patches/Combat/PlayerHorseInvincible.cs
index 7d97b16b..96aacd4d 100644
--- a/Patches/Combat/PlayerHorseInvinciblePatch.cs
+++ b/Patches/Combat/PlayerHorseInvincible.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(Agent), nameof(Agent.Invulnerable), MethodType.Getter)]
-    public static class PlayerHorseInvinciblePatch
+    public static class PlayerHorseInvincible
     {
         [HarmonyPostfix]
         public static void Invulnerable(ref Agent __instance, ref bool __result)
diff --git a/Patches/Combat/BattleRenownGainPatch.cs b/Patches/Combat/RenownRewardMultiplierBattle.cs
similarity index 94%
rename from Patches/Combat/BattleRenownGainPatch.cs
rename to Patches/Combat/RenownRewardMultiplierBattle.cs
index 6ab69497..26b70c77 100644
--- a/Patches/Combat/BattleRenownGainPatch.cs
+++ b/Patches/Combat/RenownRewardMultiplierBattle.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(DefaultBattleRewardModel), nameof(DefaultBattleRewardModel.CalculateRenownGain))]
-    public static class BattleRenownGainPatch
+    public static class RenownRewardMultiplierBattle
     {
         [HarmonyPostfix]
         public static void CalculateRenownGain(
diff --git a/Patches/Combat/TournamentRenownPatch.cs b/Patches/Combat/RenownRewardMultiplierTournament.cs
similarity index 92%
rename from Patches/Combat/TournamentRenownPatch.cs
rename to Patches/Combat/RenownRewardMultiplierTournament.cs
index 1aa2bad8..067e84e1 100644
--- a/Patches/Combat/TournamentRenownPatch.cs
+++ b/Patches/Combat/RenownRewardMultiplierTournament.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Combat
 {
     [HarmonyPatch(typeof(DefaultTournamentModel), nameof(DefaultTournamentModel.GetRenownReward))]
-    public static class TournamentRenownPatch
+    public static class RenownRewardMultiplierTournament
     {
         [HarmonyPostfix]
         public static void GetRenownReward(Hero winner, Town town, ref int __result)
diff --git a/Patches/Combat/SliceThroughEveryonePassive.cs b/Patches/Combat/SliceThroughEveryonePassive.cs
new file mode 100644
index 00000000..a62aa7cf
--- /dev/null
+++ b/Patches/Combat/SliceThroughEveryonePassive.cs
@@ -0,0 +1,27 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using SandBox;
+using TaleWorlds.MountAndBlade;
+
+namespace BannerlordCheats.Patches.Combat
+{
+    [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.DecidePassiveAttackCollisionReaction))]
+    public static class SliceThroughEveryonePassive
+    {
+        [HarmonyPostfix]
+        public static void DecidePassiveAttackCollisionReaction(
+            ref Agent attacker,
+            ref Agent defender,
+            ref bool isFatalHit,
+            ref MeleeCollisionReaction __result)
+        {
+            if (attacker.IsPlayer()
+                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.SliceThroughEveryone, out var sliceThroughEveryone)
+                && sliceThroughEveryone)
+            {
+                __result = MeleeCollisionReaction.SlicedThrough;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Patches/Combat/AlwaysSliceThroughPatch.cs b/Patches/Combat/SliceThroughEveryoneWeapon.cs
similarity index 54%
rename from Patches/Combat/AlwaysSliceThroughPatch.cs
rename to Patches/Combat/SliceThroughEveryoneWeapon.cs
index 951be919..f312a850 100644
--- a/Patches/Combat/AlwaysSliceThroughPatch.cs
+++ b/Patches/Combat/SliceThroughEveryoneWeapon.cs
@@ -1,32 +1,12 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
-using SandBox;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.DecidePassiveAttackCollisionReaction))]
-    public static class AlwaysSliceThroughPassivePatch
-    {
-        [HarmonyPostfix]
-        public static void DecidePassiveAttackCollisionReaction(
-            ref Agent attacker,
-            ref Agent defender,
-            ref bool isFatalHit,
-            ref MeleeCollisionReaction __result)
-        {
-            if (attacker.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.SliceThroughEveryone, out var sliceThroughEveryone)
-                && sliceThroughEveryone)
-            {
-                __result = MeleeCollisionReaction.SlicedThrough;
-            }
-        }
-    }
-
     [HarmonyPatch(typeof(Mission), "DecideWeaponCollisionReaction")]
-    public static class AlwaysSliceThroughWeaponPatch
+    public static class SliceThroughEveryoneWeapon
     {
         [HarmonyPostfix]
         public static void DecideWeaponCollisionReaction(
diff --git a/Patches/Experience/CompanionExperienceMultiplierPatch.cs b/Patches/Experience/CompanionExperienceMultiplier.cs
similarity index 92%
rename from Patches/Experience/CompanionExperienceMultiplierPatch.cs
rename to Patches/Experience/CompanionExperienceMultiplier.cs
index 3a207cdf..7e15fdbd 100644
--- a/Patches/Experience/CompanionExperienceMultiplierPatch.cs
+++ b/Patches/Experience/CompanionExperienceMultiplier.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Experience
 {
     [HarmonyPatch(typeof(DefaultGenericXpModel), nameof(DefaultGenericXpModel.GetXpMultiplier))]
-    public static class CompanionExperienceMultiplierPatch
+    public static class CompanionExperienceMultiplier
     {
         [HarmonyPostfix]
         public static void GetXpMultiplier(ref Hero hero, ref float __result)
diff --git a/Patches/Experience/CompanionLearningRateMultiplierPatch.cs b/Patches/Experience/CompanionLearningRateMultiplier.cs
similarity index 93%
rename from Patches/Experience/CompanionLearningRateMultiplierPatch.cs
rename to Patches/Experience/CompanionLearningRateMultiplier.cs
index 4f459f09..a80a4d76 100644
--- a/Patches/Experience/CompanionLearningRateMultiplierPatch.cs
+++ b/Patches/Experience/CompanionLearningRateMultiplier.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Experience
 {
     [HarmonyPatch(typeof(DefaultCharacterDevelopmentModel), nameof(DefaultCharacterDevelopmentModel.CalculateLearningRate), typeof(Hero), typeof(SkillObject))]
-    public static class CompanionLearningRateMultiplierPatch
+    public static class CompanionLearningRateMultiplier
     {
         [HarmonyPostfix]
         public static void CalculateLearningRate(ref Hero hero, ref SkillObject skill, ref float __result)
diff --git a/Patches/Experience/ExperienceMultiplierPatch.cs b/Patches/Experience/ExperienceMultiplier.cs
similarity index 93%
rename from Patches/Experience/ExperienceMultiplierPatch.cs
rename to Patches/Experience/ExperienceMultiplier.cs
index d642bdf6..5fa735aa 100644
--- a/Patches/Experience/ExperienceMultiplierPatch.cs
+++ b/Patches/Experience/ExperienceMultiplier.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Experience
 {
     [HarmonyPatch(typeof(DefaultGenericXpModel), nameof(DefaultGenericXpModel.GetXpMultiplier))]
-    public static class ExperienceMultiplierPatch
+    public static class ExperienceMultiplier
     {
         [HarmonyPostfix]
         public static void GetXpMultiplier(Hero hero, ref float __result)
diff --git a/Patches/Experience/FreeFocusAssignmentPatch.cs b/Patches/Experience/FreeFocusPointAssignment.cs
similarity index 92%
rename from Patches/Experience/FreeFocusAssignmentPatch.cs
rename to Patches/Experience/FreeFocusPointAssignment.cs
index 1667238a..48c2ac98 100644
--- a/Patches/Experience/FreeFocusAssignmentPatch.cs
+++ b/Patches/Experience/FreeFocusPointAssignment.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Experience
 {
     [HarmonyPatch(typeof(HeroDeveloper), nameof(HeroDeveloper.GetRequiredFocusPointsToAddFocus))]
-    public static class FreeFocusAssignmentPatch
+    public static class FreeFocusPointAssignment
     {
         [HarmonyPostfix]
         public static void GetRequiredFocusPointsToAddFocus(ref SkillObject skill, ref int __result)
diff --git a/Patches/Experience/LearningLimitMultiplierPatch.cs b/Patches/Experience/LearningLimitMultiplier.cs
similarity index 94%
rename from Patches/Experience/LearningLimitMultiplierPatch.cs
rename to Patches/Experience/LearningLimitMultiplier.cs
index e471c37e..64bb4419 100644
--- a/Patches/Experience/LearningLimitMultiplierPatch.cs
+++ b/Patches/Experience/LearningLimitMultiplier.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Experience
 {
     [HarmonyPatch(typeof(DefaultCharacterDevelopmentModel), nameof(DefaultCharacterDevelopmentModel.CalculateLearningLimit))]
-    public static class LearningLimitMultiplierPatch
+    public static class LearningLimitMultiplier
     {
         [HarmonyPostfix]
         public static void CalculateLearningLimit(
diff --git a/Patches/Experience/LearningRateMultiplierPatch.cs b/Patches/Experience/LearningRateMultiplier.cs
similarity index 94%
rename from Patches/Experience/LearningRateMultiplierPatch.cs
rename to Patches/Experience/LearningRateMultiplier.cs
index f55d5eef..7180fdc9 100644
--- a/Patches/Experience/LearningRateMultiplierPatch.cs
+++ b/Patches/Experience/LearningRateMultiplier.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Experience
 {
     [HarmonyPatch(typeof(DefaultCharacterDevelopmentModel), nameof(DefaultCharacterDevelopmentModel.CalculateLearningRate), new[] { typeof(Hero), typeof(SkillObject) })]
-    public static class LearningRateMultiplierPatch
+    public static class LearningRateMultiplier
     {
         [HarmonyPostfix]
         public static void CalculateLearningRate(ref Hero hero, SkillObject skill, ref float __result)
diff --git a/Patches/Experience/TroopExperienceMultiplierPatch.cs b/Patches/Experience/TroopExperienceMultiplier.cs
similarity index 95%
rename from Patches/Experience/TroopExperienceMultiplierPatch.cs
rename to Patches/Experience/TroopExperienceMultiplier.cs
index df77a5bc..dd215f01 100644
--- a/Patches/Experience/TroopExperienceMultiplierPatch.cs
+++ b/Patches/Experience/TroopExperienceMultiplier.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Experience
 {
     [HarmonyPatch(typeof(DefaultCombatXpModel), nameof(DefaultCombatXpModel.GetXpFromHit))]
-    public static class TroopExperienceMultiplierPatch
+    public static class TroopExperienceMultiplier
     {
         [HarmonyPostfix]
         public static void GetXpFromHit(
diff --git a/Patches/General/EnableHotkeyTipsEncyclopedia.cs b/Patches/General/EnableHotkeyTipsEncyclopedia.cs
new file mode 100644
index 00000000..24bd0c6e
--- /dev/null
+++ b/Patches/General/EnableHotkeyTipsEncyclopedia.cs
@@ -0,0 +1,25 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using SandBox.View.Map;
+
+namespace BannerlordCheats.Patches.General
+{
+    [HarmonyPatch(typeof(MapScreen), nameof(MapScreen.OpenEncyclopedia))]
+    public static class EnableHotkeyTipsEncyclopedia
+    {
+        [HarmonyPostfix]
+        public static void OpenEncyclopedia()
+        {
+            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeys, out var enableHotkeys)
+                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeyTips, out var enableHotkeyTips)
+                && enableHotkeys
+                && enableHotkeyTips)
+            {
+                Message.Show("Encyclopedia Screen Cheat Hotkeys:");
+                Message.Show("CTRL + H: Add 1 soldier of the selected troop type to the party.");
+                Message.Show("CTRL + SHIFT + H: Add 10 soldiers of the selected troop type to the party.");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Patches/General/HotkeyTipsPatch.cs b/Patches/General/EnableHotkeyTipsScreens.cs
similarity index 72%
rename from Patches/General/HotkeyTipsPatch.cs
rename to Patches/General/EnableHotkeyTipsScreens.cs
index ef5c96c2..7ff6059e 100644
--- a/Patches/General/HotkeyTipsPatch.cs
+++ b/Patches/General/EnableHotkeyTipsScreens.cs
@@ -2,13 +2,12 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using SandBox.GauntletUI;
-using SandBox.View.Map;
 using TaleWorlds.Engine.Screens;
 
 namespace BannerlordCheats.Patches.General
 {
     [HarmonyPatch(typeof(ScreenManager), nameof(ScreenManager.PushScreen))]
-    public static class HotkeyTipsPatch
+    public static class EnableHotkeyTipsScreens
     {
         [HarmonyPostfix]
         public static void PushScreen(ref ScreenBase screen)
@@ -46,22 +45,4 @@ public static void PushScreen(ref ScreenBase screen)
             }
         }
     }
-
-    [HarmonyPatch(typeof(MapScreen), nameof(MapScreen.OpenEncyclopedia))]
-    public static class HotkeyTipsPatchEncyclopedia
-    {
-        [HarmonyPostfix]
-        public static void OpenEncyclopedia()
-        {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeys, out var enableHotkeys)
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeyTips, out var enableHotkeyTips)
-                && enableHotkeys
-                && enableHotkeyTips)
-            {
-                Message.Show("Encyclopedia Screen Cheat Hotkeys:");
-                Message.Show("CTRL + H: Add 1 soldier of the selected troop type to the party.");
-                Message.Show("CTRL + SHIFT + H: Add 10 soldiers of the selected troop type to the party.");
-            }
-        }
-    }
 }
diff --git a/Patches/General/AddTroopFromEncyclopediaPatch.cs b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
similarity index 86%
rename from Patches/General/AddTroopFromEncyclopediaPatch.cs
rename to Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
index 41a4a0e5..a389fa51 100644
--- a/Patches/General/AddTroopFromEncyclopediaPatch.cs
+++ b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
@@ -11,7 +11,7 @@
 namespace BannerlordCheats.Patches.General
 {
     [HarmonyPatch(typeof(EncyclopediaPageVM), "OnTick")]
-    public static class AddTroopFromEncyclopediaPatch
+    public static class EnableHotkeysAddEncyclopediaTroops
     {
         [HarmonyPostfix]
         public static void OnTick(ref EncyclopediaPageVM __instance)
@@ -23,11 +23,11 @@ public static void OnTick(ref EncyclopediaPageVM __instance)
             {
                 if (Keys.IsKeyPressed(InputKey.H, InputKey.LeftShift, InputKey.LeftControl))
                 {
-                    AddTroopFromEncyclopediaPatch.AddTroops(characterObject, 10);
+                    EnableHotkeysAddEncyclopediaTroops.AddTroops(characterObject, 10);
                 }
                 else if (Keys.IsKeyPressed(InputKey.H, InputKey.LeftControl))
                 {
-                    AddTroopFromEncyclopediaPatch.AddTroops(characterObject, 1);
+                    EnableHotkeysAddEncyclopediaTroops.AddTroops(characterObject, 1);
                 }
             }
         }
diff --git a/Patches/General/AddItemsCheatPatch.cs b/Patches/General/EnableHotkeysAddItems.cs
similarity index 92%
rename from Patches/General/AddItemsCheatPatch.cs
rename to Patches/General/EnableHotkeysAddItems.cs
index a15eee25..7848f2a0 100644
--- a/Patches/General/AddItemsCheatPatch.cs
+++ b/Patches/General/EnableHotkeysAddItems.cs
@@ -13,7 +13,7 @@
 namespace BannerlordCheats.Patches.General
 {
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
-    public static class AddItemsCheatPatch
+    public static class EnableHotkeysAddItems
     {
         [HarmonyPostfix]
         public static void OnApplicationTick()
@@ -24,11 +24,11 @@ public static void OnApplicationTick()
             {
                 if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.LeftShift, InputKey.H))
                 {
-                    AddItemsCheatPatch.AddItems(100);
+                    EnableHotkeysAddItems.AddItems(100);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.H))
                 {
-                    AddItemsCheatPatch.AddItems(1);
+                    EnableHotkeysAddItems.AddItems(1);
                 }
             }
         }
diff --git a/Patches/General/CharacterAttributesCheatPatch.cs b/Patches/General/EnableHotkeysCharacterAttributes.cs
similarity index 98%
rename from Patches/General/CharacterAttributesCheatPatch.cs
rename to Patches/General/EnableHotkeysCharacterAttributes.cs
index 63e71956..991ccecb 100644
--- a/Patches/General/CharacterAttributesCheatPatch.cs
+++ b/Patches/General/EnableHotkeysCharacterAttributes.cs
@@ -14,7 +14,7 @@
 namespace BannerlordCheats.Patches.General
 {
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
-    public static class CharacterAttributesCheatPatch
+    public static class EnableHotkeysCharacterAttributes
     {
         [HarmonyPostfix]
         public static void OnApplicationTick()
diff --git a/Patches/General/AddCharacterPointsPatch.cs b/Patches/General/EnableHotkeysCharacterPoints.cs
similarity index 97%
rename from Patches/General/AddCharacterPointsPatch.cs
rename to Patches/General/EnableHotkeysCharacterPoints.cs
index ad342bda..fd53571e 100644
--- a/Patches/General/AddCharacterPointsPatch.cs
+++ b/Patches/General/EnableHotkeysCharacterPoints.cs
@@ -13,7 +13,7 @@
 namespace BannerlordCheats.Patches.General
 {
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
-    public static class AddCharacterPointsPatch
+    public static class EnableHotkeysCharacterPoints
     {
         [HarmonyPostfix]
         public static void OnApplicationTick()
diff --git a/Patches/General/InfluenceCheatPatch.cs b/Patches/General/EnableHotkeysInfluence.cs
similarity index 95%
rename from Patches/General/InfluenceCheatPatch.cs
rename to Patches/General/EnableHotkeysInfluence.cs
index e8eada30..6ddc44bc 100644
--- a/Patches/General/InfluenceCheatPatch.cs
+++ b/Patches/General/EnableHotkeysInfluence.cs
@@ -13,7 +13,7 @@
 namespace BannerlordCheats.Patches.General
 {
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
-    public static class InfluenceCheatPatch
+    public static class EnableHotkeysInfluence
     {
         [HarmonyPostfix]
         public static void OnApplicationTick()
diff --git a/Patches/General/MoneyCheatPatch.cs b/Patches/General/EnableHotkeysMoney.cs
similarity index 97%
rename from Patches/General/MoneyCheatPatch.cs
rename to Patches/General/EnableHotkeysMoney.cs
index a48f117f..98468183 100644
--- a/Patches/General/MoneyCheatPatch.cs
+++ b/Patches/General/EnableHotkeysMoney.cs
@@ -13,7 +13,7 @@
 namespace BannerlordCheats.Patches.General
 {
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
-    public static class MoneyCheatPatch
+    public static class EnableHotkeysMoney
     {
         [HarmonyPostfix]
         public static void OnApplicationTick()
diff --git a/Patches/General/TroopCountCheatPatch.cs b/Patches/General/EnableHotkeysTroopCount.cs
similarity index 92%
rename from Patches/General/TroopCountCheatPatch.cs
rename to Patches/General/EnableHotkeysTroopCount.cs
index b25416d9..b766fdc7 100644
--- a/Patches/General/TroopCountCheatPatch.cs
+++ b/Patches/General/EnableHotkeysTroopCount.cs
@@ -14,7 +14,7 @@
 namespace BannerlordCheats.Patches.General
 {
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
-    public static class TroopCountCheatPatch
+    public static class EnableHotkeysTroopCount
     {
         [HarmonyPostfix]
         public static void OnApplicationTick()
@@ -25,11 +25,11 @@ public static void OnApplicationTick()
             {
                 if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.LeftShift, InputKey.H))
                 {
-                    TroopCountCheatPatch.AddTroops(10);
+                    EnableHotkeysTroopCount.AddTroops(10);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.H))
                 {
-                    TroopCountCheatPatch.AddTroops(1);
+                    EnableHotkeysTroopCount.AddTroops(1);
                 }
             }
         }
diff --git a/Patches/General/TroopExperienceCheatPatch.cs b/Patches/General/EnableHotkeysTroopExperience.cs
similarity index 97%
rename from Patches/General/TroopExperienceCheatPatch.cs
rename to Patches/General/EnableHotkeysTroopExperience.cs
index 7cde5c9e..e32c2aaf 100644
--- a/Patches/General/TroopExperienceCheatPatch.cs
+++ b/Patches/General/EnableHotkeysTroopExperience.cs
@@ -14,7 +14,7 @@
 namespace BannerlordCheats.Patches.General
 {
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
-    public static class TroopExperienceCheatPatch
+    public static class EnableHotkeysTroopExperience
     {
         [HarmonyPostfix]
         public static void OnApplicationTick()
diff --git a/Patches/Inventory/DefaultInventoryCapacityModelPatch.cs b/Patches/Inventory/ExtraInventoryCapacity.cs
similarity index 94%
rename from Patches/Inventory/DefaultInventoryCapacityModelPatch.cs
rename to Patches/Inventory/ExtraInventoryCapacity.cs
index c7b52f7d..2748ed6c 100644
--- a/Patches/Inventory/DefaultInventoryCapacityModelPatch.cs
+++ b/Patches/Inventory/ExtraInventoryCapacity.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Inventory
 {
     [HarmonyPatch(typeof(DefaultInventoryCapacityModel), nameof(DefaultInventoryCapacityModel.CalculateInventoryCapacity))]
-    public static class DefaultInventoryCapacityModelPatch
+    public static class ExtraInventoryCapacity
     {
         [HarmonyPostfix]
         public static void CalculateInventoryCapacity(ref MobileParty mobileParty, ref bool includeDescriptions, ref int additionalTroops, ref int additionalSpareMounts, ref int additionalPackAnimals, ref bool includeFollowers, ref ExplainedNumber __result)
diff --git a/Patches/Inventory/NativeItemSpawningPatch.cs b/Patches/Inventory/NativeItemSpawning.cs
similarity index 97%
rename from Patches/Inventory/NativeItemSpawningPatch.cs
rename to Patches/Inventory/NativeItemSpawning.cs
index 37b386ab..2083240a 100644
--- a/Patches/Inventory/NativeItemSpawningPatch.cs
+++ b/Patches/Inventory/NativeItemSpawning.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Inventory
 {
     [HarmonyPatch(typeof(InventoryLogic), nameof(InventoryLogic.Initialize), typeof(ItemRoster), typeof(MobileParty), typeof(bool), typeof(bool), typeof(CharacterObject), typeof(InventoryManager.InventoryCategoryType), typeof(IMarketData), typeof(bool), typeof(TextObject))]
-    public static class NativeItemSpawningPatch
+    public static class NativeItemSpawning
     {
         [HarmonyPostfix]
         public static void Initialize(
diff --git a/Patches/Kingdom/DecisionOverrideInfluenceCostPatch.cs b/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
similarity index 94%
rename from Patches/Kingdom/DecisionOverrideInfluenceCostPatch.cs
rename to Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
index 97f86bc0..e7448937 100644
--- a/Patches/Kingdom/DecisionOverrideInfluenceCostPatch.cs
+++ b/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Kingdom
 {
     [HarmonyPatch(typeof(DefaultClanPoliticsModel), nameof(DefaultClanPoliticsModel.GetInfluenceRequiredToOverrideKingdomDecision))]
-    public static class DecisionOverrideInfluenceCostPatch
+    public static class DecisionOverrideInfluenceCostPercentage
     {
         [HarmonyPostfix]
         public static void GetInfluenceRequiredToOverrideKingdomDecision(
diff --git a/Patches/Kingdom/ForceKingdomDecisionPatch.cs b/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs
similarity index 92%
rename from Patches/Kingdom/ForceKingdomDecisionPatch.cs
rename to Patches/Kingdom/KingdomDecisionWeightMultiplier.cs
index 48547329..d4b8e4ed 100644
--- a/Patches/Kingdom/ForceKingdomDecisionPatch.cs
+++ b/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Kingdom
 {
     [HarmonyPatch(typeof(DecisionOutcome), nameof(DecisionOutcome.TotalSupportPoints), MethodType.Getter)]
-    public static class TotalSupportPoints
+    public static class KingdomDecisionWeightMultiplier
     {
         [HarmonyPostfix]
         public static void Getter(ref DecisionOutcome __instance, ref float __result)
diff --git a/Patches/Kingdom/NoCrimeRatingPatch.cs b/Patches/Kingdom/NoCrimeRatingForCrimes.cs
similarity index 93%
rename from Patches/Kingdom/NoCrimeRatingPatch.cs
rename to Patches/Kingdom/NoCrimeRatingForCrimes.cs
index cbe3e067..a2fd1d5f 100644
--- a/Patches/Kingdom/NoCrimeRatingPatch.cs
+++ b/Patches/Kingdom/NoCrimeRatingForCrimes.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Kingdom
 {
     [HarmonyPatch(typeof(DefaultCrimeModel), nameof(DefaultCrimeModel.GetCrimeRatingOf))]
-    public static class NoCrimeRatingPatch
+    public static class NoCrimeRatingForCrimes
     {
         [HarmonyPostfix]
         public static void GetCrimeRatingOf(ref CrimeModel.CrimeType crime, ref object[] additionalArgs, ref float __result)
diff --git a/Patches/Kingdom/NoRelationshipLossOnArmyDisband.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
similarity index 91%
rename from Patches/Kingdom/NoRelationshipLossOnArmyDisband.cs
rename to Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
index ef09feaf..437521d5 100644
--- a/Patches/Kingdom/NoRelationshipLossOnArmyDisband.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
@@ -5,7 +5,7 @@
 namespace BannerlordCheats.Patches.Kingdom
 {
     [HarmonyPatch(typeof(DefaultDiplomacyModel), nameof(DefaultDiplomacyModel.GetRelationCostOfDisbandingArmy))]
-    public static class NoRelationshipLossOnArmyDisband
+    public static class NoRelationshipLossOnDecisionArmyDisband
     {
         [HarmonyPostfix]
         public static void GetRelationCostOfDisbandingArmy(bool isLeaderParty, ref int __result)
diff --git a/Patches/Kingdom/NoRelationshipLossOnExpellingClan.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
similarity index 91%
rename from Patches/Kingdom/NoRelationshipLossOnExpellingClan.cs
rename to Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
index 5f8a994d..771b53c0 100644
--- a/Patches/Kingdom/NoRelationshipLossOnExpellingClan.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
@@ -5,7 +5,7 @@
 namespace BannerlordCheats.Patches.Kingdom
 {
     [HarmonyPatch(typeof(DefaultDiplomacyModel), nameof(DefaultDiplomacyModel.GetRelationCostOfExpellingClanFromKingdom))]
-    public static class NoRelationshipLossOnExpellingClan
+    public static class NoRelationshipLossOnDecisionExpellingClan
     {
         [HarmonyPostfix]
         public static void GetRelationCostOfExpellingClanFromKingdom(ref int __result)
diff --git a/Patches/Kingdom/NoRelationshipLossOnDecisionPatch.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs
similarity index 91%
rename from Patches/Kingdom/NoRelationshipLossOnDecisionPatch.cs
rename to Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs
index 9a53245c..5ddb72ef 100644
--- a/Patches/Kingdom/NoRelationshipLossOnDecisionPatch.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Kingdom
 {
     [HarmonyPatch(typeof(KingdomElection), nameof(KingdomElection.GetRelationChangeWithSponsor))]
-    public static class NoRelationshipLossOnDecisionPatch
+    public static class NoRelationshipLossOnDecisionKingdomDecision
     {
         [HarmonyPostfix]
         public static void GetRelationChangeWithSponsor(Supporter.SupportWeights supportWeight, bool isOpposingSides, ref int __result)
diff --git a/Patches/Map/DefaultPartySpeedCalculatingModelPatch.cs b/Patches/Map/MapSpeedMultiplier.cs
similarity index 92%
rename from Patches/Map/DefaultPartySpeedCalculatingModelPatch.cs
rename to Patches/Map/MapSpeedMultiplier.cs
index 4f79031f..261c6e37 100644
--- a/Patches/Map/DefaultPartySpeedCalculatingModelPatch.cs
+++ b/Patches/Map/MapSpeedMultiplier.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Map
 {
     // [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
-    // public static class DefaultPartySpeedCalculatingModelPatch
+    // public static class MapSpeedMultiplier
     // {
     //     [HarmonyPostfix]
     //     public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
diff --git a/Patches/Map/DefaultMapVisibilityModelPatch.cs b/Patches/Map/MapVisibilityMultiplier.cs
similarity index 93%
rename from Patches/Map/DefaultMapVisibilityModelPatch.cs
rename to Patches/Map/MapVisibilityMultiplier.cs
index 7957a850..4515af69 100644
--- a/Patches/Map/DefaultMapVisibilityModelPatch.cs
+++ b/Patches/Map/MapVisibilityMultiplier.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Map
 {
     [HarmonyPatch(typeof(DefaultMapVisibilityModel), nameof(DefaultMapVisibilityModel.GetPartySpottingRange))]
-    public static class DefaultMapVisibilityModelPatch
+    public static class MapVisibilityMultiplier
     {
         [HarmonyPostfix]
         public static void GetPartySpottingRange(ref MobileParty party, ref bool includeDescriptions, ref ExplainedNumber __result)
diff --git a/Patches/Map/SlowDownPartiesOnMap.cs b/Patches/Map/NpcMapSpeedPercentage.cs
similarity index 94%
rename from Patches/Map/SlowDownPartiesOnMap.cs
rename to Patches/Map/NpcMapSpeedPercentage.cs
index aa32c070..88c7fa62 100644
--- a/Patches/Map/SlowDownPartiesOnMap.cs
+++ b/Patches/Map/NpcMapSpeedPercentage.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Map
 {
     // [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
-    // public static class SlowDownPartiesOnMap
+    // public static class NpcMapSpeedPercentage
     // {
     //     [HarmonyPostfix]
     //     public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
diff --git a/Patches/Party/PartyMemberSizeLimitPatch.cs b/Patches/Party/ExtraPartyMemberSize.cs
similarity index 93%
rename from Patches/Party/PartyMemberSizeLimitPatch.cs
rename to Patches/Party/ExtraPartyMemberSize.cs
index b6b50a1b..28f45db1 100644
--- a/Patches/Party/PartyMemberSizeLimitPatch.cs
+++ b/Patches/Party/ExtraPartyMemberSize.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Party
 {
     [HarmonyPatch(typeof(DefaultPartySizeLimitModel), nameof(DefaultPartySizeLimitModel.GetPartyMemberSizeLimit))]
-    public static class PartyMemberSizeLimitPatch
+    public static class ExtraPartyMemberSize
     {
         [HarmonyPostfix]
         public static void GetPartyMemberSizeLimit(ref PartyBase party, ref bool includeDescriptions, ref ExplainedNumber __result)
diff --git a/Patches/Party/PartyMoralePatch.cs b/Patches/Party/ExtraPartyMorale.cs
similarity index 94%
rename from Patches/Party/PartyMoralePatch.cs
rename to Patches/Party/ExtraPartyMorale.cs
index 175291b8..1145733e 100644
--- a/Patches/Party/PartyMoralePatch.cs
+++ b/Patches/Party/ExtraPartyMorale.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Party
 {
     [HarmonyPatch(typeof(DefaultPartyMoraleModel), nameof(DefaultPartyMoraleModel.GetEffectivePartyMorale))]
-    public static class PartyMoralePatch
+    public static class ExtraPartyMorale
     {
         [HarmonyPostfix]
         public static void GetEffectivePartyMorale(ref MobileParty mobileParty, ref bool includeDescription, ref ExplainedNumber __result)
diff --git a/Patches/Party/PartyPrisonerSizeLimitPatch.cs b/Patches/Party/ExtraPartyPrisonerSize.cs
similarity index 93%
rename from Patches/Party/PartyPrisonerSizeLimitPatch.cs
rename to Patches/Party/ExtraPartyPrisonerSize.cs
index ff48ab2e..4321a41c 100644
--- a/Patches/Party/PartyPrisonerSizeLimitPatch.cs
+++ b/Patches/Party/ExtraPartyPrisonerSize.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Party
 {
     [HarmonyPatch(typeof(DefaultPartySizeLimitModel), nameof(DefaultPartySizeLimitModel.GetPartyPrisonerSizeLimit))]
-    public static class PartyPrisonerSizeLimitPatch
+    public static class ExtraPartyPrisonerSize
     {
         [HarmonyPostfix]
         public static void GetPartyPrisonerSizeLimit(ref PartyBase party, ref bool includeDescriptions, ref ExplainedNumber __result)
diff --git a/Patches/Party/NoFoodConsumptionPatch.cs b/Patches/Party/FoodConsumptionPercentage.cs
similarity index 94%
rename from Patches/Party/NoFoodConsumptionPatch.cs
rename to Patches/Party/FoodConsumptionPercentage.cs
index 856d4e33..43958910 100644
--- a/Patches/Party/NoFoodConsumptionPatch.cs
+++ b/Patches/Party/FoodConsumptionPercentage.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Party
 {
     [HarmonyPatch(typeof(DefaultMobilePartyFoodConsumptionModel), nameof(DefaultMobilePartyFoodConsumptionModel.CalculateDailyFoodConsumptionf))]
-    public static class NoFoodConsumptionPatch
+    public static class FoodConsumptionPercentage
     {
         [HarmonyPostfix]
         public static void CalculateDailyFoodConsumptionf(ref MobileParty party, ref bool includeDescription, ref ExplainedNumber __result)
diff --git a/Patches/Party/CompanionHiringPricePatch.cs b/Patches/Party/FreeCompanionHiring.cs
similarity index 93%
rename from Patches/Party/CompanionHiringPricePatch.cs
rename to Patches/Party/FreeCompanionHiring.cs
index 82f6c32c..6ea1928f 100644
--- a/Patches/Party/CompanionHiringPricePatch.cs
+++ b/Patches/Party/FreeCompanionHiring.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Party
 {
     [HarmonyPatch(typeof(DefaultCompanionHiringPriceCalculationModel), nameof(DefaultCompanionHiringPriceCalculationModel.GetCompanionHiringPrice))]
-    public static class CompanionHiringPricePatch
+    public static class FreeCompanionHiring
     {
         [HarmonyPostfix]
         public static void GetCompanionHiringPrice(Hero companion, ref int __result)
diff --git a/Patches/Party/FreeTroopUpgradesPatch.cs b/Patches/Party/FreeTroopUpgrades.cs
similarity index 94%
rename from Patches/Party/FreeTroopUpgradesPatch.cs
rename to Patches/Party/FreeTroopUpgrades.cs
index 26c9c1e3..5eb88ec9 100644
--- a/Patches/Party/FreeTroopUpgradesPatch.cs
+++ b/Patches/Party/FreeTroopUpgrades.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Party
 {
     [HarmonyPatch(typeof(DefaultPartyTroopUpgradeModel), nameof(DefaultPartyTroopUpgradeModel.GetGoldCostForUpgrade))]
-    public static class FreeTroopUpgradesPatch
+    public static class FreeTroopUpgrades
     {
         [HarmonyPostfix]
         public static void GetGoldCostForUpgrade(ref PartyBase party, ref CharacterObject characterObject, ref CharacterObject upgradeTarget, ref int __result)
diff --git a/Patches/Party/RecruitPrisonersPatch.cs b/Patches/Party/InstantPrisonerRecruitment.cs
similarity index 94%
rename from Patches/Party/RecruitPrisonersPatch.cs
rename to Patches/Party/InstantPrisonerRecruitment.cs
index bf422f6c..db45a640 100644
--- a/Patches/Party/RecruitPrisonersPatch.cs
+++ b/Patches/Party/InstantPrisonerRecruitment.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Party
 {
     [HarmonyPatch(typeof(DefaultPrisonerRecruitmentCalculationModel), nameof(DefaultPrisonerRecruitmentCalculationModel.CalculateRecruitableNumber))]
-    public static class RecruitPrisonersPatch
+    public static class InstantPrisonerRecruitment
     {
         [HarmonyPostfix]
         public static void  CalculateRecruitableNumber(ref PartyBase party, ref CharacterObject character, ref int __result)
diff --git a/Patches/Party/NoPrisonerEscapePatch.cs b/Patches/Party/NoPrisonerEscape.cs
similarity index 94%
rename from Patches/Party/NoPrisonerEscapePatch.cs
rename to Patches/Party/NoPrisonerEscape.cs
index b935b2e0..573e766c 100644
--- a/Patches/Party/NoPrisonerEscapePatch.cs
+++ b/Patches/Party/NoPrisonerEscape.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Party
 {
     [HarmonyPatch(typeof(EndCaptivityAction), nameof(EndCaptivityAction.ApplyByEscape))]
-    public static class NoPrisonerEscapePatch
+    public static class NoPrisonerEscape
     {
         [HarmonyPrefix]
         public static bool ApplyByEscape(Hero character, Hero facilitator)
diff --git a/Patches/Party/PartyHealingPatch.cs b/Patches/Party/PartyHealingMultiplierHeroes.cs
similarity index 54%
rename from Patches/Party/PartyHealingPatch.cs
rename to Patches/Party/PartyHealingMultiplierHeroes.cs
index a6cc1382..ca6dbcbc 100644
--- a/Patches/Party/PartyHealingPatch.cs
+++ b/Patches/Party/PartyHealingMultiplierHeroes.cs
@@ -6,22 +6,8 @@
 
 namespace BannerlordCheats.Patches.Party
 {
-    [HarmonyPatch(typeof(DefaultPartyHealingModel), nameof(DefaultPartyHealingModel.GetDailyHealingForRegulars))]
-    public static class PartyHealingPatchRegulars
-    {
-        [HarmonyPostfix]
-        public static void GetDailyHealingForRegulars(ref MobileParty party, ref bool includeDescriptions, ref ExplainedNumber __result)
-        {
-            if (party.IsPlayerParty()
-            && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PartyHealingMultiplier, out var partyHealingMultiplier))
-            {
-                __result.AddMultiplier(partyHealingMultiplier);
-            }
-        }
-    }
-
     [HarmonyPatch(typeof(DefaultPartyHealingModel), nameof(DefaultPartyHealingModel.GetDailyHealingHpForHeroes))]
-    public static class PartyHealingPatchHeroes
+    public static class PartyHealingMultiplierHeroes
     {
         [HarmonyPostfix]
         public static void GetDailyHealingHpForHeroes(ref MobileParty party, ref bool includeDescriptions, ref ExplainedNumber __result)
@@ -33,4 +19,4 @@ public static void GetDailyHealingHpForHeroes(ref MobileParty party, ref bool in
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Patches/Party/PartyHealingMultiplierTroops.cs b/Patches/Party/PartyHealingMultiplierTroops.cs
new file mode 100644
index 00000000..63d85dbf
--- /dev/null
+++ b/Patches/Party/PartyHealingMultiplierTroops.cs
@@ -0,0 +1,22 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+
+namespace BannerlordCheats.Patches.Party
+{
+    [HarmonyPatch(typeof(DefaultPartyHealingModel), nameof(DefaultPartyHealingModel.GetDailyHealingForRegulars))]
+    public static class PartyHealingMultiplierTroops
+    {
+        [HarmonyPostfix]
+        public static void GetDailyHealingForRegulars(ref MobileParty party, ref bool includeDescriptions, ref ExplainedNumber __result)
+        {
+            if (party.IsPlayerParty()
+            && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PartyHealingMultiplier, out var partyHealingMultiplier))
+            {
+                __result.AddMultiplier(partyHealingMultiplier);
+            }
+        }
+    }
+}
diff --git a/Patches/Party/NoTroopWagesPatch.cs b/Patches/Party/TroopWagesPercentage.cs
similarity index 94%
rename from Patches/Party/NoTroopWagesPatch.cs
rename to Patches/Party/TroopWagesPercentage.cs
index a371aaf7..f5f78295 100644
--- a/Patches/Party/NoTroopWagesPatch.cs
+++ b/Patches/Party/TroopWagesPercentage.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Party
 {
     // [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTotalWage))]
-    // public static class NoTroopWagesPatch
+    // public static class TroopWagesPercentage
     // {
     //     [HarmonyPostfix]
     //     public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
diff --git a/Patches/Settlements/SettlementFoodStocksPatch.cs b/Patches/Settlements/DailyFoodBonus.cs
similarity index 91%
rename from Patches/Settlements/SettlementFoodStocksPatch.cs
rename to Patches/Settlements/DailyFoodBonus.cs
index bc1b83cb..78f7c965 100644
--- a/Patches/Settlements/SettlementFoodStocksPatch.cs
+++ b/Patches/Settlements/DailyFoodBonus.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Settlements
 {
     [HarmonyPatch(typeof(Town), nameof(Town.FoodChange), MethodType.Getter)]
-    public static class SettlementFoodStocksChangePatch
+    public static class DailyFoodBonus
     {
         [HarmonyPostfix]
         public static void FoodChange(ref Town __instance, ref float __result)
diff --git a/Patches/Settlements/GarrisonGrowthPatch.cs b/Patches/Settlements/DailyGarrisonBonus.cs
similarity index 93%
rename from Patches/Settlements/GarrisonGrowthPatch.cs
rename to Patches/Settlements/DailyGarrisonBonus.cs
index bf9ec9ee..279cd7dd 100644
--- a/Patches/Settlements/GarrisonGrowthPatch.cs
+++ b/Patches/Settlements/DailyGarrisonBonus.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Settlements
 {
     [HarmonyPatch(typeof(Town), nameof(Town.GarrisonChange), MethodType.Getter)]
-    public static class GarrisonGrowthPatch
+    public static class DailyGarrisonBonus
     {
         [HarmonyPostfix]
         public static void GarrisonChange(ref Town __instance, ref int __result)
diff --git a/Patches/Settlements/HearthsPatch.cs b/Patches/Settlements/DailyHearthsBonus.cs
similarity index 93%
rename from Patches/Settlements/HearthsPatch.cs
rename to Patches/Settlements/DailyHearthsBonus.cs
index 873b28d5..da986429 100644
--- a/Patches/Settlements/HearthsPatch.cs
+++ b/Patches/Settlements/DailyHearthsBonus.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Settlements
 {
     [HarmonyPatch(typeof(Village), nameof(Village.HearthChange), MethodType.Getter)]
-    public static class HearthsPatch
+    public static class DailyHearthsBonus
     {
         [HarmonyPostfix]
         public static void HearthChange(ref Village __instance, ref float __result)
diff --git a/Patches/Settlements/LoyaltyPatch.cs b/Patches/Settlements/DailyLoyaltyBonus.cs
similarity index 93%
rename from Patches/Settlements/LoyaltyPatch.cs
rename to Patches/Settlements/DailyLoyaltyBonus.cs
index 8af94de7..30c662ba 100644
--- a/Patches/Settlements/LoyaltyPatch.cs
+++ b/Patches/Settlements/DailyLoyaltyBonus.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Settlements
 {
     [HarmonyPatch(typeof(Town), nameof(Town.LoyaltyChange), MethodType.Getter)]
-    public static class LoyaltyPatch
+    public static class DailyLoyaltyBonus
     {
         [HarmonyPostfix]
         public static void LoyaltyChange(ref Town __instance, ref float __result)
diff --git a/Patches/Settlements/DailyMilitiaBonusTown.cs b/Patches/Settlements/DailyMilitiaBonusTown.cs
new file mode 100644
index 00000000..f9291980
--- /dev/null
+++ b/Patches/Settlements/DailyMilitiaBonusTown.cs
@@ -0,0 +1,21 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using TaleWorlds.CampaignSystem;
+
+namespace BannerlordCheats.Patches.Settlements
+{
+    [HarmonyPatch(typeof(Town), nameof(Town.MilitiaChange), MethodType.Getter)]
+    public static class DailyMilitiaBonusTown
+    {
+        [HarmonyPostfix]
+        public static void MilitiaChange(ref Town __instance, ref float __result)
+        {
+            if (__instance.IsPlayerTown()
+                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.DailyMilitiaBonus, out var dailyMilitiaBonus))
+            {
+                __result += dailyMilitiaBonus;
+            }
+        }
+    }
+}
diff --git a/Patches/Settlements/MilitiaGrowthPatch.cs b/Patches/Settlements/DailyMilitiaBonusVillage.cs
similarity index 53%
rename from Patches/Settlements/MilitiaGrowthPatch.cs
rename to Patches/Settlements/DailyMilitiaBonusVillage.cs
index abfab402..37c403a1 100644
--- a/Patches/Settlements/MilitiaGrowthPatch.cs
+++ b/Patches/Settlements/DailyMilitiaBonusVillage.cs
@@ -5,22 +5,8 @@
 
 namespace BannerlordCheats.Patches.Settlements
 {
-    [HarmonyPatch(typeof(Town), nameof(Town.MilitiaChange), MethodType.Getter)]
-    public static class MilitiaGrowthTownPatch
-    {
-        [HarmonyPostfix]
-        public static void MilitiaChange(ref Town __instance, ref float __result)
-        {
-            if (__instance.IsPlayerTown()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.DailyMilitiaBonus, out var dailyMilitiaBonus))
-            {
-                __result += dailyMilitiaBonus;
-            }
-        }
-    }
-
     [HarmonyPatch(typeof(Village), nameof(Village.MilitiaChange), MethodType.Getter)]
-    public static class MilitiaGrowthVillagePatch
+    public static class DailyMilitiaBonusVillage
     {
         [HarmonyPostfix]
         public static void MilitiaChange(ref Village __instance, ref float __result)
@@ -32,4 +18,4 @@ public static void MilitiaChange(ref Village __instance, ref float __result)
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Patches/Settlements/ProsperityPatch.cs b/Patches/Settlements/DailyProsperityBonus.cs
similarity index 93%
rename from Patches/Settlements/ProsperityPatch.cs
rename to Patches/Settlements/DailyProsperityBonus.cs
index b49c81e6..8c8b42c9 100644
--- a/Patches/Settlements/ProsperityPatch.cs
+++ b/Patches/Settlements/DailyProsperityBonus.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Settlements
 {
     [HarmonyPatch(typeof(Town), nameof(Town.ProsperityChange), MethodType.Getter)]
-    public static class ProsperityPatch
+    public static class DailyProsperityBonus
     {
         [HarmonyPostfix]
         public static void ProsperityChange(ref Town __instance, ref float __result)
diff --git a/Patches/Settlements/SecurityPatch.cs b/Patches/Settlements/DailySecurityBonus.cs
similarity index 93%
rename from Patches/Settlements/SecurityPatch.cs
rename to Patches/Settlements/DailySecurityBonus.cs
index d276fb7c..096f1d61 100644
--- a/Patches/Settlements/SecurityPatch.cs
+++ b/Patches/Settlements/DailySecurityBonus.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Settlements
 {
     [HarmonyPatch(typeof(Town), nameof(Town.SecurityChange), MethodType.Getter)]
-    public static class SecurityPatch
+    public static class DailySecurityBonus
     {
         [HarmonyPostfix]
         public static void SecurityChange(ref Town __instance, ref float __result)
diff --git a/Patches/Settlements/DisguiseAlwaysWorksPatch.cs b/Patches/Settlements/DisguiseAlwaysWorks.cs
similarity index 93%
rename from Patches/Settlements/DisguiseAlwaysWorksPatch.cs
rename to Patches/Settlements/DisguiseAlwaysWorks.cs
index 5f6e317c..48ef6a85 100644
--- a/Patches/Settlements/DisguiseAlwaysWorksPatch.cs
+++ b/Patches/Settlements/DisguiseAlwaysWorks.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Settlements
 {
     [HarmonyPatch(typeof(DefaultDisguiseDetectionModel), nameof(DefaultDisguiseDetectionModel.CalculateDisguiseDetectionProbability))]
-    public static class DisguiseAlwaysWorksPatch
+    public static class DisguiseAlwaysWorks
     {
         [HarmonyPostfix]
         public static void CalculateDisguiseDetectionProbability(Settlement settlement, ref float __result)
diff --git a/Patches/Settlements/GarrisonWagesPatch.cs b/Patches/Settlements/GarrisonWagesPercentage.cs
similarity index 94%
rename from Patches/Settlements/GarrisonWagesPatch.cs
rename to Patches/Settlements/GarrisonWagesPercentage.cs
index 970dabed..d83b0da6 100644
--- a/Patches/Settlements/GarrisonWagesPatch.cs
+++ b/Patches/Settlements/GarrisonWagesPercentage.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Settlements
 {
     // [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTotalWage))]
-    // public static class GarrisonWagesPatch
+    // public static class GarrisonWagesPercentage
     // {
     //     [HarmonyPostfix]
     //     public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
diff --git a/Patches/Settlements/TradeCostPercentage.cs b/Patches/Settlements/ItemTradingCostPercentage.cs
similarity index 95%
rename from Patches/Settlements/TradeCostPercentage.cs
rename to Patches/Settlements/ItemTradingCostPercentage.cs
index 20cc9319..449b2ccf 100644
--- a/Patches/Settlements/TradeCostPercentage.cs
+++ b/Patches/Settlements/ItemTradingCostPercentage.cs
@@ -9,7 +9,7 @@
 namespace BannerlordCheats.Patches.Settlements
 {
     [HarmonyPatch(typeof(DefaultTradeItemPriceFactorModel), nameof(DefaultTradeItemPriceFactorModel.GetPrice))]
-    public static class TradeCostPercentage
+    public static class ItemTradingCostPercentage
     {
         [HarmonyPostfix]
         public static void GetPrice(EquipmentElement itemRosterElement, MobileParty clientParty, PartyBase merchant, bool isSelling, float inStoreValue, float supply, float demand, ref int __result)
diff --git a/Patches/Settlements/EnterWithFullEquipment.cs b/Patches/Settlements/NeverRequireCivilianEquipment.cs
similarity index 92%
rename from Patches/Settlements/EnterWithFullEquipment.cs
rename to Patches/Settlements/NeverRequireCivilianEquipment.cs
index cb06d1ea..75f553e9 100644
--- a/Patches/Settlements/EnterWithFullEquipment.cs
+++ b/Patches/Settlements/NeverRequireCivilianEquipment.cs
@@ -5,7 +5,7 @@
 namespace BannerlordCheats.Patches.Settlements
 {
     [HarmonyPatch(typeof(Mission), nameof(Mission.DoesMissionRequireCivilianEquipment), MethodType.Getter)]
-    public static class EnterWithFullEquipment
+    public static class NeverRequireCivilianEquipment
     {
         [HarmonyPostfix]
         public static void DoesMissionRequireCivilianEquipment(ref Mission __instance, ref bool __result)
diff --git a/Patches/Sieges/EnemySiegeBuildSpeed.cs b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
similarity index 96%
rename from Patches/Sieges/EnemySiegeBuildSpeed.cs
rename to Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
index c544e895..662722c5 100644
--- a/Patches/Sieges/EnemySiegeBuildSpeed.cs
+++ b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
@@ -1,6 +1,5 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
-using System;
 using System.Linq;
 using BannerlordCheats.Extensions;
 using TaleWorlds.CampaignSystem;
@@ -10,7 +9,7 @@
 namespace BannerlordCheats.Patches.Sieges
 {
     [HarmonyPatch(typeof(DefaultSiegeEventModel), nameof(DefaultSiegeEventModel.GetConstructionProgressPerHour))]
-    public static class EnemySiegeBuildSpeed
+    public static class EnemySiegeBuildingSpeedPercentage
     {
         [HarmonyPostfix]
         public static void GetConstructionProgressPerHour(ref SiegeEngineType type, ref SiegeEvent siegeEvent, ref ISiegeEventSide side, ref float __result)
diff --git a/Patches/Sieges/DefaultSiegeEventModelPatch.cs b/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
similarity index 94%
rename from Patches/Sieges/DefaultSiegeEventModelPatch.cs
rename to Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
index bc8816af..42cf6186 100644
--- a/Patches/Sieges/DefaultSiegeEventModelPatch.cs
+++ b/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
@@ -8,7 +8,7 @@
 namespace BannerlordCheats.Patches.Sieges
 {
     [HarmonyPatch(typeof(DefaultSiegeEventModel), nameof(DefaultSiegeEventModel.GetConstructionProgressPerHour))]
-    public static class DefaultSiegeEventModelPatch
+    public static class SiegeBuildingSpeedMultiplier
     {
         [HarmonyPostfix]
         public static void GetConstructionProgressPerHour(ref SiegeEngineType type, ref SiegeEvent siegeEvent, ref ISiegeEventSide side, ref float __result)
diff --git a/Patches/Smithing/SmithPerfectWeapons.cs b/Patches/Smithing/CraftedWeaponModifierBonus.cs
similarity index 97%
rename from Patches/Smithing/SmithPerfectWeapons.cs
rename to Patches/Smithing/CraftedWeaponModifierBonus.cs
index 7ebe366a..4a8bf6fb 100644
--- a/Patches/Smithing/SmithPerfectWeapons.cs
+++ b/Patches/Smithing/CraftedWeaponModifierBonus.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Smithing
 {
     [HarmonyPatch(typeof(DefaultSmithingModel), nameof(DefaultSmithingModel.GetModifierChanges))]
-    public static class SmithPerfectWeapons
+    public static class CraftedWeaponModifierBonus
     {
         [HarmonyPostfix]
         public static void GetModifierChanges(int modifierTier, ref OverrideData __result)
diff --git a/Patches/Smithing/SmithingMaterialsPatch.cs b/Patches/Smithing/SmithingCostPercentage.cs
similarity index 95%
rename from Patches/Smithing/SmithingMaterialsPatch.cs
rename to Patches/Smithing/SmithingCostPercentage.cs
index 353f82bb..515efda3 100644
--- a/Patches/Smithing/SmithingMaterialsPatch.cs
+++ b/Patches/Smithing/SmithingCostPercentage.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Smithing
 {
     [HarmonyPatch(typeof(DefaultSmithingModel), nameof(DefaultSmithingModel.GetSmithingCostsForWeaponDesign))]
-    public static class SmithingMaterialsPatch
+    public static class SmithingCostPercentage
     {
         [HarmonyPostfix]
         public static void GetSmithingCostsForWeaponDesign(WeaponDesign weaponDesign, ref int[] __result)
diff --git a/Patches/Smithing/NoSmithingDifficultyPatch.cs b/Patches/Smithing/SmithingDifficultyPercentage.cs
similarity index 93%
rename from Patches/Smithing/NoSmithingDifficultyPatch.cs
rename to Patches/Smithing/SmithingDifficultyPercentage.cs
index 0afaa279..2f62711d 100644
--- a/Patches/Smithing/NoSmithingDifficultyPatch.cs
+++ b/Patches/Smithing/SmithingDifficultyPercentage.cs
@@ -7,7 +7,7 @@
 namespace BannerlordCheats.Patches.Smithing
 {
     [HarmonyPatch(typeof(DefaultSmithingModel), nameof(DefaultSmithingModel.GetCraftingPartDifficulty))]
-    public static class NoSmithingDifficultyPatch
+    public static class SmithingDifficultyPercentage
     {
         [HarmonyPostfix]
         public static void GetCraftingPartDifficulty(CraftingPiece craftingPiece, ref int __result)
diff --git a/Patches/Smithing/RefiningEnergyCostPatch.cs b/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
similarity index 93%
rename from Patches/Smithing/RefiningEnergyCostPatch.cs
rename to Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
index cdd7e309..5a0d6090 100644
--- a/Patches/Smithing/RefiningEnergyCostPatch.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
@@ -9,7 +9,7 @@
 namespace BannerlordCheats.Patches.Smithing
 {
     [HarmonyPatch(typeof(DefaultSmithingModel), nameof(DefaultSmithingModel.GetEnergyCostForRefining))]
-    public static class RefiningEnergyCostPatch
+    public static class SmithingEnergyCostPercentageRefining
     {
         [HarmonyPostfix]
         public static void GetEnergyCostForRefining(ref Crafting.RefiningFormula refineFormula, Hero hero, ref int __result)
diff --git a/Patches/Smithing/SmeltingEnergyCostPatch.cs b/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
similarity index 93%
rename from Patches/Smithing/SmeltingEnergyCostPatch.cs
rename to Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
index f28f8f6f..5a95d330 100644
--- a/Patches/Smithing/SmeltingEnergyCostPatch.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
@@ -9,7 +9,7 @@
 namespace BannerlordCheats.Patches.Smithing
 {
     [HarmonyPatch(typeof(DefaultSmithingModel), nameof(DefaultSmithingModel.GetEnergyCostForSmelting))]
-    public static class SmeltingEnergyCostPatch
+    public static class SmithingEnergyCostPercentageSmelting
     {
         [HarmonyPostfix]
         public static void GetEnergyCostForSmelting(ItemObject item, Hero hero, ref int __result)
diff --git a/Patches/Smithing/SmithingEnergyCostPatch.cs b/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
similarity index 93%
rename from Patches/Smithing/SmithingEnergyCostPatch.cs
rename to Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
index 6ac29b63..673ce6c4 100644
--- a/Patches/Smithing/SmithingEnergyCostPatch.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
@@ -9,7 +9,7 @@
 namespace BannerlordCheats.Patches.Smithing
 {
     [HarmonyPatch(typeof(DefaultSmithingModel), nameof(DefaultSmithingModel.GetEnergyCostForSmithing))]
-    public static class SmithingEnergyCostPatch
+    public static class SmithingEnergyCostPercentageSmithing
     {
         [HarmonyPostfix]
         public static void GetEnergyCostForSmithing(ItemObject item, Hero hero, ref int __result)
diff --git a/Patches/Smithing/AllPartsUnlockedPatch.cs b/Patches/Smithing/UnlockAllParts.cs
similarity index 93%
rename from Patches/Smithing/AllPartsUnlockedPatch.cs
rename to Patches/Smithing/UnlockAllParts.cs
index b7f9669c..23739833 100644
--- a/Patches/Smithing/AllPartsUnlockedPatch.cs
+++ b/Patches/Smithing/UnlockAllParts.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Smithing
 {
     [HarmonyPatch(typeof(CraftingCampaignBehavior), nameof(CraftingCampaignBehavior.IsOpened))]
-    public static class AllPartsUnlockedPatch
+    public static class UnlockAllParts
     {
         [HarmonyPostfix]
         public static void IsOpened(CraftingPiece craftingPiece, ref bool __result)
diff --git a/Patches/Workshops/WorkshopBuyingCostPatch.cs b/Patches/Workshops/WorkshopBuyingCostPercentage.cs
similarity index 93%
rename from Patches/Workshops/WorkshopBuyingCostPatch.cs
rename to Patches/Workshops/WorkshopBuyingCostPercentage.cs
index 10ec6176..d7bfce95 100644
--- a/Patches/Workshops/WorkshopBuyingCostPatch.cs
+++ b/Patches/Workshops/WorkshopBuyingCostPercentage.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Workshops
 {
     [HarmonyPatch(typeof(DefaultWorkshopModel), nameof(DefaultWorkshopModel.GetBuyingCostForPlayer))]
-    public static class WorkshopBuyingCostPatch
+    public static class WorkshopBuyingCostPercentage
     {
         [HarmonyPostfix]
         public static void GetBuyingCostForPlayer(ref Workshop workshop, ref int __result)
diff --git a/Patches/Workshops/WorkshopDailyExpensePatch.cs b/Patches/Workshops/WorkshopDailyExpensePercentage.cs
similarity index 92%
rename from Patches/Workshops/WorkshopDailyExpensePatch.cs
rename to Patches/Workshops/WorkshopDailyExpensePercentage.cs
index 9dda1b4b..35584402 100644
--- a/Patches/Workshops/WorkshopDailyExpensePatch.cs
+++ b/Patches/Workshops/WorkshopDailyExpensePercentage.cs
@@ -5,7 +5,7 @@
 namespace BannerlordCheats.Patches.Workshops
 {
     [HarmonyPatch(typeof(DefaultWorkshopModel), nameof(DefaultWorkshopModel.GetDailyExpense))]
-    public static class WorkshopDailyExpensePatch
+    public static class WorkshopDailyExpensePercentage
     {
         [HarmonyPostfix]
         public static void GetDailyExpense(ref int level, ref int __result)
diff --git a/Patches/Workshops/WorkshopSellingCostPatch.cs b/Patches/Workshops/WorkshopSellingCostMultiplier.cs
similarity index 92%
rename from Patches/Workshops/WorkshopSellingCostPatch.cs
rename to Patches/Workshops/WorkshopSellingCostMultiplier.cs
index 249bd9d3..43e756d5 100644
--- a/Patches/Workshops/WorkshopSellingCostPatch.cs
+++ b/Patches/Workshops/WorkshopSellingCostMultiplier.cs
@@ -6,7 +6,7 @@
 namespace BannerlordCheats.Patches.Workshops
 {
     [HarmonyPatch(typeof(DefaultWorkshopModel), nameof(DefaultWorkshopModel.GetSellingCost))]
-    public static class WorkshopSellingCostPatch
+    public static class WorkshopSellingCostMultiplier
     {
         [HarmonyPostfix]
         public static void GetSellingCost(ref Workshop workshop, ref int __result)
diff --git a/Patches/Workshops/WorkshopUpgradeCostPatch.cs b/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
similarity index 92%
rename from Patches/Workshops/WorkshopUpgradeCostPatch.cs
rename to Patches/Workshops/WorkshopUpgradeCostPercentage.cs
index b9e05423..ecfc0425 100644
--- a/Patches/Workshops/WorkshopUpgradeCostPatch.cs
+++ b/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
@@ -5,7 +5,7 @@
 namespace BannerlordCheats.Patches.Workshops
 {
     [HarmonyPatch(typeof(DefaultWorkshopModel), nameof(DefaultWorkshopModel.GetUpgradeCost))]
-    public static class WorkshopUpgradeCostPatch
+    public static class WorkshopUpgradeCostPercentage
     {
         [HarmonyPostfix]
         public static void GetUpgradeCost(ref int currentLevel, ref int __result)

From c6162b6c63c578887e64f692b01df6347cd1c7b1 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 29 Jun 2021 11:30:06 +0200
Subject: [PATCH 020/177] Update to v2.5

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index a08a0a98..1e2608e1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.4.0.0</Version>
+    <Version>2.5.0.0</Version>
     <GameVersion>1.6.0</GameVersion>
     <GameBranch>Beta</GameBranch>
     <AdditionalInfo></AdditionalInfo>

From b510a69183641533fb7ca528d56b0fb2a80ec713 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 29 Jun 2021 11:33:27 +0200
Subject: [PATCH 021/177] Fix graft error

---
 .../EnableHotkeysCharacterAttributes.cs       | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Patches/General/EnableHotkeysCharacterAttributes.cs b/Patches/General/EnableHotkeysCharacterAttributes.cs
index 991ccecb..914d8544 100644
--- a/Patches/General/EnableHotkeysCharacterAttributes.cs
+++ b/Patches/General/EnableHotkeysCharacterAttributes.cs
@@ -29,12 +29,12 @@ public static void OnApplicationTick()
 
                     var currentHero = charVM.CurrentCharacter.Hero;
 
-                    CharacterAttributesCheatPatch.SetMaximum(currentHero, DefaultCharacterAttributes.Control);
-                    CharacterAttributesCheatPatch.SetMaximum(currentHero, DefaultCharacterAttributes.Cunning);
-                    CharacterAttributesCheatPatch.SetMaximum(currentHero, DefaultCharacterAttributes.Endurance);
-                    CharacterAttributesCheatPatch.SetMaximum(currentHero, DefaultCharacterAttributes.Intelligence);
-                    CharacterAttributesCheatPatch.SetMaximum(currentHero, DefaultCharacterAttributes.Social);
-                    CharacterAttributesCheatPatch.SetMaximum(currentHero, DefaultCharacterAttributes.Vigor);
+                    EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Control);
+                    EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Cunning);
+                    EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Endurance);
+                    EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Intelligence);
+                    EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Social);
+                    EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Vigor);
 
                     charVM.RefreshValues();
 
@@ -44,27 +44,27 @@ public static void OnApplicationTick()
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D1))
                 {
-                    CharacterAttributesCheatPatch.AddPoint(DefaultCharacterAttributes.Vigor);
+                    EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Vigor);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D2))
                 {
-                    CharacterAttributesCheatPatch.AddPoint(DefaultCharacterAttributes.Control);
+                    EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Control);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D3))
                 {
-                    CharacterAttributesCheatPatch.AddPoint(DefaultCharacterAttributes.Endurance);
+                    EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Endurance);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D4))
                 {
-                    CharacterAttributesCheatPatch.AddPoint(DefaultCharacterAttributes.Cunning);
+                    EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Cunning);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D5))
                 {
-                    CharacterAttributesCheatPatch.AddPoint(DefaultCharacterAttributes.Social);
+                    EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Social);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D6))
                 {
-                    CharacterAttributesCheatPatch.AddPoint(DefaultCharacterAttributes.Intelligence);
+                    EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Intelligence);
                 }
             }
         }

From 22aa7fab2738dc9d8de8ef512565b308323c1285 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 7 Jul 2021 13:29:14 +0200
Subject: [PATCH 022/177] Update Harmony to v2.1.0

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 1e2608e1..fe4dbe00 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <GameVersion>1.6.0</GameVersion>
     <GameBranch>Beta</GameBranch>
     <AdditionalInfo></AdditionalInfo>
-    <HarmonyVersion>2.0.4</HarmonyVersion>
+    <HarmonyVersion>2.1.0</HarmonyVersion>
     <MCMVersion>4.3</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>

From f3c1ad7d1d15a972d610313078ad88a4fecfa484 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 7 Jul 2021 13:36:46 +0200
Subject: [PATCH 023/177] Control usage of NuGet assemblies with build property

---
 BannerlordCheats.csproj | 4 ++--
 Directory.Build.props   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/BannerlordCheats.csproj b/BannerlordCheats.csproj
index 818754ff..7e749cb2 100644
--- a/BannerlordCheats.csproj
+++ b/BannerlordCheats.csproj
@@ -2,7 +2,7 @@
 
     <ItemGroup>
       <PackageReference Include="Bannerlord.MCM" Version="$(MCMVersion).*" />
-      <PackageReference Condition="'$(Configuration)' == 'Release'" Include="Bannerlord.ReferenceAssemblies.EarlyAccess" Version="$(GameVersion).*" />
+      <PackageReference Condition="$(UseNuGetAssemblies) == True" Include="Bannerlord.ReferenceAssemblies.EarlyAccess" Version="$(GameVersion).*" />
       <PackageReference Include="Lib.Harmony" Version="$(HarmonyVersion)" />
     </ItemGroup>
 
@@ -15,7 +15,7 @@
       </None>
     </ItemGroup>
 
-    <ItemGroup Condition="'$(Configuration)' == 'Debug'">
+    <ItemGroup Condition="$(UseNuGetAssemblies) == False">
       <Reference Include="TaleWorlds.BattlEye.Client">
         <HintPath>$(GameFolder)\bin\Win64_Shipping_Client\TaleWorlds.BattlEye.Client.dll</HintPath>
         <Private>False</Private>
diff --git a/Directory.Build.props b/Directory.Build.props
index fe4dbe00..8d6f133a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,5 +9,6 @@
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\mb2b_beta</GameFolder>
+    <UseNuGetAssemblies>True</UseNuGetAssemblies>
   </PropertyGroup>
 </Project>

From dd03e9ac15a78624c8f4b57cef63625a250202cc Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 7 Jul 2021 13:43:23 +0200
Subject: [PATCH 024/177] Rely on Harmony mod, do not copy to output

---
 BannerlordCheats.csproj | 2 +-
 SubModule.xml           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BannerlordCheats.csproj b/BannerlordCheats.csproj
index 7e749cb2..90442f3d 100644
--- a/BannerlordCheats.csproj
+++ b/BannerlordCheats.csproj
@@ -3,7 +3,7 @@
     <ItemGroup>
       <PackageReference Include="Bannerlord.MCM" Version="$(MCMVersion).*" />
       <PackageReference Condition="$(UseNuGetAssemblies) == True" Include="Bannerlord.ReferenceAssemblies.EarlyAccess" Version="$(GameVersion).*" />
-      <PackageReference Include="Lib.Harmony" Version="$(HarmonyVersion)" />
+      <PackageReference Include="Lib.Harmony" Version="$(HarmonyVersion)" IncludeAssets="compile" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/SubModule.xml b/SubModule.xml
index 001c2ed4..d47d8827 100644
--- a/SubModule.xml
+++ b/SubModule.xml
@@ -11,6 +11,7 @@
     <DependedModule Id="Sandbox"/>
     <DependedModule Id="CustomBattle"/>
     <DependedModule Id="StoryMode" />
+    <DependedModule Id="Bannerlord.Harmony" />
     <DependedModule Id="Bannerlord.MBOptionScreen"/>
   </DependedModules>
   <SubModules>

From 868bb6765d11e172ac133f0a86b703ab97529b1a Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 7 Jul 2021 13:51:01 +0200
Subject: [PATCH 025/177] Rely on MCM mod, do not copy to output

---
 BannerlordCheats.csproj | 2 +-
 SubModule.xml           | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/BannerlordCheats.csproj b/BannerlordCheats.csproj
index 90442f3d..80f00aca 100644
--- a/BannerlordCheats.csproj
+++ b/BannerlordCheats.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-      <PackageReference Include="Bannerlord.MCM" Version="$(MCMVersion).*" />
+      <PackageReference Include="Bannerlord.MCM" Version="$(MCMVersion).*" IncludeAssets="compile" />
       <PackageReference Condition="$(UseNuGetAssemblies) == True" Include="Bannerlord.ReferenceAssemblies.EarlyAccess" Version="$(GameVersion).*" />
       <PackageReference Include="Lib.Harmony" Version="$(HarmonyVersion)" IncludeAssets="compile" />
     </ItemGroup>
diff --git a/SubModule.xml b/SubModule.xml
index d47d8827..e571f033 100644
--- a/SubModule.xml
+++ b/SubModule.xml
@@ -24,15 +24,6 @@
         <Tag key="IsNoRenderModeElement" value="false" />
       </Tags>
     </SubModule>
-    <SubModule>
-      <Name value="MCMv4 Integrated Loader"/>
-      <DLLName value="MCMv4.dll"/>
-      <SubModuleClassType value="MCM.MCMSubModule"/>
-      <Tags>
-        <Tag key="DedicatedServerType" value="none" />
-        <Tag key="IsNoRenderModeElement" value="false" />
-      </Tags>
-    </SubModule>
   </SubModules>
   <Xmls/>
 </Module>

From e4a8a3e632aca45c6e28f2764bb5e3e985ca41ca Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 7 Jul 2021 14:18:01 +0200
Subject: [PATCH 026/177] Remove TryGetModifiedValue access to cheat settings

---
 Extensions/PropertyInfoHelper.cs     | 78 ----------------------------
 Settings/BannerlordCheatsSettings.cs | 58 +--------------------
 2 files changed, 1 insertion(+), 135 deletions(-)
 delete mode 100644 Extensions/PropertyInfoHelper.cs

diff --git a/Extensions/PropertyInfoHelper.cs b/Extensions/PropertyInfoHelper.cs
deleted file mode 100644
index 9c1c906d..00000000
--- a/Extensions/PropertyInfoHelper.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace BannerlordCheats.Extensions
-{
-    public interface IPropertyAccessor<in TObject, TValue>
-    {
-        PropertyInfo PropertyInfo { get; }
-
-        string Name { get; }
-
-        TValue GetValue(TObject source);
-
-        void SetValue(TObject source, TValue value);
-    }
-
-    public static class PropertyInfoHelper<TObject, TValue>
-    {
-        private static readonly Dictionary<PropertyInfo, IPropertyAccessor<TObject, TValue>> Cache = new Dictionary<PropertyInfo, IPropertyAccessor<TObject, TValue>>();
-
-        public static IPropertyAccessor<TObject, TValue> GetFastAccessor(PropertyInfo propertyInfo)
-        {
-            IPropertyAccessor<TObject, TValue> result;
-
-            lock (PropertyInfoHelper<TObject, TValue>.Cache)
-            {
-                if (!PropertyInfoHelper<TObject, TValue>.Cache.TryGetValue(propertyInfo, out result))
-                {
-                    result = PropertyInfoHelper<TObject, TValue>.CreateAccessor(propertyInfo);
-
-                    PropertyInfoHelper<TObject, TValue>.Cache.Add(propertyInfo, result);
-                }
-            }
-
-            return result;
-        }
-
-        private static IPropertyAccessor<TObject, TValue> CreateAccessor(PropertyInfo propertyInfo)
-        {
-            var instance = new PropertyWrapper<TObject, TValue>(propertyInfo);
-
-            return instance;
-        }
-    }
-
-    public class PropertyWrapper<TObject, TValue> : IPropertyAccessor<TObject, TValue>
-    {
-        private readonly Func<TObject, TValue> _getMethod;
-
-        private readonly Action<TObject, TValue> _setMethod;
-
-        public PropertyWrapper(PropertyInfo propertyInfo)
-        {
-            this.PropertyInfo = propertyInfo;
-
-            var mGet = propertyInfo.GetGetMethod(true);
-            var mSet = propertyInfo.GetSetMethod(true);
-
-            this._getMethod = (Func<TObject, TValue>)Delegate.CreateDelegate(typeof(Func<TObject, TValue>), mGet);
-            this._setMethod = (Action<TObject, TValue>)Delegate.CreateDelegate(typeof(Action<TObject, TValue>), mSet);
-        }
-
-        TValue IPropertyAccessor<TObject, TValue>.GetValue(TObject source)
-        {
-            return this._getMethod(source);
-        }
-
-        void IPropertyAccessor<TObject, TValue>.SetValue(TObject source, TValue value)
-        {
-            this._setMethod(source, value);
-        }
-
-        public string Name => this.PropertyInfo.Name;
-
-        public PropertyInfo PropertyInfo { get; }
-    }
-}
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 9083dc5a..df0c2939 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using BannerlordCheats.Localization;
+using BannerlordCheats.Localization;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using BannerlordCheats.Extensions;
 using MCM.Abstractions.Settings.Base.PerSave;
 
 namespace BannerlordCheats.Settings
@@ -29,15 +25,6 @@ public class BannerlordCheatsSettings : AttributePerSaveSettings<BannerlordCheat
         private const string CharactersGroupName = "Characters";
         private const string WorkshopsGroupName = "Workshops";
 
-        private static readonly BannerlordCheatsSettings Default = new BannerlordCheatsSettings();
-
-        #if DEBUG
-        private static readonly Dictionary<string, long> Counter = new Dictionary<string, long>();
-        #endif
-
-        [Obsolete("Use TryGetModifiedValue instead of accessing the instance directly.", true)]
-        public new static BannerlordCheatsSettings Instance => AttributePerSaveSettings<BannerlordCheatsSettings>.Instance;
-
         public override string Id { get; } = $"BannerlordCheats_v{Assembly.GetExecutingAssembly().GetName().Version.Major}";
 
         public override string FolderName { get; } = "Cheats";
@@ -60,49 +47,6 @@ public BannerlordCheatsSettings()
             this.DisplayName = $"{modName} {version}";
         }
 
-        public static bool TryGetModifiedValue<T>(Expression<Func<BannerlordCheatsSettings, T>> expression, out T modifiedValue)
-        {
-            var instance = AttributePerSaveSettings<BannerlordCheatsSettings>.Instance;
-
-            if (instance == null)
-            {
-                modifiedValue = default;
-
-                return false;
-            }
-
-            var propertyInfo = (PropertyInfo) ((MemberExpression) expression.Body).Member;
-
-            #if DEBUG
-            var name = propertyInfo.Name;
-            if (BannerlordCheatsSettings.Counter.TryGetValue(name, out var counter))
-            {
-                BannerlordCheatsSettings.Counter[name] = counter + 1;
-            }
-            else
-            {
-                BannerlordCheatsSettings.Counter.Add(name, 1);
-            }
-            #endif
-
-            var accessor = PropertyInfoHelper<BannerlordCheatsSettings, T>.GetFastAccessor(propertyInfo);
-
-            var defaultValue = accessor.GetValue(BannerlordCheatsSettings.Default);
-
-            var currentValue = accessor.GetValue(instance);
-
-            if (!EqualityComparer<T>.Default.Equals(defaultValue, currentValue))
-            {
-                modifiedValue = currentValue;
-
-                return true;
-            }
-
-            modifiedValue = defaultValue;
-
-            return false;
-        }
-
         #region General
 
         [LocalizedSettingPropertyGroup(GeneralGroupName)]

From 1c114b46dccd3ce4e35a8d6ffc81d0f76403df07 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 7 Jul 2021 15:04:55 +0200
Subject: [PATCH 027/177] Change settings value access for all cheats

---
 Patches/Army/ArmyCohesionLossPercentage.cs    |  4 ++--
 Patches/Army/ArmyFoodConsumptionPercentage.cs |  4 ++--
 .../Army/FactionArmyCohesionLossPercentage.cs |  4 ++--
 .../Characters/BarterOfferAlwaysAccepted.cs   |  3 +--
 .../ConversationAlwaysSuccessful.cs           |  3 +--
 Patches/Characters/NoBarterCooldown.cs        |  3 +--
 Patches/Characters/PerfectRelationships.cs    |  3 +--
 Patches/Clan/ExtraClanPartyLimit.cs           |  4 ++--
 Patches/Clan/ExtraClanPartySize.cs            |  4 ++--
 Patches/Clan/ExtraCompanionLimit.cs           |  4 ++--
 Patches/Combat/AlwaysCrushThroughShields.cs   |  3 +--
 Patches/Combat/AlwaysKnockDown.cs             |  3 +--
 Patches/Combat/AlwaysWinBattleSimulation.cs   |  3 +--
 Patches/Combat/BanditHideoutTroopLimit.cs     |  4 ++--
 Patches/Combat/CombatZoomMultiplier.cs        |  4 ++--
 Patches/Combat/CompanionDeathPercentage.cs    |  4 ++--
 Patches/Combat/DamageMultiplier.cs            |  4 ++--
 Patches/Combat/DamageTakenPercentage.cs       |  4 ++--
 Patches/Combat/EnemiesNoRunningAway.cs        |  3 +--
 .../EnemyLordCombatDeathPercentageBattle.cs   |  4 ++--
 ...nemyLordCombatDeathPercentageSimulation.cs |  6 +++---
 Patches/Combat/EnemyOnlyKnockout.cs           |  3 +--
 ...FriendlyLordCombatDeathPercentageBattle.cs |  4 ++--
 ...ndlyLordCombatDeathPercentageSimulation.cs |  6 +++---
 Patches/Combat/HealthRegeneration.cs          |  4 ++--
 Patches/Combat/InfiniteAmmo.cs                |  3 +--
 Patches/Combat/InfluenceRewardMultiplier.cs   |  4 ++--
 Patches/Combat/InstantCrossbowReload.cs       |  3 +--
 Patches/Combat/Invincible.cs                  |  5 ++---
 Patches/Combat/NoFriendlyFire.cs              |  3 +--
 Patches/Combat/NoRunningAway.cs               |  3 +--
 Patches/Combat/NoTroopSacrificeBreakIn.cs     |  5 ++---
 Patches/Combat/NoTroopSacrificeBreakOut.cs    |  5 ++---
 Patches/Combat/NoTroopSacrificeRunaway.cs     |  3 +--
 Patches/Combat/OneHitKill.cs                  |  3 +--
 Patches/Combat/PartyDamageMultiplier.cs       |  4 ++--
 Patches/Combat/PartyDamageTakenPercentage.cs  |  4 ++--
 Patches/Combat/PartyHealthRegeneration.cs     |  4 ++--
 Patches/Combat/PartyHeroesInvincible.cs       |  3 +--
 Patches/Combat/PartyInfiniteAmmo.cs           |  3 +--
 Patches/Combat/PartyInvincible.cs             |  3 +--
 Patches/Combat/PartyOneHitKill.cs             |  3 +--
 Patches/Combat/PartyOnlyKnockout.cs           |  3 +--
 Patches/Combat/PlayerHorseInvincible.cs       |  3 +--
 .../Combat/RenownRewardMultiplierBattle.cs    |  4 ++--
 .../RenownRewardMultiplierTournament.cs       |  4 ++--
 Patches/Combat/SliceThroughEveryonePassive.cs |  5 ++---
 Patches/Combat/SliceThroughEveryoneWeapon.cs  |  3 +--
 .../CompanionExperienceMultiplier.cs          |  4 ++--
 .../CompanionLearningRateMultiplier.cs        |  4 ++--
 Patches/Experience/ExperienceMultiplier.cs    |  4 ++--
 .../Experience/FreeFocusPointAssignment.cs    |  3 +--
 Patches/Experience/LearningLimitMultiplier.cs |  4 ++--
 Patches/Experience/LearningRateMultiplier.cs  |  4 ++--
 .../Experience/TroopExperienceMultiplier.cs   |  4 ++--
 .../General/EnableHotkeyTipsEncyclopedia.cs   |  8 +++-----
 Patches/General/EnableHotkeyTipsScreens.cs    |  6 ++----
 .../EnableHotkeysAddEncyclopediaTroops.cs     |  3 +--
 Patches/General/EnableHotkeysAddItems.cs      |  3 +--
 .../EnableHotkeysCharacterAttributes.cs       |  3 +--
 .../General/EnableHotkeysCharacterPoints.cs   |  3 +--
 Patches/General/EnableHotkeysInfluence.cs     |  3 +--
 Patches/General/EnableHotkeysMoney.cs         |  3 +--
 Patches/General/EnableHotkeysTroopCount.cs    |  3 +--
 .../General/EnableHotkeysTroopExperience.cs   |  3 +--
 Patches/Inventory/ExtraInventoryCapacity.cs   |  4 ++--
 Patches/Inventory/NativeItemSpawning.cs       |  3 +--
 ...DecisionOverrideInfluenceCostPercentage.cs |  4 ++--
 .../KingdomDecisionWeightMultiplier.cs        |  6 +++---
 Patches/Kingdom/NoCrimeRatingForCrimes.cs     |  3 +--
 ...NoRelationshipLossOnDecisionArmyDisband.cs |  3 +--
 ...RelationshipLossOnDecisionExpellingClan.cs |  3 +--
 ...lationshipLossOnDecisionKingdomDecision.cs |  3 +--
 Patches/Map/MapSpeedMultiplier.cs             |  4 ++--
 Patches/Map/MapVisibilityMultiplier.cs        |  4 ++--
 Patches/Map/NpcMapSpeedPercentage.cs          |  4 ++--
 Patches/Map/PartyInvisibleOnMap.cs            |  3 +--
 Patches/Party/ExtraPartyMemberSize.cs         |  4 ++--
 Patches/Party/ExtraPartyMorale.cs             |  4 ++--
 Patches/Party/ExtraPartyPrisonerSize.cs       |  4 ++--
 Patches/Party/FoodConsumptionPercentage.cs    |  4 ++--
 Patches/Party/FreeCompanionHiring.cs          |  3 +--
 Patches/Party/FreeTroopUpgrades.cs            |  3 +--
 Patches/Party/InstantEscape.cs                |  3 +--
 Patches/Party/InstantPrisonerRecruitment.cs   |  7 +++----
 Patches/Party/NoPrisonerEscape.cs             |  3 +--
 Patches/Party/PartyHealingMultiplierHeroes.cs |  6 +++---
 Patches/Party/PartyHealingMultiplierTroops.cs |  4 ++--
 Patches/Party/TroopWagesPercentage.cs         |  4 ++--
 .../ConstructionPowerMultiplier.cs            |  4 ++--
 Patches/Settlements/DailyFoodBonus.cs         |  4 ++--
 Patches/Settlements/DailyGarrisonBonus.cs     |  4 ++--
 Patches/Settlements/DailyHearthsBonus.cs      |  4 ++--
 Patches/Settlements/DailyLoyaltyBonus.cs      |  4 ++--
 Patches/Settlements/DailyMilitiaBonusTown.cs  |  4 ++--
 .../Settlements/DailyMilitiaBonusVillage.cs   |  6 +++---
 Patches/Settlements/DailyProsperityBonus.cs   |  4 ++--
 Patches/Settlements/DailySecurityBonus.cs     |  4 ++--
 Patches/Settlements/DisguiseAlwaysWorks.cs    |  3 +--
 Patches/Settlements/FreeTroopRecruitment.cs   |  3 +--
 .../Settlements/GarrisonWagesPercentage.cs    |  4 ++--
 .../Settlements/ItemTradingCostPercentage.cs  |  4 ++--
 .../NeverRequireCivilianEquipment.cs          |  3 +--
 Patches/Settlements/SellingPriceMultiplier.cs |  4 ++--
 .../EnemySiegeBuildingSpeedPercentage.cs      |  6 +++---
 .../Sieges/SiegeBuildingSpeedMultiplier.cs    |  4 ++--
 .../Smithing/CraftedWeaponModifierBonus.cs    | 20 +++++++++----------
 Patches/Smithing/SmithingCostPercentage.cs    |  4 ++--
 .../Smithing/SmithingDifficultyPercentage.cs  |  4 ++--
 .../SmithingEnergyCostPercentageRefining.cs   |  4 ++--
 .../SmithingEnergyCostPercentageSmelting.cs   |  4 ++--
 .../SmithingEnergyCostPercentageSmithing.cs   |  4 ++--
 Patches/Smithing/UnlockAllParts.cs            |  3 +--
 .../Workshops/WorkshopBuyingCostPercentage.cs |  4 ++--
 .../WorkshopDailyExpensePercentage.cs         |  4 ++--
 .../WorkshopSellingCostMultiplier.cs          |  4 ++--
 .../WorkshopUpgradeCostPercentage.cs          |  4 ++--
 117 files changed, 205 insertions(+), 259 deletions(-)

diff --git a/Patches/Army/ArmyCohesionLossPercentage.cs b/Patches/Army/ArmyCohesionLossPercentage.cs
index c8abf45d..cca9a04d 100644
--- a/Patches/Army/ArmyCohesionLossPercentage.cs
+++ b/Patches/Army/ArmyCohesionLossPercentage.cs
@@ -12,9 +12,9 @@ public static class ArmyCohesionLossPercentage
         public static void CohesionChange(ref ArmyObj __instance, ref float __result)
         {
             if (__instance.IsPlayerArmy()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.ArmyCohesionLossPercentage, out var armyCohesionLossPercentage))
+                && BannerlordCheatsSettings.Instance?.ArmyCohesionLossPercentage < 100f)
             {
-                var factor = armyCohesionLossPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.ArmyCohesionLossPercentage / 100f;
 
                 __result *= factor;
             }
diff --git a/Patches/Army/ArmyFoodConsumptionPercentage.cs b/Patches/Army/ArmyFoodConsumptionPercentage.cs
index 04dbb6a0..67d11b1e 100644
--- a/Patches/Army/ArmyFoodConsumptionPercentage.cs
+++ b/Patches/Army/ArmyFoodConsumptionPercentage.cs
@@ -13,9 +13,9 @@ public static class ArmyFoodConsumptionPercentage
         public static void CalculateDailyFoodConsumptionf(ref MobileParty party, ref bool includeDescription, ref ExplainedNumber __result)
         {
             if (party.IsPlayerArmy()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.ArmyFoodConsumptionPercentage, out var armyFoodConsumptionPercentage))
+                && BannerlordCheatsSettings.Instance?.ArmyFoodConsumptionPercentage < 100f)
             {
-                __result.AddPercentage(armyFoodConsumptionPercentage);
+                __result.AddPercentage(BannerlordCheatsSettings.Instance.ArmyFoodConsumptionPercentage);
             }
         }
     }
diff --git a/Patches/Army/FactionArmyCohesionLossPercentage.cs b/Patches/Army/FactionArmyCohesionLossPercentage.cs
index b6fc80b5..2b1fa362 100644
--- a/Patches/Army/FactionArmyCohesionLossPercentage.cs
+++ b/Patches/Army/FactionArmyCohesionLossPercentage.cs
@@ -13,9 +13,9 @@ public static void CohesionChange(ref ArmyObj __instance, ref float __result)
         {
             if (__instance.IsOfPlayerKingdom()
                 && !__instance.IsPlayerArmy()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.FactionArmyCohesionLossPercentage, out var factionArmyCohesionLossPercentage))
+                && BannerlordCheatsSettings.Instance?.FactionArmyCohesionLossPercentage < 100f)
             {
-                var factor = factionArmyCohesionLossPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.FactionArmyCohesionLossPercentage / 100f;
 
                 __result *= factor;
             }
diff --git a/Patches/Characters/BarterOfferAlwaysAccepted.cs b/Patches/Characters/BarterOfferAlwaysAccepted.cs
index d0b5ffea..b31e9b5f 100644
--- a/Patches/Characters/BarterOfferAlwaysAccepted.cs
+++ b/Patches/Characters/BarterOfferAlwaysAccepted.cs
@@ -10,8 +10,7 @@ public static class BarterOfferAlwaysAccepted
         [HarmonyPostfix]
         public static void IsOfferAcceptable(BarterData args, Hero hero, PartyBase party, ref BarterManager __instance, ref bool __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.BarterOfferAlwaysAccepted, out var barterOfferAlwaysAccepted)
-                && barterOfferAlwaysAccepted)
+            if (BannerlordCheatsSettings.Instance?.BarterOfferAlwaysAccepted == true)
             {
                 __result = true;
             }
diff --git a/Patches/Characters/ConversationAlwaysSuccessful.cs b/Patches/Characters/ConversationAlwaysSuccessful.cs
index d552db95..473f7010 100644
--- a/Patches/Characters/ConversationAlwaysSuccessful.cs
+++ b/Patches/Characters/ConversationAlwaysSuccessful.cs
@@ -11,8 +11,7 @@ public static class ConversationAlwaysSuccessful
         [HarmonyPostfix]
         public static void GetChances(PersuasionOptionArgs optionArgs, ref float successChance, ref float critSuccessChance, ref float critFailChance, ref float failChance, float difficultyMultiplier)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.ConversationAlwaysSuccessful, out var conversationAlwaysSuccessful)
-                 && conversationAlwaysSuccessful)
+            if (BannerlordCheatsSettings.Instance?.ConversationAlwaysSuccessful == true)
             {
                 successChance = 1;
                 critSuccessChance = 1;
diff --git a/Patches/Characters/NoBarterCooldown.cs b/Patches/Characters/NoBarterCooldown.cs
index 0535bf31..3f4211e1 100644
--- a/Patches/Characters/NoBarterCooldown.cs
+++ b/Patches/Characters/NoBarterCooldown.cs
@@ -10,8 +10,7 @@ public static class NoBarterCooldown
         [HarmonyPostfix]
         public static void CanPlayerBarterWithHero(Hero hero, ref bool __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoBarterCooldown, out var noBarterCooldown)
-                && noBarterCooldown)
+            if (BannerlordCheatsSettings.Instance?.NoBarterCooldown == true)
             {
                 __result = true;
             }
diff --git a/Patches/Characters/PerfectRelationships.cs b/Patches/Characters/PerfectRelationships.cs
index 9ffc3e2d..2a68e415 100644
--- a/Patches/Characters/PerfectRelationships.cs
+++ b/Patches/Characters/PerfectRelationships.cs
@@ -12,8 +12,7 @@ public static class PerfectRelationships
         public static void GetRelation(Hero otherHero, ref Hero __instance, ref int __result)
         {
             if ((__instance.IsPlayer() || otherHero.IsPlayer())
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PerfectRelationships, out var perfectRelationships)
-                && perfectRelationships)
+                && BannerlordCheatsSettings.Instance?.PerfectRelationships == true)
             {
                 __result = 100;
             }
diff --git a/Patches/Clan/ExtraClanPartyLimit.cs b/Patches/Clan/ExtraClanPartyLimit.cs
index b9c80c2d..1c72c392 100644
--- a/Patches/Clan/ExtraClanPartyLimit.cs
+++ b/Patches/Clan/ExtraClanPartyLimit.cs
@@ -12,9 +12,9 @@ public static class ExtraClanPartyLimit
         public static void GetPartyLimitForTier(TaleWorlds.CampaignSystem.Clan clan, int clanTierToCheck, ref int __result)
         {
             if (clan.IsPlayerClan()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.ExtraClanPartyLimit, out var extraClanPartyLimit))
+                && BannerlordCheatsSettings.Instance?.ExtraClanPartyLimit > 0)
             {
-                __result += extraClanPartyLimit;
+                __result += BannerlordCheatsSettings.Instance.ExtraClanPartyLimit;
             }
         }
     }
diff --git a/Patches/Clan/ExtraClanPartySize.cs b/Patches/Clan/ExtraClanPartySize.cs
index 5a6a6d53..2083e95b 100644
--- a/Patches/Clan/ExtraClanPartySize.cs
+++ b/Patches/Clan/ExtraClanPartySize.cs
@@ -14,9 +14,9 @@ public static void GetPartyMemberSizeLimit(ref PartyBase party, ref bool include
         {
             if (party.IsPlayerClan()
                 && !party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.ExtraClanPartySize, out var extraClanPartySize))
+                && BannerlordCheatsSettings.Instance?.ExtraClanPartySize > 0)
             {
-                __result.Add(extraClanPartySize);
+                __result.Add(BannerlordCheatsSettings.Instance.ExtraClanPartySize);
             }
         }
     }
diff --git a/Patches/Clan/ExtraCompanionLimit.cs b/Patches/Clan/ExtraCompanionLimit.cs
index a7cea909..70400fd7 100644
--- a/Patches/Clan/ExtraCompanionLimit.cs
+++ b/Patches/Clan/ExtraCompanionLimit.cs
@@ -12,9 +12,9 @@ public static class ExtraCompanionLimit
         public static void GetCompanionLimit(ref TaleWorlds.CampaignSystem.Clan clan, ref int __result)
         {
             if (clan.IsPlayerClan()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.ExtraCompanionLimit, out var extraCompanionLimit))
+                && BannerlordCheatsSettings.Instance?.ExtraCompanionLimit > 0)
             {
-                __result += extraCompanionLimit;
+                __result += BannerlordCheatsSettings.Instance.ExtraCompanionLimit;
             }
         }
     }
diff --git a/Patches/Combat/AlwaysCrushThroughShields.cs b/Patches/Combat/AlwaysCrushThroughShields.cs
index aae3f0c8..27c41b55 100644
--- a/Patches/Combat/AlwaysCrushThroughShields.cs
+++ b/Patches/Combat/AlwaysCrushThroughShields.cs
@@ -14,8 +14,7 @@ public class AlwaysCrushThroughShields
         public static void DecideCrushedThrough(Agent attackerAgent, Agent defenderAgent, float totalAttackEnergy, Agent.UsageDirection attackDirection, StrikeType strikeType, WeaponComponentData defendItem, bool isPassiveUsage, ref bool __result)
         {
             if (attackerAgent.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.AlwaysCrushThroughShields, out var alwaysCrushThroughShields)
-                && alwaysCrushThroughShields)
+                && BannerlordCheatsSettings.Instance?.AlwaysCrushThroughShields == true)
             {
                 __result = true;
             }
diff --git a/Patches/Combat/AlwaysKnockDown.cs b/Patches/Combat/AlwaysKnockDown.cs
index b8b12568..89a43e17 100644
--- a/Patches/Combat/AlwaysKnockDown.cs
+++ b/Patches/Combat/AlwaysKnockDown.cs
@@ -19,8 +19,7 @@ public static void DecideAgentKnockedByBlow(
             ref Blow blow)
         {
             if (attacker.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.AlwaysKnockDown, out var alwaysKnockDown)
-                && alwaysKnockDown)
+                && BannerlordCheatsSettings.Instance?.AlwaysKnockDown == true)
             {
                 blow.BlowFlag &= ~BlowFlags.ShrugOff;
                 blow.BlowFlag |= BlowFlags.KnockDown;
diff --git a/Patches/Combat/AlwaysWinBattleSimulation.cs b/Patches/Combat/AlwaysWinBattleSimulation.cs
index 2b4ceb2a..1f2d9e53 100644
--- a/Patches/Combat/AlwaysWinBattleSimulation.cs
+++ b/Patches/Combat/AlwaysWinBattleSimulation.cs
@@ -13,8 +13,7 @@ public static class AlwaysWinBattleSimulation
         public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterObject struckTroop, ref PartyBase strikerParty, ref PartyBase struckParty, ref float strikerAdvantage, ref MapEvent battle, ref int __result)
         {
             if (struckParty.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.AlwaysWinBattleSimulation, out var alwaysWinBattleSimulation)
-                && alwaysWinBattleSimulation)
+                && BannerlordCheatsSettings.Instance?.AlwaysWinBattleSimulation == true)
             {
                 __result = 0;
             }
diff --git a/Patches/Combat/BanditHideoutTroopLimit.cs b/Patches/Combat/BanditHideoutTroopLimit.cs
index ab42ea14..4c56c866 100644
--- a/Patches/Combat/BanditHideoutTroopLimit.cs
+++ b/Patches/Combat/BanditHideoutTroopLimit.cs
@@ -11,9 +11,9 @@ public static class BanditHideoutTroopLimit
         [HarmonyPostfix]
         public static void GetPlayerMaximumTroopCountForHideoutMission(ref MobileParty party, ref int __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.BanditHideoutTroopLimit, out var banditHideoutTroopLimit))
+            if (BannerlordCheatsSettings.Instance?.BanditHideoutTroopLimit > 0)
             {
-                __result += banditHideoutTroopLimit;
+                __result += BannerlordCheatsSettings.Instance.BanditHideoutTroopLimit;
             }
         }
     }
diff --git a/Patches/Combat/CombatZoomMultiplier.cs b/Patches/Combat/CombatZoomMultiplier.cs
index c032e839..940b893d 100644
--- a/Patches/Combat/CombatZoomMultiplier.cs
+++ b/Patches/Combat/CombatZoomMultiplier.cs
@@ -13,9 +13,9 @@ public static class CombatZoomMultiplier
         public static void CrossbowReloadSpeed(ref Agent agent, ref float __result)
         {
             if (agent.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.CombatZoomMultiplier, out var combatZoomMultiplier))
+                && BannerlordCheatsSettings.Instance?.CombatZoomMultiplier > 1f)
             {
-                __result *= combatZoomMultiplier;
+                __result *= BannerlordCheatsSettings.Instance.CombatZoomMultiplier;
             }
         }
     }
diff --git a/Patches/Combat/CompanionDeathPercentage.cs b/Patches/Combat/CompanionDeathPercentage.cs
index aa9bc7c5..101755a5 100644
--- a/Patches/Combat/CompanionDeathPercentage.cs
+++ b/Patches/Combat/CompanionDeathPercentage.cs
@@ -14,9 +14,9 @@ public static class CompanionDeathPercentage
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
         {
             if (effectedAgent.IsPlayerCompanion()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.CompanionDeathPercentage, out var companionDeathPercentage))
+                && BannerlordCheatsSettings.Instance?.CompanionDeathPercentage < 100f)
             {
-                var factor = companionDeathPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.CompanionDeathPercentage / 100f;
 
                 __result *= factor;
             }
diff --git a/Patches/Combat/DamageMultiplier.cs b/Patches/Combat/DamageMultiplier.cs
index e6b733ee..37f05d8c 100644
--- a/Patches/Combat/DamageMultiplier.cs
+++ b/Patches/Combat/DamageMultiplier.cs
@@ -15,9 +15,9 @@ public static void CalculateDamage(ref AttackInformation attackInformation, ref
         {
             if (attackInformation.AttackerAgentCharacter.IsPlayer()
                 && !attackInformation.IsFriendlyFire
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.DamageMultiplier, out var damageMultiplier))
+                && BannerlordCheatsSettings.Instance?.DamageMultiplier > 1f)
             {
-                __result *= damageMultiplier;
+                __result *= BannerlordCheatsSettings.Instance.DamageMultiplier;
             }
         }
     }
diff --git a/Patches/Combat/DamageTakenPercentage.cs b/Patches/Combat/DamageTakenPercentage.cs
index 699669f2..38a5fcfb 100644
--- a/Patches/Combat/DamageTakenPercentage.cs
+++ b/Patches/Combat/DamageTakenPercentage.cs
@@ -15,9 +15,9 @@ public static class DamageTakenPercentage
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
             if (attackInformation.VictimAgentCharacter.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.DamageTakenPercentage, out var damageTakenPercentage))
+                && BannerlordCheatsSettings.Instance?.DamageTakenPercentage < 100f)
             {
-                var factor = damageTakenPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.DamageTakenPercentage / 100f;
 
                 var newValue = (int)Math.Round(factor * __result);
 
diff --git a/Patches/Combat/EnemiesNoRunningAway.cs b/Patches/Combat/EnemiesNoRunningAway.cs
index b044253d..8f531df3 100644
--- a/Patches/Combat/EnemiesNoRunningAway.cs
+++ b/Patches/Combat/EnemiesNoRunningAway.cs
@@ -13,8 +13,7 @@ public static class EnemiesNoRunningAway
         public static void CalculateMoraleChangeToCharacter(Agent agent, float moraleChange, float distance, ref float __result)
         {
             if (agent.IsPlayerEnemy()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnemiesNoRunningAway, out var enemiesNoRunningAway)
-                && enemiesNoRunningAway)
+                && BannerlordCheatsSettings.Instance?.EnemiesNoRunningAway == true)
             {
                 __result = 0.0f;
             }
diff --git a/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
index f2294001..32c0f5cd 100644
--- a/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
+++ b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
@@ -15,9 +15,9 @@ public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedA
         {
             if (effectedAgent.IsHero()
                 && effectedAgent.IsPlayerEnemy()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnemyLordCombatDeathPercentage, out var enemyLordCombatDeathPercentage))
+                && BannerlordCheatsSettings.Instance?.EnemyLordCombatDeathPercentage < 100f)
             {
-                var factor = enemyLordCombatDeathPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.EnemyLordCombatDeathPercentage / 100f;
 
                 __result *= factor;
             }
diff --git a/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs b/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
index 06bb8437..2f9f226c 100644
--- a/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
+++ b/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
@@ -15,12 +15,12 @@ public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterOb
         {
             if (struckTroop.IsHero()
                 && !struckParty.IsPlayerKingdom()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnemyLordCombatDeathPercentage, out var enemyLordCombatDeathPercentage))
+                && BannerlordCheatsSettings.Instance?.EnemyLordCombatDeathPercentage < 100f)
             {
-                var factor = enemyLordCombatDeathPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.EnemyLordCombatDeathPercentage / 100f;
 
                 __result = (int) Math.Round(__result / factor);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Combat/EnemyOnlyKnockout.cs b/Patches/Combat/EnemyOnlyKnockout.cs
index cf765c61..d12da42a 100644
--- a/Patches/Combat/EnemyOnlyKnockout.cs
+++ b/Patches/Combat/EnemyOnlyKnockout.cs
@@ -14,8 +14,7 @@ public static class EnemyOnlyKnockout
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
         {
             if (effectedAgent.IsPlayerEnemy()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnemyOnlyKnockout, out var enemyOnlyKnockout)
-                && enemyOnlyKnockout)
+                && BannerlordCheatsSettings.Instance?.EnemyOnlyKnockout == true)
             {
                 __result = 0f;
             }
diff --git a/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
index 5d418639..6dcd8c61 100644
--- a/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
+++ b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
@@ -15,9 +15,9 @@ public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedA
         {
             if (effectedAgent.IsHero()
                 &&effectedAgent.IsPlayerAlly()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.FriendlyLordCombatDeathPercentage, out var friendlyLordCombatDeathPercentage))
+                && BannerlordCheatsSettings.Instance?.FriendlyLordCombatDeathPercentage < 100f)
             {
-                var factor = friendlyLordCombatDeathPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.FriendlyLordCombatDeathPercentage / 100f;
 
                 __result *= factor;
             }
diff --git a/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs b/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
index 47690dc1..8f20c4e0 100644
--- a/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
+++ b/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
@@ -15,12 +15,12 @@ public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterOb
         {
             if (struckTroop.IsHero()
                 && struckParty.IsPlayerKingdom()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.FriendlyLordCombatDeathPercentage, out var friendlyLordCombatDeathPercentage))
+                && BannerlordCheatsSettings.Instance?.FriendlyLordCombatDeathPercentage < 100f)
             {
-                var factor = friendlyLordCombatDeathPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.FriendlyLordCombatDeathPercentage / 100f;
 
                 __result = (int) Math.Round(__result / factor);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Combat/HealthRegeneration.cs b/Patches/Combat/HealthRegeneration.cs
index 4e521fb0..81b0f5ae 100644
--- a/Patches/Combat/HealthRegeneration.cs
+++ b/Patches/Combat/HealthRegeneration.cs
@@ -16,7 +16,7 @@ public static void OnApplicationTick(float dt)
             if (Mission.Current != null
                 && Agent.Main != null
                 && MBCommon.IsPaused != true
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.HealthRegeneration, out var healthRegeneration))
+                && BannerlordCheatsSettings.Instance?.HealthRegeneration > 0f)
             {
                 var now = DateTime.Now.Second;
 
@@ -29,7 +29,7 @@ public static void OnApplicationTick(float dt)
 
                     if (health < maxHealth)
                     {
-                        float regen = (healthRegeneration / maxHealth) * 100;
+                        float regen = (BannerlordCheatsSettings.Instance.HealthRegeneration / maxHealth) * 100;
                         float newHealth = (float) Math.Round(health + regen);
 
                         Agent.Main.Health = Math.Min(maxHealth, newHealth);
diff --git a/Patches/Combat/InfiniteAmmo.cs b/Patches/Combat/InfiniteAmmo.cs
index 0abeef4b..b29bc93f 100644
--- a/Patches/Combat/InfiniteAmmo.cs
+++ b/Patches/Combat/InfiniteAmmo.cs
@@ -22,8 +22,7 @@ public static void OnAgentShootMissile(
             ref int forcedMissileIndex)
         {
             if (shooterAgent.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.InfiniteAmmo, out var infiniteAmmo)
-                && infiniteAmmo)
+                && BannerlordCheatsSettings.Instance?.InfiniteAmmo == true)
             {
                 for (var index = EquipmentIndex.WeaponItemBeginSlot; index < EquipmentIndex.NumAllWeaponSlots; ++index)
                 {
diff --git a/Patches/Combat/InfluenceRewardMultiplier.cs b/Patches/Combat/InfluenceRewardMultiplier.cs
index 743ac05f..c4394c3c 100644
--- a/Patches/Combat/InfluenceRewardMultiplier.cs
+++ b/Patches/Combat/InfluenceRewardMultiplier.cs
@@ -17,9 +17,9 @@ public static void CalculateInfluenceGain(
             ref ExplainedNumber __result)
         {
             if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.InfluenceRewardMultiplier, out var influenceRewardMultiplier))
+                && BannerlordCheatsSettings.Instance?.InfluenceRewardMultiplier > 1f)
             {
-                __result.AddMultiplier(influenceRewardMultiplier);
+                __result.AddMultiplier(BannerlordCheatsSettings.Instance.InfluenceRewardMultiplier);
             }
         }
     }
diff --git a/Patches/Combat/InstantCrossbowReload.cs b/Patches/Combat/InstantCrossbowReload.cs
index dbda8661..410ea31d 100644
--- a/Patches/Combat/InstantCrossbowReload.cs
+++ b/Patches/Combat/InstantCrossbowReload.cs
@@ -14,8 +14,7 @@ public static class InstantCrossbowReload
         public static void GetPerkEffectsOnAgent(ref Agent agent, ref AgentDrivenProperties agentDrivenProperties, ref WeaponComponentData rightHandEquippedItem)
         {
             if (agent.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.InstantCrossbowReload, out var instantCrossbowReload)
-                && instantCrossbowReload)
+                && BannerlordCheatsSettings.Instance?.InstantCrossbowReload == true)
             {
                 agentDrivenProperties.ReloadSpeed = 10f;
             }
diff --git a/Patches/Combat/Invincible.cs b/Patches/Combat/Invincible.cs
index d36021cc..ae0c29a8 100644
--- a/Patches/Combat/Invincible.cs
+++ b/Patches/Combat/Invincible.cs
@@ -11,9 +11,8 @@ public static class Invincible
         [HarmonyPostfix]
         public static void Invulnerable(ref Agent __instance, ref bool __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.Invincible, out var invincible)
-                && invincible
-                && __instance.IsPlayer())
+            if (__instance.IsPlayer()
+                && BannerlordCheatsSettings.Instance?.Invincible == true)
             {
                 __result = true;
             }
diff --git a/Patches/Combat/NoFriendlyFire.cs b/Patches/Combat/NoFriendlyFire.cs
index 9765c102..b477f4f3 100644
--- a/Patches/Combat/NoFriendlyFire.cs
+++ b/Patches/Combat/NoFriendlyFire.cs
@@ -16,8 +16,7 @@ public static void CalculateDamage(ref AttackInformation attackInformation, ref
             if (attackInformation.AttackerAgentOrigin.TryGetParty(out var party)
                 && party.IsPlayerParty()
                 && attackInformation.IsFriendlyFire
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoFriendlyFire, out var noFriendlyFire)
-                && noFriendlyFire)
+                && BannerlordCheatsSettings.Instance?.NoFriendlyFire == true)
             {
                 __result = 0;
             }
diff --git a/Patches/Combat/NoRunningAway.cs b/Patches/Combat/NoRunningAway.cs
index 67cdbf8b..251dd13b 100644
--- a/Patches/Combat/NoRunningAway.cs
+++ b/Patches/Combat/NoRunningAway.cs
@@ -14,8 +14,7 @@ public static void CalculateMoraleChangeToCharacter(Agent agent, float moraleCha
         {
             if (agent.Origin.TryGetParty(out var party)
                 && party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoRunningAway, out var noRunningAway)
-                && noRunningAway)
+                && BannerlordCheatsSettings.Instance?.NoRunningAway == true)
             {
                 __result = 0.0f;
             }
diff --git a/Patches/Combat/NoTroopSacrificeBreakIn.cs b/Patches/Combat/NoTroopSacrificeBreakIn.cs
index b30bc79d..5f5805db 100644
--- a/Patches/Combat/NoTroopSacrificeBreakIn.cs
+++ b/Patches/Combat/NoTroopSacrificeBreakIn.cs
@@ -13,11 +13,10 @@ public static class NoTroopSacrificeBreakIn
         public static void GetLostTroopCountForBreakingInBesiegedSettlement(MobileParty party, SiegeEvent siegeEvent, ref int __result)
         {
             if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoTroopSacrifice, out var noTroopSacrifice)
-                && noTroopSacrifice)
+                && BannerlordCheatsSettings.Instance?.NoTroopSacrifice == true)
             {
                 __result = 0;
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Combat/NoTroopSacrificeBreakOut.cs b/Patches/Combat/NoTroopSacrificeBreakOut.cs
index 5ede335d..04855033 100644
--- a/Patches/Combat/NoTroopSacrificeBreakOut.cs
+++ b/Patches/Combat/NoTroopSacrificeBreakOut.cs
@@ -13,11 +13,10 @@ public static class NoTroopSacrificeBreakOut
         public static void GetLostTroopCountForBreakingOutOfBesiegedSettlement(MobileParty party, SiegeEvent siegeEvent, ref int __result)
         {
             if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoTroopSacrifice, out var noTroopSacrifice)
-                && noTroopSacrifice)
+                && BannerlordCheatsSettings.Instance?.NoTroopSacrifice == true)
             {
                 __result = 0;
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Combat/NoTroopSacrificeRunaway.cs b/Patches/Combat/NoTroopSacrificeRunaway.cs
index 52787c35..26635478 100644
--- a/Patches/Combat/NoTroopSacrificeRunaway.cs
+++ b/Patches/Combat/NoTroopSacrificeRunaway.cs
@@ -14,8 +14,7 @@ public static void GetNumberOfTroopsSacrificedForTryingToGetAway(BattleSideEnum
         {
             if (mapEvent.IsPlayerMapEvent
                 && battleSide == mapEvent.PlayerSide
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoTroopSacrifice, out var noTroopSacrifice)
-                && noTroopSacrifice)
+                && BannerlordCheatsSettings.Instance?.NoTroopSacrifice == true)
             {
                 __result = 0;
             }
diff --git a/Patches/Combat/OneHitKill.cs b/Patches/Combat/OneHitKill.cs
index 3846a0a5..a13f6731 100644
--- a/Patches/Combat/OneHitKill.cs
+++ b/Patches/Combat/OneHitKill.cs
@@ -15,8 +15,7 @@ public static void CalculateDamage(ref AttackInformation attackInformation, ref
         {
             if (attackInformation.AttackerAgentCharacter.IsPlayer()
                 && !attackInformation.IsFriendlyFire
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.OneHitKill, out var oneHitKill)
-                && oneHitKill)
+                && BannerlordCheatsSettings.Instance?.OneHitKill == true)
             {
                 __result = 10000;
             }
diff --git a/Patches/Combat/PartyDamageMultiplier.cs b/Patches/Combat/PartyDamageMultiplier.cs
index a3f2b2bc..075e77f5 100644
--- a/Patches/Combat/PartyDamageMultiplier.cs
+++ b/Patches/Combat/PartyDamageMultiplier.cs
@@ -17,9 +17,9 @@ public static void CalculateDamage(ref AttackInformation attackInformation, ref
                 && party.IsPlayerParty()
                 && !attackInformation.AttackerAgentCharacter.IsPlayer()
                 && !attackInformation.IsFriendlyFire
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PartyDamageMultiplier, out var partyDamageMultiplier))
+                && BannerlordCheatsSettings.Instance?.PartyDamageMultiplier > 1f)
             {
-                __result *= partyDamageMultiplier;
+                __result *= BannerlordCheatsSettings.Instance.PartyDamageMultiplier;
             }
         }
     }
diff --git a/Patches/Combat/PartyDamageTakenPercentage.cs b/Patches/Combat/PartyDamageTakenPercentage.cs
index 73c6639b..2a811ca5 100644
--- a/Patches/Combat/PartyDamageTakenPercentage.cs
+++ b/Patches/Combat/PartyDamageTakenPercentage.cs
@@ -17,9 +17,9 @@ public static void CalculateDamage(ref AttackInformation attackInformation, ref
             if ( attackInformation.VictimAgentOrigin.TryGetParty(out var party)
                 && party.IsPlayerParty()
                 && !attackInformation.VictimAgentCharacter.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PartyDamageTakenPercentage, out var partyDamageTakenPercentage))
+                && BannerlordCheatsSettings.Instance?.PartyDamageTakenPercentage < 100f)
             {
-                var factor = partyDamageTakenPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.PartyDamageTakenPercentage / 100f;
 
                 var newValue = (int)Math.Round(factor * __result);
 
diff --git a/Patches/Combat/PartyHealthRegeneration.cs b/Patches/Combat/PartyHealthRegeneration.cs
index a4b6b0a3..620775cc 100644
--- a/Patches/Combat/PartyHealthRegeneration.cs
+++ b/Patches/Combat/PartyHealthRegeneration.cs
@@ -18,7 +18,7 @@ public static void OnApplicationTick(float dt)
             if (Mission.Current != null
                 && Mission.Current.PlayerTeam != null
                 && MBCommon.IsPaused != true
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PartyHealthRegeneration, out var partyHealthRegeneration))
+                && BannerlordCheatsSettings.Instance?.PartyHealthRegeneration > 0f)
             {
                 var now = DateTime.Now.Second;
 
@@ -40,7 +40,7 @@ public static void OnApplicationTick(float dt)
 
                         if (health < maxHealth)
                         {
-                            var regen = (partyHealthRegeneration / maxHealth) * 100;
+                            var regen = (BannerlordCheatsSettings.Instance.PartyHealthRegeneration / maxHealth) * 100;
                             var newHealth = (float)Math.Round(health + regen);
 
                             agent.Health = Math.Min(maxHealth, newHealth);
diff --git a/Patches/Combat/PartyHeroesInvincible.cs b/Patches/Combat/PartyHeroesInvincible.cs
index 18d574b6..bb9e3095 100644
--- a/Patches/Combat/PartyHeroesInvincible.cs
+++ b/Patches/Combat/PartyHeroesInvincible.cs
@@ -16,8 +16,7 @@ public static void Invulnerable(ref Agent __instance, ref bool __result)
                 && agent.Origin.TryGetParty(out var party)
                 && party.IsPlayerParty()
                 && agent.IsHero()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PartyHeroesInvincible, out var partyHeroesInvincible)
-                && partyHeroesInvincible)
+                && BannerlordCheatsSettings.Instance?.PartyHeroesInvincible == true)
             {
                 __result = true;
             }
diff --git a/Patches/Combat/PartyInfiniteAmmo.cs b/Patches/Combat/PartyInfiniteAmmo.cs
index 433ed6d4..27a8af1e 100644
--- a/Patches/Combat/PartyInfiniteAmmo.cs
+++ b/Patches/Combat/PartyInfiniteAmmo.cs
@@ -24,8 +24,7 @@ public static void OnAgentShootMissile(
             if (!shooterAgent.IsPlayer()
                 && shooterAgent.Origin.TryGetParty(out var party)
                 && party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PartyInfiniteAmmo, out var partyInfiniteAmmo)
-                && partyInfiniteAmmo)
+                && BannerlordCheatsSettings.Instance?.PartyInfiniteAmmo == true)
             {
                 for (var index = EquipmentIndex.WeaponItemBeginSlot; index < EquipmentIndex.NumAllWeaponSlots; ++index)
                 {
diff --git a/Patches/Combat/PartyInvincible.cs b/Patches/Combat/PartyInvincible.cs
index 783dd38e..55479785 100644
--- a/Patches/Combat/PartyInvincible.cs
+++ b/Patches/Combat/PartyInvincible.cs
@@ -15,8 +15,7 @@ public static void Invulnerable(ref Agent __instance, ref bool __result)
                 && agent.Origin.TryGetParty(out var party)
                 && party.IsPlayerParty()
                 && !agent.IsHero()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PartyInvincible, out var partyInvincible)
-                && partyInvincible)
+                && BannerlordCheatsSettings.Instance?.PartyInvincible == true)
             {
                 __result = true;
             }
diff --git a/Patches/Combat/PartyOneHitKill.cs b/Patches/Combat/PartyOneHitKill.cs
index 82a213eb..7578e5b1 100644
--- a/Patches/Combat/PartyOneHitKill.cs
+++ b/Patches/Combat/PartyOneHitKill.cs
@@ -17,8 +17,7 @@ public static void CalculateDamage(ref AttackInformation attackInformation, ref
                 && party.IsPlayerParty()
                 && !attackInformation.AttackerAgentCharacter.IsPlayer()
                 && !attackInformation.IsFriendlyFire
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PartyOneHitKill, out var partyOneHitKill)
-                && partyOneHitKill)
+                && BannerlordCheatsSettings.Instance?.PartyOneHitKill == true)
             {
                 __result = 10000;
             }
diff --git a/Patches/Combat/PartyOnlyKnockout.cs b/Patches/Combat/PartyOnlyKnockout.cs
index 7d8b5feb..7cf2b4f1 100644
--- a/Patches/Combat/PartyOnlyKnockout.cs
+++ b/Patches/Combat/PartyOnlyKnockout.cs
@@ -16,8 +16,7 @@ public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedA
             if (effectedAgent.Origin.TryGetParty(out var party)
                 && party.IsPlayerParty()
                 && !effectedAgent.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PartyOnlyKnockout, out var partyOnlyKnockout)
-                && partyOnlyKnockout)
+                && BannerlordCheatsSettings.Instance?.PartyOnlyKnockout == true)
             {
                 __result = 0f;
             }
diff --git a/Patches/Combat/PlayerHorseInvincible.cs b/Patches/Combat/PlayerHorseInvincible.cs
index 96aacd4d..d468d522 100644
--- a/Patches/Combat/PlayerHorseInvincible.cs
+++ b/Patches/Combat/PlayerHorseInvincible.cs
@@ -14,8 +14,7 @@ public static void Invulnerable(ref Agent __instance, ref bool __result)
             if (__instance.IsMount
                 && __instance.TryGetHuman(out var rider)
                 && rider.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PlayerHorseInvincible, out var playerHorseInvincible)
-                && playerHorseInvincible)
+                && BannerlordCheatsSettings.Instance?.PlayerHorseInvincible == true)
             {
                 __result = true;
             }
diff --git a/Patches/Combat/RenownRewardMultiplierBattle.cs b/Patches/Combat/RenownRewardMultiplierBattle.cs
index 26b70c77..cf0d7101 100644
--- a/Patches/Combat/RenownRewardMultiplierBattle.cs
+++ b/Patches/Combat/RenownRewardMultiplierBattle.cs
@@ -17,9 +17,9 @@ public static void CalculateRenownGain(
             ref ExplainedNumber __result)
         {
             if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.RenownRewardMultiplier, out var renownRewardMultiplier))
+                && BannerlordCheatsSettings.Instance?.RenownRewardMultiplier > 1f)
             {
-                __result.AddMultiplier(renownRewardMultiplier);
+                __result.AddMultiplier(BannerlordCheatsSettings.Instance.RenownRewardMultiplier);
             }
         }
     }
diff --git a/Patches/Combat/RenownRewardMultiplierTournament.cs b/Patches/Combat/RenownRewardMultiplierTournament.cs
index 067e84e1..b8e0a248 100644
--- a/Patches/Combat/RenownRewardMultiplierTournament.cs
+++ b/Patches/Combat/RenownRewardMultiplierTournament.cs
@@ -14,9 +14,9 @@ public static class RenownRewardMultiplierTournament
         public static void GetRenownReward(Hero winner, Town town, ref int __result)
         {
             if (winner.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.RenownRewardMultiplier, out var renownRewardMultiplier))
+                && BannerlordCheatsSettings.Instance?.RenownRewardMultiplier > 1f)
             {
-                __result = (int) Math.Round(__result * renownRewardMultiplier);
+                __result = (int) Math.Round(__result * BannerlordCheatsSettings.Instance.RenownRewardMultiplier);
             }
         }
     }
diff --git a/Patches/Combat/SliceThroughEveryonePassive.cs b/Patches/Combat/SliceThroughEveryonePassive.cs
index a62aa7cf..436b4de1 100644
--- a/Patches/Combat/SliceThroughEveryonePassive.cs
+++ b/Patches/Combat/SliceThroughEveryonePassive.cs
@@ -17,11 +17,10 @@ public static void DecidePassiveAttackCollisionReaction(
             ref MeleeCollisionReaction __result)
         {
             if (attacker.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.SliceThroughEveryone, out var sliceThroughEveryone)
-                && sliceThroughEveryone)
+                && BannerlordCheatsSettings.Instance?.SliceThroughEveryone == true)
             {
                 __result = MeleeCollisionReaction.SlicedThrough;
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Combat/SliceThroughEveryoneWeapon.cs b/Patches/Combat/SliceThroughEveryoneWeapon.cs
index f312a850..3bf05910 100644
--- a/Patches/Combat/SliceThroughEveryoneWeapon.cs
+++ b/Patches/Combat/SliceThroughEveryoneWeapon.cs
@@ -20,8 +20,7 @@ public static void DecideWeaponCollisionReaction(
             ref MeleeCollisionReaction colReaction)
         {
             if (attacker.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.SliceThroughEveryone, out var sliceThroughEveryone)
-                && sliceThroughEveryone)
+                && BannerlordCheatsSettings.Instance?.SliceThroughEveryone == true)
             {
                 colReaction = MeleeCollisionReaction.SlicedThrough;
             }
diff --git a/Patches/Experience/CompanionExperienceMultiplier.cs b/Patches/Experience/CompanionExperienceMultiplier.cs
index 7e15fdbd..dc999a65 100644
--- a/Patches/Experience/CompanionExperienceMultiplier.cs
+++ b/Patches/Experience/CompanionExperienceMultiplier.cs
@@ -14,9 +14,9 @@ public static void GetXpMultiplier(ref Hero hero, ref float __result)
         {
             if (!hero.IsPlayer()
                 && hero.IsPlayerCompanion()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.CompanionExperienceMultiplier, out var companionExperienceMultiplier))
+                && BannerlordCheatsSettings.Instance?.CompanionExperienceMultiplier > 1f)
             {
-                __result *= companionExperienceMultiplier;
+                __result *= BannerlordCheatsSettings.Instance.CompanionExperienceMultiplier;
             }
         }
     }
diff --git a/Patches/Experience/CompanionLearningRateMultiplier.cs b/Patches/Experience/CompanionLearningRateMultiplier.cs
index a80a4d76..653d03ed 100644
--- a/Patches/Experience/CompanionLearningRateMultiplier.cs
+++ b/Patches/Experience/CompanionLearningRateMultiplier.cs
@@ -15,9 +15,9 @@ public static void CalculateLearningRate(ref Hero hero, ref SkillObject skill, r
         {
             if (!hero.IsPlayer()
                 && hero.IsPlayerCompanion()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.CompanionLearningRateMultiplier, out var companionLearningRateMultiplier))
+                && BannerlordCheatsSettings.Instance?.CompanionLearningRateMultiplier > 1f)
             {
-                __result *= companionLearningRateMultiplier;
+                __result *= BannerlordCheatsSettings.Instance.CompanionLearningRateMultiplier;
             }
         }
     }
diff --git a/Patches/Experience/ExperienceMultiplier.cs b/Patches/Experience/ExperienceMultiplier.cs
index 5fa735aa..5b9cac0c 100644
--- a/Patches/Experience/ExperienceMultiplier.cs
+++ b/Patches/Experience/ExperienceMultiplier.cs
@@ -13,9 +13,9 @@ public static class ExperienceMultiplier
         public static void GetXpMultiplier(Hero hero, ref float __result)
         {
             if (hero.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.ExperienceMultiplier, out var experienceMultiplier))
+                && BannerlordCheatsSettings.Instance?.ExperienceMultiplier > 1f)
             {
-                __result *= experienceMultiplier;
+                __result *= BannerlordCheatsSettings.Instance.ExperienceMultiplier;
             }
         }
     }
diff --git a/Patches/Experience/FreeFocusPointAssignment.cs b/Patches/Experience/FreeFocusPointAssignment.cs
index 48c2ac98..cf3ee03b 100644
--- a/Patches/Experience/FreeFocusPointAssignment.cs
+++ b/Patches/Experience/FreeFocusPointAssignment.cs
@@ -11,8 +11,7 @@ public static class FreeFocusPointAssignment
         [HarmonyPostfix]
         public static void GetRequiredFocusPointsToAddFocus(ref SkillObject skill, ref int __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.FreeFocusPointAssignment, out var freeFocusPointAssignment)
-                && freeFocusPointAssignment)
+            if (BannerlordCheatsSettings.Instance?.FreeFocusPointAssignment == true)
             {
                 __result = 0;
             }
diff --git a/Patches/Experience/LearningLimitMultiplier.cs b/Patches/Experience/LearningLimitMultiplier.cs
index 64bb4419..7ac840af 100644
--- a/Patches/Experience/LearningLimitMultiplier.cs
+++ b/Patches/Experience/LearningLimitMultiplier.cs
@@ -18,9 +18,9 @@ public static void CalculateLearningLimit(
             ref bool includeDescriptions,
             ref ExplainedNumber __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.LearningLimitMultiplier, out var learningLimitMultiplier))
+            if (BannerlordCheatsSettings.Instance?.LearningLimitMultiplier > 1f)
             {
-                __result.AddMultiplier(learningLimitMultiplier);
+                __result.AddMultiplier(BannerlordCheatsSettings.Instance.LearningLimitMultiplier);
             }
         }
     }
diff --git a/Patches/Experience/LearningRateMultiplier.cs b/Patches/Experience/LearningRateMultiplier.cs
index 7180fdc9..58ebbc07 100644
--- a/Patches/Experience/LearningRateMultiplier.cs
+++ b/Patches/Experience/LearningRateMultiplier.cs
@@ -14,9 +14,9 @@ public static class LearningRateMultiplier
         public static void CalculateLearningRate(ref Hero hero, SkillObject skill, ref float __result)
         {
             if (hero.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.LearningRateMultiplier, out var learningRateMultiplier))
+                && BannerlordCheatsSettings.Instance?.LearningRateMultiplier > 1f)
             {
-                __result *= learningRateMultiplier;
+                __result *= BannerlordCheatsSettings.Instance.LearningRateMultiplier;
             }
         }
     }
diff --git a/Patches/Experience/TroopExperienceMultiplier.cs b/Patches/Experience/TroopExperienceMultiplier.cs
index dd215f01..22ae11e3 100644
--- a/Patches/Experience/TroopExperienceMultiplier.cs
+++ b/Patches/Experience/TroopExperienceMultiplier.cs
@@ -23,9 +23,9 @@ public static void GetXpFromHit(
         {
             if (party.IsPlayerParty()
                 && !attackerTroop.IsPlayer()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.TroopExperienceMultiplier, out var troopExperienceMultiplier))
+                && BannerlordCheatsSettings.Instance?.TroopExperienceMultiplier > 1f)
             {
-                xpAmount = (int) Math.Round(xpAmount * troopExperienceMultiplier);
+                xpAmount = (int) Math.Round(xpAmount * BannerlordCheatsSettings.Instance.TroopExperienceMultiplier);
             }
         }
     }
diff --git a/Patches/General/EnableHotkeyTipsEncyclopedia.cs b/Patches/General/EnableHotkeyTipsEncyclopedia.cs
index 24bd0c6e..728ecf87 100644
--- a/Patches/General/EnableHotkeyTipsEncyclopedia.cs
+++ b/Patches/General/EnableHotkeyTipsEncyclopedia.cs
@@ -11,10 +11,8 @@ public static class EnableHotkeyTipsEncyclopedia
         [HarmonyPostfix]
         public static void OpenEncyclopedia()
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeys, out var enableHotkeys)
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeyTips, out var enableHotkeyTips)
-                && enableHotkeys
-                && enableHotkeyTips)
+            if (BannerlordCheatsSettings.Instance?.EnableHotkeys == true
+                && BannerlordCheatsSettings.Instance?.EnableHotkeyTips == true)
             {
                 Message.Show("Encyclopedia Screen Cheat Hotkeys:");
                 Message.Show("CTRL + H: Add 1 soldier of the selected troop type to the party.");
@@ -22,4 +20,4 @@ public static void OpenEncyclopedia()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/General/EnableHotkeyTipsScreens.cs b/Patches/General/EnableHotkeyTipsScreens.cs
index 7ff6059e..6bd4c6b3 100644
--- a/Patches/General/EnableHotkeyTipsScreens.cs
+++ b/Patches/General/EnableHotkeyTipsScreens.cs
@@ -12,10 +12,8 @@ public static class EnableHotkeyTipsScreens
         [HarmonyPostfix]
         public static void PushScreen(ref ScreenBase screen)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeys, out var enableHotkeys)
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeyTips, out var enableHotkeyTips)
-                && enableHotkeys
-                && enableHotkeyTips)
+            if (BannerlordCheatsSettings.Instance?.EnableHotkeys == true
+                && BannerlordCheatsSettings.Instance?.EnableHotkeyTips == true)
             {
                 switch (screen)
                 {
diff --git a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
index a389fa51..cbf877fa 100644
--- a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
+++ b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
@@ -18,8 +18,7 @@ public static void OnTick(ref EncyclopediaPageVM __instance)
         {
             if (__instance is EncyclopediaUnitPageVM
                 && __instance.Obj is CharacterObject characterObject
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeys, out var enableHotkeys)
-                && enableHotkeys)
+                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
             {
                 if (Keys.IsKeyPressed(InputKey.H, InputKey.LeftShift, InputKey.LeftControl))
                 {
diff --git a/Patches/General/EnableHotkeysAddItems.cs b/Patches/General/EnableHotkeysAddItems.cs
index 7848f2a0..c310cb1f 100644
--- a/Patches/General/EnableHotkeysAddItems.cs
+++ b/Patches/General/EnableHotkeysAddItems.cs
@@ -19,8 +19,7 @@ public static class EnableHotkeysAddItems
         public static void OnApplicationTick()
         {
             if (ScreenManager.TopScreen is InventoryGauntletScreen
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeys, out var enableHotkeys)
-                && enableHotkeys)
+                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
             {
                 if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.LeftShift, InputKey.H))
                 {
diff --git a/Patches/General/EnableHotkeysCharacterAttributes.cs b/Patches/General/EnableHotkeysCharacterAttributes.cs
index 914d8544..0d6441e7 100644
--- a/Patches/General/EnableHotkeysCharacterAttributes.cs
+++ b/Patches/General/EnableHotkeysCharacterAttributes.cs
@@ -20,8 +20,7 @@ public static class EnableHotkeysCharacterAttributes
         public static void OnApplicationTick()
         {
             if (ScreenManager.TopScreen is GauntletCharacterDeveloperScreen
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeys, out var enableHotkeys)
-                && enableHotkeys)
+                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
             {
                 if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.A))
                 {
diff --git a/Patches/General/EnableHotkeysCharacterPoints.cs b/Patches/General/EnableHotkeysCharacterPoints.cs
index fd53571e..19e9021b 100644
--- a/Patches/General/EnableHotkeysCharacterPoints.cs
+++ b/Patches/General/EnableHotkeysCharacterPoints.cs
@@ -19,8 +19,7 @@ public static class EnableHotkeysCharacterPoints
         public static void OnApplicationTick()
         {
             if (ScreenManager.TopScreen is GauntletCharacterDeveloperScreen
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeys, out var enableHotkeys)
-                && enableHotkeys)
+                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
             {
                 if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.F))
                 {
diff --git a/Patches/General/EnableHotkeysInfluence.cs b/Patches/General/EnableHotkeysInfluence.cs
index 6ddc44bc..3cea5967 100644
--- a/Patches/General/EnableHotkeysInfluence.cs
+++ b/Patches/General/EnableHotkeysInfluence.cs
@@ -20,8 +20,7 @@ public static void OnApplicationTick()
         {
             if (ScreenManager.TopScreen is GauntletClanScreen
                 && Keys.IsKeyPressed(InputKey.LeftControl, InputKey.X)
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeys, out var enableHotkeys)
-                && enableHotkeys)
+                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
             {
                 Hero.MainHero.AddInfluenceWithKingdom(1000);
 
diff --git a/Patches/General/EnableHotkeysMoney.cs b/Patches/General/EnableHotkeysMoney.cs
index 98468183..ac4b63e6 100644
--- a/Patches/General/EnableHotkeysMoney.cs
+++ b/Patches/General/EnableHotkeysMoney.cs
@@ -19,8 +19,7 @@ public static class EnableHotkeysMoney
         public static void OnApplicationTick()
         {
             if (ScreenManager.TopScreen is InventoryGauntletScreen
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeys, out var enableHotkeys)
-                && enableHotkeys)
+                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
             {
                 if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.LeftShift, InputKey.X))
                 {
diff --git a/Patches/General/EnableHotkeysTroopCount.cs b/Patches/General/EnableHotkeysTroopCount.cs
index b766fdc7..4f56cfba 100644
--- a/Patches/General/EnableHotkeysTroopCount.cs
+++ b/Patches/General/EnableHotkeysTroopCount.cs
@@ -20,8 +20,7 @@ public static class EnableHotkeysTroopCount
         public static void OnApplicationTick()
         {
             if (ScreenManager.TopScreen is GauntletPartyScreen
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeys, out var enableHotkeys)
-                && enableHotkeys)
+                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
             {
                 if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.LeftShift, InputKey.H))
                 {
diff --git a/Patches/General/EnableHotkeysTroopExperience.cs b/Patches/General/EnableHotkeysTroopExperience.cs
index e32c2aaf..c88690e9 100644
--- a/Patches/General/EnableHotkeysTroopExperience.cs
+++ b/Patches/General/EnableHotkeysTroopExperience.cs
@@ -21,8 +21,7 @@ public static void OnApplicationTick()
         {
             if (ScreenManager.TopScreen is GauntletPartyScreen
                 && Keys.IsKeyPressed(InputKey.LeftControl, InputKey.X)
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnableHotkeys, out var enableHotkeys)
-                && enableHotkeys)
+                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
             {
                 var partyScreen = ScreenManager.TopScreen as GauntletPartyScreen;
 
diff --git a/Patches/Inventory/ExtraInventoryCapacity.cs b/Patches/Inventory/ExtraInventoryCapacity.cs
index 2748ed6c..2b07ca9f 100644
--- a/Patches/Inventory/ExtraInventoryCapacity.cs
+++ b/Patches/Inventory/ExtraInventoryCapacity.cs
@@ -13,9 +13,9 @@ public static class ExtraInventoryCapacity
         public static void CalculateInventoryCapacity(ref MobileParty mobileParty, ref bool includeDescriptions, ref int additionalTroops, ref int additionalSpareMounts, ref int additionalPackAnimals, ref bool includeFollowers, ref ExplainedNumber __result)
         {
             if (mobileParty.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.ExtraInventoryCapacity, out var extraInventoryCapacity))
+                && BannerlordCheatsSettings.Instance?.ExtraInventoryCapacity > 0)
             {
-                __result.Add(extraInventoryCapacity);
+                __result.Add(BannerlordCheatsSettings.Instance.ExtraInventoryCapacity);
             }
         }
     }
diff --git a/Patches/Inventory/NativeItemSpawning.cs b/Patches/Inventory/NativeItemSpawning.cs
index 2083240a..5a75aac0 100644
--- a/Patches/Inventory/NativeItemSpawning.cs
+++ b/Patches/Inventory/NativeItemSpawning.cs
@@ -25,8 +25,7 @@ public static void Initialize(
             if (party.IsPlayerParty()
                 && !isTrading
                 && !Game.Current.CheatMode
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NativeItemSpawning, out var nativeItemSpawning)
-                && nativeItemSpawning)
+                && BannerlordCheatsSettings.Instance?.NativeItemSpawning == true)
             {
                 var objectTypeList = Game.Current.ObjectManager.GetObjectTypeList<ItemObject>();
                 for (var index = 0; index != objectTypeList.Count; ++index)
diff --git a/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs b/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
index e7448937..e40541dd 100644
--- a/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
+++ b/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
@@ -16,9 +16,9 @@ public static void GetInfluenceRequiredToOverrideKingdomDecision(
             ref KingdomDecision decision,
             ref int __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.DecisionOverrideInfluenceCostPercentage, out var decisionOverrideInfluenceCostPercentage))
+            if (BannerlordCheatsSettings.Instance?.DecisionOverrideInfluenceCostPercentage < 100f)
             {
-                var factor = decisionOverrideInfluenceCostPercentage / 100.0f;
+                var factor = BannerlordCheatsSettings.Instance.DecisionOverrideInfluenceCostPercentage / 100.0f;
 
                 var newValue = __result * factor;
 
diff --git a/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs b/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs
index d4b8e4ed..e47eb036 100644
--- a/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs
+++ b/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs
@@ -11,10 +11,10 @@ public static class KingdomDecisionWeightMultiplier
         [HarmonyPostfix]
         public static void Getter(ref DecisionOutcome __instance, ref float __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.KingdomDecisionWeightMultiplier, out var kingdomDecisionWeightMultiplier)
-                && __instance.SupporterList.Any(x => x.IsPlayer))
+            if (__instance.SupporterList.Any(x => x.IsPlayer)
+                && BannerlordCheatsSettings.Instance?.KingdomDecisionWeightMultiplier > 1f)
             {
-                __result *= kingdomDecisionWeightMultiplier;
+                __result *= BannerlordCheatsSettings.Instance.KingdomDecisionWeightMultiplier;
             }
         }
     }
diff --git a/Patches/Kingdom/NoCrimeRatingForCrimes.cs b/Patches/Kingdom/NoCrimeRatingForCrimes.cs
index a2fd1d5f..9f4db4f2 100644
--- a/Patches/Kingdom/NoCrimeRatingForCrimes.cs
+++ b/Patches/Kingdom/NoCrimeRatingForCrimes.cs
@@ -11,8 +11,7 @@ public static class NoCrimeRatingForCrimes
         [HarmonyPostfix]
         public static void GetCrimeRatingOf(ref CrimeModel.CrimeType crime, ref object[] additionalArgs, ref float __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoCrimeRatingForCrimes, out var noCrimeRatingForCrimes)
-                && noCrimeRatingForCrimes)
+            if (BannerlordCheatsSettings.Instance?.NoCrimeRatingForCrimes == true)
             {
                 __result = 0f;
             }
diff --git a/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
index 437521d5..722ee0ea 100644
--- a/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
@@ -10,8 +10,7 @@ public static class NoRelationshipLossOnDecisionArmyDisband
         [HarmonyPostfix]
         public static void GetRelationCostOfDisbandingArmy(bool isLeaderParty, ref int __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoRelationshipLossOnDecision, out var noRelationshipLossOnDecision)
-                && noRelationshipLossOnDecision)
+            if (BannerlordCheatsSettings.Instance?.NoRelationshipLossOnDecision == true)
             {
                 __result = 0;
             }
diff --git a/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
index 771b53c0..87b644af 100644
--- a/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
@@ -10,8 +10,7 @@ public static class NoRelationshipLossOnDecisionExpellingClan
         [HarmonyPostfix]
         public static void GetRelationCostOfExpellingClanFromKingdom(ref int __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoRelationshipLossOnDecision, out var noRelationshipLossOnDecision)
-                && noRelationshipLossOnDecision)
+            if (BannerlordCheatsSettings.Instance?.NoRelationshipLossOnDecision == true)
             {
                 __result = 0;
             }
diff --git a/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs
index 5ddb72ef..70c39ef8 100644
--- a/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs
@@ -11,8 +11,7 @@ public static class NoRelationshipLossOnDecisionKingdomDecision
         [HarmonyPostfix]
         public static void GetRelationChangeWithSponsor(Supporter.SupportWeights supportWeight, bool isOpposingSides, ref int __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoRelationshipLossOnDecision, out var noRelationshipLossOnDecision)
-                && noRelationshipLossOnDecision)
+            if (BannerlordCheatsSettings.Instance?.NoRelationshipLossOnDecision == true)
             {
                 __result = Math.Max(__result, 0);
             }
diff --git a/Patches/Map/MapSpeedMultiplier.cs b/Patches/Map/MapSpeedMultiplier.cs
index 261c6e37..4b8426ec 100644
--- a/Patches/Map/MapSpeedMultiplier.cs
+++ b/Patches/Map/MapSpeedMultiplier.cs
@@ -13,9 +13,9 @@ namespace BannerlordCheats.Patches.Map
     //     public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
     //     {
     //         if (mobileParty.IsPlayerParty()
-    //             && BannerlordCheatsSettings.TryGetModifiedValue(x => x.MapSpeedMultiplier, out var mapSpeedMultiplier))
+    //             && BannerlordCheatsSettings.Instance?.MapSpeedMultiplier > 1f)
     //         {
-    //             __result.AddMultiplier(mapSpeedMultiplier);
+    //             __result.AddMultiplier(BannerlordCheatsSettings.Instance.MapSpeedMultiplier);
     //         }
     //     }
     // }
diff --git a/Patches/Map/MapVisibilityMultiplier.cs b/Patches/Map/MapVisibilityMultiplier.cs
index 4515af69..72796d4b 100644
--- a/Patches/Map/MapVisibilityMultiplier.cs
+++ b/Patches/Map/MapVisibilityMultiplier.cs
@@ -13,9 +13,9 @@ public static class MapVisibilityMultiplier
         public static void GetPartySpottingRange(ref MobileParty party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
             if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.MapVisibilityMultiplier, out var mapVisibilityMultiplier))
+                && BannerlordCheatsSettings.Instance?.MapVisibilityMultiplier > 1f)
             {
-                __result.AddMultiplier(mapVisibilityMultiplier);
+                __result.AddMultiplier(BannerlordCheatsSettings.Instance.MapVisibilityMultiplier);
             }
         }
     }
diff --git a/Patches/Map/NpcMapSpeedPercentage.cs b/Patches/Map/NpcMapSpeedPercentage.cs
index 88c7fa62..3d4044ff 100644
--- a/Patches/Map/NpcMapSpeedPercentage.cs
+++ b/Patches/Map/NpcMapSpeedPercentage.cs
@@ -13,9 +13,9 @@ namespace BannerlordCheats.Patches.Map
     //     public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
     //     {
     //         if (!mobileParty.IsPlayerParty()
-    //             && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NpcMapSpeedPercentage, out var npcMapSpeedPercentage))
+    //             && BannerlordCheatsSettings.Instance?.NpcMapSpeedPercentage > 100f)
     //         {
-    //             __result.AddPercentage(npcMapSpeedPercentage);
+    //             __result.AddPercentage(BannerlordCheatsSettings.Instance.NpcMapSpeedPercentage);
     //         }
     //     }
     // }
diff --git a/Patches/Map/PartyInvisibleOnMap.cs b/Patches/Map/PartyInvisibleOnMap.cs
index 4c394313..6d6abac0 100644
--- a/Patches/Map/PartyInvisibleOnMap.cs
+++ b/Patches/Map/PartyInvisibleOnMap.cs
@@ -12,8 +12,7 @@ public static class PartyInvisibleOnMap
         public static void ShouldBeIgnored(ref MobileParty __instance, ref bool __result)
         {
             if (__instance.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PartyInvisibleOnMap, out var partyInvisibleOnMap)
-                && partyInvisibleOnMap)
+                && BannerlordCheatsSettings.Instance?.PartyInvisibleOnMap == true)
             {
                 __result = true;
             }
diff --git a/Patches/Party/ExtraPartyMemberSize.cs b/Patches/Party/ExtraPartyMemberSize.cs
index 28f45db1..fafb916a 100644
--- a/Patches/Party/ExtraPartyMemberSize.cs
+++ b/Patches/Party/ExtraPartyMemberSize.cs
@@ -13,9 +13,9 @@ public static class ExtraPartyMemberSize
         public static void GetPartyMemberSizeLimit(ref PartyBase party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
             if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.ExtraPartyMemberSize, out var extraPartyMemberSize))
+                && BannerlordCheatsSettings.Instance?.ExtraPartyMemberSize > 0)
             {
-                __result.Add(extraPartyMemberSize);
+                __result.Add(BannerlordCheatsSettings.Instance.ExtraPartyMemberSize);
             }
         }
     }
diff --git a/Patches/Party/ExtraPartyMorale.cs b/Patches/Party/ExtraPartyMorale.cs
index 1145733e..f89d378c 100644
--- a/Patches/Party/ExtraPartyMorale.cs
+++ b/Patches/Party/ExtraPartyMorale.cs
@@ -13,9 +13,9 @@ public static class ExtraPartyMorale
         public static void GetEffectivePartyMorale(ref MobileParty mobileParty, ref bool includeDescription, ref ExplainedNumber __result)
         {
             if (mobileParty.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.ExtraPartyMorale, out var extraPartyMorale))
+                && BannerlordCheatsSettings.Instance?.ExtraPartyMorale > 0)
             {
-                __result.Add(extraPartyMorale);
+                __result.Add(BannerlordCheatsSettings.Instance.ExtraPartyMorale);
             }
         }
     }
diff --git a/Patches/Party/ExtraPartyPrisonerSize.cs b/Patches/Party/ExtraPartyPrisonerSize.cs
index 4321a41c..338bf98b 100644
--- a/Patches/Party/ExtraPartyPrisonerSize.cs
+++ b/Patches/Party/ExtraPartyPrisonerSize.cs
@@ -13,9 +13,9 @@ public static class ExtraPartyPrisonerSize
         public static void GetPartyPrisonerSizeLimit(ref PartyBase party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
             if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.ExtraPartyPrisonerSize, out var extraPartyPrisonerSize))
+                && BannerlordCheatsSettings.Instance?.ExtraPartyPrisonerSize > 0)
             {
-                __result.Add(extraPartyPrisonerSize);
+                __result.Add(BannerlordCheatsSettings.Instance.ExtraPartyPrisonerSize);
             }
         }
     }
diff --git a/Patches/Party/FoodConsumptionPercentage.cs b/Patches/Party/FoodConsumptionPercentage.cs
index 43958910..6b45c283 100644
--- a/Patches/Party/FoodConsumptionPercentage.cs
+++ b/Patches/Party/FoodConsumptionPercentage.cs
@@ -13,9 +13,9 @@ public static class FoodConsumptionPercentage
         public static void CalculateDailyFoodConsumptionf(ref MobileParty party, ref bool includeDescription, ref ExplainedNumber __result)
         {
             if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.FoodConsumptionPercentage, out var foodConsumptionPercentage))
+                && BannerlordCheatsSettings.Instance?.FoodConsumptionPercentage < 100f)
             {
-                __result.AddPercentage(foodConsumptionPercentage);
+                __result.AddPercentage(BannerlordCheatsSettings.Instance.FoodConsumptionPercentage);
             }
         }
     }
diff --git a/Patches/Party/FreeCompanionHiring.cs b/Patches/Party/FreeCompanionHiring.cs
index 6ea1928f..fc25516a 100644
--- a/Patches/Party/FreeCompanionHiring.cs
+++ b/Patches/Party/FreeCompanionHiring.cs
@@ -11,8 +11,7 @@ public static class FreeCompanionHiring
         [HarmonyPostfix]
         public static void GetCompanionHiringPrice(Hero companion, ref int __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.FreeCompanionHiring, out var freeCompanionHiring)
-                && freeCompanionHiring)
+            if (BannerlordCheatsSettings.Instance?.FreeCompanionHiring == true)
             {
                 __result = 0;
             }
diff --git a/Patches/Party/FreeTroopUpgrades.cs b/Patches/Party/FreeTroopUpgrades.cs
index 5eb88ec9..f8e14845 100644
--- a/Patches/Party/FreeTroopUpgrades.cs
+++ b/Patches/Party/FreeTroopUpgrades.cs
@@ -13,8 +13,7 @@ public static class FreeTroopUpgrades
         public static void GetGoldCostForUpgrade(ref PartyBase party, ref CharacterObject characterObject, ref CharacterObject upgradeTarget, ref int __result)
         {
             if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.FreeTroopUpgrades, out var freeTroopUpgrades)
-                && freeTroopUpgrades)
+                && BannerlordCheatsSettings.Instance?.FreeTroopUpgrades == true)
             {
                 __result = 0;
             }
diff --git a/Patches/Party/InstantEscape.cs b/Patches/Party/InstantEscape.cs
index 524e07ea..14cd9b7c 100644
--- a/Patches/Party/InstantEscape.cs
+++ b/Patches/Party/InstantEscape.cs
@@ -11,8 +11,7 @@ public static class InstantEscape
         [HarmonyPostfix]
         public static void CheckCaptivityChange(float dt, ref string __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.InstantEscape, out var instantEscape)
-                && instantEscape)
+            if (BannerlordCheatsSettings.Instance?.InstantEscape == true)
             {
                 PlayerCaptivity.EndCaptivity();
             }
diff --git a/Patches/Party/InstantPrisonerRecruitment.cs b/Patches/Party/InstantPrisonerRecruitment.cs
index db45a640..38f00f0b 100644
--- a/Patches/Party/InstantPrisonerRecruitment.cs
+++ b/Patches/Party/InstantPrisonerRecruitment.cs
@@ -12,10 +12,9 @@ public static class InstantPrisonerRecruitment
         [HarmonyPostfix]
         public static void  CalculateRecruitableNumber(ref PartyBase party, ref CharacterObject character, ref int __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.InstantPrisonerRecruitment, out var instantPrisonerRecruitment)
-                && instantPrisonerRecruitment
-                && party.IsPlayerParty()
-                && !character.IsHero())
+            if (party.IsPlayerParty()
+                && !character.IsHero()
+                && BannerlordCheatsSettings.Instance?.InstantPrisonerRecruitment == true)
             {
                 __result = party.PrisonRoster.GetTroopCount(character);
             }
diff --git a/Patches/Party/NoPrisonerEscape.cs b/Patches/Party/NoPrisonerEscape.cs
index 573e766c..4ec04b74 100644
--- a/Patches/Party/NoPrisonerEscape.cs
+++ b/Patches/Party/NoPrisonerEscape.cs
@@ -14,8 +14,7 @@ public static bool ApplyByEscape(Hero character, Hero facilitator)
             if (character.IsPrisoner
                 && character.PartyBelongedToAsPrisoner != null
                 && character.PartyBelongedToAsPrisoner.MapFaction == Hero.MainHero.MapFaction
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.NoPrisonerEscape, out var noPrisonerEscape)
-                && noPrisonerEscape)
+                && BannerlordCheatsSettings.Instance?.NoPrisonerEscape == true)
             {
                 return false;
             }
diff --git a/Patches/Party/PartyHealingMultiplierHeroes.cs b/Patches/Party/PartyHealingMultiplierHeroes.cs
index ca6dbcbc..80b4b5f5 100644
--- a/Patches/Party/PartyHealingMultiplierHeroes.cs
+++ b/Patches/Party/PartyHealingMultiplierHeroes.cs
@@ -13,10 +13,10 @@ public static class PartyHealingMultiplierHeroes
         public static void GetDailyHealingHpForHeroes(ref MobileParty party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
             if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PartyHealingMultiplier, out var partyHealingMultiplier))
+                && BannerlordCheatsSettings.Instance?.PartyHealingMultiplier > 1f)
             {
-                __result.AddMultiplier(partyHealingMultiplier);
+                __result.AddMultiplier(BannerlordCheatsSettings.Instance.PartyHealingMultiplier);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Party/PartyHealingMultiplierTroops.cs b/Patches/Party/PartyHealingMultiplierTroops.cs
index 63d85dbf..b903b0c6 100644
--- a/Patches/Party/PartyHealingMultiplierTroops.cs
+++ b/Patches/Party/PartyHealingMultiplierTroops.cs
@@ -13,9 +13,9 @@ public static class PartyHealingMultiplierTroops
         public static void GetDailyHealingForRegulars(ref MobileParty party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
             if (party.IsPlayerParty()
-            && BannerlordCheatsSettings.TryGetModifiedValue(x => x.PartyHealingMultiplier, out var partyHealingMultiplier))
+            && BannerlordCheatsSettings.Instance?.PartyHealingMultiplier > 1f)
             {
-                __result.AddMultiplier(partyHealingMultiplier);
+                __result.AddMultiplier(BannerlordCheatsSettings.Instance.PartyHealingMultiplier);
             }
         }
     }
diff --git a/Patches/Party/TroopWagesPercentage.cs b/Patches/Party/TroopWagesPercentage.cs
index f5f78295..c87a7db6 100644
--- a/Patches/Party/TroopWagesPercentage.cs
+++ b/Patches/Party/TroopWagesPercentage.cs
@@ -13,9 +13,9 @@ namespace BannerlordCheats.Patches.Party
     //     public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
     //     {
     //         if (mobileParty.IsPlayerParty()
-    //             && BannerlordCheatsSettings.TryGetModifiedValue(x => x.TroopWagesPercentage, out var troopWagesPercentage))
+    //             && BannerlordCheatsSettings.Instance?.TroopWagesPercentage < 100f)
     //         {
-    //             __result.AddPercentage(troopWagesPercentage);
+    //             __result.AddPercentage(BannerlordCheatsSettings.Instance.TroopWagesPercentage);
     //         }
     //     }
     // }
diff --git a/Patches/Settlements/ConstructionPowerMultiplier.cs b/Patches/Settlements/ConstructionPowerMultiplier.cs
index 45c518dd..775bc247 100644
--- a/Patches/Settlements/ConstructionPowerMultiplier.cs
+++ b/Patches/Settlements/ConstructionPowerMultiplier.cs
@@ -16,9 +16,9 @@ namespace BannerlordCheats.Patches.Settlements
     //         ref ExplainedNumber __result)
     //     {
     //         if (town.IsPlayerTown()
-    //             && BannerlordCheatsSettings.TryGetModifiedValue(settings => settings.ConstructionPowerMultiplier, out var constructionPowerMultiplier))
+    //             && BannerlordCheatsSettings.Instance?.ConstructionPowerMultiplier > 1f)
     //         {
-    //             __result.AddMultiplier(constructionPowerMultiplier);
+    //             __result.AddMultiplier(BannerlordCheatsSettings.Instance.ConstructionPowerMultiplier);
     //         }
     //     }
     // }
diff --git a/Patches/Settlements/DailyFoodBonus.cs b/Patches/Settlements/DailyFoodBonus.cs
index 78f7c965..9269b39e 100644
--- a/Patches/Settlements/DailyFoodBonus.cs
+++ b/Patches/Settlements/DailyFoodBonus.cs
@@ -12,9 +12,9 @@ public static class DailyFoodBonus
         public static void FoodChange(ref Town __instance, ref float __result)
         {
             if (__instance.IsPlayerTown()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.DailyFoodBonus, out var dailyFoodBonus))
+                && BannerlordCheatsSettings.Instance?.DailyFoodBonus > 0)
             {
-                __result += dailyFoodBonus;
+                __result += BannerlordCheatsSettings.Instance.DailyFoodBonus;
             }
         }
     }
diff --git a/Patches/Settlements/DailyGarrisonBonus.cs b/Patches/Settlements/DailyGarrisonBonus.cs
index 279cd7dd..b71bc1fc 100644
--- a/Patches/Settlements/DailyGarrisonBonus.cs
+++ b/Patches/Settlements/DailyGarrisonBonus.cs
@@ -12,9 +12,9 @@ public static class DailyGarrisonBonus
         public static void GarrisonChange(ref Town __instance, ref int __result)
         {
             if (__instance.IsPlayerTown()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.DailyGarrisonBonus, out var dailyGarrisonBonus))
+                && BannerlordCheatsSettings.Instance?.DailyGarrisonBonus > 0)
             {
-                __result += dailyGarrisonBonus;
+                __result += BannerlordCheatsSettings.Instance.DailyGarrisonBonus;
             }
         }
     }
diff --git a/Patches/Settlements/DailyHearthsBonus.cs b/Patches/Settlements/DailyHearthsBonus.cs
index da986429..5c1f8f39 100644
--- a/Patches/Settlements/DailyHearthsBonus.cs
+++ b/Patches/Settlements/DailyHearthsBonus.cs
@@ -12,9 +12,9 @@ public static class DailyHearthsBonus
         public static void HearthChange(ref Village __instance, ref float __result)
         {
             if (__instance.IsPlayerVillage()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.DailyHearthsBonus, out var dailyHearthsBonus))
+                && BannerlordCheatsSettings.Instance?.DailyHearthsBonus > 0)
             {
-                __result += dailyHearthsBonus;
+                __result += BannerlordCheatsSettings.Instance.DailyHearthsBonus;
             }
         }
     }
diff --git a/Patches/Settlements/DailyLoyaltyBonus.cs b/Patches/Settlements/DailyLoyaltyBonus.cs
index 30c662ba..e5c21504 100644
--- a/Patches/Settlements/DailyLoyaltyBonus.cs
+++ b/Patches/Settlements/DailyLoyaltyBonus.cs
@@ -12,9 +12,9 @@ public static class DailyLoyaltyBonus
         public static void LoyaltyChange(ref Town __instance, ref float __result)
         {
             if (__instance.IsPlayerTown()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.DailyLoyaltyBonus, out var dailyLoyaltyBonus))
+                && BannerlordCheatsSettings.Instance?.DailyLoyaltyBonus > 0)
             {
-                __result += dailyLoyaltyBonus;
+                __result += BannerlordCheatsSettings.Instance.DailyLoyaltyBonus;
             }
         }
     }
diff --git a/Patches/Settlements/DailyMilitiaBonusTown.cs b/Patches/Settlements/DailyMilitiaBonusTown.cs
index f9291980..78b9d9b0 100644
--- a/Patches/Settlements/DailyMilitiaBonusTown.cs
+++ b/Patches/Settlements/DailyMilitiaBonusTown.cs
@@ -12,9 +12,9 @@ public static class DailyMilitiaBonusTown
         public static void MilitiaChange(ref Town __instance, ref float __result)
         {
             if (__instance.IsPlayerTown()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.DailyMilitiaBonus, out var dailyMilitiaBonus))
+                && BannerlordCheatsSettings.Instance?.DailyMilitiaBonus > 0)
             {
-                __result += dailyMilitiaBonus;
+                __result += BannerlordCheatsSettings.Instance.DailyMilitiaBonus;
             }
         }
     }
diff --git a/Patches/Settlements/DailyMilitiaBonusVillage.cs b/Patches/Settlements/DailyMilitiaBonusVillage.cs
index 37c403a1..790159ea 100644
--- a/Patches/Settlements/DailyMilitiaBonusVillage.cs
+++ b/Patches/Settlements/DailyMilitiaBonusVillage.cs
@@ -12,10 +12,10 @@ public static class DailyMilitiaBonusVillage
         public static void MilitiaChange(ref Village __instance, ref float __result)
         {
             if (__instance.IsPlayerVillage()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.DailyMilitiaBonus, out var dailyMilitiaBonus))
+                && BannerlordCheatsSettings.Instance?.DailyMilitiaBonus > 0)
             {
-                __result += dailyMilitiaBonus;
+                __result += BannerlordCheatsSettings.Instance.DailyMilitiaBonus;
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Settlements/DailyProsperityBonus.cs b/Patches/Settlements/DailyProsperityBonus.cs
index 8c8b42c9..632b28e9 100644
--- a/Patches/Settlements/DailyProsperityBonus.cs
+++ b/Patches/Settlements/DailyProsperityBonus.cs
@@ -12,9 +12,9 @@ public static class DailyProsperityBonus
         public static void ProsperityChange(ref Town __instance, ref float __result)
         {
             if (__instance.IsPlayerTown()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.DailyProsperityBonus, out var dailyProsperityBonus))
+                && BannerlordCheatsSettings.Instance?.DailyProsperityBonus > 0)
             {
-                __result += dailyProsperityBonus;
+                __result += BannerlordCheatsSettings.Instance.DailyProsperityBonus;
             }
         }
     }
diff --git a/Patches/Settlements/DailySecurityBonus.cs b/Patches/Settlements/DailySecurityBonus.cs
index 096f1d61..aa531af2 100644
--- a/Patches/Settlements/DailySecurityBonus.cs
+++ b/Patches/Settlements/DailySecurityBonus.cs
@@ -12,9 +12,9 @@ public static class DailySecurityBonus
         public static void SecurityChange(ref Town __instance, ref float __result)
         {
             if (__instance.IsPlayerTown()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.DailySecurityBonus, out var dailySecurityBonus))
+                && BannerlordCheatsSettings.Instance?.DailySecurityBonus > 0)
             {
-                __result += dailySecurityBonus;
+                __result += BannerlordCheatsSettings.Instance.DailySecurityBonus;
             }
         }
     }
diff --git a/Patches/Settlements/DisguiseAlwaysWorks.cs b/Patches/Settlements/DisguiseAlwaysWorks.cs
index 48ef6a85..a7a8896b 100644
--- a/Patches/Settlements/DisguiseAlwaysWorks.cs
+++ b/Patches/Settlements/DisguiseAlwaysWorks.cs
@@ -11,8 +11,7 @@ public static class DisguiseAlwaysWorks
         [HarmonyPostfix]
         public static void CalculateDisguiseDetectionProbability(Settlement settlement, ref float __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.DisguiseAlwaysWorks, out var disguiseAlwaysWorks)
-                && disguiseAlwaysWorks)
+            if (BannerlordCheatsSettings.Instance?.DisguiseAlwaysWorks == true)
             {
                 __result = 1;
             }
diff --git a/Patches/Settlements/FreeTroopRecruitment.cs b/Patches/Settlements/FreeTroopRecruitment.cs
index 074ad2f8..16b2cc99 100644
--- a/Patches/Settlements/FreeTroopRecruitment.cs
+++ b/Patches/Settlements/FreeTroopRecruitment.cs
@@ -13,8 +13,7 @@ namespace BannerlordCheats.Patches.Settlements
     //     public static void GetTroopRecruitmentCost(CharacterObject troop, Hero buyerHero, bool withoutItemCost, ref int __result)
     //     {
     //         if (buyerHero.IsPlayer()
-    //             && BannerlordCheatsSettings.TryGetModifiedValue(x => x.FreeTroopRecruitment, out var freeTroopRecruitment)
-    //             && freeTroopRecruitment)
+    //             && BannerlordCheatsSettings.Instance?.FreeTroopRecruitment == true)
     //         {
     //             __result = 1;
     //         }
diff --git a/Patches/Settlements/GarrisonWagesPercentage.cs b/Patches/Settlements/GarrisonWagesPercentage.cs
index d83b0da6..a3dfd072 100644
--- a/Patches/Settlements/GarrisonWagesPercentage.cs
+++ b/Patches/Settlements/GarrisonWagesPercentage.cs
@@ -14,9 +14,9 @@ namespace BannerlordCheats.Patches.Settlements
     //     {
     //         if (mobileParty.IsGarrison
     //             && mobileParty.IsPlayerParty()
-    //             && BannerlordCheatsSettings.TryGetModifiedValue(x => x.GarrisonWagesPercentage, out var garrisonWagesPercentage))
+    //             && BannerlordCheatsSettings.Instance?.GarrisonWagesPercentage < 100f)
     //         {
-    //             __result.AddPercentage(garrisonWagesPercentage);
+    //             __result.AddPercentage(BannerlordCheatsSettings.Instance.GarrisonWagesPercentage);
     //         }
     //     }
     // }
diff --git a/Patches/Settlements/ItemTradingCostPercentage.cs b/Patches/Settlements/ItemTradingCostPercentage.cs
index 449b2ccf..d6fc6cb3 100644
--- a/Patches/Settlements/ItemTradingCostPercentage.cs
+++ b/Patches/Settlements/ItemTradingCostPercentage.cs
@@ -16,9 +16,9 @@ public static void GetPrice(EquipmentElement itemRosterElement, MobileParty clie
         {
             if (clientParty.IsPlayerParty()
                 && !isSelling
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.ItemTradingCostPercentage, out var itemTradingCostPercentage))
+                && BannerlordCheatsSettings.Instance?.ItemTradingCostPercentage < 100f)
             {
-                var factor = itemTradingCostPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.ItemTradingCostPercentage / 100f;
 
                 var newValue = (int)Math.Round(factor * __result);
 
diff --git a/Patches/Settlements/NeverRequireCivilianEquipment.cs b/Patches/Settlements/NeverRequireCivilianEquipment.cs
index 75f553e9..07b0b632 100644
--- a/Patches/Settlements/NeverRequireCivilianEquipment.cs
+++ b/Patches/Settlements/NeverRequireCivilianEquipment.cs
@@ -10,8 +10,7 @@ public static class NeverRequireCivilianEquipment
         [HarmonyPostfix]
         public static void DoesMissionRequireCivilianEquipment(ref Mission __instance, ref bool __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.NeverRequireCivilianEquipment, out var neverRequireCivilianEquipment)
-                && neverRequireCivilianEquipment)
+            if (BannerlordCheatsSettings.Instance?.NeverRequireCivilianEquipment == true)
             {
                 __result = false;
             }
diff --git a/Patches/Settlements/SellingPriceMultiplier.cs b/Patches/Settlements/SellingPriceMultiplier.cs
index 8015a827..c2ab03c5 100644
--- a/Patches/Settlements/SellingPriceMultiplier.cs
+++ b/Patches/Settlements/SellingPriceMultiplier.cs
@@ -16,9 +16,9 @@ public static void GetPrice(EquipmentElement itemRosterElement, MobileParty clie
         {
             if (clientParty.IsPlayerParty()
                 && isSelling
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.SellingPriceMultiplier, out var sellingPriceMultiplier))
+                && BannerlordCheatsSettings.Instance?.SellingPriceMultiplier > 1f)
             {
-                __result = (int) Math.Round(__result * sellingPriceMultiplier);
+                __result = (int) Math.Round(__result * BannerlordCheatsSettings.Instance.SellingPriceMultiplier);
             }
         }
     }
diff --git a/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
index 662722c5..468d7aab 100644
--- a/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
+++ b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
@@ -27,10 +27,10 @@ public static void GetConstructionProgressPerHour(ref SiegeEngineType type, ref
                     return;
             }
 
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.EnemySiegeBuildingSpeedPercentage, out var enemySiegeBuildingSpeedPercentage)
-                && (siegeEvent.GetSiegeEventSide(otherSide)?.SiegeParties.Any(x => x.IsPlayerParty()) ?? false))
+            if ((siegeEvent.GetSiegeEventSide(otherSide)?.SiegeParties.Any(x => x.IsPlayerParty()) ?? false)
+                && BannerlordCheatsSettings.Instance?.EnemySiegeBuildingSpeedPercentage < 100f)
             {
-                var factor = enemySiegeBuildingSpeedPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.EnemySiegeBuildingSpeedPercentage / 100f;
 
                 var newValue = factor * __result;
 
diff --git a/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs b/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
index 42cf6186..0e3c7224 100644
--- a/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
+++ b/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
@@ -14,9 +14,9 @@ public static class SiegeBuildingSpeedMultiplier
         public static void GetConstructionProgressPerHour(ref SiegeEngineType type, ref SiegeEvent siegeEvent, ref ISiegeEventSide side, ref float __result)
         {
             if (side.IsPlayerSide()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.SiegeBuildingSpeedMultiplier, out var siegeBuildingSpeedMultiplier))
+                && BannerlordCheatsSettings.Instance?.EnemySiegeBuildingSpeedPercentage > 1f)
             {
-                __result *= siegeBuildingSpeedMultiplier;
+                __result *= BannerlordCheatsSettings.Instance.EnemySiegeBuildingSpeedPercentage;
             }
         }
     }
diff --git a/Patches/Smithing/CraftedWeaponModifierBonus.cs b/Patches/Smithing/CraftedWeaponModifierBonus.cs
index 4a8bf6fb..aa1b2bb6 100644
--- a/Patches/Smithing/CraftedWeaponModifierBonus.cs
+++ b/Patches/Smithing/CraftedWeaponModifierBonus.cs
@@ -11,29 +11,29 @@ public static class CraftedWeaponModifierBonus
         [HarmonyPostfix]
         public static void GetModifierChanges(int modifierTier, ref OverrideData __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.CraftedWeaponHandlingBonus, out var craftedWeaponHandlingBonus))
+            if (BannerlordCheatsSettings.Instance?.CraftedWeaponHandlingBonus > 0)
             {
-                __result.Handling += craftedWeaponHandlingBonus;
+                __result.Handling += BannerlordCheatsSettings.Instance.CraftedWeaponHandlingBonus;
             }
 
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.CraftedWeaponSwingDamageBonus, out var craftedWeaponSwingDamageBonus))
+            if (BannerlordCheatsSettings.Instance?.CraftedWeaponSwingDamageBonus > 0)
             {
-                __result.SwingDamageOverriden += craftedWeaponSwingDamageBonus;
+                __result.SwingDamageOverriden += BannerlordCheatsSettings.Instance.CraftedWeaponSwingDamageBonus;
             }
 
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.CraftedWeaponSwingSpeedBonus, out var craftedWeaponSwingSpeedBonus))
+            if (BannerlordCheatsSettings.Instance?.CraftedWeaponSwingSpeedBonus > 0)
             {
-                __result.SwingSpeedOverriden += craftedWeaponSwingSpeedBonus;
+                __result.SwingSpeedOverriden += BannerlordCheatsSettings.Instance.CraftedWeaponSwingSpeedBonus;
             }
 
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.CraftedWeaponThrustDamageBonus, out var craftedWeaponThrustDamageBonus))
+            if (BannerlordCheatsSettings.Instance?.CraftedWeaponThrustDamageBonus > 0)
             {
-                __result.ThrustDamageOverriden += craftedWeaponThrustDamageBonus;
+                __result.ThrustDamageOverriden += BannerlordCheatsSettings.Instance.CraftedWeaponThrustDamageBonus;
             }
 
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.CraftedWeaponThrustSpeedBonus, out var craftedWeaponThrustSpeedBonus))
+            if (BannerlordCheatsSettings.Instance?.CraftedWeaponThrustSpeedBonus > 0)
             {
-                __result.ThrustSpeedOverriden += craftedWeaponThrustSpeedBonus;
+                __result.ThrustSpeedOverriden += BannerlordCheatsSettings.Instance.CraftedWeaponThrustSpeedBonus;
             }
         }
     }
diff --git a/Patches/Smithing/SmithingCostPercentage.cs b/Patches/Smithing/SmithingCostPercentage.cs
index 515efda3..1d6c98a7 100644
--- a/Patches/Smithing/SmithingCostPercentage.cs
+++ b/Patches/Smithing/SmithingCostPercentage.cs
@@ -12,9 +12,9 @@ public static class SmithingCostPercentage
         [HarmonyPostfix]
         public static void GetSmithingCostsForWeaponDesign(WeaponDesign weaponDesign, ref int[] __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.SmithingCostPercentage, out var smithingCostPercentage))
+            if (BannerlordCheatsSettings.Instance?.SmithingCostPercentage < 100f)
             {
-                var factor = smithingCostPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.SmithingCostPercentage / 100f;
 
                 for (var i = 0; i < __result.Length; i++)
                 {
diff --git a/Patches/Smithing/SmithingDifficultyPercentage.cs b/Patches/Smithing/SmithingDifficultyPercentage.cs
index 2f62711d..271a91a4 100644
--- a/Patches/Smithing/SmithingDifficultyPercentage.cs
+++ b/Patches/Smithing/SmithingDifficultyPercentage.cs
@@ -12,9 +12,9 @@ public static class SmithingDifficultyPercentage
         [HarmonyPostfix]
         public static void GetCraftingPartDifficulty(CraftingPiece craftingPiece, ref int __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.SmithingDifficultyPercentage, out var smithingDifficultyPercentage))
+            if (BannerlordCheatsSettings.Instance?.SmithingDifficultyPercentage < 100f)
             {
-                var factor = smithingDifficultyPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.SmithingDifficultyPercentage / 100f;
 
                 var newValue = (int)Math.Round(factor * __result);
 
diff --git a/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs b/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
index 5a0d6090..1a0cde98 100644
--- a/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
@@ -15,9 +15,9 @@ public static class SmithingEnergyCostPercentageRefining
         public static void GetEnergyCostForRefining(ref Crafting.RefiningFormula refineFormula, Hero hero, ref int __result)
         {
             if (hero.PartyBelongedTo.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.SmithingEnergyCostPercentage, out var smithingEnergyCostPercentage))
+                && BannerlordCheatsSettings.Instance?.SmithingEnergyCostPercentage < 100f)
             {
-                var factor = smithingEnergyCostPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.SmithingEnergyCostPercentage / 100f;
 
                 var newValue = (int)Math.Round(factor * __result);
 
diff --git a/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs b/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
index 5a95d330..d2008594 100644
--- a/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
@@ -15,9 +15,9 @@ public static class SmithingEnergyCostPercentageSmelting
         public static void GetEnergyCostForSmelting(ItemObject item, Hero hero, ref int __result)
         {
             if (hero.PartyBelongedTo.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.SmithingEnergyCostPercentage, out var smithingEnergyCostPercentage))
+                && BannerlordCheatsSettings.Instance?.SmithingEnergyCostPercentage < 100f)
             {
-                var factor = smithingEnergyCostPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.SmithingEnergyCostPercentage / 100f;
 
                 var newValue = (int)Math.Round(factor * __result);
 
diff --git a/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs b/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
index 673ce6c4..bc5265e4 100644
--- a/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
@@ -15,9 +15,9 @@ public static class SmithingEnergyCostPercentageSmithing
         public static void GetEnergyCostForSmithing(ItemObject item, Hero hero, ref int __result)
         {
             if (hero.PartyBelongedTo.IsPlayerParty()
-                && BannerlordCheatsSettings.TryGetModifiedValue(x => x.SmithingEnergyCostPercentage, out var smithingEnergyCostPercentage))
+                && BannerlordCheatsSettings.Instance?.SmithingEnergyCostPercentage < 100f)
             {
-                var factor = smithingEnergyCostPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.SmithingEnergyCostPercentage / 100f;
 
                 var newValue = (int)Math.Round(factor * __result);
 
diff --git a/Patches/Smithing/UnlockAllParts.cs b/Patches/Smithing/UnlockAllParts.cs
index 23739833..423c0849 100644
--- a/Patches/Smithing/UnlockAllParts.cs
+++ b/Patches/Smithing/UnlockAllParts.cs
@@ -11,8 +11,7 @@ public static class UnlockAllParts
         [HarmonyPostfix]
         public static void IsOpened(CraftingPiece craftingPiece, ref bool __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.UnlockAllParts, out var unlockAllParts)
-                && unlockAllParts)
+            if (BannerlordCheatsSettings.Instance?.UnlockAllParts == true)
             {
                 __result = true;
             }
diff --git a/Patches/Workshops/WorkshopBuyingCostPercentage.cs b/Patches/Workshops/WorkshopBuyingCostPercentage.cs
index d7bfce95..525c1ba9 100644
--- a/Patches/Workshops/WorkshopBuyingCostPercentage.cs
+++ b/Patches/Workshops/WorkshopBuyingCostPercentage.cs
@@ -11,9 +11,9 @@ public static class WorkshopBuyingCostPercentage
         [HarmonyPostfix]
         public static void GetBuyingCostForPlayer(ref Workshop workshop, ref int __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.WorkshopBuyingCostPercentage, out var workshopBuyingCostPercentage))
+            if (BannerlordCheatsSettings.Instance?.WorkshopBuyingCostPercentage < 100f)
             {
-                var factor = workshopBuyingCostPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.WorkshopBuyingCostPercentage / 100f;
 
                 __result = (int) (__result * factor);
             }
diff --git a/Patches/Workshops/WorkshopDailyExpensePercentage.cs b/Patches/Workshops/WorkshopDailyExpensePercentage.cs
index 35584402..dca7d9f9 100644
--- a/Patches/Workshops/WorkshopDailyExpensePercentage.cs
+++ b/Patches/Workshops/WorkshopDailyExpensePercentage.cs
@@ -10,9 +10,9 @@ public static class WorkshopDailyExpensePercentage
         [HarmonyPostfix]
         public static void GetDailyExpense(ref int level, ref int __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.WorkshopDailyExpensePercentage, out var workshopDailyExpensePercentage))
+            if (BannerlordCheatsSettings.Instance?.WorkshopDailyExpensePercentage < 100f)
             {
-                var factor = workshopDailyExpensePercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.WorkshopDailyExpensePercentage / 100f;
 
                 __result = (int) (__result * factor);
             }
diff --git a/Patches/Workshops/WorkshopSellingCostMultiplier.cs b/Patches/Workshops/WorkshopSellingCostMultiplier.cs
index 43e756d5..aab237cc 100644
--- a/Patches/Workshops/WorkshopSellingCostMultiplier.cs
+++ b/Patches/Workshops/WorkshopSellingCostMultiplier.cs
@@ -11,9 +11,9 @@ public static class WorkshopSellingCostMultiplier
         [HarmonyPostfix]
         public static void GetSellingCost(ref Workshop workshop, ref int __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.WorkshopSellingCostMultiplier, out var workshopSellingCostMultiplier))
+            if (BannerlordCheatsSettings.Instance?.WorkshopSellingCostMultiplier > 1f)
             {
-                __result = (int) (__result * workshopSellingCostMultiplier);
+                __result = (int) (__result * BannerlordCheatsSettings.Instance.WorkshopSellingCostMultiplier);
             }
         }
     }
diff --git a/Patches/Workshops/WorkshopUpgradeCostPercentage.cs b/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
index ecfc0425..7d03c564 100644
--- a/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
+++ b/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
@@ -10,9 +10,9 @@ public static class WorkshopUpgradeCostPercentage
         [HarmonyPostfix]
         public static void GetUpgradeCost(ref int currentLevel, ref int __result)
         {
-            if (BannerlordCheatsSettings.TryGetModifiedValue(x => x.WorkshopUpgradeCostPercentage, out var workshopUpgradeCostPercentage))
+            if (BannerlordCheatsSettings.Instance?.WorkshopUpgradeCostPercentage < 100f)
             {
-                var factor = workshopUpgradeCostPercentage / 100f;
+                var factor = BannerlordCheatsSettings.Instance.WorkshopUpgradeCostPercentage / 100f;
 
                 __result = (int) (__result * factor);
             }

From 2f9c7bb115ee3098847dec4660d527237d785010 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 7 Jul 2021 16:26:07 +0200
Subject: [PATCH 028/177] Update to v2.6

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 8d6f133a..3e688cb3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.5.0.0</Version>
+    <Version>2.6.0.0</Version>
     <GameVersion>1.6.0</GameVersion>
     <GameBranch>Beta</GameBranch>
     <AdditionalInfo></AdditionalInfo>

From 7c3d82d923161679e2a2fd243538033f67408092 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 27 Aug 2021 15:15:54 +0200
Subject: [PATCH 029/177] Rename branches in release workflow

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 644c4dd6..9749a57b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: Release
 
 on:
   push:
-    branches: [ master, beta, integrated, beta-integrated ]
+    branches: [ stable, beta ]
 
 jobs:
   build:

From 1764a903f4837af360a5036240247678de745b66 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 27 Aug 2021 17:56:08 +0200
Subject: [PATCH 030/177] Update Harmony to v2.1.1

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 3e688cb3..39b3689d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <GameVersion>1.6.0</GameVersion>
     <GameBranch>Beta</GameBranch>
     <AdditionalInfo></AdditionalInfo>
-    <HarmonyVersion>2.1.0</HarmonyVersion>
+    <HarmonyVersion>2.1.1</HarmonyVersion>
     <MCMVersion>4.3</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>

From efd1d2542d9f3ca90147f58cbf3fc71106510221 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 27 Aug 2021 17:57:04 +0200
Subject: [PATCH 031/177] Update MCM to v4.3.10

---
 BannerlordCheats.csproj | 2 +-
 Directory.Build.props   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BannerlordCheats.csproj b/BannerlordCheats.csproj
index 80f00aca..fe90d0e0 100644
--- a/BannerlordCheats.csproj
+++ b/BannerlordCheats.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-      <PackageReference Include="Bannerlord.MCM" Version="$(MCMVersion).*" IncludeAssets="compile" />
+      <PackageReference Include="Bannerlord.MCM" Version="$(MCMVersion)" IncludeAssets="compile" />
       <PackageReference Condition="$(UseNuGetAssemblies) == True" Include="Bannerlord.ReferenceAssemblies.EarlyAccess" Version="$(GameVersion).*" />
       <PackageReference Include="Lib.Harmony" Version="$(HarmonyVersion)" IncludeAssets="compile" />
     </ItemGroup>
diff --git a/Directory.Build.props b/Directory.Build.props
index 39b3689d..3b9ad13c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,7 +5,7 @@
     <GameBranch>Beta</GameBranch>
     <AdditionalInfo></AdditionalInfo>
     <HarmonyVersion>2.1.1</HarmonyVersion>
-    <MCMVersion>4.3</MCMVersion>
+    <MCMVersion>4.3.10</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\mb2b_beta</GameFolder>

From 362e3441ad7eac82f0ce03c92a491760b3c4b2f2 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 27 Aug 2021 18:18:18 +0200
Subject: [PATCH 032/177] Update game to e1.6.2.280252

---
 BannerlordCheats.csproj | 2 +-
 Directory.Build.props   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BannerlordCheats.csproj b/BannerlordCheats.csproj
index fe90d0e0..23c290ea 100644
--- a/BannerlordCheats.csproj
+++ b/BannerlordCheats.csproj
@@ -2,7 +2,7 @@
 
     <ItemGroup>
       <PackageReference Include="Bannerlord.MCM" Version="$(MCMVersion)" IncludeAssets="compile" />
-      <PackageReference Condition="$(UseNuGetAssemblies) == True" Include="Bannerlord.ReferenceAssemblies.EarlyAccess" Version="$(GameVersion).*" />
+      <PackageReference Condition="$(UseNuGetAssemblies) == True" Include="Bannerlord.ReferenceAssemblies.EarlyAccess" Version="$(GameVersion)" />
       <PackageReference Include="Lib.Harmony" Version="$(HarmonyVersion)" IncludeAssets="compile" />
     </ItemGroup>
 
diff --git a/Directory.Build.props b/Directory.Build.props
index 3b9ad13c..8c663893 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.6.0.0</Version>
-    <GameVersion>1.6.0</GameVersion>
+    <GameVersion>1.6.2.280252</GameVersion>
     <GameBranch>Beta</GameBranch>
     <AdditionalInfo></AdditionalInfo>
     <HarmonyVersion>2.1.1</HarmonyVersion>

From 05de38e1b14d6fb486dfdc52497e0185babc1346 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 27 Aug 2021 18:39:29 +0200
Subject: [PATCH 033/177] Fix Troop Experience Hotkey cheat

---
 Patches/General/EnableHotkeysTroopExperience.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Patches/General/EnableHotkeysTroopExperience.cs b/Patches/General/EnableHotkeysTroopExperience.cs
index c88690e9..c61babee 100644
--- a/Patches/General/EnableHotkeysTroopExperience.cs
+++ b/Patches/General/EnableHotkeysTroopExperience.cs
@@ -29,7 +29,7 @@ public static void OnApplicationTick()
 
                 var selectedCharacter = partyVM.CurrentCharacter;
 
-                if (selectedCharacter.IsHero || (!selectedCharacter.IsUpgrade1Exists && !selectedCharacter.IsUpgrade2Exists)) { return; }
+                if (selectedCharacter.IsHero || !selectedCharacter.IsTroopUpgradable) { return; }
 
                 var index = PartyBase.MainParty.MemberRoster.FindIndexOfTroop(selectedCharacter.Character);
 

From 25b7fbbe1fddeb325a9bf9bd16eb8b6bd017e373 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 27 Aug 2021 19:35:27 +0200
Subject: [PATCH 034/177] Update to v2.7

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 8c663893..ce57434e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.6.0.0</Version>
+    <Version>2.7.0.0</Version>
     <GameVersion>1.6.2.280252</GameVersion>
     <GameBranch>Beta</GameBranch>
     <AdditionalInfo></AdditionalInfo>

From 4102ba3407834d8f4aa2986a3a26fd4a828e61f2 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 27 Aug 2021 19:37:47 +0200
Subject: [PATCH 035/177] Do not run build workflow in release branches

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d85304c1..260a01ec 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,7 @@ name: Build
 
 on:
   push:
+    branches: [ stable-develop, beta-develop ]
   workflow_dispatch:
 
 jobs:

From daeccb037ddb6ff1038a56102216b419164bd869 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 27 Aug 2021 19:40:14 +0200
Subject: [PATCH 036/177] Remove Additional Info property from workflows (no
 more integrated version!)

---
 .github/workflows/build.yml   | 13 ++-----------
 .github/workflows/release.yml | 13 ++-----------
 Directory.Build.props         |  1 -
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 260a01ec..e7253d24 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,15 +47,6 @@ jobs:
           Write-Host "::set-output name=game_branch::$GameBranch"
           Write-Host "GameBranch: ""$GameBranch"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $AdditionalInfo = Get-Content .\Directory.Build.props | Select-String -Pattern "<AdditionalInfo>(.*)<\/AdditionalInfo>" | % { $($_.Matches.Groups[1]).Value }
-          $AdditionalInfoEscaped = $AdditionalInfo -replace " ", "_"
-          If ($AdditionalInfoEscaped) { $AdditionalInfoEscaped = "_$AdditionalInfoEscaped" }
-          If ($AdditionalInfo) { $AdditionalInfo = " ($AdditionalInfo)" }
-          Write-Host "::set-output name=additional_info_escaped::$AdditionalInfoEscaped"
-          Write-Host "AdditionalInfoEscaped: ""$AdditionalInfoEscaped"""
-          Write-Host "::set-output name=additional_info::$AdditionalInfo"
-          Write-Host "AdditionalInfo: ""$AdditionalInfo"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
           $RepoBranch = "${{github.ref}}"
           $RepoBranch = $RepoBranch.Split("/")[-1]
           If ($RepoBranch -eq "master") { $RepoBranch = "" }
@@ -63,7 +54,7 @@ jobs:
           Write-Host "::set-output name=repo_branch::$RepoBranch"
           Write-Host "RepoBranch: ""$RepoBranch"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $ZipName = "BannerlordCheats_v$($ModVersion)$($AdditionalInfoEscaped)_for_$($GameBranch)_e$($GameVersion)"
+          $ZipName = "BannerlordCheats_v$($ModVersion)_for_$($GameBranch)_e$($GameVersion)"
           Write-Host "::set-output name=zip_name::$ZipName"
           Write-Host "ZipName: ""$ZipName"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -71,7 +62,7 @@ jobs:
           Write-Host "::set-output name=tag_name::$TagName"
           Write-Host "TagName: ""$TagName"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $ReleaseTitle = "Release v$($ModVersion)$($AdditionalInfo) for $($GameBranch) e$($GameVersion)"
+          $ReleaseTitle = "Release v$($ModVersion) for $($GameBranch) e$($GameVersion)"
           Write-Host "::set-output name=release_title::$ReleaseTitle"
           Write-Host "ReleaseTitle: ""$ReleaseTitle"""
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9749a57b..0bddd48c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -46,15 +46,6 @@ jobs:
           Write-Host "::set-output name=game_branch::$GameBranch"
           Write-Host "GameBranch: ""$GameBranch"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $AdditionalInfo = Get-Content .\Directory.Build.props | Select-String -Pattern "<AdditionalInfo>(.*)<\/AdditionalInfo>" | % { $($_.Matches.Groups[1]).Value }
-          $AdditionalInfoEscaped = $AdditionalInfo -replace " ", "_"
-          If ($AdditionalInfoEscaped) { $AdditionalInfoEscaped = "_$AdditionalInfoEscaped" }
-          If ($AdditionalInfo) { $AdditionalInfo = " ($AdditionalInfo)" }
-          Write-Host "::set-output name=additional_info_escaped::$AdditionalInfoEscaped"
-          Write-Host "AdditionalInfoEscaped: ""$AdditionalInfoEscaped"""
-          Write-Host "::set-output name=additional_info::$AdditionalInfo"
-          Write-Host "AdditionalInfo: ""$AdditionalInfo"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
           $RepoBranch = "${{github.ref}}"
           $RepoBranch = $RepoBranch.Split("/")[-1]
           If ($RepoBranch -eq "master") { $RepoBranch = "" }
@@ -62,7 +53,7 @@ jobs:
           Write-Host "::set-output name=repo_branch::$RepoBranch"
           Write-Host "RepoBranch: ""$RepoBranch"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $ZipName = "BannerlordCheats_v$($ModVersion)$($AdditionalInfoEscaped)_for_$($GameBranch)_e$($GameVersion)"
+          $ZipName = "BannerlordCheats_v$($ModVersion)_for_$($GameBranch)_e$($GameVersion)"
           Write-Host "::set-output name=zip_name::$ZipName"
           Write-Host "ZipName: ""$ZipName"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -70,7 +61,7 @@ jobs:
           Write-Host "::set-output name=tag_name::$TagName"
           Write-Host "TagName: ""$TagName"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $ReleaseTitle = "Release v$($ModVersion)$($AdditionalInfo) for $($GameBranch) e$($GameVersion)"
+          $ReleaseTitle = "Release v$($ModVersion) for $($GameBranch) e$($GameVersion)"
           Write-Host "::set-output name=release_title::$ReleaseTitle"
           Write-Host "ReleaseTitle: ""$ReleaseTitle"""
 
diff --git a/Directory.Build.props b/Directory.Build.props
index ce57434e..68ff08db 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,6 @@
     <Version>2.7.0.0</Version>
     <GameVersion>1.6.2.280252</GameVersion>
     <GameBranch>Beta</GameBranch>
-    <AdditionalInfo></AdditionalInfo>
     <HarmonyVersion>2.1.1</HarmonyVersion>
     <MCMVersion>4.3.10</MCMVersion>
     <TargetFramework>net472</TargetFramework>

From 4bd48649ff59bb4d7d50d88bbc79cffa009849c4 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 31 Aug 2021 19:04:02 +0200
Subject: [PATCH 037/177] Add UsedImplicitly to patches

---
 MBInitialScreenBasePatch.cs                                    | 2 ++
 Patches/Army/ArmyCohesionLossPercentage.cs                     | 2 ++
 Patches/Army/ArmyFoodConsumptionPercentage.cs                  | 2 ++
 Patches/Army/FactionArmyCohesionLossPercentage.cs              | 2 ++
 Patches/Characters/BarterOfferAlwaysAccepted.cs                | 2 ++
 Patches/Characters/ConversationAlwaysSuccessful.cs             | 2 ++
 Patches/Characters/NoBarterCooldown.cs                         | 2 ++
 Patches/Characters/PerfectRelationships.cs                     | 2 ++
 Patches/Clan/ExtraClanPartyLimit.cs                            | 2 ++
 Patches/Clan/ExtraClanPartySize.cs                             | 2 ++
 Patches/Clan/ExtraCompanionLimit.cs                            | 2 ++
 Patches/Combat/AlwaysCrushThroughShields.cs                    | 2 ++
 Patches/Combat/AlwaysKnockDown.cs                              | 2 ++
 Patches/Combat/AlwaysWinBattleSimulation.cs                    | 2 ++
 Patches/Combat/BanditHideoutTroopLimit.cs                      | 2 ++
 Patches/Combat/CombatZoomMultiplier.cs                         | 2 ++
 Patches/Combat/CompanionDeathPercentage.cs                     | 2 ++
 Patches/Combat/DamageMultiplier.cs                             | 2 ++
 Patches/Combat/DamageTakenPercentage.cs                        | 2 ++
 Patches/Combat/EnemiesNoRunningAway.cs                         | 2 ++
 Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs         | 2 ++
 Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs     | 2 ++
 Patches/Combat/EnemyOnlyKnockout.cs                            | 2 ++
 Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs      | 2 ++
 Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs  | 2 ++
 Patches/Combat/HealthRegeneration.cs                           | 2 ++
 Patches/Combat/InfiniteAmmo.cs                                 | 2 ++
 Patches/Combat/InfluenceRewardMultiplier.cs                    | 2 ++
 Patches/Combat/Invincible.cs                                   | 2 ++
 Patches/Combat/NoFriendlyFire.cs                               | 2 ++
 Patches/Combat/NoRunningAway.cs                                | 2 ++
 Patches/Combat/NoTroopSacrificeBreakIn.cs                      | 2 ++
 Patches/Combat/NoTroopSacrificeBreakOut.cs                     | 2 ++
 Patches/Combat/NoTroopSacrificeRunaway.cs                      | 2 ++
 Patches/Combat/OneHitKill.cs                                   | 2 ++
 Patches/Combat/PartyDamageMultiplier.cs                        | 2 ++
 Patches/Combat/PartyDamageTakenPercentage.cs                   | 2 ++
 Patches/Combat/PartyHealthRegeneration.cs                      | 2 ++
 Patches/Combat/PartyHeroesInvincible.cs                        | 2 ++
 Patches/Combat/PartyInfiniteAmmo.cs                            | 2 ++
 Patches/Combat/PartyInvincible.cs                              | 2 ++
 Patches/Combat/PartyOneHitKill.cs                              | 2 ++
 Patches/Combat/PartyOnlyKnockout.cs                            | 2 ++
 Patches/Combat/PlayerHorseInvincible.cs                        | 2 ++
 Patches/Combat/RenownRewardMultiplierBattle.cs                 | 2 ++
 Patches/Combat/RenownRewardMultiplierTournament.cs             | 2 ++
 Patches/Combat/SliceThroughEveryonePassive.cs                  | 2 ++
 Patches/Combat/SliceThroughEveryoneWeapon.cs                   | 2 ++
 Patches/Experience/CompanionExperienceMultiplier.cs            | 2 ++
 Patches/Experience/CompanionLearningRateMultiplier.cs          | 2 ++
 Patches/Experience/ExperienceMultiplier.cs                     | 2 ++
 Patches/Experience/FreeFocusPointAssignment.cs                 | 2 ++
 Patches/Experience/LearningLimitMultiplier.cs                  | 2 ++
 Patches/Experience/LearningRateMultiplier.cs                   | 2 ++
 Patches/Experience/TroopExperienceMultiplier.cs                | 2 ++
 Patches/General/EnableHotkeyTipsEncyclopedia.cs                | 2 ++
 Patches/General/EnableHotkeyTipsScreens.cs                     | 2 ++
 Patches/General/EnableHotkeysAddEncyclopediaTroops.cs          | 2 ++
 Patches/General/EnableHotkeysAddItems.cs                       | 2 ++
 Patches/General/EnableHotkeysCharacterAttributes.cs            | 2 ++
 Patches/General/EnableHotkeysCharacterPoints.cs                | 2 ++
 Patches/General/EnableHotkeysInfluence.cs                      | 2 ++
 Patches/General/EnableHotkeysMoney.cs                          | 2 ++
 Patches/General/EnableHotkeysTroopCount.cs                     | 2 ++
 Patches/General/EnableHotkeysTroopExperience.cs                | 2 ++
 Patches/Inventory/ExtraInventoryCapacity.cs                    | 2 ++
 Patches/Inventory/NativeItemSpawning.cs                        | 2 ++
 Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs     | 2 ++
 Patches/Kingdom/KingdomDecisionWeightMultiplier.cs             | 2 ++
 Patches/Kingdom/NoCrimeRatingForCrimes.cs                      | 2 ++
 Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs     | 2 ++
 Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs   | 2 ++
 Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs | 2 ++
 Patches/Map/MapSpeedMultiplier.cs                              | 1 +
 Patches/Map/MapVisibilityMultiplier.cs                         | 2 ++
 Patches/Map/NpcMapSpeedPercentage.cs                           | 1 +
 Patches/Map/PartyInvisibleOnMap.cs                             | 2 ++
 Patches/Party/ExtraPartyMemberSize.cs                          | 2 ++
 Patches/Party/ExtraPartyMorale.cs                              | 2 ++
 Patches/Party/ExtraPartyPrisonerSize.cs                        | 2 ++
 Patches/Party/FoodConsumptionPercentage.cs                     | 2 ++
 Patches/Party/FreeCompanionHiring.cs                           | 2 ++
 Patches/Party/FreeTroopUpgrades.cs                             | 2 ++
 Patches/Party/InstantEscape.cs                                 | 2 ++
 Patches/Party/InstantPrisonerRecruitment.cs                    | 2 ++
 Patches/Party/PartyHealingMultiplierHeroes.cs                  | 2 ++
 Patches/Party/PartyHealingMultiplierTroops.cs                  | 2 ++
 Patches/Party/TroopWagesPercentage.cs                          | 1 +
 Patches/Settlements/ConstructionPowerMultiplier.cs             | 1 +
 Patches/Settlements/DailyFoodBonus.cs                          | 2 ++
 Patches/Settlements/DailyGarrisonBonus.cs                      | 2 ++
 Patches/Settlements/DailyHearthsBonus.cs                       | 2 ++
 Patches/Settlements/DailyLoyaltyBonus.cs                       | 2 ++
 Patches/Settlements/DailyMilitiaBonusTown.cs                   | 2 ++
 Patches/Settlements/DailyMilitiaBonusVillage.cs                | 2 ++
 Patches/Settlements/DailyProsperityBonus.cs                    | 2 ++
 Patches/Settlements/DailySecurityBonus.cs                      | 2 ++
 Patches/Settlements/DisguiseAlwaysWorks.cs                     | 2 ++
 Patches/Settlements/FreeTroopRecruitment.cs                    | 1 +
 Patches/Settlements/GarrisonWagesPercentage.cs                 | 1 +
 Patches/Settlements/ItemTradingCostPercentage.cs               | 2 ++
 Patches/Settlements/NeverRequireCivilianEquipment.cs           | 2 ++
 Patches/Settlements/SellingPriceMultiplier.cs                  | 2 ++
 Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs            | 2 ++
 Patches/Sieges/SiegeBuildingSpeedMultiplier.cs                 | 2 ++
 Patches/Smithing/CraftedWeaponModifierBonus.cs                 | 2 ++
 Patches/Smithing/SmithingCostPercentage.cs                     | 2 ++
 Patches/Smithing/SmithingDifficultyPercentage.cs               | 2 ++
 Patches/Smithing/SmithingEnergyCostPercentageRefining.cs       | 2 ++
 Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs       | 2 ++
 Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs       | 2 ++
 Patches/Smithing/UnlockAllParts.cs                             | 2 ++
 Patches/Workshops/WorkshopBuyingCostPercentage.cs              | 2 ++
 Patches/Workshops/WorkshopDailyExpensePercentage.cs            | 2 ++
 Patches/Workshops/WorkshopSellingCostMultiplier.cs             | 2 ++
 Patches/Workshops/WorkshopUpgradeCostPercentage.cs             | 2 ++
 116 files changed, 226 insertions(+)

diff --git a/MBInitialScreenBasePatch.cs b/MBInitialScreenBasePatch.cs
index 31c8f637..dfe2f720 100644
--- a/MBInitialScreenBasePatch.cs
+++ b/MBInitialScreenBasePatch.cs
@@ -1,4 +1,5 @@
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.Core;
 using TaleWorlds.Library;
 using TaleWorlds.MountAndBlade;
@@ -8,6 +9,7 @@ namespace BannerlordCheats
     [HarmonyPatch(typeof(MBInitialScreenBase), "OnInitialize")]
     public static class MBInitialScreenBasePatch
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OnInitialize()
         {
diff --git a/Patches/Army/ArmyCohesionLossPercentage.cs b/Patches/Army/ArmyCohesionLossPercentage.cs
index cca9a04d..68608705 100644
--- a/Patches/Army/ArmyCohesionLossPercentage.cs
+++ b/Patches/Army/ArmyCohesionLossPercentage.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using ArmyObj = TaleWorlds.CampaignSystem.Army;
 
 namespace BannerlordCheats.Patches.Army
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Army
     [HarmonyPatch(typeof(ArmyObj), nameof(ArmyObj.CohesionChange), MethodType.Getter)]
     public static class ArmyCohesionLossPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CohesionChange(ref ArmyObj __instance, ref float __result)
         {
diff --git a/Patches/Army/ArmyFoodConsumptionPercentage.cs b/Patches/Army/ArmyFoodConsumptionPercentage.cs
index 67d11b1e..d6bad8de 100644
--- a/Patches/Army/ArmyFoodConsumptionPercentage.cs
+++ b/Patches/Army/ArmyFoodConsumptionPercentage.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using BannerlordCheats.Extensions;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Army
     [HarmonyPatch(typeof(DefaultMobilePartyFoodConsumptionModel), nameof(DefaultMobilePartyFoodConsumptionModel.CalculateDailyFoodConsumptionf))]
     public static class ArmyFoodConsumptionPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateDailyFoodConsumptionf(ref MobileParty party, ref bool includeDescription, ref ExplainedNumber __result)
         {
diff --git a/Patches/Army/FactionArmyCohesionLossPercentage.cs b/Patches/Army/FactionArmyCohesionLossPercentage.cs
index 2b1fa362..60eed012 100644
--- a/Patches/Army/FactionArmyCohesionLossPercentage.cs
+++ b/Patches/Army/FactionArmyCohesionLossPercentage.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using ArmyObj = TaleWorlds.CampaignSystem.Army;
 
 namespace BannerlordCheats.Patches.Army
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Army
     [HarmonyPatch(typeof(ArmyObj), nameof(ArmyObj.CohesionChange), MethodType.Getter)]
     public static class FactionArmyCohesionLossPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CohesionChange(ref ArmyObj __instance, ref float __result)
         {
diff --git a/Patches/Characters/BarterOfferAlwaysAccepted.cs b/Patches/Characters/BarterOfferAlwaysAccepted.cs
index b31e9b5f..60136a53 100644
--- a/Patches/Characters/BarterOfferAlwaysAccepted.cs
+++ b/Patches/Characters/BarterOfferAlwaysAccepted.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 
 namespace BannerlordCheats.Patches.Characters
@@ -7,6 +8,7 @@ namespace BannerlordCheats.Patches.Characters
     [HarmonyPatch(typeof(BarterManager), nameof(BarterManager.IsOfferAcceptable), new[] { typeof(BarterData), typeof(Hero), typeof(PartyBase) })]
     public static class BarterOfferAlwaysAccepted
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void IsOfferAcceptable(BarterData args, Hero hero, PartyBase party, ref BarterManager __instance, ref bool __result)
         {
diff --git a/Patches/Characters/ConversationAlwaysSuccessful.cs b/Patches/Characters/ConversationAlwaysSuccessful.cs
index 473f7010..18d01081 100644
--- a/Patches/Characters/ConversationAlwaysSuccessful.cs
+++ b/Patches/Characters/ConversationAlwaysSuccessful.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.Conversation.Persuasion;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Characters
     [HarmonyPatch(typeof(DefaultPersuasionModel), nameof(DefaultPersuasionModel.GetChances))]
     public static class ConversationAlwaysSuccessful
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetChances(PersuasionOptionArgs optionArgs, ref float successChance, ref float critSuccessChance, ref float critFailChance, ref float failChance, float difficultyMultiplier)
         {
diff --git a/Patches/Characters/NoBarterCooldown.cs b/Patches/Characters/NoBarterCooldown.cs
index 3f4211e1..00e3e49b 100644
--- a/Patches/Characters/NoBarterCooldown.cs
+++ b/Patches/Characters/NoBarterCooldown.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 
 namespace BannerlordCheats.Patches.Characters
@@ -7,6 +8,7 @@ namespace BannerlordCheats.Patches.Characters
     [HarmonyPatch(typeof(BarterManager), nameof(BarterManager.CanPlayerBarterWithHero))]
     public static class NoBarterCooldown
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CanPlayerBarterWithHero(Hero hero, ref bool __result)
         {
diff --git a/Patches/Characters/PerfectRelationships.cs b/Patches/Characters/PerfectRelationships.cs
index 2a68e415..40f49f48 100644
--- a/Patches/Characters/PerfectRelationships.cs
+++ b/Patches/Characters/PerfectRelationships.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 
 namespace BannerlordCheats.Patches.Characters
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Characters
     [HarmonyPatch(typeof(Hero), nameof(Hero.GetRelation))]
     public static class PerfectRelationships
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetRelation(Hero otherHero, ref Hero __instance, ref int __result)
         {
diff --git a/Patches/Clan/ExtraClanPartyLimit.cs b/Patches/Clan/ExtraClanPartyLimit.cs
index 1c72c392..90f4f2a1 100644
--- a/Patches/Clan/ExtraClanPartyLimit.cs
+++ b/Patches/Clan/ExtraClanPartyLimit.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
 namespace BannerlordCheats.Patches.Clan
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Clan
     [HarmonyPatch(typeof(DefaultClanTierModel), nameof(DefaultClanTierModel.GetPartyLimitForTier))]
     public static class ExtraClanPartyLimit
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetPartyLimitForTier(TaleWorlds.CampaignSystem.Clan clan, int clanTierToCheck, ref int __result)
         {
diff --git a/Patches/Clan/ExtraClanPartySize.cs b/Patches/Clan/ExtraClanPartySize.cs
index 2083e95b..6d00adeb 100644
--- a/Patches/Clan/ExtraClanPartySize.cs
+++ b/Patches/Clan/ExtraClanPartySize.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Clan
     [HarmonyPatch(typeof(DefaultPartySizeLimitModel), nameof(DefaultPartySizeLimitModel.GetPartyMemberSizeLimit))]
     public static class ExtraClanPartySize
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetPartyMemberSizeLimit(ref PartyBase party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
diff --git a/Patches/Clan/ExtraCompanionLimit.cs b/Patches/Clan/ExtraCompanionLimit.cs
index 70400fd7..7259f6b8 100644
--- a/Patches/Clan/ExtraCompanionLimit.cs
+++ b/Patches/Clan/ExtraCompanionLimit.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
 namespace BannerlordCheats.Patches.Clan
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Clan
     [HarmonyPatch(typeof(DefaultClanTierModel), nameof(DefaultClanTierModel.GetCompanionLimit))]
     public static class ExtraCompanionLimit
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetCompanionLimit(ref TaleWorlds.CampaignSystem.Clan clan, ref int __result)
         {
diff --git a/Patches/Combat/AlwaysCrushThroughShields.cs b/Patches/Combat/AlwaysCrushThroughShields.cs
index 27c41b55..14473d23 100644
--- a/Patches/Combat/AlwaysCrushThroughShields.cs
+++ b/Patches/Combat/AlwaysCrushThroughShields.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.DecideCrushedThrough))]
     public class AlwaysCrushThroughShields
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void DecideCrushedThrough(Agent attackerAgent, Agent defenderAgent, float totalAttackEnergy, Agent.UsageDirection attackDirection, StrikeType strikeType, WeaponComponentData defendItem, bool isPassiveUsage, ref bool __result)
         {
diff --git a/Patches/Combat/AlwaysKnockDown.cs b/Patches/Combat/AlwaysKnockDown.cs
index 89a43e17..41f42bf3 100644
--- a/Patches/Combat/AlwaysKnockDown.cs
+++ b/Patches/Combat/AlwaysKnockDown.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(Mission), "DecideAgentKnockedByBlow")]
     public static class AlwaysKnockDown
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void DecideAgentKnockedByBlow(
             ref Agent attacker,
diff --git a/Patches/Combat/AlwaysWinBattleSimulation.cs b/Patches/Combat/AlwaysWinBattleSimulation.cs
index 1f2d9e53..1181ea13 100644
--- a/Patches/Combat/AlwaysWinBattleSimulation.cs
+++ b/Patches/Combat/AlwaysWinBattleSimulation.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultCombatSimulationModel), nameof(DefaultCombatSimulationModel.SimulateHit))]
     public static class AlwaysWinBattleSimulation
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterObject struckTroop, ref PartyBase strikerParty, ref PartyBase struckParty, ref float strikerAdvantage, ref MapEvent battle, ref int __result)
         {
diff --git a/Patches/Combat/BanditHideoutTroopLimit.cs b/Patches/Combat/BanditHideoutTroopLimit.cs
index 4c56c866..24acb066 100644
--- a/Patches/Combat/BanditHideoutTroopLimit.cs
+++ b/Patches/Combat/BanditHideoutTroopLimit.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultBanditDensityModel), nameof(DefaultBanditDensityModel.GetPlayerMaximumTroopCountForHideoutMission))]
     public static class BanditHideoutTroopLimit
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetPlayerMaximumTroopCountForHideoutMission(ref MobileParty party, ref int __result)
         {
diff --git a/Patches/Combat/CombatZoomMultiplier.cs b/Patches/Combat/CombatZoomMultiplier.cs
index 940b893d..d7845751 100644
--- a/Patches/Combat/CombatZoomMultiplier.cs
+++ b/Patches/Combat/CombatZoomMultiplier.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.MountAndBlade;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(SandboxAgentStatCalculateModel), nameof(SandboxAgentStatCalculateModel.GetMaxCameraZoom))]
     public static class CombatZoomMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CrossbowReloadSpeed(ref Agent agent, ref float __result)
         {
diff --git a/Patches/Combat/CompanionDeathPercentage.cs b/Patches/Combat/CompanionDeathPercentage.cs
index 101755a5..00930dd8 100644
--- a/Patches/Combat/CompanionDeathPercentage.cs
+++ b/Patches/Combat/CompanionDeathPercentage.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
     public static class CompanionDeathPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
         {
diff --git a/Patches/Combat/DamageMultiplier.cs b/Patches/Combat/DamageMultiplier.cs
index 37f05d8c..c7707945 100644
--- a/Patches/Combat/DamageMultiplier.cs
+++ b/Patches/Combat/DamageMultiplier.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.CalculateDamage))]
     public static class DamageMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
diff --git a/Patches/Combat/DamageTakenPercentage.cs b/Patches/Combat/DamageTakenPercentage.cs
index 38a5fcfb..a93e7448 100644
--- a/Patches/Combat/DamageTakenPercentage.cs
+++ b/Patches/Combat/DamageTakenPercentage.cs
@@ -3,6 +3,7 @@
 using SandBox;
 using System;
 using BannerlordCheats.Extensions;
+using JetBrains.Annotations;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
@@ -11,6 +12,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.CalculateDamage))]
     public static class DamageTakenPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
diff --git a/Patches/Combat/EnemiesNoRunningAway.cs b/Patches/Combat/EnemiesNoRunningAway.cs
index 8f531df3..6a85b404 100644
--- a/Patches/Combat/EnemiesNoRunningAway.cs
+++ b/Patches/Combat/EnemiesNoRunningAway.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.MountAndBlade;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultBattleMoraleModel), nameof(DefaultBattleMoraleModel.CalculateMoraleChangeToCharacter))]
     public static class EnemiesNoRunningAway
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateMoraleChangeToCharacter(Agent agent, float moraleChange, float distance, ref float __result)
         {
diff --git a/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
index 32c0f5cd..5657a6ea 100644
--- a/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
+++ b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
     public static class EnemyLordCombatDeathPercentageBattle
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
         {
diff --git a/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs b/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
index 2f9f226c..0f68024d 100644
--- a/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
+++ b/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
@@ -2,6 +2,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultCombatSimulationModel), nameof(DefaultCombatSimulationModel.SimulateHit))]
     public static class EnemyLordCombatDeathPercentageSimulation
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterObject struckTroop, ref PartyBase strikerParty, ref PartyBase struckParty, ref float strikerAdvantage, ref MapEvent battle, ref int __result)
         {
diff --git a/Patches/Combat/EnemyOnlyKnockout.cs b/Patches/Combat/EnemyOnlyKnockout.cs
index d12da42a..cba9b9ed 100644
--- a/Patches/Combat/EnemyOnlyKnockout.cs
+++ b/Patches/Combat/EnemyOnlyKnockout.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
     public static class EnemyOnlyKnockout
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
         {
diff --git a/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
index 6dcd8c61..6ad3d384 100644
--- a/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
+++ b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
     public static class FriendlyLordCombatDeathPercentageBattle
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
         {
diff --git a/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs b/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
index 8f20c4e0..449c0c62 100644
--- a/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
+++ b/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
@@ -2,6 +2,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultCombatSimulationModel), nameof(DefaultCombatSimulationModel.SimulateHit))]
     public static class FriendlyLordCombatDeathPercentageSimulation
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterObject struckTroop, ref PartyBase strikerParty, ref PartyBase struckParty, ref float strikerAdvantage, ref MapEvent battle, ref int __result)
         {
diff --git a/Patches/Combat/HealthRegeneration.cs b/Patches/Combat/HealthRegeneration.cs
index 81b0f5ae..3a6e50dc 100644
--- a/Patches/Combat/HealthRegeneration.cs
+++ b/Patches/Combat/HealthRegeneration.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using System;
+using JetBrains.Annotations;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
@@ -10,6 +11,7 @@ public static class HealthRegeneration
     {
         private static int? LastSet = null;
 
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OnApplicationTick(float dt)
         {
diff --git a/Patches/Combat/InfiniteAmmo.cs b/Patches/Combat/InfiniteAmmo.cs
index b29bc93f..ff3474ac 100644
--- a/Patches/Combat/InfiniteAmmo.cs
+++ b/Patches/Combat/InfiniteAmmo.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.Core;
 using TaleWorlds.Library;
 using TaleWorlds.MountAndBlade;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(Mission), "OnAgentShootMissile")]
     public static class InfiniteAmmo
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OnAgentShootMissile(
             ref Agent shooterAgent,
diff --git a/Patches/Combat/InfluenceRewardMultiplier.cs b/Patches/Combat/InfluenceRewardMultiplier.cs
index c4394c3c..a14e4836 100644
--- a/Patches/Combat/InfluenceRewardMultiplier.cs
+++ b/Patches/Combat/InfluenceRewardMultiplier.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultBattleRewardModel), nameof(DefaultBattleRewardModel.CalculateInfluenceGain))]
     public static class InfluenceRewardMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateInfluenceGain(
             ref PartyBase party,
diff --git a/Patches/Combat/Invincible.cs b/Patches/Combat/Invincible.cs
index ae0c29a8..f3e87161 100644
--- a/Patches/Combat/Invincible.cs
+++ b/Patches/Combat/Invincible.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(Agent), nameof(Agent.Invulnerable), MethodType.Getter)]
     public static class Invincible
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void Invulnerable(ref Agent __instance, ref bool __result)
         {
diff --git a/Patches/Combat/NoFriendlyFire.cs b/Patches/Combat/NoFriendlyFire.cs
index b477f4f3..136d5f27 100644
--- a/Patches/Combat/NoFriendlyFire.cs
+++ b/Patches/Combat/NoFriendlyFire.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.CalculateDamage))]
     public static class NoFriendlyFire
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
diff --git a/Patches/Combat/NoRunningAway.cs b/Patches/Combat/NoRunningAway.cs
index 251dd13b..22bba1e5 100644
--- a/Patches/Combat/NoRunningAway.cs
+++ b/Patches/Combat/NoRunningAway.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.MountAndBlade;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultBattleMoraleModel), nameof(DefaultBattleMoraleModel.CalculateMoraleChangeToCharacter))]
     public static class NoRunningAway
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateMoraleChangeToCharacter(Agent agent, float moraleChange, float distance, ref float __result)
         {
diff --git a/Patches/Combat/NoTroopSacrificeBreakIn.cs b/Patches/Combat/NoTroopSacrificeBreakIn.cs
index 5f5805db..7ef297b3 100644
--- a/Patches/Combat/NoTroopSacrificeBreakIn.cs
+++ b/Patches/Combat/NoTroopSacrificeBreakIn.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultTroopSacrificeModel), nameof(DefaultTroopSacrificeModel.GetLostTroopCountForBreakingInBesiegedSettlement))]
     public static class NoTroopSacrificeBreakIn
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetLostTroopCountForBreakingInBesiegedSettlement(MobileParty party, SiegeEvent siegeEvent, ref int __result)
         {
diff --git a/Patches/Combat/NoTroopSacrificeBreakOut.cs b/Patches/Combat/NoTroopSacrificeBreakOut.cs
index 04855033..355449f0 100644
--- a/Patches/Combat/NoTroopSacrificeBreakOut.cs
+++ b/Patches/Combat/NoTroopSacrificeBreakOut.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultTroopSacrificeModel), nameof(DefaultTroopSacrificeModel.GetLostTroopCountForBreakingOutOfBesiegedSettlement))]
     public static class NoTroopSacrificeBreakOut
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetLostTroopCountForBreakingOutOfBesiegedSettlement(MobileParty party, SiegeEvent siegeEvent, ref int __result)
         {
diff --git a/Patches/Combat/NoTroopSacrificeRunaway.cs b/Patches/Combat/NoTroopSacrificeRunaway.cs
index 26635478..a6ac3d28 100644
--- a/Patches/Combat/NoTroopSacrificeRunaway.cs
+++ b/Patches/Combat/NoTroopSacrificeRunaway.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 using TaleWorlds.Core;
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultTroopSacrificeModel), nameof(DefaultTroopSacrificeModel.GetNumberOfTroopsSacrificedForTryingToGetAway))]
     public static class NoTroopSacrificeRunaway
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetNumberOfTroopsSacrificedForTryingToGetAway(BattleSideEnum battleSide, MapEvent mapEvent, ref int __result)
         {
diff --git a/Patches/Combat/OneHitKill.cs b/Patches/Combat/OneHitKill.cs
index a13f6731..83a49256 100644
--- a/Patches/Combat/OneHitKill.cs
+++ b/Patches/Combat/OneHitKill.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.CalculateDamage))]
     public static class OneHitKill
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
diff --git a/Patches/Combat/PartyDamageMultiplier.cs b/Patches/Combat/PartyDamageMultiplier.cs
index 075e77f5..a2f6df55 100644
--- a/Patches/Combat/PartyDamageMultiplier.cs
+++ b/Patches/Combat/PartyDamageMultiplier.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.CalculateDamage))]
     public static class PartyDamageMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
diff --git a/Patches/Combat/PartyDamageTakenPercentage.cs b/Patches/Combat/PartyDamageTakenPercentage.cs
index 2a811ca5..437d37a9 100644
--- a/Patches/Combat/PartyDamageTakenPercentage.cs
+++ b/Patches/Combat/PartyDamageTakenPercentage.cs
@@ -3,6 +3,7 @@
 using SandBox;
 using System;
 using BannerlordCheats.Extensions;
+using JetBrains.Annotations;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
@@ -11,6 +12,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.CalculateDamage))]
     public static class PartyDamageTakenPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
diff --git a/Patches/Combat/PartyHealthRegeneration.cs b/Patches/Combat/PartyHealthRegeneration.cs
index 620775cc..c155856e 100644
--- a/Patches/Combat/PartyHealthRegeneration.cs
+++ b/Patches/Combat/PartyHealthRegeneration.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Linq;
 using BannerlordCheats.Extensions;
+using JetBrains.Annotations;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
@@ -12,6 +13,7 @@ public static class PartyHealthRegeneration
     {
         private static int? LastSet = null;
 
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OnApplicationTick(float dt)
         {
diff --git a/Patches/Combat/PartyHeroesInvincible.cs b/Patches/Combat/PartyHeroesInvincible.cs
index bb9e3095..b935d69c 100644
--- a/Patches/Combat/PartyHeroesInvincible.cs
+++ b/Patches/Combat/PartyHeroesInvincible.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(Agent), nameof(Agent.Invulnerable), MethodType.Getter)]
     public static class PartyHeroesInvincible
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void Invulnerable(ref Agent __instance, ref bool __result)
         {
diff --git a/Patches/Combat/PartyInfiniteAmmo.cs b/Patches/Combat/PartyInfiniteAmmo.cs
index 27a8af1e..6814ac93 100644
--- a/Patches/Combat/PartyInfiniteAmmo.cs
+++ b/Patches/Combat/PartyInfiniteAmmo.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.Core;
 using TaleWorlds.Library;
 using TaleWorlds.MountAndBlade;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(Mission), "OnAgentShootMissile")]
     public static class PartyInfiniteAmmo
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OnAgentShootMissile(
             ref Agent shooterAgent,
diff --git a/Patches/Combat/PartyInvincible.cs b/Patches/Combat/PartyInvincible.cs
index 55479785..a1e18052 100644
--- a/Patches/Combat/PartyInvincible.cs
+++ b/Patches/Combat/PartyInvincible.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(Agent), nameof(Agent.Invulnerable), MethodType.Getter)]
     public static class PartyInvincible
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void Invulnerable(ref Agent __instance, ref bool __result)
         {
diff --git a/Patches/Combat/PartyOneHitKill.cs b/Patches/Combat/PartyOneHitKill.cs
index 7578e5b1..a08b7e15 100644
--- a/Patches/Combat/PartyOneHitKill.cs
+++ b/Patches/Combat/PartyOneHitKill.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.CalculateDamage))]
     public static class PartyOneHitKill
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
diff --git a/Patches/Combat/PartyOnlyKnockout.cs b/Patches/Combat/PartyOnlyKnockout.cs
index 7cf2b4f1..51d29007 100644
--- a/Patches/Combat/PartyOnlyKnockout.cs
+++ b/Patches/Combat/PartyOnlyKnockout.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
     public static class PartyOnlyKnockout
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
         {
diff --git a/Patches/Combat/PlayerHorseInvincible.cs b/Patches/Combat/PlayerHorseInvincible.cs
index d468d522..19665a65 100644
--- a/Patches/Combat/PlayerHorseInvincible.cs
+++ b/Patches/Combat/PlayerHorseInvincible.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(Agent), nameof(Agent.Invulnerable), MethodType.Getter)]
     public static class PlayerHorseInvincible
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void Invulnerable(ref Agent __instance, ref bool __result)
         {
diff --git a/Patches/Combat/RenownRewardMultiplierBattle.cs b/Patches/Combat/RenownRewardMultiplierBattle.cs
index cf0d7101..fe04fbd0 100644
--- a/Patches/Combat/RenownRewardMultiplierBattle.cs
+++ b/Patches/Combat/RenownRewardMultiplierBattle.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultBattleRewardModel), nameof(DefaultBattleRewardModel.CalculateRenownGain))]
     public static class RenownRewardMultiplierBattle
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateRenownGain(
             ref PartyBase party,
diff --git a/Patches/Combat/RenownRewardMultiplierTournament.cs b/Patches/Combat/RenownRewardMultiplierTournament.cs
index b8e0a248..e4bad80f 100644
--- a/Patches/Combat/RenownRewardMultiplierTournament.cs
+++ b/Patches/Combat/RenownRewardMultiplierTournament.cs
@@ -2,6 +2,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(DefaultTournamentModel), nameof(DefaultTournamentModel.GetRenownReward))]
     public static class RenownRewardMultiplierTournament
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetRenownReward(Hero winner, Town town, ref int __result)
         {
diff --git a/Patches/Combat/SliceThroughEveryonePassive.cs b/Patches/Combat/SliceThroughEveryonePassive.cs
index 436b4de1..ae9d06a9 100644
--- a/Patches/Combat/SliceThroughEveryonePassive.cs
+++ b/Patches/Combat/SliceThroughEveryonePassive.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox;
 using TaleWorlds.MountAndBlade;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.DecidePassiveAttackCollisionReaction))]
     public static class SliceThroughEveryonePassive
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void DecidePassiveAttackCollisionReaction(
             ref Agent attacker,
diff --git a/Patches/Combat/SliceThroughEveryoneWeapon.cs b/Patches/Combat/SliceThroughEveryoneWeapon.cs
index 3bf05910..8cc82a43 100644
--- a/Patches/Combat/SliceThroughEveryoneWeapon.cs
+++ b/Patches/Combat/SliceThroughEveryoneWeapon.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Combat
     [HarmonyPatch(typeof(Mission), "DecideWeaponCollisionReaction")]
     public static class SliceThroughEveryoneWeapon
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void DecideWeaponCollisionReaction(
             ref Blow registeredBlow,
diff --git a/Patches/Experience/CompanionExperienceMultiplier.cs b/Patches/Experience/CompanionExperienceMultiplier.cs
index dc999a65..4e4c465f 100644
--- a/Patches/Experience/CompanionExperienceMultiplier.cs
+++ b/Patches/Experience/CompanionExperienceMultiplier.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Experience
     [HarmonyPatch(typeof(DefaultGenericXpModel), nameof(DefaultGenericXpModel.GetXpMultiplier))]
     public static class CompanionExperienceMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetXpMultiplier(ref Hero hero, ref float __result)
         {
diff --git a/Patches/Experience/CompanionLearningRateMultiplier.cs b/Patches/Experience/CompanionLearningRateMultiplier.cs
index 653d03ed..b403c530 100644
--- a/Patches/Experience/CompanionLearningRateMultiplier.cs
+++ b/Patches/Experience/CompanionLearningRateMultiplier.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 using TaleWorlds.Core;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Experience
     [HarmonyPatch(typeof(DefaultCharacterDevelopmentModel), nameof(DefaultCharacterDevelopmentModel.CalculateLearningRate), typeof(Hero), typeof(SkillObject))]
     public static class CompanionLearningRateMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateLearningRate(ref Hero hero, ref SkillObject skill, ref float __result)
         {
diff --git a/Patches/Experience/ExperienceMultiplier.cs b/Patches/Experience/ExperienceMultiplier.cs
index 5b9cac0c..93cb907f 100644
--- a/Patches/Experience/ExperienceMultiplier.cs
+++ b/Patches/Experience/ExperienceMultiplier.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Experience
     [HarmonyPatch(typeof(DefaultGenericXpModel), nameof(DefaultGenericXpModel.GetXpMultiplier))]
     public static class ExperienceMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetXpMultiplier(Hero hero, ref float __result)
         {
diff --git a/Patches/Experience/FreeFocusPointAssignment.cs b/Patches/Experience/FreeFocusPointAssignment.cs
index cf3ee03b..62388683 100644
--- a/Patches/Experience/FreeFocusPointAssignment.cs
+++ b/Patches/Experience/FreeFocusPointAssignment.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.Core;
 
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Experience
     [HarmonyPatch(typeof(HeroDeveloper), nameof(HeroDeveloper.GetRequiredFocusPointsToAddFocus))]
     public static class FreeFocusPointAssignment
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetRequiredFocusPointsToAddFocus(ref SkillObject skill, ref int __result)
         {
diff --git a/Patches/Experience/LearningLimitMultiplier.cs b/Patches/Experience/LearningLimitMultiplier.cs
index 7ac840af..7209675a 100644
--- a/Patches/Experience/LearningLimitMultiplier.cs
+++ b/Patches/Experience/LearningLimitMultiplier.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 using TaleWorlds.Localization;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Experience
     [HarmonyPatch(typeof(DefaultCharacterDevelopmentModel), nameof(DefaultCharacterDevelopmentModel.CalculateLearningLimit))]
     public static class LearningLimitMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateLearningLimit(
             ref int attributeValue,
diff --git a/Patches/Experience/LearningRateMultiplier.cs b/Patches/Experience/LearningRateMultiplier.cs
index 58ebbc07..d416718e 100644
--- a/Patches/Experience/LearningRateMultiplier.cs
+++ b/Patches/Experience/LearningRateMultiplier.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 using TaleWorlds.Core;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Experience
     [HarmonyPatch(typeof(DefaultCharacterDevelopmentModel), nameof(DefaultCharacterDevelopmentModel.CalculateLearningRate), new[] { typeof(Hero), typeof(SkillObject) })]
     public static class LearningRateMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateLearningRate(ref Hero hero, SkillObject skill, ref float __result)
         {
diff --git a/Patches/Experience/TroopExperienceMultiplier.cs b/Patches/Experience/TroopExperienceMultiplier.cs
index 22ae11e3..ce2110fa 100644
--- a/Patches/Experience/TroopExperienceMultiplier.cs
+++ b/Patches/Experience/TroopExperienceMultiplier.cs
@@ -2,6 +2,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Experience
     [HarmonyPatch(typeof(DefaultCombatXpModel), nameof(DefaultCombatXpModel.GetXpFromHit))]
     public static class TroopExperienceMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetXpFromHit(
             ref CharacterObject attackerTroop,
diff --git a/Patches/General/EnableHotkeyTipsEncyclopedia.cs b/Patches/General/EnableHotkeyTipsEncyclopedia.cs
index 728ecf87..b0e7a7c9 100644
--- a/Patches/General/EnableHotkeyTipsEncyclopedia.cs
+++ b/Patches/General/EnableHotkeyTipsEncyclopedia.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox.View.Map;
 
 namespace BannerlordCheats.Patches.General
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.General
     [HarmonyPatch(typeof(MapScreen), nameof(MapScreen.OpenEncyclopedia))]
     public static class EnableHotkeyTipsEncyclopedia
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OpenEncyclopedia()
         {
diff --git a/Patches/General/EnableHotkeyTipsScreens.cs b/Patches/General/EnableHotkeyTipsScreens.cs
index 6bd4c6b3..87513aa4 100644
--- a/Patches/General/EnableHotkeyTipsScreens.cs
+++ b/Patches/General/EnableHotkeyTipsScreens.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.Engine.Screens;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.General
     [HarmonyPatch(typeof(ScreenManager), nameof(ScreenManager.PushScreen))]
     public static class EnableHotkeyTipsScreens
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void PushScreen(ref ScreenBase screen)
         {
diff --git a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
index cbf877fa..cfd9f8ca 100644
--- a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
+++ b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
@@ -2,6 +2,7 @@
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.ViewModelCollection.Encyclopedia;
 using TaleWorlds.Core;
@@ -13,6 +14,7 @@ namespace BannerlordCheats.Patches.General
     [HarmonyPatch(typeof(EncyclopediaPageVM), "OnTick")]
     public static class EnableHotkeysAddEncyclopediaTroops
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OnTick(ref EncyclopediaPageVM __instance)
         {
diff --git a/Patches/General/EnableHotkeysAddItems.cs b/Patches/General/EnableHotkeysAddItems.cs
index c310cb1f..36718408 100644
--- a/Patches/General/EnableHotkeysAddItems.cs
+++ b/Patches/General/EnableHotkeysAddItems.cs
@@ -2,6 +2,7 @@
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
 using TaleWorlds.Core;
@@ -15,6 +16,7 @@ namespace BannerlordCheats.Patches.General
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
     public static class EnableHotkeysAddItems
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
diff --git a/Patches/General/EnableHotkeysCharacterAttributes.cs b/Patches/General/EnableHotkeysCharacterAttributes.cs
index 0d6441e7..e299b8ea 100644
--- a/Patches/General/EnableHotkeysCharacterAttributes.cs
+++ b/Patches/General/EnableHotkeysCharacterAttributes.cs
@@ -2,6 +2,7 @@
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
@@ -16,6 +17,7 @@ namespace BannerlordCheats.Patches.General
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
     public static class EnableHotkeysCharacterAttributes
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
diff --git a/Patches/General/EnableHotkeysCharacterPoints.cs b/Patches/General/EnableHotkeysCharacterPoints.cs
index 19e9021b..b36f203e 100644
--- a/Patches/General/EnableHotkeysCharacterPoints.cs
+++ b/Patches/General/EnableHotkeysCharacterPoints.cs
@@ -2,6 +2,7 @@
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
 using TaleWorlds.Core;
@@ -15,6 +16,7 @@ namespace BannerlordCheats.Patches.General
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
     public static class EnableHotkeysCharacterPoints
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
diff --git a/Patches/General/EnableHotkeysInfluence.cs b/Patches/General/EnableHotkeysInfluence.cs
index 3cea5967..7484d0ea 100644
--- a/Patches/General/EnableHotkeysInfluence.cs
+++ b/Patches/General/EnableHotkeysInfluence.cs
@@ -2,6 +2,7 @@
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.Core;
@@ -15,6 +16,7 @@ namespace BannerlordCheats.Patches.General
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
     public static class EnableHotkeysInfluence
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
diff --git a/Patches/General/EnableHotkeysMoney.cs b/Patches/General/EnableHotkeysMoney.cs
index ac4b63e6..be5f5f51 100644
--- a/Patches/General/EnableHotkeysMoney.cs
+++ b/Patches/General/EnableHotkeysMoney.cs
@@ -2,6 +2,7 @@
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.Core;
@@ -15,6 +16,7 @@ namespace BannerlordCheats.Patches.General
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
     public static class EnableHotkeysMoney
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
diff --git a/Patches/General/EnableHotkeysTroopCount.cs b/Patches/General/EnableHotkeysTroopCount.cs
index 4f56cfba..bc3e5dbd 100644
--- a/Patches/General/EnableHotkeysTroopCount.cs
+++ b/Patches/General/EnableHotkeysTroopCount.cs
@@ -2,6 +2,7 @@
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
@@ -16,6 +17,7 @@ namespace BannerlordCheats.Patches.General
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
     public static class EnableHotkeysTroopCount
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
diff --git a/Patches/General/EnableHotkeysTroopExperience.cs b/Patches/General/EnableHotkeysTroopExperience.cs
index c61babee..1c9185ba 100644
--- a/Patches/General/EnableHotkeysTroopExperience.cs
+++ b/Patches/General/EnableHotkeysTroopExperience.cs
@@ -2,6 +2,7 @@
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
@@ -16,6 +17,7 @@ namespace BannerlordCheats.Patches.General
     [HarmonyPatch(typeof(Module), "OnApplicationTick")]
     public static class EnableHotkeysTroopExperience
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
diff --git a/Patches/Inventory/ExtraInventoryCapacity.cs b/Patches/Inventory/ExtraInventoryCapacity.cs
index 2b07ca9f..02ead579 100644
--- a/Patches/Inventory/ExtraInventoryCapacity.cs
+++ b/Patches/Inventory/ExtraInventoryCapacity.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Inventory
     [HarmonyPatch(typeof(DefaultInventoryCapacityModel), nameof(DefaultInventoryCapacityModel.CalculateInventoryCapacity))]
     public static class ExtraInventoryCapacity
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateInventoryCapacity(ref MobileParty mobileParty, ref bool includeDescriptions, ref int additionalTroops, ref int additionalSpareMounts, ref int additionalPackAnimals, ref bool includeFollowers, ref ExplainedNumber __result)
         {
diff --git a/Patches/Inventory/NativeItemSpawning.cs b/Patches/Inventory/NativeItemSpawning.cs
index 5a75aac0..22186650 100644
--- a/Patches/Inventory/NativeItemSpawning.cs
+++ b/Patches/Inventory/NativeItemSpawning.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.Core;
 using TaleWorlds.Localization;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Inventory
     [HarmonyPatch(typeof(InventoryLogic), nameof(InventoryLogic.Initialize), typeof(ItemRoster), typeof(MobileParty), typeof(bool), typeof(bool), typeof(CharacterObject), typeof(InventoryManager.InventoryCategoryType), typeof(IMarketData), typeof(bool), typeof(TextObject))]
     public static class NativeItemSpawning
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void Initialize(
             ref ItemRoster leftItemRoster,
diff --git a/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs b/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
index e40541dd..70343e17 100644
--- a/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
+++ b/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
@@ -1,6 +1,7 @@
 using System;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.Election;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Kingdom
     [HarmonyPatch(typeof(DefaultClanPoliticsModel), nameof(DefaultClanPoliticsModel.GetInfluenceRequiredToOverrideKingdomDecision))]
     public static class DecisionOverrideInfluenceCostPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetInfluenceRequiredToOverrideKingdomDecision(
             ref DecisionOutcome popularOption,
diff --git a/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs b/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs
index e47eb036..d19d1bac 100644
--- a/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs
+++ b/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using System.Linq;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.Election;
 
 namespace BannerlordCheats.Patches.Kingdom
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Kingdom
     [HarmonyPatch(typeof(DecisionOutcome), nameof(DecisionOutcome.TotalSupportPoints), MethodType.Getter)]
     public static class KingdomDecisionWeightMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void Getter(ref DecisionOutcome __instance, ref float __result)
         {
diff --git a/Patches/Kingdom/NoCrimeRatingForCrimes.cs b/Patches/Kingdom/NoCrimeRatingForCrimes.cs
index 9f4db4f2..b5d4148d 100644
--- a/Patches/Kingdom/NoCrimeRatingForCrimes.cs
+++ b/Patches/Kingdom/NoCrimeRatingForCrimes.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Kingdom
     [HarmonyPatch(typeof(DefaultCrimeModel), nameof(DefaultCrimeModel.GetCrimeRatingOf))]
     public static class NoCrimeRatingForCrimes
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetCrimeRatingOf(ref CrimeModel.CrimeType crime, ref object[] additionalArgs, ref float __result)
         {
diff --git a/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
index 722ee0ea..c7ffee4f 100644
--- a/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
 namespace BannerlordCheats.Patches.Kingdom
@@ -7,6 +8,7 @@ namespace BannerlordCheats.Patches.Kingdom
     [HarmonyPatch(typeof(DefaultDiplomacyModel), nameof(DefaultDiplomacyModel.GetRelationCostOfDisbandingArmy))]
     public static class NoRelationshipLossOnDecisionArmyDisband
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetRelationCostOfDisbandingArmy(bool isLeaderParty, ref int __result)
         {
diff --git a/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
index 87b644af..f8f10dc0 100644
--- a/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
 namespace BannerlordCheats.Patches.Kingdom
@@ -7,6 +8,7 @@ namespace BannerlordCheats.Patches.Kingdom
     [HarmonyPatch(typeof(DefaultDiplomacyModel), nameof(DefaultDiplomacyModel.GetRelationCostOfExpellingClanFromKingdom))]
     public static class NoRelationshipLossOnDecisionExpellingClan
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetRelationCostOfExpellingClanFromKingdom(ref int __result)
         {
diff --git a/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs
index 70c39ef8..4df3b878 100644
--- a/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using System;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.Election;
 
 namespace BannerlordCheats.Patches.Kingdom
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Kingdom
     [HarmonyPatch(typeof(KingdomElection), nameof(KingdomElection.GetRelationChangeWithSponsor))]
     public static class NoRelationshipLossOnDecisionKingdomDecision
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetRelationChangeWithSponsor(Supporter.SupportWeights supportWeight, bool isOpposingSides, ref int __result)
         {
diff --git a/Patches/Map/MapSpeedMultiplier.cs b/Patches/Map/MapSpeedMultiplier.cs
index 4b8426ec..f0cbbfaa 100644
--- a/Patches/Map/MapSpeedMultiplier.cs
+++ b/Patches/Map/MapSpeedMultiplier.cs
@@ -9,6 +9,7 @@ namespace BannerlordCheats.Patches.Map
     // [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
     // public static class MapSpeedMultiplier
     // {
+    //     [UsedImplicitly]
     //     [HarmonyPostfix]
     //     public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
     //     {
diff --git a/Patches/Map/MapVisibilityMultiplier.cs b/Patches/Map/MapVisibilityMultiplier.cs
index 72796d4b..976cd475 100644
--- a/Patches/Map/MapVisibilityMultiplier.cs
+++ b/Patches/Map/MapVisibilityMultiplier.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Map
     [HarmonyPatch(typeof(DefaultMapVisibilityModel), nameof(DefaultMapVisibilityModel.GetPartySpottingRange))]
     public static class MapVisibilityMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetPartySpottingRange(ref MobileParty party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
diff --git a/Patches/Map/NpcMapSpeedPercentage.cs b/Patches/Map/NpcMapSpeedPercentage.cs
index 3d4044ff..0d75304c 100644
--- a/Patches/Map/NpcMapSpeedPercentage.cs
+++ b/Patches/Map/NpcMapSpeedPercentage.cs
@@ -9,6 +9,7 @@ namespace BannerlordCheats.Patches.Map
     // [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
     // public static class NpcMapSpeedPercentage
     // {
+    //     [UsedImplicitly]
     //     [HarmonyPostfix]
     //     public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
     //     {
diff --git a/Patches/Map/PartyInvisibleOnMap.cs b/Patches/Map/PartyInvisibleOnMap.cs
index 6d6abac0..c9a528e4 100644
--- a/Patches/Map/PartyInvisibleOnMap.cs
+++ b/Patches/Map/PartyInvisibleOnMap.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 
 namespace BannerlordCheats.Patches.Map
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Map
     [HarmonyPatch(typeof(MobileParty), nameof(MobileParty.ShouldBeIgnored), MethodType.Getter)]
     public static class PartyInvisibleOnMap
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void ShouldBeIgnored(ref MobileParty __instance, ref bool __result)
         {
diff --git a/Patches/Party/ExtraPartyMemberSize.cs b/Patches/Party/ExtraPartyMemberSize.cs
index fafb916a..a61be297 100644
--- a/Patches/Party/ExtraPartyMemberSize.cs
+++ b/Patches/Party/ExtraPartyMemberSize.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Party
     [HarmonyPatch(typeof(DefaultPartySizeLimitModel), nameof(DefaultPartySizeLimitModel.GetPartyMemberSizeLimit))]
     public static class ExtraPartyMemberSize
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetPartyMemberSizeLimit(ref PartyBase party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
diff --git a/Patches/Party/ExtraPartyMorale.cs b/Patches/Party/ExtraPartyMorale.cs
index f89d378c..f517c2cf 100644
--- a/Patches/Party/ExtraPartyMorale.cs
+++ b/Patches/Party/ExtraPartyMorale.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Party
     [HarmonyPatch(typeof(DefaultPartyMoraleModel), nameof(DefaultPartyMoraleModel.GetEffectivePartyMorale))]
     public static class ExtraPartyMorale
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetEffectivePartyMorale(ref MobileParty mobileParty, ref bool includeDescription, ref ExplainedNumber __result)
         {
diff --git a/Patches/Party/ExtraPartyPrisonerSize.cs b/Patches/Party/ExtraPartyPrisonerSize.cs
index 338bf98b..78de2612 100644
--- a/Patches/Party/ExtraPartyPrisonerSize.cs
+++ b/Patches/Party/ExtraPartyPrisonerSize.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Party
     [HarmonyPatch(typeof(DefaultPartySizeLimitModel), nameof(DefaultPartySizeLimitModel.GetPartyPrisonerSizeLimit))]
     public static class ExtraPartyPrisonerSize
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetPartyPrisonerSizeLimit(ref PartyBase party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
diff --git a/Patches/Party/FoodConsumptionPercentage.cs b/Patches/Party/FoodConsumptionPercentage.cs
index 6b45c283..39b3d617 100644
--- a/Patches/Party/FoodConsumptionPercentage.cs
+++ b/Patches/Party/FoodConsumptionPercentage.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Party
     [HarmonyPatch(typeof(DefaultMobilePartyFoodConsumptionModel), nameof(DefaultMobilePartyFoodConsumptionModel.CalculateDailyFoodConsumptionf))]
     public static class FoodConsumptionPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateDailyFoodConsumptionf(ref MobileParty party, ref bool includeDescription, ref ExplainedNumber __result)
         {
diff --git a/Patches/Party/FreeCompanionHiring.cs b/Patches/Party/FreeCompanionHiring.cs
index fc25516a..1ba9aa83 100644
--- a/Patches/Party/FreeCompanionHiring.cs
+++ b/Patches/Party/FreeCompanionHiring.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Party
     [HarmonyPatch(typeof(DefaultCompanionHiringPriceCalculationModel), nameof(DefaultCompanionHiringPriceCalculationModel.GetCompanionHiringPrice))]
     public static class FreeCompanionHiring
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetCompanionHiringPrice(Hero companion, ref int __result)
         {
diff --git a/Patches/Party/FreeTroopUpgrades.cs b/Patches/Party/FreeTroopUpgrades.cs
index f8e14845..b9790452 100644
--- a/Patches/Party/FreeTroopUpgrades.cs
+++ b/Patches/Party/FreeTroopUpgrades.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Party
     [HarmonyPatch(typeof(DefaultPartyTroopUpgradeModel), nameof(DefaultPartyTroopUpgradeModel.GetGoldCostForUpgrade))]
     public static class FreeTroopUpgrades
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetGoldCostForUpgrade(ref PartyBase party, ref CharacterObject characterObject, ref CharacterObject upgradeTarget, ref int __result)
         {
diff --git a/Patches/Party/InstantEscape.cs b/Patches/Party/InstantEscape.cs
index 14cd9b7c..4820498e 100644
--- a/Patches/Party/InstantEscape.cs
+++ b/Patches/Party/InstantEscape.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
 
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Party
     [HarmonyPatch(typeof(DefaultPlayerCaptivityModel), nameof(DefaultPlayerCaptivityModel.CheckCaptivityChange))]
     public static class InstantEscape
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CheckCaptivityChange(float dt, ref string __result)
         {
diff --git a/Patches/Party/InstantPrisonerRecruitment.cs b/Patches/Party/InstantPrisonerRecruitment.cs
index 38f00f0b..01b665f0 100644
--- a/Patches/Party/InstantPrisonerRecruitment.cs
+++ b/Patches/Party/InstantPrisonerRecruitment.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Party
     [HarmonyPatch(typeof(DefaultPrisonerRecruitmentCalculationModel), nameof(DefaultPrisonerRecruitmentCalculationModel.CalculateRecruitableNumber))]
     public static class InstantPrisonerRecruitment
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void  CalculateRecruitableNumber(ref PartyBase party, ref CharacterObject character, ref int __result)
         {
diff --git a/Patches/Party/PartyHealingMultiplierHeroes.cs b/Patches/Party/PartyHealingMultiplierHeroes.cs
index 80b4b5f5..e11704ae 100644
--- a/Patches/Party/PartyHealingMultiplierHeroes.cs
+++ b/Patches/Party/PartyHealingMultiplierHeroes.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Party
     [HarmonyPatch(typeof(DefaultPartyHealingModel), nameof(DefaultPartyHealingModel.GetDailyHealingHpForHeroes))]
     public static class PartyHealingMultiplierHeroes
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetDailyHealingHpForHeroes(ref MobileParty party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
diff --git a/Patches/Party/PartyHealingMultiplierTroops.cs b/Patches/Party/PartyHealingMultiplierTroops.cs
index b903b0c6..eb51c362 100644
--- a/Patches/Party/PartyHealingMultiplierTroops.cs
+++ b/Patches/Party/PartyHealingMultiplierTroops.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Party
     [HarmonyPatch(typeof(DefaultPartyHealingModel), nameof(DefaultPartyHealingModel.GetDailyHealingForRegulars))]
     public static class PartyHealingMultiplierTroops
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetDailyHealingForRegulars(ref MobileParty party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
diff --git a/Patches/Party/TroopWagesPercentage.cs b/Patches/Party/TroopWagesPercentage.cs
index c87a7db6..de00066d 100644
--- a/Patches/Party/TroopWagesPercentage.cs
+++ b/Patches/Party/TroopWagesPercentage.cs
@@ -9,6 +9,7 @@ namespace BannerlordCheats.Patches.Party
     // [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTotalWage))]
     // public static class TroopWagesPercentage
     // {
+    //     [UsedImplicitly]
     //     [HarmonyPostfix]
     //     public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
     //     {
diff --git a/Patches/Settlements/ConstructionPowerMultiplier.cs b/Patches/Settlements/ConstructionPowerMultiplier.cs
index 775bc247..e9c519da 100644
--- a/Patches/Settlements/ConstructionPowerMultiplier.cs
+++ b/Patches/Settlements/ConstructionPowerMultiplier.cs
@@ -9,6 +9,7 @@ namespace BannerlordCheats.Patches.Settlements
     // [HarmonyPatch(typeof(DefaultBuildingConstructionModel), nameof(DefaultBuildingConstructionModel.CalculateDailyConstructionPower))]
     // public static class ConstructionPowerMultiplier
     // {
+    //     [UsedImplicitly]
     //     [HarmonyPostfix]
     //     public static void CalculateDailyConstructionPower(
     //         ref Town town,
diff --git a/Patches/Settlements/DailyFoodBonus.cs b/Patches/Settlements/DailyFoodBonus.cs
index 9269b39e..8eb86285 100644
--- a/Patches/Settlements/DailyFoodBonus.cs
+++ b/Patches/Settlements/DailyFoodBonus.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 
 namespace BannerlordCheats.Patches.Settlements
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Settlements
     [HarmonyPatch(typeof(Town), nameof(Town.FoodChange), MethodType.Getter)]
     public static class DailyFoodBonus
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void FoodChange(ref Town __instance, ref float __result)
         {
diff --git a/Patches/Settlements/DailyGarrisonBonus.cs b/Patches/Settlements/DailyGarrisonBonus.cs
index b71bc1fc..7e4c48b4 100644
--- a/Patches/Settlements/DailyGarrisonBonus.cs
+++ b/Patches/Settlements/DailyGarrisonBonus.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 
 namespace BannerlordCheats.Patches.Settlements
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Settlements
     [HarmonyPatch(typeof(Town), nameof(Town.GarrisonChange), MethodType.Getter)]
     public static class DailyGarrisonBonus
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GarrisonChange(ref Town __instance, ref int __result)
         {
diff --git a/Patches/Settlements/DailyHearthsBonus.cs b/Patches/Settlements/DailyHearthsBonus.cs
index 5c1f8f39..695e2976 100644
--- a/Patches/Settlements/DailyHearthsBonus.cs
+++ b/Patches/Settlements/DailyHearthsBonus.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 
 namespace BannerlordCheats.Patches.Settlements
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Settlements
     [HarmonyPatch(typeof(Village), nameof(Village.HearthChange), MethodType.Getter)]
     public static class DailyHearthsBonus
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void HearthChange(ref Village __instance, ref float __result)
         {
diff --git a/Patches/Settlements/DailyLoyaltyBonus.cs b/Patches/Settlements/DailyLoyaltyBonus.cs
index e5c21504..084e9ca7 100644
--- a/Patches/Settlements/DailyLoyaltyBonus.cs
+++ b/Patches/Settlements/DailyLoyaltyBonus.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 
 namespace BannerlordCheats.Patches.Settlements
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Settlements
     [HarmonyPatch(typeof(Town), nameof(Town.LoyaltyChange), MethodType.Getter)]
     public static class DailyLoyaltyBonus
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void LoyaltyChange(ref Town __instance, ref float __result)
         {
diff --git a/Patches/Settlements/DailyMilitiaBonusTown.cs b/Patches/Settlements/DailyMilitiaBonusTown.cs
index 78b9d9b0..376b908b 100644
--- a/Patches/Settlements/DailyMilitiaBonusTown.cs
+++ b/Patches/Settlements/DailyMilitiaBonusTown.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 
 namespace BannerlordCheats.Patches.Settlements
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Settlements
     [HarmonyPatch(typeof(Town), nameof(Town.MilitiaChange), MethodType.Getter)]
     public static class DailyMilitiaBonusTown
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void MilitiaChange(ref Town __instance, ref float __result)
         {
diff --git a/Patches/Settlements/DailyMilitiaBonusVillage.cs b/Patches/Settlements/DailyMilitiaBonusVillage.cs
index 790159ea..434fe658 100644
--- a/Patches/Settlements/DailyMilitiaBonusVillage.cs
+++ b/Patches/Settlements/DailyMilitiaBonusVillage.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 
 namespace BannerlordCheats.Patches.Settlements
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Settlements
     [HarmonyPatch(typeof(Village), nameof(Village.MilitiaChange), MethodType.Getter)]
     public static class DailyMilitiaBonusVillage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void MilitiaChange(ref Village __instance, ref float __result)
         {
diff --git a/Patches/Settlements/DailyProsperityBonus.cs b/Patches/Settlements/DailyProsperityBonus.cs
index 632b28e9..1be01aa3 100644
--- a/Patches/Settlements/DailyProsperityBonus.cs
+++ b/Patches/Settlements/DailyProsperityBonus.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 
 namespace BannerlordCheats.Patches.Settlements
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Settlements
     [HarmonyPatch(typeof(Town), nameof(Town.ProsperityChange), MethodType.Getter)]
     public static class DailyProsperityBonus
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void ProsperityChange(ref Town __instance, ref float __result)
         {
diff --git a/Patches/Settlements/DailySecurityBonus.cs b/Patches/Settlements/DailySecurityBonus.cs
index aa531af2..cbee4e60 100644
--- a/Patches/Settlements/DailySecurityBonus.cs
+++ b/Patches/Settlements/DailySecurityBonus.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 
 namespace BannerlordCheats.Patches.Settlements
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Settlements
     [HarmonyPatch(typeof(Town), nameof(Town.SecurityChange), MethodType.Getter)]
     public static class DailySecurityBonus
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void SecurityChange(ref Town __instance, ref float __result)
         {
diff --git a/Patches/Settlements/DisguiseAlwaysWorks.cs b/Patches/Settlements/DisguiseAlwaysWorks.cs
index a7a8896b..26649430 100644
--- a/Patches/Settlements/DisguiseAlwaysWorks.cs
+++ b/Patches/Settlements/DisguiseAlwaysWorks.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Settlements
     [HarmonyPatch(typeof(DefaultDisguiseDetectionModel), nameof(DefaultDisguiseDetectionModel.CalculateDisguiseDetectionProbability))]
     public static class DisguiseAlwaysWorks
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void CalculateDisguiseDetectionProbability(Settlement settlement, ref float __result)
         {
diff --git a/Patches/Settlements/FreeTroopRecruitment.cs b/Patches/Settlements/FreeTroopRecruitment.cs
index 16b2cc99..87b87f2e 100644
--- a/Patches/Settlements/FreeTroopRecruitment.cs
+++ b/Patches/Settlements/FreeTroopRecruitment.cs
@@ -9,6 +9,7 @@ namespace BannerlordCheats.Patches.Settlements
     // [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTroopRecruitmentCost))]
     // public static class FreeTroopRecruitment
     // {
+    //     [UsedImplicitly]
     //     [HarmonyPostfix]
     //     public static void GetTroopRecruitmentCost(CharacterObject troop, Hero buyerHero, bool withoutItemCost, ref int __result)
     //     {
diff --git a/Patches/Settlements/GarrisonWagesPercentage.cs b/Patches/Settlements/GarrisonWagesPercentage.cs
index a3dfd072..97611fc3 100644
--- a/Patches/Settlements/GarrisonWagesPercentage.cs
+++ b/Patches/Settlements/GarrisonWagesPercentage.cs
@@ -9,6 +9,7 @@ namespace BannerlordCheats.Patches.Settlements
     // [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTotalWage))]
     // public static class GarrisonWagesPercentage
     // {
+    //     [UsedImplicitly]
     //     [HarmonyPostfix]
     //     public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
     //     {
diff --git a/Patches/Settlements/ItemTradingCostPercentage.cs b/Patches/Settlements/ItemTradingCostPercentage.cs
index d6fc6cb3..0ee6cfc8 100644
--- a/Patches/Settlements/ItemTradingCostPercentage.cs
+++ b/Patches/Settlements/ItemTradingCostPercentage.cs
@@ -2,6 +2,7 @@
 using HarmonyLib;
 using System;
 using BannerlordCheats.Extensions;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 using TaleWorlds.Core;
@@ -11,6 +12,7 @@ namespace BannerlordCheats.Patches.Settlements
     [HarmonyPatch(typeof(DefaultTradeItemPriceFactorModel), nameof(DefaultTradeItemPriceFactorModel.GetPrice))]
     public static class ItemTradingCostPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetPrice(EquipmentElement itemRosterElement, MobileParty clientParty, PartyBase merchant, bool isSelling, float inStoreValue, float supply, float demand, ref int __result)
         {
diff --git a/Patches/Settlements/NeverRequireCivilianEquipment.cs b/Patches/Settlements/NeverRequireCivilianEquipment.cs
index 07b0b632..f32d33e8 100644
--- a/Patches/Settlements/NeverRequireCivilianEquipment.cs
+++ b/Patches/Settlements/NeverRequireCivilianEquipment.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Settlements
@@ -7,6 +8,7 @@ namespace BannerlordCheats.Patches.Settlements
     [HarmonyPatch(typeof(Mission), nameof(Mission.DoesMissionRequireCivilianEquipment), MethodType.Getter)]
     public static class NeverRequireCivilianEquipment
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void DoesMissionRequireCivilianEquipment(ref Mission __instance, ref bool __result)
         {
diff --git a/Patches/Settlements/SellingPriceMultiplier.cs b/Patches/Settlements/SellingPriceMultiplier.cs
index c2ab03c5..41ff5f4c 100644
--- a/Patches/Settlements/SellingPriceMultiplier.cs
+++ b/Patches/Settlements/SellingPriceMultiplier.cs
@@ -2,6 +2,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 using TaleWorlds.Core;
@@ -11,6 +12,7 @@ namespace BannerlordCheats.Patches.Settlements
     [HarmonyPatch(typeof(DefaultTradeItemPriceFactorModel), nameof(DefaultTradeItemPriceFactorModel.GetPrice))]
     public static class SellingPriceMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetPrice(EquipmentElement itemRosterElement, MobileParty clientParty, PartyBase merchant, bool isSelling, float inStoreValue, float supply, float demand, ref int __result)
         {
diff --git a/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
index 468d7aab..f7f32091 100644
--- a/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
+++ b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
@@ -2,6 +2,7 @@
 using HarmonyLib;
 using System.Linq;
 using BannerlordCheats.Extensions;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 using TaleWorlds.Core;
@@ -11,6 +12,7 @@ namespace BannerlordCheats.Patches.Sieges
     [HarmonyPatch(typeof(DefaultSiegeEventModel), nameof(DefaultSiegeEventModel.GetConstructionProgressPerHour))]
     public static class EnemySiegeBuildingSpeedPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetConstructionProgressPerHour(ref SiegeEngineType type, ref SiegeEvent siegeEvent, ref ISiegeEventSide side, ref float __result)
         {
diff --git a/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs b/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
index 0e3c7224..bf82ad8b 100644
--- a/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
+++ b/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
@@ -1,6 +1,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using BannerlordCheats.Extensions;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 using TaleWorlds.Core;
@@ -10,6 +11,7 @@ namespace BannerlordCheats.Patches.Sieges
     [HarmonyPatch(typeof(DefaultSiegeEventModel), nameof(DefaultSiegeEventModel.GetConstructionProgressPerHour))]
     public static class SiegeBuildingSpeedMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetConstructionProgressPerHour(ref SiegeEngineType type, ref SiegeEvent siegeEvent, ref ISiegeEventSide side, ref float __result)
         {
diff --git a/Patches/Smithing/CraftedWeaponModifierBonus.cs b/Patches/Smithing/CraftedWeaponModifierBonus.cs
index aa1b2bb6..8c4a5a10 100644
--- a/Patches/Smithing/CraftedWeaponModifierBonus.cs
+++ b/Patches/Smithing/CraftedWeaponModifierBonus.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 using static TaleWorlds.Core.Crafting;
 
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Smithing
     [HarmonyPatch(typeof(DefaultSmithingModel), nameof(DefaultSmithingModel.GetModifierChanges))]
     public static class CraftedWeaponModifierBonus
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetModifierChanges(int modifierTier, ref OverrideData __result)
         {
diff --git a/Patches/Smithing/SmithingCostPercentage.cs b/Patches/Smithing/SmithingCostPercentage.cs
index 1d6c98a7..51c234d8 100644
--- a/Patches/Smithing/SmithingCostPercentage.cs
+++ b/Patches/Smithing/SmithingCostPercentage.cs
@@ -1,6 +1,7 @@
 using System;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 using TaleWorlds.Core;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Smithing
     [HarmonyPatch(typeof(DefaultSmithingModel), nameof(DefaultSmithingModel.GetSmithingCostsForWeaponDesign))]
     public static class SmithingCostPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetSmithingCostsForWeaponDesign(WeaponDesign weaponDesign, ref int[] __result)
         {
diff --git a/Patches/Smithing/SmithingDifficultyPercentage.cs b/Patches/Smithing/SmithingDifficultyPercentage.cs
index 271a91a4..da336737 100644
--- a/Patches/Smithing/SmithingDifficultyPercentage.cs
+++ b/Patches/Smithing/SmithingDifficultyPercentage.cs
@@ -1,6 +1,7 @@
 using System;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 using TaleWorlds.Core;
 
@@ -9,6 +10,7 @@ namespace BannerlordCheats.Patches.Smithing
     [HarmonyPatch(typeof(DefaultSmithingModel), nameof(DefaultSmithingModel.GetCraftingPartDifficulty))]
     public static class SmithingDifficultyPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetCraftingPartDifficulty(CraftingPiece craftingPiece, ref int __result)
         {
diff --git a/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs b/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
index 1a0cde98..5019c71a 100644
--- a/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
@@ -2,6 +2,7 @@
 using HarmonyLib;
 using System;
 using BannerlordCheats.Extensions;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 using TaleWorlds.Core;
@@ -11,6 +12,7 @@ namespace BannerlordCheats.Patches.Smithing
     [HarmonyPatch(typeof(DefaultSmithingModel), nameof(DefaultSmithingModel.GetEnergyCostForRefining))]
     public static class SmithingEnergyCostPercentageRefining
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetEnergyCostForRefining(ref Crafting.RefiningFormula refineFormula, Hero hero, ref int __result)
         {
diff --git a/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs b/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
index d2008594..22cc8545 100644
--- a/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
@@ -2,6 +2,7 @@
 using HarmonyLib;
 using System;
 using BannerlordCheats.Extensions;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 using TaleWorlds.Core;
@@ -11,6 +12,7 @@ namespace BannerlordCheats.Patches.Smithing
     [HarmonyPatch(typeof(DefaultSmithingModel), nameof(DefaultSmithingModel.GetEnergyCostForSmelting))]
     public static class SmithingEnergyCostPercentageSmelting
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetEnergyCostForSmelting(ItemObject item, Hero hero, ref int __result)
         {
diff --git a/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs b/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
index bc5265e4..aa75d7d0 100644
--- a/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
@@ -2,6 +2,7 @@
 using HarmonyLib;
 using System;
 using BannerlordCheats.Extensions;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 using TaleWorlds.Core;
@@ -11,6 +12,7 @@ namespace BannerlordCheats.Patches.Smithing
     [HarmonyPatch(typeof(DefaultSmithingModel), nameof(DefaultSmithingModel.GetEnergyCostForSmithing))]
     public static class SmithingEnergyCostPercentageSmithing
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetEnergyCostForSmithing(ItemObject item, Hero hero, ref int __result)
         {
diff --git a/Patches/Smithing/UnlockAllParts.cs b/Patches/Smithing/UnlockAllParts.cs
index 423c0849..b33aa354 100644
--- a/Patches/Smithing/UnlockAllParts.cs
+++ b/Patches/Smithing/UnlockAllParts.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.CampaignBehaviors;
 using TaleWorlds.Core;
 
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Smithing
     [HarmonyPatch(typeof(CraftingCampaignBehavior), nameof(CraftingCampaignBehavior.IsOpened))]
     public static class UnlockAllParts
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void IsOpened(CraftingPiece craftingPiece, ref bool __result)
         {
diff --git a/Patches/Workshops/WorkshopBuyingCostPercentage.cs b/Patches/Workshops/WorkshopBuyingCostPercentage.cs
index 525c1ba9..bb837730 100644
--- a/Patches/Workshops/WorkshopBuyingCostPercentage.cs
+++ b/Patches/Workshops/WorkshopBuyingCostPercentage.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Workshops
     [HarmonyPatch(typeof(DefaultWorkshopModel), nameof(DefaultWorkshopModel.GetBuyingCostForPlayer))]
     public static class WorkshopBuyingCostPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetBuyingCostForPlayer(ref Workshop workshop, ref int __result)
         {
diff --git a/Patches/Workshops/WorkshopDailyExpensePercentage.cs b/Patches/Workshops/WorkshopDailyExpensePercentage.cs
index dca7d9f9..5fc53a8d 100644
--- a/Patches/Workshops/WorkshopDailyExpensePercentage.cs
+++ b/Patches/Workshops/WorkshopDailyExpensePercentage.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
 namespace BannerlordCheats.Patches.Workshops
@@ -7,6 +8,7 @@ namespace BannerlordCheats.Patches.Workshops
     [HarmonyPatch(typeof(DefaultWorkshopModel), nameof(DefaultWorkshopModel.GetDailyExpense))]
     public static class WorkshopDailyExpensePercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetDailyExpense(ref int level, ref int __result)
         {
diff --git a/Patches/Workshops/WorkshopSellingCostMultiplier.cs b/Patches/Workshops/WorkshopSellingCostMultiplier.cs
index aab237cc..a0003a0b 100644
--- a/Patches/Workshops/WorkshopSellingCostMultiplier.cs
+++ b/Patches/Workshops/WorkshopSellingCostMultiplier.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
@@ -8,6 +9,7 @@ namespace BannerlordCheats.Patches.Workshops
     [HarmonyPatch(typeof(DefaultWorkshopModel), nameof(DefaultWorkshopModel.GetSellingCost))]
     public static class WorkshopSellingCostMultiplier
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetSellingCost(ref Workshop workshop, ref int __result)
         {
diff --git a/Patches/Workshops/WorkshopUpgradeCostPercentage.cs b/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
index 7d03c564..13818073 100644
--- a/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
+++ b/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
@@ -1,5 +1,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
 namespace BannerlordCheats.Patches.Workshops
@@ -7,6 +8,7 @@ namespace BannerlordCheats.Patches.Workshops
     [HarmonyPatch(typeof(DefaultWorkshopModel), nameof(DefaultWorkshopModel.GetUpgradeCost))]
     public static class WorkshopUpgradeCostPercentage
     {
+        [UsedImplicitly]
         [HarmonyPostfix]
         public static void GetUpgradeCost(ref int currentLevel, ref int __result)
         {

From 3551e65ffbfb06f1af5f0fb2673645929f59e57e Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 23 Sep 2021 19:05:56 +0200
Subject: [PATCH 038/177] Update game to e1.6.3.283736

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 68ff08db..24fba32a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.7.0.0</Version>
-    <GameVersion>1.6.2.280252</GameVersion>
+    <GameVersion>1.6.3.283736</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>
     <MCMVersion>4.3.10</MCMVersion>

From 0b6c29d523e9fdf568536b70c1110cd306ee7e32 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 23 Sep 2021 19:09:32 +0200
Subject: [PATCH 039/177] Replace old references to master branch in workflows

---
 .github/workflows/build.yml   | 2 +-
 .github/workflows/release.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e7253d24..41df8965 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,7 +49,7 @@ jobs:
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
           $RepoBranch = "${{github.ref}}"
           $RepoBranch = $RepoBranch.Split("/")[-1]
-          If ($RepoBranch -eq "master") { $RepoBranch = "" }
+          If ($RepoBranch -eq "stable") { $RepoBranch = "" }
           If ($RepoBranch) { $RepoBranch = "-$RepoBranch" }
           Write-Host "::set-output name=repo_branch::$RepoBranch"
           Write-Host "RepoBranch: ""$RepoBranch"""
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0bddd48c..4f75d676 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
           $RepoBranch = "${{github.ref}}"
           $RepoBranch = $RepoBranch.Split("/")[-1]
-          If ($RepoBranch -eq "master") { $RepoBranch = "" }
+          If ($RepoBranch -eq "stable") { $RepoBranch = "" }
           If ($RepoBranch) { $RepoBranch = "-$RepoBranch" }
           Write-Host "::set-output name=repo_branch::$RepoBranch"
           Write-Host "RepoBranch: ""$RepoBranch"""

From bed2138b726300b758293c14b02633da72592745 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 23 Sep 2021 19:17:14 +0200
Subject: [PATCH 040/177] Fix Siege Building Speed Multiplier cheat

---
 Patches/Sieges/SiegeBuildingSpeedMultiplier.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs b/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
index bf82ad8b..93f5760e 100644
--- a/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
+++ b/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
@@ -16,9 +16,9 @@ public static class SiegeBuildingSpeedMultiplier
         public static void GetConstructionProgressPerHour(ref SiegeEngineType type, ref SiegeEvent siegeEvent, ref ISiegeEventSide side, ref float __result)
         {
             if (side.IsPlayerSide()
-                && BannerlordCheatsSettings.Instance?.EnemySiegeBuildingSpeedPercentage > 1f)
+                && BannerlordCheatsSettings.Instance?.SiegeBuildingSpeedMultiplier > 1f)
             {
-                __result *= BannerlordCheatsSettings.Instance.EnemySiegeBuildingSpeedPercentage;
+                __result *= BannerlordCheatsSettings.Instance.SiegeBuildingSpeedMultiplier;
             }
         }
     }

From 98f70a5422480fea549f108229f26caf0f77eec6 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 23 Sep 2021 19:47:04 +0200
Subject: [PATCH 041/177] Fix Troop Upgrade Hotkey cheat

---
 Patches/General/EnableHotkeysTroopExperience.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Patches/General/EnableHotkeysTroopExperience.cs b/Patches/General/EnableHotkeysTroopExperience.cs
index 1c9185ba..88a58691 100644
--- a/Patches/General/EnableHotkeysTroopExperience.cs
+++ b/Patches/General/EnableHotkeysTroopExperience.cs
@@ -31,7 +31,7 @@ public static void OnApplicationTick()
 
                 var selectedCharacter = partyVM.CurrentCharacter;
 
-                if (selectedCharacter.IsHero || !selectedCharacter.IsTroopUpgradable) { return; }
+                if (selectedCharacter.IsHero || !selectedCharacter.IsUpgradableTroop) { return; }
 
                 var index = PartyBase.MainParty.MemberRoster.FindIndexOfTroop(selectedCharacter.Character);
 

From acba6590a801a721d91eac331231e6937fc5902b Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 27 Sep 2021 00:18:57 +0200
Subject: [PATCH 042/177] Update to v2.8

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 24fba32a..43eb589b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.7.0.0</Version>
+    <Version>2.8.0.0</Version>
     <GameVersion>1.6.3.283736</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>

From ad821d038081989fdb0ff0c8b83e6fcb56f80724 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 20 Oct 2021 11:17:39 +0200
Subject: [PATCH 043/177] Update game to e1.6.4.287129

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 43eb589b..1534377f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.8.0.0</Version>
-    <GameVersion>1.6.3.283736</GameVersion>
+    <GameVersion>1.6.4.287129</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>
     <MCMVersion>4.3.10</MCMVersion>

From 0b63979b2fdb7712afba28216f358f72ff6c855e Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 20 Oct 2021 11:39:26 +0200
Subject: [PATCH 044/177] Restore Map Speed Multiplier cheat

---
 Patches/Map/MapSpeedMultiplier.cs    | 29 ++++++++++++++--------------
 Settings/BannerlordCheatsSettings.cs |  6 +++---
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Patches/Map/MapSpeedMultiplier.cs b/Patches/Map/MapSpeedMultiplier.cs
index f0cbbfaa..278a5288 100644
--- a/Patches/Map/MapSpeedMultiplier.cs
+++ b/Patches/Map/MapSpeedMultiplier.cs
@@ -1,23 +1,24 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
 namespace BannerlordCheats.Patches.Map
 {
-    // [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
-    // public static class MapSpeedMultiplier
-    // {
-    //     [UsedImplicitly]
-    //     [HarmonyPostfix]
-    //     public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
-    //     {
-    //         if (mobileParty.IsPlayerParty()
-    //             && BannerlordCheatsSettings.Instance?.MapSpeedMultiplier > 1f)
-    //         {
-    //             __result.AddMultiplier(BannerlordCheatsSettings.Instance.MapSpeedMultiplier);
-    //         }
-    //     }
-    // }
+    [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
+    public static class MapSpeedMultiplier
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
+        {
+            if (mobileParty.IsPlayerParty()
+                && BannerlordCheatsSettings.Instance?.MapSpeedMultiplier > 1f)
+            {
+                __result.AddMultiplier(BannerlordCheatsSettings.Instance.MapSpeedMultiplier);
+            }
+        }
+    }
 }
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index df0c2939..7ce6c185 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -61,9 +61,9 @@ public BannerlordCheatsSettings()
 
         #region Map
 
-        // [LocalizedSettingPropertyGroup(MapGroupName)]
-        // [LocalizedSettingPropertyFloatingInteger(nameof(MapSpeedMultiplier), minValue: 1.0f, maxValue: 100.0f)]
-        // public float MapSpeedMultiplier { get; set; } = 1.0f;
+        [LocalizedSettingPropertyGroup(MapGroupName)]
+        [LocalizedSettingPropertyFloatingInteger(nameof(MapSpeedMultiplier), minValue: 1.0f, maxValue: 100.0f)]
+        public float MapSpeedMultiplier { get; set; } = 1.0f;
 
         [LocalizedSettingPropertyGroup(MapGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(MapVisibilityMultiplier), minValue: 1.0f, maxValue: 100.0f)]

From 4ca9ed9d9982b95f9cb9b39511449311d6bd3fbd Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 20 Oct 2021 11:42:45 +0200
Subject: [PATCH 045/177] Resore NPC Map Speed Percentage cheat

---
 Patches/Map/NpcMapSpeedPercentage.cs | 29 ++++++++++++++--------------
 Settings/BannerlordCheatsSettings.cs |  6 +++---
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Patches/Map/NpcMapSpeedPercentage.cs b/Patches/Map/NpcMapSpeedPercentage.cs
index 0d75304c..18e802be 100644
--- a/Patches/Map/NpcMapSpeedPercentage.cs
+++ b/Patches/Map/NpcMapSpeedPercentage.cs
@@ -1,23 +1,24 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
 
 namespace BannerlordCheats.Patches.Map
 {
-    // [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
-    // public static class NpcMapSpeedPercentage
-    // {
-    //     [UsedImplicitly]
-    //     [HarmonyPostfix]
-    //     public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
-    //     {
-    //         if (!mobileParty.IsPlayerParty()
-    //             && BannerlordCheatsSettings.Instance?.NpcMapSpeedPercentage > 100f)
-    //         {
-    //             __result.AddPercentage(BannerlordCheatsSettings.Instance.NpcMapSpeedPercentage);
-    //         }
-    //     }
-    // }
+    [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
+    public static class NpcMapSpeedPercentage
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
+        {
+            if (!mobileParty.IsPlayerParty()
+                && BannerlordCheatsSettings.Instance?.NpcMapSpeedPercentage > 100f)
+            {
+                __result.AddPercentage(BannerlordCheatsSettings.Instance.NpcMapSpeedPercentage);
+            }
+        }
+    }
 }
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 7ce6c185..5030bef7 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -69,9 +69,9 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyFloatingInteger(nameof(MapVisibilityMultiplier), minValue: 1.0f, maxValue: 100.0f)]
         public float MapVisibilityMultiplier { get; set; } = 1.0f;
 
-        // [LocalizedSettingPropertyGroup(MapGroupName)]
-        // [LocalizedSettingPropertyPercent(nameof(NpcMapSpeedPercentage))]
-        // public float NpcMapSpeedPercentage { get; set; } = 100.0f;
+        [LocalizedSettingPropertyGroup(MapGroupName)]
+        [LocalizedSettingPropertyPercent(nameof(NpcMapSpeedPercentage))]
+        public float NpcMapSpeedPercentage { get; set; } = 100.0f;
 
         [LocalizedSettingPropertyGroup(MapGroupName)]
         [LocalizedSettingPropertyBool(nameof(PartyInvisibleOnMap))]

From 3e219eec43727db087c4d4269619d542d4d98ed3 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 22 Oct 2021 11:51:05 +0200
Subject: [PATCH 046/177] Add No Bribe To Enter Keep cheat

---
 L10N.resx                                 |  6 ++++++
 Patches/Settlements/NoBribeToEnterKeep.cs | 22 ++++++++++++++++++++++
 Settings/BannerlordCheatsSettings.cs      |  4 ++++
 3 files changed, 32 insertions(+)
 create mode 100644 Patches/Settlements/NoBribeToEnterKeep.cs

diff --git a/L10N.resx b/L10N.resx
index e32a1858..88b605db 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -798,4 +798,10 @@
   <data name="ConstructionPowerMultiplier_Desc" xml:space="preserve">
     <value>Factor by which the construction power of player towns is multiplied. A factor of 1 means default construction power.</value>
   </data>
+  <data name="NoBribeToEnterKeep_Name" xml:space="preserve">
+    <value>If enabled, no bribe is required to enter a keep.</value>
+  </data>
+  <data name="NoBribeToEnterKeep_Desc" xml:space="preserve">
+    <value>Enter Keeps Without Bribe</value>
+  </data>
 </root>
diff --git a/Patches/Settlements/NoBribeToEnterKeep.cs b/Patches/Settlements/NoBribeToEnterKeep.cs
new file mode 100644
index 00000000..f8282bea
--- /dev/null
+++ b/Patches/Settlements/NoBribeToEnterKeep.cs
@@ -0,0 +1,22 @@
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using JetBrains.Annotations;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+
+namespace BannerlordCheats.Patches.Settlements
+{
+    [HarmonyPatch(typeof(DefaultBribeCalculationModel), nameof(DefaultBribeCalculationModel.IsBribeNotNeededToEnterKeep))]
+    public static class NoBribeToEnterKeep
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void IsBribeNotNeededToEnterKeep(Settlement settlement, ref bool __result)
+        {
+            if (BannerlordCheatsSettings.Instance?.NoBribeToEnterKeep == true)
+            {
+                __result = true;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 5030bef7..280fd1af 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -444,6 +444,10 @@ public BannerlordCheatsSettings()
         // [LocalizedSettingPropertyGroup(SettlementsGroupName)]
         // [LocalizedSettingPropertyFloatingInteger(nameof(ConstructionPowerMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
         // public float ConstructionPowerMultiplier { get; set; } = 1.0f;
+        
+        [LocalizedSettingPropertyGroup(SettlementsGroupName)]
+        [LocalizedSettingPropertyBool(nameof(NoBribeToEnterKeep))]
+        public bool NoBribeToEnterKeep { get; set; } = false;
 
         #endregion Settlements
 

From 29fab9adab3322aaa42c015812722582b13632b0 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 23 Oct 2021 12:10:19 +0200
Subject: [PATCH 047/177] Add Everyone Buys Workshops cheat

---
 L10N.resx                                     |  6 ++++
 .../Workshops/EveryoneBuysWorkshopsCost.cs    | 33 +++++++++++++++++++
 .../EveryoneBuysWorkshopsSelectOwner.cs       | 28 ++++++++++++++++
 Settings/BannerlordCheatsSettings.cs          |  4 +++
 4 files changed, 71 insertions(+)
 create mode 100644 Patches/Workshops/EveryoneBuysWorkshopsCost.cs
 create mode 100644 Patches/Workshops/EveryoneBuysWorkshopsSelectOwner.cs

diff --git a/L10N.resx b/L10N.resx
index 88b605db..5b2ca470 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -804,4 +804,10 @@
   <data name="NoBribeToEnterKeep_Desc" xml:space="preserve">
     <value>Enter Keeps Without Bribe</value>
   </data>
+  <data name="EveryoneBuysWorkshops_Name" xml:space="preserve">
+    <value>Everyone Buys Workshops</value>
+  </data>
+  <data name="EveryoneBuysWorkshops_Desc" xml:space="preserve">
+    <value>If enabled, you will always find a buyer for your workshop, even if you have adjusted the workshop selling price cheat.</value>
+  </data>
 </root>
diff --git a/Patches/Workshops/EveryoneBuysWorkshopsCost.cs b/Patches/Workshops/EveryoneBuysWorkshopsCost.cs
new file mode 100644
index 00000000..abd0d3d6
--- /dev/null
+++ b/Patches/Workshops/EveryoneBuysWorkshopsCost.cs
@@ -0,0 +1,33 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using JetBrains.Annotations;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Actions;
+using TaleWorlds.Localization;
+
+namespace BannerlordCheats.Patches.Workshops
+{
+    [HarmonyPatch(typeof(ChangeOwnerOfWorkshopAction), nameof(ChangeOwnerOfWorkshopAction.ApplyByTrade))]
+    public static class EveryoneBuysWorkshopsCost
+    {
+        [UsedImplicitly]
+        [HarmonyPrefix]
+        public static void ApplyByTrade(
+            ref Workshop workshop,
+            ref Hero newOwner,
+            ref WorkshopType workshopType,
+            ref int capital,
+            ref bool upgradable,
+            ref int cost,
+            ref TextObject customName)
+        {
+            if (BannerlordCheatsSettings.Instance?.EveryoneBuysWorkshops == true
+                && workshop.Owner.IsPlayer()
+                && cost > newOwner.Gold)
+            {
+                newOwner.Gold = cost;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Patches/Workshops/EveryoneBuysWorkshopsSelectOwner.cs b/Patches/Workshops/EveryoneBuysWorkshopsSelectOwner.cs
new file mode 100644
index 00000000..d1533926
--- /dev/null
+++ b/Patches/Workshops/EveryoneBuysWorkshopsSelectOwner.cs
@@ -0,0 +1,28 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using JetBrains.Annotations;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+
+namespace BannerlordCheats.Patches.Workshops
+{
+    [HarmonyPatch(typeof(DefaultWorkshopModel), nameof(DefaultWorkshopModel.SelectNextOwnerForWorkshop))]
+    public static class EveryoneBuysWorkshopsSelectOwner
+    {
+        [UsedImplicitly]
+        [HarmonyPrefix]
+        public static void SelectNextOwnerForWorkshop(
+            ref Town town,
+            ref Workshop workshop,
+            ref Hero excludedHero,
+            ref int requiredGold)
+        {
+            if (BannerlordCheatsSettings.Instance?.EveryoneBuysWorkshops == true
+                && excludedHero.IsPlayer())
+            {
+                requiredGold = 0;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 280fd1af..dfbb0894 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -508,6 +508,10 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyGroup(WorkshopsGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(WorkshopSellingCostMultiplier), minValue: 1.0f, maxValue: 100.0f)]
         public float WorkshopSellingCostMultiplier { get; set; } = 1.0f;
+        
+        [LocalizedSettingPropertyGroup(WorkshopsGroupName)]
+        [LocalizedSettingPropertyBool(nameof(EveryoneBuysWorkshops))]
+        public bool EveryoneBuysWorkshops { get; set; } = false;
 
         #endregion Workshops
     }

From 96955652eb2a6127fdf31f038ba61e40a59de22f Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 23 Oct 2021 13:10:25 +0200
Subject: [PATCH 048/177] Add Perfect Attraction cheat

---
 L10N.resx                               |  6 ++++++
 Patches/Characters/PerfectAttraction.cs | 27 +++++++++++++++++++++++++
 Settings/BannerlordCheatsSettings.cs    |  4 ++++
 3 files changed, 37 insertions(+)
 create mode 100644 Patches/Characters/PerfectAttraction.cs

diff --git a/L10N.resx b/L10N.resx
index 5b2ca470..c138916b 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -810,4 +810,10 @@
   <data name="EveryoneBuysWorkshops_Desc" xml:space="preserve">
     <value>If enabled, you will always find a buyer for your workshop, even if you have adjusted the workshop selling price cheat.</value>
   </data>
+  <data name="PerfectAttraction_Name" xml:space="preserve">
+    <value>Perfect Attraction</value>
+  </data>
+  <data name="PerfectAttraction_Desc" xml:space="preserve">
+    <value>If enabled, potential partners will always be 100% attracted to you.</value>
+  </data>
 </root>
diff --git a/Patches/Characters/PerfectAttraction.cs b/Patches/Characters/PerfectAttraction.cs
new file mode 100644
index 00000000..4ecb3f88
--- /dev/null
+++ b/Patches/Characters/PerfectAttraction.cs
@@ -0,0 +1,27 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using JetBrains.Annotations;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+
+namespace BannerlordCheats.Patches.Characters
+{
+    [HarmonyPatch(typeof(DefaultRomanceModel), nameof(DefaultRomanceModel.GetAttractionValuePercentage))]
+    public static class PerfectAttraction
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void GetAttractionValuePercentage(
+            ref Hero potentiallyInterestedCharacter,
+            ref Hero heroOfInterest,
+            ref int __result)
+        {
+            if (BannerlordCheatsSettings.Instance?.PerfectAttraction == true
+                && heroOfInterest.IsPlayer())
+            {
+                __result = 100;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index dfbb0894..8560662d 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -304,6 +304,10 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyGroup(CharactersGroupName)]
         [LocalizedSettingPropertyBool(nameof(ConversationAlwaysSuccessful))]
         public bool ConversationAlwaysSuccessful { get; set; } = false;
+        
+        [LocalizedSettingPropertyGroup(CharactersGroupName)]
+        [LocalizedSettingPropertyBool(nameof(PerfectAttraction))]
+        public bool PerfectAttraction { get; set; } = false;
 
         #endregion Characters
 

From b627f17aaaceb55c987f8e801b225044f128f1ad Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 23 Oct 2021 13:11:19 +0200
Subject: [PATCH 049/177] Fix Enter Keeps Without Bribe cheat description

---
 L10N.resx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/L10N.resx b/L10N.resx
index c138916b..55cd5cd5 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -799,10 +799,10 @@
     <value>Factor by which the construction power of player towns is multiplied. A factor of 1 means default construction power.</value>
   </data>
   <data name="NoBribeToEnterKeep_Name" xml:space="preserve">
-    <value>If enabled, no bribe is required to enter a keep.</value>
+    <value>Enter Keeps Without Bribe</value>
   </data>
   <data name="NoBribeToEnterKeep_Desc" xml:space="preserve">
-    <value>Enter Keeps Without Bribe</value>
+    <value>If enabled, no bribe is required to enter a keep.</value>
   </data>
   <data name="EveryoneBuysWorkshops_Name" xml:space="preserve">
     <value>Everyone Buys Workshops</value>

From 50028fe02eff099573b8917565096c878c8d78af Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 23 Oct 2021 13:30:44 +0200
Subject: [PATCH 050/177] Add Allow Same Sex Marriage cheat

---
 L10N.resx                                  |  6 +++
 Patches/Characters/AllowSameSexMarriage.cs | 48 ++++++++++++++++++++++
 Settings/BannerlordCheatsSettings.cs       |  4 ++
 3 files changed, 58 insertions(+)
 create mode 100644 Patches/Characters/AllowSameSexMarriage.cs

diff --git a/L10N.resx b/L10N.resx
index 55cd5cd5..b52a18f5 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -816,4 +816,10 @@
   <data name="PerfectAttraction_Desc" xml:space="preserve">
     <value>If enabled, potential partners will always be 100% attracted to you.</value>
   </data>
+  <data name="AllowSameSexMarriage_Name" xml:space="preserve">
+    <value>Allow Same Sex Marriage</value>
+  </data>
+  <data name="AllowSameSexMarriage_Desc" xml:space="preserve">
+    <value>If enabled, you can marry characters of the same gender as your character.</value>
+  </data>
 </root>
diff --git a/Patches/Characters/AllowSameSexMarriage.cs b/Patches/Characters/AllowSameSexMarriage.cs
new file mode 100644
index 00000000..0fa09083
--- /dev/null
+++ b/Patches/Characters/AllowSameSexMarriage.cs
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.Linq;
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using JetBrains.Annotations;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+
+namespace BannerlordCheats.Patches.Characters
+{
+    [HarmonyPatch(typeof(DefaultMarriageModel), nameof(DefaultMarriageModel.IsCoupleSuitableForMarriage))]
+    public static class AllowSameSexMarriage
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void IsCoupleSuitableForMarriage(
+            ref Hero firstHero,
+            ref Hero secondHero,
+            ref bool __result)
+        {
+            if (BannerlordCheatsSettings.Instance?.AllowSameSexMarriage == true
+                && (firstHero.IsPlayer() || secondHero.IsPlayer()))
+            {
+                __result = (firstHero.Clan?.Leader != firstHero || secondHero.Clan?.Leader != secondHero) 
+                           // && firstHero.IsFemale != secondHero.IsFemale
+                           && !DiscoverAncestors(firstHero, 3).Intersect(DiscoverAncestors(secondHero, 3)).Any()
+                           && firstHero.CanMarry()
+                           && secondHero.CanMarry();
+            }
+        }
+        
+        private static IEnumerable<Hero> DiscoverAncestors(Hero hero, int n)
+        {
+            if (hero != null)
+            {
+                yield return hero;
+                if (n > 0)
+                {
+                    foreach (Hero discoverAncestor in DiscoverAncestors(hero.Mother, n - 1))
+                        yield return discoverAncestor;
+                    foreach (Hero discoverAncestor in DiscoverAncestors(hero.Father, n - 1))
+                        yield return discoverAncestor;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 8560662d..44dd9c28 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -308,6 +308,10 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyGroup(CharactersGroupName)]
         [LocalizedSettingPropertyBool(nameof(PerfectAttraction))]
         public bool PerfectAttraction { get; set; } = false;
+        
+        [LocalizedSettingPropertyGroup(CharactersGroupName)]
+        [LocalizedSettingPropertyBool(nameof(AllowSameSexMarriage))]
+        public bool AllowSameSexMarriage { get; set; } = false;
 
         #endregion Characters
 

From 0a52462a41152d04051fb1c7aecdb6420ad9add7 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 23 Oct 2021 13:41:50 +0200
Subject: [PATCH 051/177] Add Pregnancy Chance Multiplier cheat

---
 L10N.resx                                     |  6 +++++
 .../Characters/PregnancyChanceMultiplier.cs   | 27 +++++++++++++++++++
 Settings/BannerlordCheatsSettings.cs          |  4 +++
 3 files changed, 37 insertions(+)
 create mode 100644 Patches/Characters/PregnancyChanceMultiplier.cs

diff --git a/L10N.resx b/L10N.resx
index b52a18f5..ebcd9a70 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -822,4 +822,10 @@
   <data name="AllowSameSexMarriage_Desc" xml:space="preserve">
     <value>If enabled, you can marry characters of the same gender as your character.</value>
   </data>
+  <data name="PregnancyChanceMultiplier_Name" xml:space="preserve">
+    <value>Pregnancy Chance Multiplier</value>
+  </data>
+  <data name="PregnancyChanceMultiplier_Desc" xml:space="preserve">
+    <value>Factor by which the chance of getting pregnant for player characters or player character spouses is multiplied. Does not affect characters that cannot become pregnant! A factor of 1 means default pregnancy chance.</value>
+  </data>
 </root>
diff --git a/Patches/Characters/PregnancyChanceMultiplier.cs b/Patches/Characters/PregnancyChanceMultiplier.cs
new file mode 100644
index 00000000..e93aa41d
--- /dev/null
+++ b/Patches/Characters/PregnancyChanceMultiplier.cs
@@ -0,0 +1,27 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using JetBrains.Annotations;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+
+namespace BannerlordCheats.Patches.Characters
+{
+    [HarmonyPatch(typeof(DefaultPregnancyModel), nameof(DefaultPregnancyModel.GetDailyChanceOfPregnancyForHero))]
+    public static class PregnancyChanceMultiplier
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void GetDailyChanceOfPregnancyForHero(
+            ref Hero hero,
+            ref float __result)
+        {
+            if (BannerlordCheatsSettings.Instance?.PregnancyChanceMultiplier > 1.0f
+                && (hero.IsPlayer() || hero.Spouse.IsPlayer()))
+            {
+                __result *= BannerlordCheatsSettings.Instance.PregnancyChanceMultiplier;
+            }
+        } 
+        
+    }
+}
\ No newline at end of file
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 44dd9c28..8207800e 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -312,6 +312,10 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyGroup(CharactersGroupName)]
         [LocalizedSettingPropertyBool(nameof(AllowSameSexMarriage))]
         public bool AllowSameSexMarriage { get; set; } = false;
+        
+        [LocalizedSettingPropertyGroup(CharactersGroupName)]
+        [LocalizedSettingPropertyFloatingInteger(nameof(PregnancyChanceMultiplier), minValue: 1.0f, maxValue: 100.0f)]
+        public float PregnancyChanceMultiplier { get; set; } = 1.0f;
 
         #endregion Characters
 

From ea631d7c21180131d6f36c7154d5716d604f9caf Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 23 Oct 2021 13:55:18 +0200
Subject: [PATCH 052/177] Add Adjust Pregnancy Duration cheat

---
 L10N.resx                                     |  6 ++++++
 Patches/Characters/AdjustPregnancyDuration.cs | 21 +++++++++++++++++++
 Settings/BannerlordCheatsSettings.cs          |  4 ++++
 3 files changed, 31 insertions(+)
 create mode 100644 Patches/Characters/AdjustPregnancyDuration.cs

diff --git a/L10N.resx b/L10N.resx
index ebcd9a70..6a477a93 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -828,4 +828,10 @@
   <data name="PregnancyChanceMultiplier_Desc" xml:space="preserve">
     <value>Factor by which the chance of getting pregnant for player characters or player character spouses is multiplied. Does not affect characters that cannot become pregnant! A factor of 1 means default pregnancy chance.</value>
   </data>
+  <data name="AdjustPregnancyDuration_Name" xml:space="preserve">
+    <value>Adjust Pregnancy Duration</value>
+  </data>
+  <data name="AdjustPregnancyDuration_Desc" xml:space="preserve">
+    <value>Adjust the length of pregnancies for all characters in the game. The default length of a pregnancy is 36 days.</value>
+  </data>
 </root>
diff --git a/Patches/Characters/AdjustPregnancyDuration.cs b/Patches/Characters/AdjustPregnancyDuration.cs
new file mode 100644
index 00000000..88826a99
--- /dev/null
+++ b/Patches/Characters/AdjustPregnancyDuration.cs
@@ -0,0 +1,21 @@
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using JetBrains.Annotations;
+using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+
+namespace BannerlordCheats.Patches.Characters
+{
+    [HarmonyPatch(typeof(DefaultPregnancyModel), nameof(DefaultPregnancyModel.PregnancyDurationInDays), MethodType.Getter)]
+    public static class AdjustPregnancyDuration
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void PregnancyDurationInDays(ref float __result)
+        {
+            if (BannerlordCheatsSettings.Instance?.AdjustPregnancyDuration < 36)
+            {
+                __result = BannerlordCheatsSettings.Instance.AdjustPregnancyDuration;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 8207800e..42e941c3 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -316,6 +316,10 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyGroup(CharactersGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(PregnancyChanceMultiplier), minValue: 1.0f, maxValue: 100.0f)]
         public float PregnancyChanceMultiplier { get; set; } = 1.0f;
+        
+        [LocalizedSettingPropertyGroup(CharactersGroupName)]
+        [LocalizedSettingPropertyInteger(nameof(AdjustPregnancyDuration), minValue: 1, maxValue: 36)]
+        public int AdjustPregnancyDuration { get; set; } = 36;
 
         #endregion Characters
 

From a9bb1d008077965e35325d0d98cb0a97e29649a9 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 23 Oct 2021 14:22:37 +0200
Subject: [PATCH 053/177] Do not throw exception when cheat descriptions are
 whitespace

---
 Localization/L10N.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Localization/L10N.cs b/Localization/L10N.cs
index 705ae2d1..9ee23807 100644
--- a/Localization/L10N.cs
+++ b/Localization/L10N.cs
@@ -26,7 +26,7 @@ static L10N()
                 var key = entry.Attribute("name").Value;
                 var value = entry.Element("value").Value;
 
-                if (!string.IsNullOrWhiteSpace(key) && !string.IsNullOrWhiteSpace(value))
+                if (!string.IsNullOrEmpty(key) && !string.IsNullOrEmpty(value))
                 {
                     L10N.Values.Add(key, value);
                 }

From d5a8ed8c066d64f5e34a1a592378d2a35c99699e Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 23 Oct 2021 14:46:19 +0200
Subject: [PATCH 054/177] Show warning message when using mod for the first
 time

---
 L10N.resx                   | 10 +++++++
 MBInitialScreenBasePatch.cs | 54 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/L10N.resx b/L10N.resx
index 6a477a93..81ff311e 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -834,4 +834,14 @@
   <data name="AdjustPregnancyDuration_Desc" xml:space="preserve">
     <value>Adjust the length of pregnancies for all characters in the game. The default length of a pregnancy is 36 days.</value>
   </data>
+  <data name="ModWarningMessage" xml:space="preserve">
+    <value>Thank you for using the Cheats mod!
+Please remember that the cheats only show up when you have a campaign loaded.
+You can access them by pressing ESC, then going to Options → Mod Options → Cheats.
+Also please use the cheats responsibly and backup your save files. Some cheats might have unintended side effects or might break your game completely.
+Thank you!</value>
+  </data>
+  <data name="ModWarningMessageConfirm" xml:space="preserve">
+    <value>I Understand</value>
+  </data>
 </root>
diff --git a/MBInitialScreenBasePatch.cs b/MBInitialScreenBasePatch.cs
index dfe2f720..073578f3 100644
--- a/MBInitialScreenBasePatch.cs
+++ b/MBInitialScreenBasePatch.cs
@@ -1,4 +1,7 @@
-using HarmonyLib;
+using System.IO;
+using System.Reflection;
+using BannerlordCheats.Localization;
+using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.Core;
 using TaleWorlds.Library;
@@ -20,6 +23,55 @@ public static void OnInitialize()
                 InformationManager.DisplayMessage(new InformationMessage("If possible please send this file to the mod author.", Color.FromUint(16711680)));
                 InformationManager.DisplayMessage(new InformationMessage("You can still play the game, but some cheats may not work.", Color.FromUint(16711680)));
             }
+
+            if (!ConfirmFileExists())
+            {
+                InformationManager.ShowInquiry(new InquiryData(
+                    L10N.GetText("ModName"),
+                    L10N.GetText("ModWarningMessage"),
+                    true,
+                    false,
+                    L10N.GetText("ModWarningMessageConfirm"),
+                    null,
+                    CreateConfirmFile,
+                    null));
+            }
+        }
+
+        private static void CreateConfirmFile()
+        {
+            try
+            {
+                var confirmFileName = $"I Understand How The Cheats Work.txt";
+
+                var location = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+
+                var confirmFilePath = Path.Combine(location, confirmFileName);
+
+                File.Create(confirmFileName);
+            }
+            catch
+            {
+                // Not worth crashing for
+            }
+        }
+
+        private static bool ConfirmFileExists()
+        {
+            try
+            {
+                var confirmFileName = $"I Understand How The Cheats Work.txt";
+
+                var location = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+
+                var confirmFilePath = Path.Combine(location, confirmFileName);
+
+                return File.Exists(confirmFilePath);
+            }
+            catch
+            {
+                return false;
+            }
         }
     }
 }

From db48f969c6e076e4236409794ad7c57eb5903f47 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 23 Oct 2021 15:01:55 +0200
Subject: [PATCH 055/177] Add L10N method for formatting variables into strings

---
 Localization/L10N.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Localization/L10N.cs b/Localization/L10N.cs
index 9ee23807..25e293ef 100644
--- a/Localization/L10N.cs
+++ b/Localization/L10N.cs
@@ -37,5 +37,17 @@ public static string GetText(string key)
         {
             return L10N.Values[key];
         }
+
+        public static string GetTextFormat(string key, params object[] formatValues)
+        {
+            var text = Values[key];
+
+            for (int i = 0; i < formatValues.Length; i++)
+            {
+                text = text.Replace($"{{{i}}}", formatValues[i].ToString());
+            }
+
+            return text;
+        }
     }
 }

From 0bfa1007da71bdf26c2385a4f76b2a79c561c53d Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 23 Oct 2021 15:06:49 +0200
Subject: [PATCH 056/177] Show load failed error message in inquiry message box

---
 L10N.resx                   |  9 +++++++++
 MBInitialScreenBasePatch.cs | 17 ++++++++++-------
 SubModule.cs                |  4 ++--
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/L10N.resx b/L10N.resx
index 81ff311e..b1882abf 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -844,4 +844,13 @@ Thank you!</value>
   <data name="ModWarningMessageConfirm" xml:space="preserve">
     <value>I Understand</value>
   </data>
+  <data name="ModFailedLoadWarningTitle" xml:space="preserve">
+    <value>Bannerlord Cheats failed to load!</value>
+  </data>
+  <data name="ModFailedLoadWarningMessage" xml:space="preserve">
+    <value>This is most likely due to a version mismatch between the game and the mod. Please check if you have the correct mod version for your version of the game.
+If you do, please send the error information that has been generated in the file "{0}" to the mod author so that they can investigate this issue.
+You can still play the game, but most cheats will not work.
+Thank you!</value>
+  </data>
 </root>
diff --git a/MBInitialScreenBasePatch.cs b/MBInitialScreenBasePatch.cs
index 073578f3..7a0ad287 100644
--- a/MBInitialScreenBasePatch.cs
+++ b/MBInitialScreenBasePatch.cs
@@ -4,7 +4,6 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.Core;
-using TaleWorlds.Library;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats
@@ -18,13 +17,17 @@ public static void OnInitialize()
         {
             if (SubModule.ErrorFile != null)
             {
-                InformationManager.DisplayMessage(new InformationMessage("Bannerlord Cheats could not load correctly!", Color.FromUint(16711680)));
-                InformationManager.DisplayMessage(new InformationMessage($"Detailed error info has been saved in the file {SubModule.ErrorFile} in the Cheats mod folder.", Color.FromUint(16711680)));
-                InformationManager.DisplayMessage(new InformationMessage("If possible please send this file to the mod author.", Color.FromUint(16711680)));
-                InformationManager.DisplayMessage(new InformationMessage("You can still play the game, but some cheats may not work.", Color.FromUint(16711680)));
+                InformationManager.ShowInquiry(new InquiryData(
+                    L10N.GetText("ModFailedLoadWarningTitle"),
+                    L10N.GetTextFormat("ModFailedLoadWarningMessage", SubModule.ErrorFile),
+                    true,
+                    false,
+                    L10N.GetText("ModWarningMessageConfirm"),
+                    null,
+                    null,
+                    null));
             }
-
-            if (!ConfirmFileExists())
+            else if (!ConfirmFileExists())
             {
                 InformationManager.ShowInquiry(new InquiryData(
                     L10N.GetText("ModName"),
diff --git a/SubModule.cs b/SubModule.cs
index 7e62b462..6d2378c9 100644
--- a/SubModule.cs
+++ b/SubModule.cs
@@ -31,12 +31,12 @@ protected override void OnSubModuleLoad()
                 {
                     var errorFileName = $"Error-{DateTime.Now:yyyy-MM-dd-HH-mm-ss}.txt";
 
-                    SubModule.ErrorFile = errorFileName;
-
                     var location = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
                     var errorFilePath = Path.Combine(location, errorFileName);
 
+                    SubModule.ErrorFile = errorFilePath;
+
                     var errorMessage = new StringBuilder();
 
                     foreach (var module in ModuleHelper.GetModules())

From de6df482e1cf9a45d74935592ac607bc678de574 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 23 Oct 2021 15:14:41 +0200
Subject: [PATCH 057/177] Disable Lord Death Percentage cheats affecting
 simulated battles

---
 Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs    | 2 ++
 Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs b/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
index 0f68024d..f9d19409 100644
--- a/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
+++ b/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
@@ -8,6 +8,7 @@
 
 namespace BannerlordCheats.Patches.Combat
 {
+    /*
     [HarmonyPatch(typeof(DefaultCombatSimulationModel), nameof(DefaultCombatSimulationModel.SimulateHit))]
     public static class EnemyLordCombatDeathPercentageSimulation
     {
@@ -25,4 +26,5 @@ public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterOb
             }
         }
     }
+    */
 }
diff --git a/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs b/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
index 449c0c62..c0b719ac 100644
--- a/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
+++ b/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
@@ -8,6 +8,7 @@
 
 namespace BannerlordCheats.Patches.Combat
 {
+    /*
     [HarmonyPatch(typeof(DefaultCombatSimulationModel), nameof(DefaultCombatSimulationModel.SimulateHit))]
     public static class FriendlyLordCombatDeathPercentageSimulation
     {
@@ -25,4 +26,5 @@ public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterOb
             }
         }
     }
+    */
 }

From 764802bd7f5695c2f7d54be0db41fe4a4683ef8b Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 23 Oct 2021 15:52:41 +0200
Subject: [PATCH 058/177] Update to v2.8.1

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 1534377f..37643fc7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.8.0.0</Version>
+    <Version>2.8.1.0</Version>
     <GameVersion>1.6.4.287129</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>

From 7a2cc11838f8cc95207da7e2dbe1f0bb1df44e59 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 23 Oct 2021 15:53:00 +0200
Subject: [PATCH 059/177] Fix first startup dialog file location

---
 MBInitialScreenBasePatch.cs | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/MBInitialScreenBasePatch.cs b/MBInitialScreenBasePatch.cs
index 7a0ad287..0ab7c75e 100644
--- a/MBInitialScreenBasePatch.cs
+++ b/MBInitialScreenBasePatch.cs
@@ -1,6 +1,7 @@
 using System.IO;
 using System.Reflection;
 using BannerlordCheats.Localization;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.Core;
@@ -41,17 +42,27 @@ public static void OnInitialize()
             }
         }
 
-        private static void CreateConfirmFile()
+        private static string ConfirmFilePath
         {
-            try
+            get
             {
-                var confirmFileName = $"I Understand How The Cheats Work.txt";
+                var confirmFileName = "I Understand How The Cheats Work.txt";
 
-                var location = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+                var assemblyLocation = Assembly.GetAssembly(typeof(BannerlordCheatsSettings)).Location;
+
+                var location = Path.GetDirectoryName(assemblyLocation);
 
                 var confirmFilePath = Path.Combine(location, confirmFileName);
 
-                File.Create(confirmFileName);
+                return confirmFilePath;
+            }
+        }
+
+        private static void CreateConfirmFile()
+        {
+            try
+            {
+                File.Create(ConfirmFilePath);
             }
             catch
             {
@@ -63,13 +74,7 @@ private static bool ConfirmFileExists()
         {
             try
             {
-                var confirmFileName = $"I Understand How The Cheats Work.txt";
-
-                var location = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-
-                var confirmFilePath = Path.Combine(location, confirmFileName);
-
-                return File.Exists(confirmFilePath);
+                return File.Exists(ConfirmFilePath);
             }
             catch
             {

From 1235652b652e4e80022d524ca543fb8583282640 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 26 Oct 2021 11:48:37 +0200
Subject: [PATCH 060/177] Update game to e1.6.5.288298

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 37643fc7..affd565f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.8.1.0</Version>
-    <GameVersion>1.6.4.287129</GameVersion>
+    <GameVersion>1.6.5.288298</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>
     <MCMVersion>4.3.10</MCMVersion>

From e3db6b85d13a2db09257147013c37068f5eda262 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 27 Oct 2021 12:56:06 +0200
Subject: [PATCH 061/177] Update game to e1.6.5.288497

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index affd565f..78cf9df5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.8.1.0</Version>
-    <GameVersion>1.6.5.288298</GameVersion>
+    <GameVersion>1.6.5.288497</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>
     <MCMVersion>4.3.10</MCMVersion>

From cc8cedcd76983f5a7b4ced4c152850d160e1661b Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sun, 28 Nov 2021 10:49:28 +0100
Subject: [PATCH 062/177] Update game to e1.6.5.291843

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 78cf9df5..bb5083d5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.8.1.0</Version>
-    <GameVersion>1.6.5.288497</GameVersion>
+    <GameVersion>1.6.5.291843</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>
     <MCMVersion>4.3.10</MCMVersion>

From c1703f58a5f0c59f0f14d55a845bd8422b5cc997 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 19 Nov 2021 20:32:12 +0100
Subject: [PATCH 063/177] Add additional project properties

---
 BannerlordCheats.csproj | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/BannerlordCheats.csproj b/BannerlordCheats.csproj
index 23c290ea..c14cd51b 100644
--- a/BannerlordCheats.csproj
+++ b/BannerlordCheats.csproj
@@ -1,5 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+    <PropertyGroup>
+      <IsPackable>false</IsPackable>
+      <AssemblyVersion>$(Version)</AssemblyVersion>
+    </PropertyGroup>
+
     <ItemGroup>
       <PackageReference Include="Bannerlord.MCM" Version="$(MCMVersion)" IncludeAssets="compile" />
       <PackageReference Condition="$(UseNuGetAssemblies) == True" Include="Bannerlord.ReferenceAssemblies.EarlyAccess" Version="$(GameVersion)" />

From daec41274b5071c27840d1fb0ae98cbcb0015aea Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sun, 28 Nov 2021 10:50:17 +0100
Subject: [PATCH 064/177] Update to v2.9

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index bb5083d5..42be3b9f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.8.1.0</Version>
+    <Version>2.9.0.0</Version>
     <GameVersion>1.6.5.291843</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>

From 588fd08a03103660accc05983a115ce43a691c9d Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sun, 28 Nov 2021 11:17:45 +0100
Subject: [PATCH 065/177] Add Enemy Lord Combat Death Chance Multiplier (#77)

---
 L10N.resx                                     |  6 +++++
 .../EnemyLordCombatDeathChanceMultiplier.cs   | 26 +++++++++++++++++++
 Settings/BannerlordCheatsSettings.cs          | 18 ++++++++-----
 3 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs

diff --git a/L10N.resx b/L10N.resx
index b1882abf..62418e91 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -853,4 +853,10 @@ If you do, please send the error information that has been generated in the file
 You can still play the game, but most cheats will not work.
 Thank you!</value>
   </data>
+  <data name="EnemyLordCombatDeathChanceMultiplier_Name" xml:space="preserve">
+    <value>Enemy Lord Combat Death Chance Multiplier</value>
+  </data>
+  <data name="EnemyLordCombatDeathChanceMultiplier_Desc" xml:space="preserve">
+    <value>Factor by which the chance of enemy lords dying in combat is multiplied. 1 means default death chance.</value>
+  </data>
 </root>
diff --git a/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs b/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
new file mode 100644
index 00000000..d0c8832f
--- /dev/null
+++ b/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
@@ -0,0 +1,26 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using JetBrains.Annotations;
+using SandBox;
+using TaleWorlds.Core;
+using TaleWorlds.MountAndBlade;
+
+namespace BannerlordCheats.Patches.Combat
+{
+    [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
+    public static class EnemyLordCombatDeathChanceMultiplier
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
+        {
+            if (effectedAgent.IsHero()
+                && effectedAgent.IsPlayerEnemy()
+                && BannerlordCheatsSettings.Instance?.EnemyLordCombatDeathChanceMultiplier > 1.0f)
+            {
+                __result *= BannerlordCheatsSettings.Instance.EnemyLordCombatDeathChanceMultiplier;
+            }
+        }
+    }
+}
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 42e941c3..1e6d355d 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -205,6 +205,10 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyPercent(nameof(EnemyLordCombatDeathPercentage))]
         public float EnemyLordCombatDeathPercentage { get; set; } = 100.0f;
 
+        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyFloatingInteger(nameof(EnemyLordCombatDeathChanceMultiplier), minValue: 1.0f, maxValue: 100.0f)]
+        public float EnemyLordCombatDeathChanceMultiplier { get; set; } = 1.0f;
+
         [LocalizedSettingPropertyGroup(CombatGroupName)]
         [LocalizedSettingPropertyBool(nameof(AlwaysKnockDown))]
         public bool AlwaysKnockDown { get; set; } = false;
@@ -304,19 +308,19 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyGroup(CharactersGroupName)]
         [LocalizedSettingPropertyBool(nameof(ConversationAlwaysSuccessful))]
         public bool ConversationAlwaysSuccessful { get; set; } = false;
-        
+
         [LocalizedSettingPropertyGroup(CharactersGroupName)]
         [LocalizedSettingPropertyBool(nameof(PerfectAttraction))]
         public bool PerfectAttraction { get; set; } = false;
-        
+
         [LocalizedSettingPropertyGroup(CharactersGroupName)]
         [LocalizedSettingPropertyBool(nameof(AllowSameSexMarriage))]
         public bool AllowSameSexMarriage { get; set; } = false;
-        
+
         [LocalizedSettingPropertyGroup(CharactersGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(PregnancyChanceMultiplier), minValue: 1.0f, maxValue: 100.0f)]
         public float PregnancyChanceMultiplier { get; set; } = 1.0f;
-        
+
         [LocalizedSettingPropertyGroup(CharactersGroupName)]
         [LocalizedSettingPropertyInteger(nameof(AdjustPregnancyDuration), minValue: 1, maxValue: 36)]
         public int AdjustPregnancyDuration { get; set; } = 36;
@@ -380,7 +384,7 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyGroup(SiegesGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(SiegeBuildingSpeedMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
         public float SiegeBuildingSpeedMultiplier { get; set; } = 1.0f;
-        
+
         [LocalizedSettingPropertyGroup(SiegesGroupName)]
         [LocalizedSettingPropertyPercent(nameof(EnemySiegeBuildingSpeedPercentage))]
         public float EnemySiegeBuildingSpeedPercentage { get; set; } = 100.0f;
@@ -460,7 +464,7 @@ public BannerlordCheatsSettings()
         // [LocalizedSettingPropertyGroup(SettlementsGroupName)]
         // [LocalizedSettingPropertyFloatingInteger(nameof(ConstructionPowerMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
         // public float ConstructionPowerMultiplier { get; set; } = 1.0f;
-        
+
         [LocalizedSettingPropertyGroup(SettlementsGroupName)]
         [LocalizedSettingPropertyBool(nameof(NoBribeToEnterKeep))]
         public bool NoBribeToEnterKeep { get; set; } = false;
@@ -524,7 +528,7 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyGroup(WorkshopsGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(WorkshopSellingCostMultiplier), minValue: 1.0f, maxValue: 100.0f)]
         public float WorkshopSellingCostMultiplier { get; set; } = 1.0f;
-        
+
         [LocalizedSettingPropertyGroup(WorkshopsGroupName)]
         [LocalizedSettingPropertyBool(nameof(EveryoneBuysWorkshops))]
         public bool EveryoneBuysWorkshops { get; set; } = false;

From 4655b5048f73ceede86c44013c7de5b19ce620c3 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sun, 28 Nov 2021 11:55:08 +0100
Subject: [PATCH 066/177] Add Never Knocked Back By Attacks cheat

---
 L10N.resx                                   |  6 ++++
 Patches/Combat/NeverKnockedBackByAttacks.cs | 32 +++++++++++++++++++++
 Settings/BannerlordCheatsSettings.cs        |  4 +++
 3 files changed, 42 insertions(+)
 create mode 100644 Patches/Combat/NeverKnockedBackByAttacks.cs

diff --git a/L10N.resx b/L10N.resx
index 62418e91..fb8d7708 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -859,4 +859,10 @@ Thank you!</value>
   <data name="EnemyLordCombatDeathChanceMultiplier_Desc" xml:space="preserve">
     <value>Factor by which the chance of enemy lords dying in combat is multiplied. 1 means default death chance.</value>
   </data>
+  <data name="NeverKnockedBackByAttacks_Desc" xml:space="preserve">
+    <value>If enabled the player character is never knocked back or stunned by enemy attacks.</value>
+  </data>
+  <data name="NeverKnockedBackByAttacks_Name" xml:space="preserve">
+    <value>Never Knocked Back By Attacks</value>
+  </data>
 </root>
diff --git a/Patches/Combat/NeverKnockedBackByAttacks.cs b/Patches/Combat/NeverKnockedBackByAttacks.cs
new file mode 100644
index 00000000..9f90c712
--- /dev/null
+++ b/Patches/Combat/NeverKnockedBackByAttacks.cs
@@ -0,0 +1,32 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using JetBrains.Annotations;
+using TaleWorlds.Core;
+using TaleWorlds.MountAndBlade;
+
+namespace BannerlordCheats.Patches.Combat
+{
+    [HarmonyPatch(typeof(Mission), "DecideAgentKnockedByBlow")]
+    public static class NeverKnockedBackByAttacks
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void DecideAgentKnockedByBlow(
+            ref Agent attacker,
+            ref Agent victim,
+            ref AttackCollisionData collisionData,
+            ref WeaponComponentData attackerWeapon,
+            ref bool isInitialBlowShrugOff,
+            ref Blow blow)
+        {
+            if (victim.IsPlayer()
+                && BannerlordCheatsSettings.Instance?.NeverKnockedBackByAttacks == true)
+            {
+                blow.BlowFlag &= ~BlowFlags.KnockDown;
+                blow.BlowFlag &= ~BlowFlags.KnockBack;
+                blow.BlowFlag |= BlowFlags.ShrugOff;
+            }
+        }
+    }
+}
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 1e6d355d..0a971170 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -213,6 +213,10 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyBool(nameof(AlwaysKnockDown))]
         public bool AlwaysKnockDown { get; set; } = false;
 
+        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyBool(nameof(NeverKnockedBackByAttacks))]
+        public bool NeverKnockedBackByAttacks { get; set; } = false;
+
         #endregion Combat
 
         #region Inventory

From 9e97eb5f7ccd83710cc1484bcd11ac94f02abb9e Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sun, 28 Nov 2021 12:25:19 +0100
Subject: [PATCH 067/177] Add Enemy Damage Percentage cheat

---
 Extensions/AgentExtensions.cs           |  6 +++++
 L10N.resx                               |  6 +++++
 Patches/Combat/EnemyDamagePercentage.cs | 30 +++++++++++++++++++++++++
 Settings/BannerlordCheatsSettings.cs    |  4 ++++
 4 files changed, 46 insertions(+)
 create mode 100644 Patches/Combat/EnemyDamagePercentage.cs

diff --git a/Extensions/AgentExtensions.cs b/Extensions/AgentExtensions.cs
index 53cb52d5..b73ed88a 100644
--- a/Extensions/AgentExtensions.cs
+++ b/Extensions/AgentExtensions.cs
@@ -58,6 +58,12 @@ public static bool TryGetParty(this IAgentOriginBase origin, out PartyBase party
             }
         }
 
+        public static bool IsOnPlayerEnemySide(this IAgentOriginBase origin)
+        {
+            return origin.TryGetParty(out var party)
+                   && (party.MapEventSide?.OtherSide?.IsMainPartyAmongParties() ?? false);
+        }
+
         public static bool IsHero(this Agent agent)
         {
             return agent?.IsHero ?? false;
diff --git a/L10N.resx b/L10N.resx
index fb8d7708..37e4f7c7 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -865,4 +865,10 @@ Thank you!</value>
   <data name="NeverKnockedBackByAttacks_Name" xml:space="preserve">
     <value>Never Knocked Back By Attacks</value>
   </data>
+  <data name="EnemyDamagePercentage_Name" xml:space="preserve">
+    <value>Enemy Damage Percentage</value>
+  </data>
+  <data name="EnemyDamagePercentage_Desc" xml:space="preserve">
+    <value>Percentage of damage all player enemies do during combat compared to the original damage. 100% means full damage.</value>
+  </data>
 </root>
diff --git a/Patches/Combat/EnemyDamagePercentage.cs b/Patches/Combat/EnemyDamagePercentage.cs
new file mode 100644
index 00000000..3ac3cf04
--- /dev/null
+++ b/Patches/Combat/EnemyDamagePercentage.cs
@@ -0,0 +1,30 @@
+using System;
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using JetBrains.Annotations;
+using SandBox;
+using TaleWorlds.Core;
+using TaleWorlds.MountAndBlade;
+
+namespace BannerlordCheats.Patches.Combat
+{
+    [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.CalculateDamage))]
+    public static class EnemyDamagePercentage
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
+        {
+            if (attackInformation.AttackerAgentOrigin.IsOnPlayerEnemySide()
+                && BannerlordCheatsSettings.Instance?.EnemyDamagePercentage < 100f)
+            {
+                var factor = BannerlordCheatsSettings.Instance.EnemyDamagePercentage / 100f;
+
+                var newValue = (int)Math.Round(factor * __result);
+
+                __result = newValue;
+            }
+        }
+    }
+}
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 0a971170..3ea6dda0 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -177,6 +177,10 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyFloatingInteger(nameof(DamageMultiplier), minValue: 1.0f, maxValue: 10.0f)]
         public float DamageMultiplier { get; set; } = 1.0f;
 
+        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyPercent(nameof(EnemyDamagePercentage))]
+        public float EnemyDamagePercentage { get; set; } = 100.0f;
+
         [LocalizedSettingPropertyGroup(CombatGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(PartyDamageMultiplier), minValue: 1.0f, maxValue: 10.0f)]
         public float PartyDamageMultiplier { get; set; } = 1.0f;

From 649cd62f7ccf7eb83786d5c0a197c99ad2aeb325 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sun, 28 Nov 2021 12:39:40 +0100
Subject: [PATCH 068/177] Add Tournament Maximum Bet Multiplier cheat

---
 L10N.resx                                     |  6 +++++
 .../TournamentMaximumBetMultiplier.cs         | 24 +++++++++++++++++++
 Settings/BannerlordCheatsSettings.cs          |  4 ++++
 3 files changed, 34 insertions(+)
 create mode 100644 Patches/Settlements/TournamentMaximumBetMultiplier.cs

diff --git a/L10N.resx b/L10N.resx
index 37e4f7c7..6383ada5 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -871,4 +871,10 @@ Thank you!</value>
   <data name="EnemyDamagePercentage_Desc" xml:space="preserve">
     <value>Percentage of damage all player enemies do during combat compared to the original damage. 100% means full damage.</value>
   </data>
+  <data name="TournamentMaximumBetMultiplier_Name" xml:space="preserve">
+    <value>Tournament Maximum Bet Multiplier</value>
+  </data>
+  <data name="TournamentMaximumBetMultiplier_Desc" xml:space="preserve">
+    <value>Factor by which the maximum amont of money you can bet on a tournament is multiplied. 1 means default value.</value>
+  </data>
 </root>
diff --git a/Patches/Settlements/TournamentMaximumBetMultiplier.cs b/Patches/Settlements/TournamentMaximumBetMultiplier.cs
new file mode 100644
index 00000000..257c0376
--- /dev/null
+++ b/Patches/Settlements/TournamentMaximumBetMultiplier.cs
@@ -0,0 +1,24 @@
+using System;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using JetBrains.Annotations;
+using SandBox.TournamentMissions.Missions;
+
+namespace BannerlordCheats.Patches.Settlements
+{
+    [HarmonyPatch(typeof(TournamentBehavior), nameof(TournamentBehavior.GetMaximumBet))]
+    public static class TournamentMaximumBetMultiplier
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void GetMaximumBet(ref int __result)
+        {
+            if (BannerlordCheatsSettings.Instance?.TournamentMaximumBetMultiplier > 1)
+            {
+                var newValue = (int) Math.Round(__result * BannerlordCheatsSettings.Instance.TournamentMaximumBetMultiplier);
+
+                __result = newValue;
+            }
+        }
+    }
+}
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 3ea6dda0..c9d0b5af 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -433,6 +433,10 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyFloatingInteger(nameof(SellingPriceMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
         public float SellingPriceMultiplier { get; set; } = 1.0f;
 
+        [LocalizedSettingPropertyGroup(SettlementsGroupName)]
+        [LocalizedSettingPropertyFloatingInteger(nameof(TournamentMaximumBetMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
+        public float TournamentMaximumBetMultiplier { get; set; } = 1.0f;
+
         [LocalizedSettingPropertyGroup(SettlementsGroupName)]
         [LocalizedSettingPropertyInteger(nameof(DailyFoodBonus), minValue: 0, maxValue: 10000)]
         public int DailyFoodBonus { get; set; } = 0;

From 465c3523d4588302daabd51b20b3ea5e7f06e6d0 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 30 Nov 2021 10:53:29 +0100
Subject: [PATCH 069/177] Add hotkeys overview

---
 hotkeys.txt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 hotkeys.txt

diff --git a/hotkeys.txt b/hotkeys.txt
new file mode 100644
index 00000000..bf9e5b3a
--- /dev/null
+++ b/hotkeys.txt
@@ -0,0 +1,21 @@
+Keybinding       │ Screen                            │ Description
+─────────────────┼───────────────────────────────────┼──────────────────────────────────────────────────────────────────
+CTRL + X         │ Inventory                         │ Add 1.000 gold to your character
+CTRL + SHIFT + X │ Inventory                         │ Add 100.000 gold to your character
+CTRL + X         │ Clan                              │ Add 1.000 influence to your clan
+CTRL + H         │ Encyclopedia page of a troop type │ Add 1 soldiers of the troop type to your party
+CTRL + SHIFT + H │ Encyclopedia page of a troop type │ Add 10 soldiers of the troop type to your party
+CTRL + H         │ Inventory (with item selected)    │ Add 1 of the selected item to your inventory
+CTRL + SHIFT + H │ Inventory (with item selected)    │ Add 100 of the selected item to your inventory
+CTRL + X         │ Party (with troop selected)       │ Add experience to the selected troop
+CTRL + H         │ Party (with troop selected)       │ Add 1 soldier to the selected troop
+CTRL + SHIFT + H │ Party (with troop selected)       │ Add 10 soldiers to the selected troop
+CTRL + F         │ Character                         │ Add 1 unspent focus point to the character
+CTRL + G         │ Character                         │ Add 1 unspent attribute point to the character
+CTRL + A         │ Character                         │ Set all attributes of the character to 10
+CTRL + 1         │ Character                         │ Add 1 point to the Vigor attribute of the character
+CTRL + 2         │ Character                         │ Add 1 point to the Control attribute of the character
+CTRL + 3         │ Character                         │ Add 1 point to the Endurance attribute of the character
+CTRL + 4         │ Character                         │ Add 1 point to the Cunning attribute of the character
+CTRL + 5         │ Character                         │ Add 1 point to the Social attribute of the character
+CTRL + 6         │ Character                         │ Add 1 point to the Intelligence attribute of the character

From 34a892c06adbf5350fd0ae36a6af595bc07fa06c Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 13 Dec 2021 13:56:30 +0100
Subject: [PATCH 070/177] Update game to e1.7.0.294465

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 42be3b9f..52b8a136 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.9.0.0</Version>
-    <GameVersion>1.6.5.291843</GameVersion>
+    <GameVersion>1.7.0.294465</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>
     <MCMVersion>4.3.10</MCMVersion>

From 8bbf29db2726c4d740498acd3a29fcc0d0d8c53b Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 13 Dec 2021 13:57:47 +0100
Subject: [PATCH 071/177] Update to v2.9.1

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 52b8a136..c7c8644b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.9.0.0</Version>
+    <Version>2.9.1.0</Version>
     <GameVersion>1.7.0.294465</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>

From 4852a4c80f2ae1dd71c5b46cc0262ffe04b9b577 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 13 Dec 2021 13:58:05 +0100
Subject: [PATCH 072/177] Update MCM to v4.3.15

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index c7c8644b..c4041426 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <GameVersion>1.7.0.294465</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>
-    <MCMVersion>4.3.10</MCMVersion>
+    <MCMVersion>4.3.15</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\mb2b_beta</GameFolder>

From 35cc391e8e8bd2c4fdbadf01ccb4e82c618064b3 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 13 Dec 2021 14:21:18 +0100
Subject: [PATCH 073/177] Disable Map Speed cheats because they're broken again
 in beta

---
 Patches/Map/MapSpeedMultiplier.cs    | 2 ++
 Patches/Map/NpcMapSpeedPercentage.cs | 2 ++
 Settings/BannerlordCheatsSettings.cs | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/Patches/Map/MapSpeedMultiplier.cs b/Patches/Map/MapSpeedMultiplier.cs
index 278a5288..86b83b35 100644
--- a/Patches/Map/MapSpeedMultiplier.cs
+++ b/Patches/Map/MapSpeedMultiplier.cs
@@ -7,6 +7,7 @@
 
 namespace BannerlordCheats.Patches.Map
 {
+    /*
     [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
     public static class MapSpeedMultiplier
     {
@@ -21,4 +22,5 @@ public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref Explaine
             }
         }
     }
+    */
 }
diff --git a/Patches/Map/NpcMapSpeedPercentage.cs b/Patches/Map/NpcMapSpeedPercentage.cs
index 18e802be..8cd7fb9a 100644
--- a/Patches/Map/NpcMapSpeedPercentage.cs
+++ b/Patches/Map/NpcMapSpeedPercentage.cs
@@ -7,6 +7,7 @@
 
 namespace BannerlordCheats.Patches.Map
 {
+    /*
     [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
     public static class NpcMapSpeedPercentage
     {
@@ -21,4 +22,5 @@ public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref Explaine
             }
         }
     }
+    */
 }
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index c9d0b5af..60e5a567 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -61,17 +61,21 @@ public BannerlordCheatsSettings()
 
         #region Map
 
+        /*
         [LocalizedSettingPropertyGroup(MapGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(MapSpeedMultiplier), minValue: 1.0f, maxValue: 100.0f)]
         public float MapSpeedMultiplier { get; set; } = 1.0f;
+        */
 
         [LocalizedSettingPropertyGroup(MapGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(MapVisibilityMultiplier), minValue: 1.0f, maxValue: 100.0f)]
         public float MapVisibilityMultiplier { get; set; } = 1.0f;
 
+        /*
         [LocalizedSettingPropertyGroup(MapGroupName)]
         [LocalizedSettingPropertyPercent(nameof(NpcMapSpeedPercentage))]
         public float NpcMapSpeedPercentage { get; set; } = 100.0f;
+        */
 
         [LocalizedSettingPropertyGroup(MapGroupName)]
         [LocalizedSettingPropertyBool(nameof(PartyInvisibleOnMap))]

From fb653caae4d12ca91968940085977024f9221fa7 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 13 Dec 2021 14:21:45 +0100
Subject: [PATCH 074/177] Update No Running Away cheats for beta

---
 Patches/Combat/EnemiesNoRunningAway.cs | 7 +++++--
 Patches/Combat/NoRunningAway.cs        | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Patches/Combat/EnemiesNoRunningAway.cs b/Patches/Combat/EnemiesNoRunningAway.cs
index 6a85b404..1443ed47 100644
--- a/Patches/Combat/EnemiesNoRunningAway.cs
+++ b/Patches/Combat/EnemiesNoRunningAway.cs
@@ -7,12 +7,15 @@
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(DefaultBattleMoraleModel), nameof(DefaultBattleMoraleModel.CalculateMoraleChangeToCharacter))]
+    [HarmonyPatch(typeof(SandboxBattleMoraleModel), nameof(SandboxBattleMoraleModel.CalculateMoraleChangeToCharacter))]
     public static class EnemiesNoRunningAway
     {
         [UsedImplicitly]
         [HarmonyPostfix]
-        public static void CalculateMoraleChangeToCharacter(Agent agent, float moraleChange, float distance, ref float __result)
+        public static void CalculateMoraleChangeToCharacter(
+            ref Agent agent,
+            ref float maxMoraleChange,
+            ref float __result)
         {
             if (agent.IsPlayerEnemy()
                 && BannerlordCheatsSettings.Instance?.EnemiesNoRunningAway == true)
diff --git a/Patches/Combat/NoRunningAway.cs b/Patches/Combat/NoRunningAway.cs
index 22bba1e5..b70f7420 100644
--- a/Patches/Combat/NoRunningAway.cs
+++ b/Patches/Combat/NoRunningAway.cs
@@ -7,12 +7,15 @@
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(DefaultBattleMoraleModel), nameof(DefaultBattleMoraleModel.CalculateMoraleChangeToCharacter))]
+    [HarmonyPatch(typeof(SandboxBattleMoraleModel), nameof(SandboxBattleMoraleModel.CalculateMoraleChangeToCharacter))]
     public static class NoRunningAway
     {
         [UsedImplicitly]
         [HarmonyPostfix]
-        public static void CalculateMoraleChangeToCharacter(Agent agent, float moraleChange, float distance, ref float __result)
+        public static void CalculateMoraleChangeToCharacter(
+            ref Agent agent,
+            ref float maxMoraleChange,
+            ref float __result)
         {
             if (agent.Origin.TryGetParty(out var party)
                 && party.IsPlayerParty()

From 51578f712beb0f00d4e21b64e647e877b420027d Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 13 Dec 2021 14:22:11 +0100
Subject: [PATCH 075/177] Fix warning popup for beta

---
 MBInitialScreenBasePatch.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MBInitialScreenBasePatch.cs b/MBInitialScreenBasePatch.cs
index 0ab7c75e..5f67ba95 100644
--- a/MBInitialScreenBasePatch.cs
+++ b/MBInitialScreenBasePatch.cs
@@ -5,6 +5,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.Core;
+using TaleWorlds.Library;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats

From 458ef01ec9ac33d38132746502698eaf3b698961 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 15 Dec 2021 17:04:51 +0100
Subject: [PATCH 076/177] Fix crashes in Party/Agent extensions

---
 Extensions/AgentExtensions.cs | 11 ++++++-----
 Extensions/PartyExtensions.cs |  6 ++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Extensions/AgentExtensions.cs b/Extensions/AgentExtensions.cs
index b73ed88a..2206bab0 100644
--- a/Extensions/AgentExtensions.cs
+++ b/Extensions/AgentExtensions.cs
@@ -84,15 +84,16 @@ public static bool IsPlayerCompanion(this Agent agent)
 
         public static bool IsPlayerEnemy(this Agent agent)
         {
-            return agent?.Team != null
-                && !agent.Team.IsPlayerTeam
-                && !agent.Team.IsPlayerAlly;
+            return Mission.Current?.PlayerTeam != null
+                   && agent?.Team != null
+                   && Mission.Current.PlayerTeam.Side != agent.Team.Side;
         }
 
         public static bool IsPlayerAlly(this Agent agent)
         {
-            return agent?.Team != null
-                   && (agent.Team.IsPlayerTeam || agent.Team.IsPlayerAlly);
+            return Mission.Current?.PlayerTeam != null
+                   && agent?.Team != null
+                   && Mission.Current.PlayerTeam.Side == agent.Team.Side;
         }
     }
 }
diff --git a/Extensions/PartyExtensions.cs b/Extensions/PartyExtensions.cs
index a4d71d37..0874ec21 100644
--- a/Extensions/PartyExtensions.cs
+++ b/Extensions/PartyExtensions.cs
@@ -6,6 +6,12 @@ public static class PartyExtensions
     {
         public static bool IsPlayerParty(this PartyBase party)
         {
+            // Workaround for crash on accessing BanditPartyComponent.Owner
+            if (party?.MapFaction?.IsBanditFaction == true)
+            {
+                return false;
+            }
+
             return party?.Owner?.IsHumanPlayerCharacter ?? false;
         }
 

From c00145238b4dfbb535b21d06b2f773852471d100 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 17 Jan 2022 16:59:19 +0100
Subject: [PATCH 077/177] Update to v2.9.2

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index c4041426..e7edc906 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.9.1.0</Version>
+    <Version>2.9.2.0</Version>
     <GameVersion>1.7.0.294465</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>

From 261f9938b0f6736c955576e416c354f3cf55dae1 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 17 Jan 2022 16:59:50 +0100
Subject: [PATCH 078/177] Update game to e1.7.1.299086

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index e7edc906..10164dd5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.9.2.0</Version>
-    <GameVersion>1.7.0.294465</GameVersion>
+    <GameVersion>1.7.1.299086</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>
     <MCMVersion>4.3.15</MCMVersion>

From af73fdf10add8ef3d9309d3acedec5141f4f20c5 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 17 Jan 2022 17:08:20 +0100
Subject: [PATCH 079/177] Update MCM to v4.3.17

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 10164dd5..fc83a4b9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <GameVersion>1.7.1.299086</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.1.1</HarmonyVersion>
-    <MCMVersion>4.3.15</MCMVersion>
+    <MCMVersion>4.3.17</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\mb2b_beta</GameFolder>

From 29fb83f7ee7e89e007e32a5abdc0610f0d790d14 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 17 Jan 2022 17:10:23 +0100
Subject: [PATCH 080/177] Update Harmony to v2.2.0

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index fc83a4b9..55cbb87b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
     <Version>2.9.2.0</Version>
     <GameVersion>1.7.1.299086</GameVersion>
     <GameBranch>Beta</GameBranch>
-    <HarmonyVersion>2.1.1</HarmonyVersion>
+    <HarmonyVersion>2.2.0</HarmonyVersion>
     <MCMVersion>4.3.17</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>

From 6c800fd3f2d3d5968f452bb1c322b148d1c0420a Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 18 Jan 2022 08:50:31 +0100
Subject: [PATCH 081/177] Update to v2.9.3

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 55cbb87b..0acd351b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.9.2.0</Version>
+    <Version>2.9.3.0</Version>
     <GameVersion>1.7.1.299086</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.0</HarmonyVersion>

From 9d2d62403f66dac5a4b403ea75d4f6eab0e7adca Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 18 Jan 2022 11:09:11 +0100
Subject: [PATCH 082/177] Refactor Submodule initialization

---
 MBInitialScreenBasePatch.cs |  86 -----------------------
 SubModule.cs                | 131 ++++++++++++++++++++++++++++++------
 2 files changed, 110 insertions(+), 107 deletions(-)
 delete mode 100644 MBInitialScreenBasePatch.cs

diff --git a/MBInitialScreenBasePatch.cs b/MBInitialScreenBasePatch.cs
deleted file mode 100644
index 5f67ba95..00000000
--- a/MBInitialScreenBasePatch.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System.IO;
-using System.Reflection;
-using BannerlordCheats.Localization;
-using BannerlordCheats.Settings;
-using HarmonyLib;
-using JetBrains.Annotations;
-using TaleWorlds.Core;
-using TaleWorlds.Library;
-using TaleWorlds.MountAndBlade;
-
-namespace BannerlordCheats
-{
-    [HarmonyPatch(typeof(MBInitialScreenBase), "OnInitialize")]
-    public static class MBInitialScreenBasePatch
-    {
-        [UsedImplicitly]
-        [HarmonyPostfix]
-        public static void OnInitialize()
-        {
-            if (SubModule.ErrorFile != null)
-            {
-                InformationManager.ShowInquiry(new InquiryData(
-                    L10N.GetText("ModFailedLoadWarningTitle"),
-                    L10N.GetTextFormat("ModFailedLoadWarningMessage", SubModule.ErrorFile),
-                    true,
-                    false,
-                    L10N.GetText("ModWarningMessageConfirm"),
-                    null,
-                    null,
-                    null));
-            }
-            else if (!ConfirmFileExists())
-            {
-                InformationManager.ShowInquiry(new InquiryData(
-                    L10N.GetText("ModName"),
-                    L10N.GetText("ModWarningMessage"),
-                    true,
-                    false,
-                    L10N.GetText("ModWarningMessageConfirm"),
-                    null,
-                    CreateConfirmFile,
-                    null));
-            }
-        }
-
-        private static string ConfirmFilePath
-        {
-            get
-            {
-                var confirmFileName = "I Understand How The Cheats Work.txt";
-
-                var assemblyLocation = Assembly.GetAssembly(typeof(BannerlordCheatsSettings)).Location;
-
-                var location = Path.GetDirectoryName(assemblyLocation);
-
-                var confirmFilePath = Path.Combine(location, confirmFileName);
-
-                return confirmFilePath;
-            }
-        }
-
-        private static void CreateConfirmFile()
-        {
-            try
-            {
-                File.Create(ConfirmFilePath);
-            }
-            catch
-            {
-                // Not worth crashing for
-            }
-        }
-
-        private static bool ConfirmFileExists()
-        {
-            try
-            {
-                return File.Exists(ConfirmFilePath);
-            }
-            catch
-            {
-                return false;
-            }
-        }
-    }
-}
diff --git a/SubModule.cs b/SubModule.cs
index 6d2378c9..9212f66e 100644
--- a/SubModule.cs
+++ b/SubModule.cs
@@ -3,25 +3,57 @@
 using System.IO;
 using System.Reflection;
 using System.Text;
+using BannerlordCheats.Localization;
+using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.Core;
+using TaleWorlds.Library;
 using TaleWorlds.ModuleManager;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats
 {
+    [UsedImplicitly]
     public class SubModule : MBSubModuleBase
     {
-        public static string ErrorFile = null;
+        private static bool PatchesApplied = false;
 
-        protected override void OnSubModuleLoad()
+        public override void OnInitialState()
         {
-            try
+            base.OnInitialState();
+
+            if (!SubModule.ConfirmFileExists())
+            {
+                InformationManager.ShowInquiry(new InquiryData(
+                    L10N.GetText("ModName"),
+                    L10N.GetText("ModWarningMessage"),
+                    true,
+                    false,
+                    L10N.GetText("ModWarningMessageConfirm"),
+                    null,
+                    SubModule.CreateConfirmFile,
+                    null));
+            }
+        }
+
+        public override void OnGameInitializationFinished(Game game)
+        {
+            base.OnGameInitializationFinished(game);
+
+            if (!(game.GameType is Campaign) || SubModule.PatchesApplied)
             {
-                base.OnSubModuleLoad();
+                return;
+            }
 
+            try
+            {
                 var harmony = new Harmony("BannerlordCheats");
 
                 harmony.PatchAll();
+
+                SubModule.PatchesApplied = true;
             }
             catch (Exception e)
             {
@@ -29,30 +61,87 @@ protected override void OnSubModuleLoad()
 
                 try
                 {
-                    var errorFileName = $"Error-{DateTime.Now:yyyy-MM-dd-HH-mm-ss}.txt";
+                    var errorFilePath = SubModule.CreateErrorFile(e);
 
-                    var location = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+                    InformationManager.ShowInquiry(new InquiryData(
+                        L10N.GetText("ModFailedLoadWarningTitle"),
+                        L10N.GetTextFormat("ModFailedLoadWarningMessage", errorFilePath),
+                        true,
+                        false,
+                        L10N.GetText("ModWarningMessageConfirm"),
+                        null,
+                        null,
+                        null));
+                }
+                catch
+                {
+                    // Not worth crashing for
+                }
+            }
+        }
 
-                    var errorFilePath = Path.Combine(location, errorFileName);
+        private static string CreateErrorFile(Exception e)
+        {
+            var errorFileName = $"Error-{DateTime.Now:yyyy-MM-dd-HH-mm-ss}.txt";
 
-                    SubModule.ErrorFile = errorFilePath;
+            var assemblyLocation = Assembly.GetAssembly(typeof(BannerlordCheatsSettings)).Location;
 
-                    var errorMessage = new StringBuilder();
+            var location = Path.GetDirectoryName(assemblyLocation);
 
-                    foreach (var module in ModuleHelper.GetModules())
-                    {
-                        errorMessage.AppendLine($"{module.Name} {module.Version}");
-                    }
+            var errorFilePath = Path.Combine(location, errorFileName);
 
-                    errorMessage.AppendLine();
-                    errorMessage.AppendLine(e.ToString());
+            var errorMessage = new StringBuilder();
 
-                    File.WriteAllText(errorFilePath, errorMessage.ToString());
-                }
-                catch
-                {
-                    // Not worth crashing for
-                }
+            foreach (var module in ModuleHelper.GetModules())
+            {
+                errorMessage.AppendLine($"{module.Name} {module.Version}");
+            }
+
+            errorMessage.AppendLine();
+            errorMessage.AppendLine(e.ToString());
+
+            File.WriteAllText(errorFilePath, errorMessage.ToString());
+
+            return errorFilePath;
+        }
+
+        private static string ConfirmFilePath
+        {
+            get
+            {
+                var confirmFileName = "I Understand How The Cheats Work.txt";
+
+                var assemblyLocation = Assembly.GetAssembly(typeof(BannerlordCheatsSettings)).Location;
+
+                var location = Path.GetDirectoryName(assemblyLocation);
+
+                var confirmFilePath = Path.Combine(location, confirmFileName);
+
+                return confirmFilePath;
+            }
+        }
+
+        private static void CreateConfirmFile()
+        {
+            try
+            {
+                File.Create(SubModule.ConfirmFilePath);
+            }
+            catch
+            {
+                // Not worth crashing for
+            }
+        }
+
+        private static bool ConfirmFileExists()
+        {
+            try
+            {
+                return File.Exists(SubModule.ConfirmFilePath);
+            }
+            catch
+            {
+                return false;
             }
         }
     }

From 56c7b34b49e0b98c08faba16013a423c59c61197 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 18 Jan 2022 11:10:28 +0100
Subject: [PATCH 083/177] Reenable previously broken cheats

---
 Patches/Map/MapSpeedMultiplier.cs             |  2 --
 Patches/Map/NpcMapSpeedPercentage.cs          |  2 --
 Patches/Party/TroopWagesPercentage.cs         | 29 +++++++--------
 .../ConstructionPowerMultiplier.cs            | 35 ++++++++++---------
 Patches/Settlements/FreeTroopRecruitment.cs   | 29 +++++++--------
 .../Settlements/GarrisonWagesPercentage.cs    | 31 ++++++++--------
 Settings/BannerlordCheatsSettings.cs          | 28 +++++++--------
 7 files changed, 76 insertions(+), 80 deletions(-)

diff --git a/Patches/Map/MapSpeedMultiplier.cs b/Patches/Map/MapSpeedMultiplier.cs
index 86b83b35..278a5288 100644
--- a/Patches/Map/MapSpeedMultiplier.cs
+++ b/Patches/Map/MapSpeedMultiplier.cs
@@ -7,7 +7,6 @@
 
 namespace BannerlordCheats.Patches.Map
 {
-    /*
     [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
     public static class MapSpeedMultiplier
     {
@@ -22,5 +21,4 @@ public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref Explaine
             }
         }
     }
-    */
 }
diff --git a/Patches/Map/NpcMapSpeedPercentage.cs b/Patches/Map/NpcMapSpeedPercentage.cs
index 8cd7fb9a..18e802be 100644
--- a/Patches/Map/NpcMapSpeedPercentage.cs
+++ b/Patches/Map/NpcMapSpeedPercentage.cs
@@ -7,7 +7,6 @@
 
 namespace BannerlordCheats.Patches.Map
 {
-    /*
     [HarmonyPatch(typeof(DefaultPartySpeedCalculatingModel), nameof(DefaultPartySpeedCalculatingModel.CalculateFinalSpeed))]
     public static class NpcMapSpeedPercentage
     {
@@ -22,5 +21,4 @@ public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref Explaine
             }
         }
     }
-    */
 }
diff --git a/Patches/Party/TroopWagesPercentage.cs b/Patches/Party/TroopWagesPercentage.cs
index de00066d..13e27877 100644
--- a/Patches/Party/TroopWagesPercentage.cs
+++ b/Patches/Party/TroopWagesPercentage.cs
@@ -1,23 +1,24 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
 
 namespace BannerlordCheats.Patches.Party
 {
-    // [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTotalWage))]
-    // public static class TroopWagesPercentage
-    // {
-    //     [UsedImplicitly]
-    //     [HarmonyPostfix]
-    //     public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
-    //     {
-    //         if (mobileParty.IsPlayerParty()
-    //             && BannerlordCheatsSettings.Instance?.TroopWagesPercentage < 100f)
-    //         {
-    //             __result.AddPercentage(BannerlordCheatsSettings.Instance.TroopWagesPercentage);
-    //         }
-    //     }
-    // }
+    [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTotalWage))]
+    public static class TroopWagesPercentage
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
+        {
+            if (mobileParty.IsPlayerParty()
+                && BannerlordCheatsSettings.Instance?.TroopWagesPercentage < 100f)
+            {
+                __result.AddPercentage(BannerlordCheatsSettings.Instance.TroopWagesPercentage);
+            }
+        }
+    }
 }
diff --git a/Patches/Settlements/ConstructionPowerMultiplier.cs b/Patches/Settlements/ConstructionPowerMultiplier.cs
index e9c519da..b58a8864 100644
--- a/Patches/Settlements/ConstructionPowerMultiplier.cs
+++ b/Patches/Settlements/ConstructionPowerMultiplier.cs
@@ -1,26 +1,27 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
 namespace BannerlordCheats.Patches.Settlements
 {
-    // [HarmonyPatch(typeof(DefaultBuildingConstructionModel), nameof(DefaultBuildingConstructionModel.CalculateDailyConstructionPower))]
-    // public static class ConstructionPowerMultiplier
-    // {
-    //     [UsedImplicitly]
-    //     [HarmonyPostfix]
-    //     public static void CalculateDailyConstructionPower(
-    //         ref Town town,
-    //         ref bool includeDescriptions,
-    //         ref ExplainedNumber __result)
-    //     {
-    //         if (town.IsPlayerTown()
-    //             && BannerlordCheatsSettings.Instance?.ConstructionPowerMultiplier > 1f)
-    //         {
-    //             __result.AddMultiplier(BannerlordCheatsSettings.Instance.ConstructionPowerMultiplier);
-    //         }
-    //     }
-    // }
+    [HarmonyPatch(typeof(DefaultBuildingConstructionModel), nameof(DefaultBuildingConstructionModel.CalculateDailyConstructionPower))]
+    public static class ConstructionPowerMultiplier
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void CalculateDailyConstructionPower(
+            ref Town town,
+            ref bool includeDescriptions,
+            ref ExplainedNumber __result)
+        {
+            if (town.IsPlayerTown()
+                && BannerlordCheatsSettings.Instance?.ConstructionPowerMultiplier > 1f)
+            {
+                __result.AddMultiplier(BannerlordCheatsSettings.Instance.ConstructionPowerMultiplier);
+            }
+        }
+    }
 }
diff --git a/Patches/Settlements/FreeTroopRecruitment.cs b/Patches/Settlements/FreeTroopRecruitment.cs
index 87b87f2e..b334eccd 100644
--- a/Patches/Settlements/FreeTroopRecruitment.cs
+++ b/Patches/Settlements/FreeTroopRecruitment.cs
@@ -1,23 +1,24 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
 
 namespace BannerlordCheats.Patches.Settlements
 {
-    // [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTroopRecruitmentCost))]
-    // public static class FreeTroopRecruitment
-    // {
-    //     [UsedImplicitly]
-    //     [HarmonyPostfix]
-    //     public static void GetTroopRecruitmentCost(CharacterObject troop, Hero buyerHero, bool withoutItemCost, ref int __result)
-    //     {
-    //         if (buyerHero.IsPlayer()
-    //             && BannerlordCheatsSettings.Instance?.FreeTroopRecruitment == true)
-    //         {
-    //             __result = 1;
-    //         }
-    //     }
-    // }
+    [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTroopRecruitmentCost))]
+    public static class FreeTroopRecruitment
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void GetTroopRecruitmentCost(CharacterObject troop, Hero buyerHero, bool withoutItemCost, ref int __result)
+        {
+            if (buyerHero.IsPlayer()
+                && BannerlordCheatsSettings.Instance?.FreeTroopRecruitment == true)
+            {
+                __result = 1;
+            }
+        }
+    }
 }
diff --git a/Patches/Settlements/GarrisonWagesPercentage.cs b/Patches/Settlements/GarrisonWagesPercentage.cs
index 97611fc3..cbb62968 100644
--- a/Patches/Settlements/GarrisonWagesPercentage.cs
+++ b/Patches/Settlements/GarrisonWagesPercentage.cs
@@ -1,24 +1,25 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
+using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
 
 namespace BannerlordCheats.Patches.Settlements
 {
-    // [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTotalWage))]
-    // public static class GarrisonWagesPercentage
-    // {
-    //     [UsedImplicitly]
-    //     [HarmonyPostfix]
-    //     public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
-    //     {
-    //         if (mobileParty.IsGarrison
-    //             && mobileParty.IsPlayerParty()
-    //             && BannerlordCheatsSettings.Instance?.GarrisonWagesPercentage < 100f)
-    //         {
-    //             __result.AddPercentage(BannerlordCheatsSettings.Instance.GarrisonWagesPercentage);
-    //         }
-    //     }
-    // }
+    [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetTotalWage))]
+    public static class GarrisonWagesPercentage
+    {
+        [UsedImplicitly]
+        [HarmonyPostfix]
+        public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
+        {
+            if (mobileParty.IsGarrison
+                && mobileParty.IsPlayerParty()
+                && BannerlordCheatsSettings.Instance?.GarrisonWagesPercentage < 100f)
+            {
+                __result.AddPercentage(BannerlordCheatsSettings.Instance.GarrisonWagesPercentage);
+            }
+        }
+    }
 }
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index 60e5a567..a604ab8e 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -61,21 +61,17 @@ public BannerlordCheatsSettings()
 
         #region Map
 
-        /*
         [LocalizedSettingPropertyGroup(MapGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(MapSpeedMultiplier), minValue: 1.0f, maxValue: 100.0f)]
         public float MapSpeedMultiplier { get; set; } = 1.0f;
-        */
 
         [LocalizedSettingPropertyGroup(MapGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(MapVisibilityMultiplier), minValue: 1.0f, maxValue: 100.0f)]
         public float MapVisibilityMultiplier { get; set; } = 1.0f;
 
-        /*
         [LocalizedSettingPropertyGroup(MapGroupName)]
         [LocalizedSettingPropertyPercent(nameof(NpcMapSpeedPercentage))]
         public float NpcMapSpeedPercentage { get; set; } = 100.0f;
-        */
 
         [LocalizedSettingPropertyGroup(MapGroupName)]
         [LocalizedSettingPropertyBool(nameof(PartyInvisibleOnMap))]
@@ -261,9 +257,9 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyPercent(nameof(FoodConsumptionPercentage))]
         public float FoodConsumptionPercentage { get; set; } = 100.0f;
 
-        // [LocalizedSettingPropertyGroup(PartyGroupName)]
-        // [LocalizedSettingPropertyPercent(nameof(TroopWagesPercentage))]
-        // public float TroopWagesPercentage { get; set; } = 100.0f;
+        [LocalizedSettingPropertyGroup(PartyGroupName)]
+        [LocalizedSettingPropertyPercent(nameof(TroopWagesPercentage))]
+        public float TroopWagesPercentage { get; set; } = 100.0f;
 
         [LocalizedSettingPropertyGroup(PartyGroupName)]
         [LocalizedSettingPropertyBool(nameof(FreeTroopUpgrades))]
@@ -425,9 +421,9 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyBool(nameof(DisguiseAlwaysWorks))]
         public bool DisguiseAlwaysWorks { get; set; } = false;
 
-        // [LocalizedSettingPropertyGroup(SettlementsGroupName)]
-        // [LocalizedSettingPropertyBool(nameof(FreeTroopRecruitment))]
-        // public bool FreeTroopRecruitment { get; set; } = false;
+        [LocalizedSettingPropertyGroup(SettlementsGroupName)]
+        [LocalizedSettingPropertyBool(nameof(FreeTroopRecruitment))]
+        public bool FreeTroopRecruitment { get; set; } = false;
 
         [LocalizedSettingPropertyGroup(SettlementsGroupName)]
         [LocalizedSettingPropertyPercent(nameof(ItemTradingCostPercentage))]
@@ -469,17 +465,17 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyInteger(nameof(DailyHearthsBonus), minValue: 0, maxValue: 10000)]
         public int DailyHearthsBonus { get; set; } = 0;
 
-        // [LocalizedSettingPropertyGroup(SettlementsGroupName)]
-        // [LocalizedSettingPropertyPercent(nameof(GarrisonWagesPercentage))]
-        // public float GarrisonWagesPercentage { get; set; } = 100.0f;
+        [LocalizedSettingPropertyGroup(SettlementsGroupName)]
+        [LocalizedSettingPropertyPercent(nameof(GarrisonWagesPercentage))]
+        public float GarrisonWagesPercentage { get; set; } = 100.0f;
 
         [LocalizedSettingPropertyGroup(SettlementsGroupName)]
         [LocalizedSettingPropertyBool(nameof(NeverRequireCivilianEquipment))]
         public bool NeverRequireCivilianEquipment { get; set; } = false;
 
-        // [LocalizedSettingPropertyGroup(SettlementsGroupName)]
-        // [LocalizedSettingPropertyFloatingInteger(nameof(ConstructionPowerMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
-        // public float ConstructionPowerMultiplier { get; set; } = 1.0f;
+        [LocalizedSettingPropertyGroup(SettlementsGroupName)]
+        [LocalizedSettingPropertyFloatingInteger(nameof(ConstructionPowerMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
+        public float ConstructionPowerMultiplier { get; set; } = 1.0f;
 
         [LocalizedSettingPropertyGroup(SettlementsGroupName)]
         [LocalizedSettingPropertyBool(nameof(NoBribeToEnterKeep))]

From 4d156568a11b9afc25b4053c495e768fb0c3cff0 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 18 Jan 2022 13:50:08 +0100
Subject: [PATCH 084/177] Add No Stuck Arrows cheat

---
 L10N.resx                            |  6 +++++
 Patches/Combat/NoStuckArrows.cs      | 36 ++++++++++++++++++++++++++++
 Settings/BannerlordCheatsSettings.cs |  4 ++++
 3 files changed, 46 insertions(+)
 create mode 100644 Patches/Combat/NoStuckArrows.cs

diff --git a/L10N.resx b/L10N.resx
index 6383ada5..2636f64b 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -877,4 +877,10 @@ Thank you!</value>
   <data name="TournamentMaximumBetMultiplier_Desc" xml:space="preserve">
     <value>Factor by which the maximum amont of money you can bet on a tournament is multiplied. 1 means default value.</value>
   </data>
+  <data name="NoStuckArrows_Name" xml:space="preserve">
+    <value>No Stuck Arrows</value>
+  </data>
+  <data name="NoStuckArrows_Desc" xml:space="preserve">
+    <value>If enabled, arrows will not get stuck in the player character.</value>
+  </data>
 </root>
diff --git a/Patches/Combat/NoStuckArrows.cs b/Patches/Combat/NoStuckArrows.cs
new file mode 100644
index 00000000..5b88cca4
--- /dev/null
+++ b/Patches/Combat/NoStuckArrows.cs
@@ -0,0 +1,36 @@
+using BannerlordCheats.Extensions;
+using BannerlordCheats.Settings;
+using HarmonyLib;
+using JetBrains.Annotations;
+using TaleWorlds.Library;
+using TaleWorlds.MountAndBlade;
+
+namespace BannerlordCheats.Patches.Combat
+{
+    [HarmonyPatch(typeof(Mission), nameof(Mission.HandleMissileCollisionReaction))]
+    public static class NoStuckArrows
+    {
+        [UsedImplicitly]
+        [HarmonyPrefix]
+        public static void HandleMissileCollisionReaction(
+            ref int missileIndex,
+            ref Mission.MissileCollisionReaction collisionReaction,
+            ref MatrixFrame attachLocalFrame,
+            ref Agent attackerAgent,
+            ref Agent attachedAgent,
+            ref bool attachedToShield,
+            ref sbyte attachedBoneIndex,
+            ref MissionObject attachedMissionObject,
+            ref Vec3 bounceBackVelocity,
+            ref Vec3 bounceBackAngularVelocity,
+            ref int forcedSpawnIndex)
+        {
+            if (attachedAgent.IsPlayer()
+                && collisionReaction == Mission.MissileCollisionReaction.Stick
+                && BannerlordCheatsSettings.Instance?.NoStuckArrows == true)
+            {
+                collisionReaction = Mission.MissileCollisionReaction.BecomeInvisible;
+            }
+        }
+    }
+}
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index a604ab8e..fc0c6c44 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -221,6 +221,10 @@ public BannerlordCheatsSettings()
         [LocalizedSettingPropertyBool(nameof(NeverKnockedBackByAttacks))]
         public bool NeverKnockedBackByAttacks { get; set; } = false;
 
+        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyBool(nameof(NoStuckArrows))]
+        public bool NoStuckArrows { get; set; } = false;
+
         #endregion Combat
 
         #region Inventory

From 69a9332d1fe3bb9c81ba7783bca2991d32c36c95 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 18 Jan 2022 13:54:46 +0100
Subject: [PATCH 085/177] Update to v2.10

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0acd351b..61946d3e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.9.3.0</Version>
+    <Version>2.10.0.0</Version>
     <GameVersion>1.7.1.299086</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.0</HarmonyVersion>

From 14c15d0df1776e9cb75cd543499b8692fcda5df5 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 19 Jan 2022 10:36:45 +0100
Subject: [PATCH 086/177] Update game to e1.7.1.299545

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 61946d3e..ba913b43 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.10.0.0</Version>
-    <GameVersion>1.7.1.299086</GameVersion>
+    <GameVersion>1.7.1.299545</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.0</HarmonyVersion>
     <MCMVersion>4.3.17</MCMVersion>

From f9c9393d911f6c38397330d6983004012e153d36 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 19 Jan 2022 10:44:05 +0100
Subject: [PATCH 087/177] Use Message extension

---
 Patches/General/EnableHotkeysAddEncyclopediaTroops.cs | 2 +-
 Patches/General/EnableHotkeysAddItems.cs              | 2 +-
 Patches/General/EnableHotkeysCharacterAttributes.cs   | 4 ++--
 Patches/General/EnableHotkeysCharacterPoints.cs       | 4 ++--
 Patches/General/EnableHotkeysInfluence.cs             | 2 +-
 Patches/General/EnableHotkeysMoney.cs                 | 4 ++--
 Patches/General/EnableHotkeysTroopCount.cs            | 2 +-
 Patches/General/EnableHotkeysTroopExperience.cs       | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
index cfd9f8ca..b8f74536 100644
--- a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
+++ b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
@@ -39,7 +39,7 @@ private static void AddTroops(CharacterObject characterObject, int count)
 
             var message = string.Format(L10N.GetText("AddTroopsFromEncyclopediaMessage"), count, characterObject.Name);
 
-            InformationManager.DisplayMessage(new InformationMessage(message, Color.White));
+            Message.Show(message);
         }
     }
 }
diff --git a/Patches/General/EnableHotkeysAddItems.cs b/Patches/General/EnableHotkeysAddItems.cs
index 36718408..829d2ff4 100644
--- a/Patches/General/EnableHotkeysAddItems.cs
+++ b/Patches/General/EnableHotkeysAddItems.cs
@@ -54,7 +54,7 @@ private static void AddItems(int count)
 
             var message = string.Format(L10N.GetText("AddItemsMessage"), count, selectedItem.ItemDescription);
 
-            InformationManager.DisplayMessage(new InformationMessage(message, Color.White));
+            Message.Show(message);
         }
     }
 }
diff --git a/Patches/General/EnableHotkeysCharacterAttributes.cs b/Patches/General/EnableHotkeysCharacterAttributes.cs
index e299b8ea..7c8acd43 100644
--- a/Patches/General/EnableHotkeysCharacterAttributes.cs
+++ b/Patches/General/EnableHotkeysCharacterAttributes.cs
@@ -41,7 +41,7 @@ public static void OnApplicationTick()
 
                     var message = string.Format(L10N.GetText("SetAllAttributesMessage"), currentHero.Name);
 
-                    InformationManager.DisplayMessage(new InformationMessage(message, Color.White));
+                    Message.Show(message);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D1))
                 {
@@ -93,7 +93,7 @@ private static void AddPoint(CharacterAttribute attribute)
 
             var message = string.Format(L10N.GetText("AddAttributePointMessage"), attribute.Name, currentHero.Name);
 
-            InformationManager.DisplayMessage(new InformationMessage(message, Color.White));
+            Message.Show(message);
         }
     }
 }
diff --git a/Patches/General/EnableHotkeysCharacterPoints.cs b/Patches/General/EnableHotkeysCharacterPoints.cs
index b36f203e..3e5478d5 100644
--- a/Patches/General/EnableHotkeysCharacterPoints.cs
+++ b/Patches/General/EnableHotkeysCharacterPoints.cs
@@ -35,7 +35,7 @@ public static void OnApplicationTick()
 
                     var message = string.Format(L10N.GetText("AddUnspentFocusPointMessage"), currentHero.Name);
 
-                    InformationManager.DisplayMessage(new InformationMessage(message, Color.White));
+                    Message.Show(message);
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.G))
                 {
@@ -49,7 +49,7 @@ public static void OnApplicationTick()
 
                     var message = string.Format(L10N.GetText("AddUnspentAttributePointMessage"), currentHero.Name);
 
-                    InformationManager.DisplayMessage(new InformationMessage(message, Color.White));
+                    Message.Show(message);
                 }
             }
         }
diff --git a/Patches/General/EnableHotkeysInfluence.cs b/Patches/General/EnableHotkeysInfluence.cs
index 7484d0ea..2d2abcdb 100644
--- a/Patches/General/EnableHotkeysInfluence.cs
+++ b/Patches/General/EnableHotkeysInfluence.cs
@@ -26,7 +26,7 @@ public static void OnApplicationTick()
             {
                 Hero.MainHero.AddInfluenceWithKingdom(1000);
 
-                InformationManager.DisplayMessage(new InformationMessage(L10N.GetText("AddInfluenceMessage"), Color.White));
+                Message.Show(L10N.GetText("AddInfluenceMessage"));
             }
         }
     }
diff --git a/Patches/General/EnableHotkeysMoney.cs b/Patches/General/EnableHotkeysMoney.cs
index be5f5f51..27b61c7a 100644
--- a/Patches/General/EnableHotkeysMoney.cs
+++ b/Patches/General/EnableHotkeysMoney.cs
@@ -27,13 +27,13 @@ public static void OnApplicationTick()
                 {
                     Hero.MainHero.ChangeHeroGold(100000);
 
-                    InformationManager.DisplayMessage(new InformationMessage(string.Format(L10N.GetText("AddGoldMessage"), 100000), Color.White));
+                    Message.Show(string.Format(L10N.GetText("AddGoldMessage"), 100000));
                 }
                 else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.X))
                 {
                     Hero.MainHero.ChangeHeroGold(1000);
 
-                    InformationManager.DisplayMessage(new InformationMessage(string.Format(L10N.GetText("AddGoldMessage"), 1000), Color.White));
+                    Message.Show(string.Format(L10N.GetText("AddGoldMessage"), 1000));
                 }
             }
         }
diff --git a/Patches/General/EnableHotkeysTroopCount.cs b/Patches/General/EnableHotkeysTroopCount.cs
index bc3e5dbd..2f62c77f 100644
--- a/Patches/General/EnableHotkeysTroopCount.cs
+++ b/Patches/General/EnableHotkeysTroopCount.cs
@@ -64,7 +64,7 @@ private static void AddTroops(int count)
 
             var message = string.Format(L10N.GetText("AddTroopsMessage"), count, selectedCharacter.Name);
 
-            InformationManager.DisplayMessage(new InformationMessage(message, Color.White));
+            Message.Show(message);
         }
     }
 }
diff --git a/Patches/General/EnableHotkeysTroopExperience.cs b/Patches/General/EnableHotkeysTroopExperience.cs
index 88a58691..8ca9ec0e 100644
--- a/Patches/General/EnableHotkeysTroopExperience.cs
+++ b/Patches/General/EnableHotkeysTroopExperience.cs
@@ -47,7 +47,7 @@ public static void OnApplicationTick()
 
                 var message = string.Format(L10N.GetText("AddTroopXpMessage"), selectedCharacter.Name);
 
-                InformationManager.DisplayMessage(new InformationMessage(message, Color.White));
+                Message.Show(message);
             }
         }
     }

From 7392e99631d0b9667b7137c0fa5429cdfb2a5e91 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Tue, 25 Jan 2022 12:04:47 +0100
Subject: [PATCH 088/177] Update MCM to v4.3.18

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index ba913b43..068b1eb2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <GameVersion>1.7.1.299545</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.0</HarmonyVersion>
-    <MCMVersion>4.3.17</MCMVersion>
+    <MCMVersion>4.3.18</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\mb2b_beta</GameFolder>

From 48958ce32ffd1cb1bd03941325be7a790ba09aff Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 31 Jan 2022 12:52:12 +0100
Subject: [PATCH 089/177] Split up combat cheats into subcategories

---
 L10N.resx                            |  16 ++-
 Settings/BannerlordCheatsSettings.cs | 206 +++++++++++++++------------
 2 files changed, 127 insertions(+), 95 deletions(-)

diff --git a/L10N.resx b/L10N.resx
index 2636f64b..fe3bd414 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -120,8 +120,20 @@
   <data name="ModName" xml:space="preserve">
     <value>Cheats</value>
   </data>
-  <data name="Combat_GroupName" xml:space="preserve">
-    <value>Combat</value>
+  <data name="Combat_Player_GroupName" xml:space="preserve">
+    <value>Combat - Player</value>
+  </data>
+  <data name="Combat_Party_GroupName" xml:space="preserve">
+    <value>Combat - Party</value>
+  </data>
+  <data name="Combat_Allies_GroupName" xml:space="preserve">
+    <value>Combat - Allies</value>
+  </data>
+  <data name="Combat_Enemies_GroupName" xml:space="preserve">
+    <value>Combat - Enemies</value>
+  </data>
+  <data name="Combat_Misc_GroupName" xml:space="preserve">
+    <value>Combat - Misc</value>
   </data>
   <data name="Party_GroupName" xml:space="preserve">
     <value>Party</value>
diff --git a/Settings/BannerlordCheatsSettings.cs b/Settings/BannerlordCheatsSettings.cs
index fc0c6c44..d031dc87 100644
--- a/Settings/BannerlordCheatsSettings.cs
+++ b/Settings/BannerlordCheatsSettings.cs
@@ -10,7 +10,11 @@ public class BannerlordCheatsSettings : AttributePerSaveSettings<BannerlordCheat
         #region Base
 
         private const string ModName = "ModName";
-        private const string CombatGroupName = "Combat";
+        private const string CombatPlayerGroupName = "Combat_Player";
+        private const string CombatPartyGroupName = "Combat_Party";
+        private const string CombatAlliesGroupName = "Combat_Allies";
+        private const string CombatEnemiesGroupName = "Combat_Enemies";
+        private const string CombatMiscGroupName = "Combat_Misc";
         private const string GeneralGroupName = "General";
         private const string MapGroupName = "Map";
         private const string InventoryGroupName = "Inventory";
@@ -79,153 +83,169 @@ public BannerlordCheatsSettings()
 
         #endregion Map
 
-        #region Combat
+        #region Combat - Player
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPlayerGroupName)]
         [LocalizedSettingPropertyPercent(nameof(DamageTakenPercentage))]
         public float DamageTakenPercentage { get; set; } = 100.0f;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPlayerGroupName)]
         [LocalizedSettingPropertyBool(nameof(Invincible))]
         public bool Invincible { get; set; } = false;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPlayerGroupName)]
         [LocalizedSettingPropertyBool(nameof(PlayerHorseInvincible))]
         public bool PlayerHorseInvincible { get; set; } = false;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPlayerGroupName)]
+        [LocalizedSettingPropertyBool(nameof(OneHitKill))]
+        public bool OneHitKill { get; set; } = false;
+
+        [LocalizedSettingPropertyGroup(CombatPlayerGroupName)]
+        [LocalizedSettingPropertyBool(nameof(AlwaysCrushThroughShields))]
+        public bool AlwaysCrushThroughShields { get; set; } = false;
+
+        [LocalizedSettingPropertyGroup(CombatPlayerGroupName)]
+        [LocalizedSettingPropertyBool(nameof(SliceThroughEveryone))]
+        public bool SliceThroughEveryone { get; set; } = false;
+
+        [LocalizedSettingPropertyGroup(CombatPlayerGroupName)]
+        [LocalizedSettingPropertyPercent(nameof(HealthRegeneration))]
+        public float HealthRegeneration { get; set; } = 0.0f;
+
+        [LocalizedSettingPropertyGroup(CombatPlayerGroupName)]
+        [LocalizedSettingPropertyBool(nameof(InfiniteAmmo))]
+        public bool InfiniteAmmo { get; set; } = false;
+
+        [LocalizedSettingPropertyGroup(CombatPlayerGroupName)]
+        [LocalizedSettingPropertyFloatingInteger(nameof(DamageMultiplier), minValue: 1.0f, maxValue: 10.0f)]
+        public float DamageMultiplier { get; set; } = 1.0f;
+
+        [LocalizedSettingPropertyGroup(CombatPlayerGroupName)]
+        [LocalizedSettingPropertyBool(nameof(AlwaysKnockDown))]
+        public bool AlwaysKnockDown { get; set; } = false;
+
+        [LocalizedSettingPropertyGroup(CombatPlayerGroupName)]
+        [LocalizedSettingPropertyBool(nameof(NeverKnockedBackByAttacks))]
+        public bool NeverKnockedBackByAttacks { get; set; } = false;
+
+        [LocalizedSettingPropertyGroup(CombatPlayerGroupName)]
+        [LocalizedSettingPropertyBool(nameof(NoStuckArrows))]
+        public bool NoStuckArrows { get; set; } = false;
+
+        [LocalizedSettingPropertyGroup(CombatPlayerGroupName)]
+        [LocalizedSettingPropertyBool(nameof(InstantCrossbowReload))]
+        public bool InstantCrossbowReload { get; set; } = false;
+
+        #endregion Combat - Player
+
+        #region Combat - Party
+
+        [LocalizedSettingPropertyGroup(CombatPartyGroupName)]
         [LocalizedSettingPropertyBool(nameof(PartyInvincible))]
         public bool PartyInvincible { get; set; } = false;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPartyGroupName)]
         [LocalizedSettingPropertyBool(nameof(PartyHeroesInvincible))]
         public bool PartyHeroesInvincible { get; set; } = false;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPartyGroupName)]
         [LocalizedSettingPropertyPercent(nameof(PartyDamageTakenPercentage))]
         public float PartyDamageTakenPercentage { get; set; } = 100.0f;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyBool(nameof(OneHitKill))]
-        public bool OneHitKill { get; set; } = false;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPartyGroupName)]
         [LocalizedSettingPropertyBool(nameof(PartyOneHitKill))]
         public bool PartyOneHitKill { get; set; } = false;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPartyGroupName)]
         [LocalizedSettingPropertyBool(nameof(PartyOnlyKnockout))]
         public bool PartyOnlyKnockout { get; set; } = false;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyBool(nameof(EnemyOnlyKnockout))]
-        public bool EnemyOnlyKnockout { get; set; } = false;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyFloatingInteger(nameof(RenownRewardMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
-        public float RenownRewardMultiplier { get; set; } = 1.0f;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyFloatingInteger(nameof(InfluenceRewardMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
-        public float InfluenceRewardMultiplier { get; set; } = 1.0f;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyBool(nameof(AlwaysWinBattleSimulation))]
-        public bool AlwaysWinBattleSimulation { get; set; } = false;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyBool(nameof(NoTroopSacrifice))]
-        public bool NoTroopSacrifice { get; set; } = false;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPartyGroupName)]
         [LocalizedSettingPropertyBool(nameof(NoRunningAway))]
         public bool NoRunningAway { get; set; } = false;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyBool(nameof(EnemiesNoRunningAway))]
-        public bool EnemiesNoRunningAway { get; set; } = false;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyInteger(nameof(BanditHideoutTroopLimit), minValue: 0, maxValue: 1000)]
-        public int BanditHideoutTroopLimit { get; set; } = 0;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyBool(nameof(AlwaysCrushThroughShields))]
-        public bool AlwaysCrushThroughShields { get; set; } = false;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyBool(nameof(SliceThroughEveryone))]
-        public bool SliceThroughEveryone { get; set; } = false;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyPercent(nameof(HealthRegeneration))]
-        public float HealthRegeneration { get; set; } = 0.0f;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPartyGroupName)]
         [LocalizedSettingPropertyPercent(nameof(PartyHealthRegeneration))]
         public float PartyHealthRegeneration { get; set; } = 0.0f;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyBool(nameof(InfiniteAmmo))]
-        public bool InfiniteAmmo { get; set; } = false;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPartyGroupName)]
         [LocalizedSettingPropertyBool(nameof(PartyInfiniteAmmo))]
         public bool PartyInfiniteAmmo { get; set; } = false;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyFloatingInteger(nameof(DamageMultiplier), minValue: 1.0f, maxValue: 10.0f)]
-        public float DamageMultiplier { get; set; } = 1.0f;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyPercent(nameof(EnemyDamagePercentage))]
-        public float EnemyDamagePercentage { get; set; } = 100.0f;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPartyGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(PartyDamageMultiplier), minValue: 1.0f, maxValue: 10.0f)]
         public float PartyDamageMultiplier { get; set; } = 1.0f;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPartyGroupName)]
         [LocalizedSettingPropertyBool(nameof(NoFriendlyFire))]
         public bool NoFriendlyFire { get; set; } = false;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyFloatingInteger(nameof(CombatZoomMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
-        public float CombatZoomMultiplier { get; set; } = 1.0f;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyBool(nameof(InstantCrossbowReload))]
-        public bool InstantCrossbowReload { get; set; } = false;
-
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatPartyGroupName)]
         [LocalizedSettingPropertyPercent(nameof(CompanionDeathPercentage))]
         public float CompanionDeathPercentage { get; set; } = 100.0f;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        #endregion Combat - Party
+
+        #region Combat - Allies
+
+        [LocalizedSettingPropertyGroup(CombatAlliesGroupName)]
         [LocalizedSettingPropertyPercent(nameof(FriendlyLordCombatDeathPercentage))]
         public float FriendlyLordCombatDeathPercentage { get; set; } = 100.0f;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        #endregion Combat - Allies
+
+        #region Combat - Enemies
+
+        [LocalizedSettingPropertyGroup(CombatEnemiesGroupName)]
+        [LocalizedSettingPropertyBool(nameof(EnemyOnlyKnockout))]
+        public bool EnemyOnlyKnockout { get; set; } = false;
+
+        [LocalizedSettingPropertyGroup(CombatEnemiesGroupName)]
+        [LocalizedSettingPropertyBool(nameof(EnemiesNoRunningAway))]
+        public bool EnemiesNoRunningAway { get; set; } = false;
+
+        [LocalizedSettingPropertyGroup(CombatEnemiesGroupName)]
+        [LocalizedSettingPropertyPercent(nameof(EnemyDamagePercentage))]
+        public float EnemyDamagePercentage { get; set; } = 100.0f;
+
+        [LocalizedSettingPropertyGroup(CombatEnemiesGroupName)]
         [LocalizedSettingPropertyPercent(nameof(EnemyLordCombatDeathPercentage))]
         public float EnemyLordCombatDeathPercentage { get; set; } = 100.0f;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
+        [LocalizedSettingPropertyGroup(CombatEnemiesGroupName)]
         [LocalizedSettingPropertyFloatingInteger(nameof(EnemyLordCombatDeathChanceMultiplier), minValue: 1.0f, maxValue: 100.0f)]
         public float EnemyLordCombatDeathChanceMultiplier { get; set; } = 1.0f;
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyBool(nameof(AlwaysKnockDown))]
-        public bool AlwaysKnockDown { get; set; } = false;
+        #endregion Combat - Enemies
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyBool(nameof(NeverKnockedBackByAttacks))]
-        public bool NeverKnockedBackByAttacks { get; set; } = false;
+        #region Combat - Misc
 
-        [LocalizedSettingPropertyGroup(CombatGroupName)]
-        [LocalizedSettingPropertyBool(nameof(NoStuckArrows))]
-        public bool NoStuckArrows { get; set; } = false;
+        [LocalizedSettingPropertyGroup(CombatMiscGroupName)]
+        [LocalizedSettingPropertyFloatingInteger(nameof(RenownRewardMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
+        public float RenownRewardMultiplier { get; set; } = 1.0f;
+
+        [LocalizedSettingPropertyGroup(CombatMiscGroupName)]
+        [LocalizedSettingPropertyFloatingInteger(nameof(InfluenceRewardMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
+        public float InfluenceRewardMultiplier { get; set; } = 1.0f;
+
+        [LocalizedSettingPropertyGroup(CombatMiscGroupName)]
+        [LocalizedSettingPropertyBool(nameof(AlwaysWinBattleSimulation))]
+        public bool AlwaysWinBattleSimulation { get; set; } = false;
+
+        [LocalizedSettingPropertyGroup(CombatMiscGroupName)]
+        [LocalizedSettingPropertyBool(nameof(NoTroopSacrifice))]
+        public bool NoTroopSacrifice { get; set; } = false;
+
+        [LocalizedSettingPropertyGroup(CombatMiscGroupName)]
+        [LocalizedSettingPropertyInteger(nameof(BanditHideoutTroopLimit), minValue: 0, maxValue: 1000)]
+        public int BanditHideoutTroopLimit { get; set; } = 0;
+
+        [LocalizedSettingPropertyGroup(CombatMiscGroupName)]
+        [LocalizedSettingPropertyFloatingInteger(nameof(CombatZoomMultiplier), minValue: 1.0f, maxValue: 1000.0f)]
+        public float CombatZoomMultiplier { get; set; } = 1.0f;
 
-        #endregion Combat
+        #endregion Combat - Misc
 
         #region Inventory
 

From 677096af879519c9cf94f91a0e19bd10a9f7ec5a Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 31 Jan 2022 15:48:49 +0100
Subject: [PATCH 090/177] Add generic exception message method for errors

---
 L10N.resx    |  6 ++++++
 SubModule.cs | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/L10N.resx b/L10N.resx
index fe3bd414..ea9b8cb1 100644
--- a/L10N.resx
+++ b/L10N.resx
@@ -895,4 +895,10 @@ Thank you!</value>
   <data name="NoStuckArrows_Desc" xml:space="preserve">
     <value>If enabled, arrows will not get stuck in the player character.</value>
   </data>
+  <data name="ModExceptionMessage" xml:space="preserve">
+    <value>Bannerlord Cheats encountered an error while trying to apply a cheat. Please send the error information that has been generated in the file "{0}" to the mod author so that they can investigate this issue. Sorry for the inconvenience!</value>
+  </data>
+  <data name="ModExceptionTitle" xml:space="preserve">
+    <value>Bannerlord Cheats encountered an error!</value>
+  </data>
 </root>
diff --git a/SubModule.cs b/SubModule.cs
index 9212f66e..78719932 100644
--- a/SubModule.cs
+++ b/SubModule.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Reflection;
 using System.Text;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
@@ -80,7 +81,45 @@ public override void OnGameInitializationFinished(Game game)
             }
         }
 
-        private static string CreateErrorFile(Exception e)
+        internal static void LogError(Exception e, Type type)
+        {
+            string errorFilePath;
+
+            try
+            {
+                errorFilePath = SubModule.CreateErrorFile(e, type);
+            }
+            catch
+            {
+                return;
+            }
+
+            try
+            {
+                InformationManager.ShowInquiry(new InquiryData(
+                    L10N.GetText("ModExceptionTitle"),
+                    L10N.GetTextFormat("ModExceptionMessage", errorFilePath),
+                    true,
+                    false,
+                    L10N.GetText("ModWarningMessageConfirm"),
+                    null,
+                    null,
+                    null));
+            }
+            catch
+            {
+                try
+                {
+                    Message.Show(L10N.GetTextFormat("ModExceptionMessage", errorFilePath), Colors.Red);
+                }
+                catch
+                {
+                    // If this fails everything is lost anyways
+                }
+            }
+        }
+
+        private static string CreateErrorFile(Exception e, Type type = null)
         {
             var errorFileName = $"Error-{DateTime.Now:yyyy-MM-dd-HH-mm-ss}.txt";
 
@@ -92,12 +131,32 @@ private static string CreateErrorFile(Exception e)
 
             var errorMessage = new StringBuilder();
 
+            errorMessage.AppendLine("Thanks a lot for helping to improve this mod!");
+            errorMessage.AppendLine("You could drop the contents of this file into https://pastebin.com/ and post a link to the file");
+            errorMessage.AppendLine("in the NexusMods posts page at https://www.nexusmods.com/mountandblade2bannerlord/mods/1839?tab=posts");
+
+            errorMessage.AppendLine();
+            errorMessage.AppendLine("Modules:");
+
             foreach (var module in ModuleHelper.GetModules())
             {
                 errorMessage.AppendLine($"{module.Name} {module.Version}");
             }
 
+            if (type != null)
+            {
+                errorMessage.AppendLine();
+                errorMessage.AppendLine("Harmony Patch:");
+
+                var patch = type.GetCustomAttribute<HarmonyPatch>();
+
+                errorMessage.AppendLine($"Type: {type.FullName}");
+                errorMessage.AppendLine($"Declaring Type: {patch.info.declaringType.FullName}");
+                errorMessage.AppendLine($"Method: {patch.info.methodName}");
+            }
+
             errorMessage.AppendLine();
+            errorMessage.AppendLine("Exception:");
             errorMessage.AppendLine(e.ToString());
 
             File.WriteAllText(errorFilePath, errorMessage.ToString());

From 05d4c2ec128f0f039e20e2ff6da4645d8dd944f1 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 31 Jan 2022 17:31:42 +0100
Subject: [PATCH 091/177] Add exception handling to all patches

---
 Patches/Army/ArmyCohesionLossPercentage.cs    | 18 +++-
 Patches/Army/ArmyFoodConsumptionPercentage.cs | 16 +++-
 .../Army/FactionArmyCohesionLossPercentage.cs | 20 ++--
 Patches/Characters/AdjustPregnancyDuration.cs | 16 +++-
 Patches/Characters/AllowSameSexMarriage.cs    | 28 ++++--
 .../Characters/BarterOfferAlwaysAccepted.cs   | 14 ++-
 .../ConversationAlwaysSuccessful.cs           | 20 ++--
 Patches/Characters/NoBarterCooldown.cs        | 14 ++-
 Patches/Characters/PerfectAttraction.cs       | 18 +++-
 Patches/Characters/PerfectRelationships.cs    | 16 +++-
 .../Characters/PregnancyChanceMultiplier.cs   | 22 +++--
 Patches/Clan/ExtraClanPartyLimit.cs           | 16 +++-
 Patches/Clan/ExtraClanPartySize.cs            | 18 +++-
 Patches/Clan/ExtraCompanionLimit.cs           | 16 +++-
 Patches/Combat/AlwaysCrushThroughShields.cs   | 16 +++-
 Patches/Combat/AlwaysKnockDown.cs             | 18 +++-
 Patches/Combat/AlwaysWinBattleSimulation.cs   | 16 +++-
 Patches/Combat/BanditHideoutTroopLimit.cs     | 14 ++-
 Patches/Combat/CombatZoomMultiplier.cs        | 16 +++-
 Patches/Combat/CompanionDeathPercentage.cs    | 18 +++-
 Patches/Combat/DamageMultiplier.cs            | 18 +++-
 Patches/Combat/DamageTakenPercentage.cs       | 17 +++-
 Patches/Combat/EnemiesNoRunningAway.cs        | 16 +++-
 Patches/Combat/EnemyDamagePercentage.cs       | 17 +++-
 .../EnemyLordCombatDeathChanceMultiplier.cs   | 18 +++-
 .../EnemyLordCombatDeathPercentageBattle.cs   | 20 ++--
 Patches/Combat/EnemyOnlyKnockout.cs           | 16 +++-
 ...FriendlyLordCombatDeathPercentageBattle.cs | 20 ++--
 Patches/Combat/HealthRegeneration.cs          | 37 ++++---
 Patches/Combat/InfiniteAmmo.cs                | 26 +++--
 Patches/Combat/InfluenceRewardMultiplier.cs   | 16 +++-
 Patches/Combat/InstantCrossbowReload.cs       | 16 +++-
 Patches/Combat/Invincible.cs                  | 16 +++-
 Patches/Combat/NeverKnockedBackByAttacks.cs   | 20 ++--
 Patches/Combat/NoFriendlyFire.cs              | 20 ++--
 Patches/Combat/NoRunningAway.cs               | 18 +++-
 Patches/Combat/NoStuckArrows.cs               | 18 +++-
 Patches/Combat/NoTroopSacrificeBreakIn.cs     | 16 +++-
 Patches/Combat/NoTroopSacrificeBreakOut.cs    | 16 +++-
 Patches/Combat/NoTroopSacrificeRunaway.cs     | 18 +++-
 Patches/Combat/OneHitKill.cs                  | 18 +++-
 Patches/Combat/PartyDamageMultiplier.cs       | 22 +++--
 Patches/Combat/PartyDamageTakenPercentage.cs  | 21 ++--
 Patches/Combat/PartyHealthRegeneration.cs     | 51 +++++-----
 Patches/Combat/PartyHeroesInvincible.cs       | 24 +++--
 Patches/Combat/PartyInfiniteAmmo.cs           | 30 +++---
 Patches/Combat/PartyInvincible.cs             | 22 +++--
 Patches/Combat/PartyOneHitKill.cs             | 22 +++--
 Patches/Combat/PartyOnlyKnockout.cs           | 20 ++--
 Patches/Combat/PlayerHorseInvincible.cs       | 20 ++--
 .../Combat/RenownRewardMultiplierBattle.cs    | 16 +++-
 .../RenownRewardMultiplierTournament.cs       | 13 ++-
 Patches/Combat/SliceThroughEveryonePassive.cs | 16 +++-
 Patches/Combat/SliceThroughEveryoneWeapon.cs  | 16 +++-
 .../CompanionExperienceMultiplier.cs          | 18 +++-
 .../CompanionLearningRateMultiplier.cs        | 18 +++-
 Patches/Experience/ExperienceMultiplier.cs    | 16 +++-
 .../Experience/FreeFocusPointAssignment.cs    | 14 ++-
 Patches/Experience/LearningLimitMultiplier.cs | 14 ++-
 Patches/Experience/LearningRateMultiplier.cs  | 16 +++-
 .../Experience/TroopExperienceMultiplier.cs   | 15 ++-
 .../General/EnableHotkeyTipsEncyclopedia.cs   | 20 ++--
 Patches/General/EnableHotkeyTipsScreens.cs    | 60 +++++++-----
 .../EnableHotkeysAddEncyclopediaTroops.cs     | 28 ++++--
 Patches/General/EnableHotkeysAddItems.cs      | 26 +++--
 .../EnableHotkeysCharacterAttributes.cs       | 96 ++++++++++---------
 .../General/EnableHotkeysCharacterPoints.cs   | 46 +++++----
 Patches/General/EnableHotkeysInfluence.cs     | 20 ++--
 Patches/General/EnableHotkeysMoney.cs         | 30 +++---
 Patches/General/EnableHotkeysTroopCount.cs    | 26 +++--
 .../General/EnableHotkeysTroopExperience.cs   | 42 ++++----
 Patches/Inventory/ExtraInventoryCapacity.cs   | 16 +++-
 Patches/Inventory/NativeItemSpawning.cs       | 26 +++--
 ...DecisionOverrideInfluenceCostPercentage.cs | 15 ++-
 .../KingdomDecisionWeightMultiplier.cs        | 16 +++-
 Patches/Kingdom/NoCrimeRatingForCrimes.cs     | 14 ++-
 ...NoRelationshipLossOnDecisionArmyDisband.cs | 14 ++-
 ...RelationshipLossOnDecisionExpellingClan.cs | 14 ++-
 ...lationshipLossOnDecisionKingdomDecision.cs | 11 ++-
 Patches/Map/MapSpeedMultiplier.cs             | 16 +++-
 Patches/Map/MapVisibilityMultiplier.cs        | 16 +++-
 Patches/Map/NpcMapSpeedPercentage.cs          | 16 +++-
 Patches/Map/PartyInvisibleOnMap.cs            | 16 +++-
 Patches/Party/ExtraPartyMemberSize.cs         | 16 +++-
 Patches/Party/ExtraPartyMorale.cs             | 16 +++-
 Patches/Party/ExtraPartyPrisonerSize.cs       | 16 +++-
 Patches/Party/FoodConsumptionPercentage.cs    | 16 +++-
 Patches/Party/FreeCompanionHiring.cs          | 14 ++-
 Patches/Party/FreeTroopUpgrades.cs            | 16 +++-
 Patches/Party/InstantEscape.cs                | 14 ++-
 Patches/Party/InstantPrisonerRecruitment.cs   | 18 +++-
 Patches/Party/NoPrisonerEscape.cs             | 24 +++--
 Patches/Party/PartyHealingMultiplierHeroes.cs | 16 +++-
 Patches/Party/PartyHealingMultiplierTroops.cs | 16 +++-
 Patches/Party/TroopWagesPercentage.cs         | 16 +++-
 .../ConstructionPowerMultiplier.cs            | 16 +++-
 Patches/Settlements/DailyFoodBonus.cs         | 16 +++-
 Patches/Settlements/DailyGarrisonBonus.cs     | 16 +++-
 Patches/Settlements/DailyHearthsBonus.cs      | 16 +++-
 Patches/Settlements/DailyLoyaltyBonus.cs      | 16 +++-
 Patches/Settlements/DailyMilitiaBonusTown.cs  | 16 +++-
 .../Settlements/DailyMilitiaBonusVillage.cs   | 16 +++-
 Patches/Settlements/DailyProsperityBonus.cs   | 16 +++-
 Patches/Settlements/DailySecurityBonus.cs     | 16 +++-
 Patches/Settlements/DisguiseAlwaysWorks.cs    | 14 ++-
 Patches/Settlements/FreeTroopRecruitment.cs   | 16 +++-
 .../Settlements/GarrisonWagesPercentage.cs    | 18 +++-
 .../Settlements/ItemTradingCostPercentage.cs  | 19 ++--
 .../NeverRequireCivilianEquipment.cs          | 14 ++-
 Patches/Settlements/NoBribeToEnterKeep.cs     | 16 +++-
 Patches/Settlements/SellingPriceMultiplier.cs | 15 ++-
 .../TournamentMaximumBetMultiplier.cs         | 13 ++-
 .../EnemySiegeBuildingSpeedPercentage.cs      | 44 +++++----
 .../Sieges/SiegeBuildingSpeedMultiplier.cs    | 16 +++-
 .../Smithing/CraftedWeaponModifierBonus.cs    | 44 +++++----
 Patches/Smithing/SmithingCostPercentage.cs    | 19 ++--
 .../Smithing/SmithingDifficultyPercentage.cs  | 15 ++-
 .../SmithingEnergyCostPercentageRefining.cs   | 17 +++-
 .../SmithingEnergyCostPercentageSmelting.cs   | 17 +++-
 .../SmithingEnergyCostPercentageSmithing.cs   | 17 +++-
 Patches/Smithing/UnlockAllParts.cs            | 14 ++-
 .../Workshops/EveryoneBuysWorkshopsCost.cs    | 20 ++--
 .../EveryoneBuysWorkshopsSelectOwner.cs       | 18 +++-
 .../Workshops/WorkshopBuyingCostPercentage.cs | 16 +++-
 .../WorkshopDailyExpensePercentage.cs         | 16 +++-
 .../WorkshopSellingCostMultiplier.cs          | 14 ++-
 .../WorkshopUpgradeCostPercentage.cs          | 16 +++-
 127 files changed, 1753 insertions(+), 752 deletions(-)

diff --git a/Patches/Army/ArmyCohesionLossPercentage.cs b/Patches/Army/ArmyCohesionLossPercentage.cs
index 68608705..0cfdf348 100644
--- a/Patches/Army/ArmyCohesionLossPercentage.cs
+++ b/Patches/Army/ArmyCohesionLossPercentage.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,12 +14,19 @@ public static class ArmyCohesionLossPercentage
         [HarmonyPostfix]
         public static void CohesionChange(ref ArmyObj __instance, ref float __result)
         {
-            if (__instance.IsPlayerArmy()
-                && BannerlordCheatsSettings.Instance?.ArmyCohesionLossPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.ArmyCohesionLossPercentage / 100f;
+                if (__instance.IsPlayerArmy()
+                    && BannerlordCheatsSettings.Instance?.ArmyCohesionLossPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.ArmyCohesionLossPercentage / 100f;
 
-                __result *= factor;
+                    __result *= factor;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(ArmyCohesionLossPercentage));
             }
         }
     }
diff --git a/Patches/Army/ArmyFoodConsumptionPercentage.cs b/Patches/Army/ArmyFoodConsumptionPercentage.cs
index d6bad8de..30e46f85 100644
--- a/Patches/Army/ArmyFoodConsumptionPercentage.cs
+++ b/Patches/Army/ArmyFoodConsumptionPercentage.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using BannerlordCheats.Extensions;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class ArmyFoodConsumptionPercentage
         [HarmonyPostfix]
         public static void CalculateDailyFoodConsumptionf(ref MobileParty party, ref bool includeDescription, ref ExplainedNumber __result)
         {
-            if (party.IsPlayerArmy()
-                && BannerlordCheatsSettings.Instance?.ArmyFoodConsumptionPercentage < 100f)
+            try
             {
-                __result.AddPercentage(BannerlordCheatsSettings.Instance.ArmyFoodConsumptionPercentage);
+                if (party.IsPlayerArmy()
+                    && BannerlordCheatsSettings.Instance?.ArmyFoodConsumptionPercentage < 100f)
+                {
+                    __result.AddPercentage(BannerlordCheatsSettings.Instance.ArmyFoodConsumptionPercentage);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(ArmyFoodConsumptionPercentage));
             }
         }
     }
diff --git a/Patches/Army/FactionArmyCohesionLossPercentage.cs b/Patches/Army/FactionArmyCohesionLossPercentage.cs
index 60eed012..03b50187 100644
--- a/Patches/Army/FactionArmyCohesionLossPercentage.cs
+++ b/Patches/Army/FactionArmyCohesionLossPercentage.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,13 +14,20 @@ public static class FactionArmyCohesionLossPercentage
         [HarmonyPostfix]
         public static void CohesionChange(ref ArmyObj __instance, ref float __result)
         {
-            if (__instance.IsOfPlayerKingdom()
-                && !__instance.IsPlayerArmy()
-                && BannerlordCheatsSettings.Instance?.FactionArmyCohesionLossPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.FactionArmyCohesionLossPercentage / 100f;
+                if (__instance.IsOfPlayerKingdom()
+                    && !__instance.IsPlayerArmy()
+                    && BannerlordCheatsSettings.Instance?.FactionArmyCohesionLossPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.FactionArmyCohesionLossPercentage / 100f;
 
-                __result *= factor;
+                    __result *= factor;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(FactionArmyCohesionLossPercentage));
             }
         }
     }
diff --git a/Patches/Characters/AdjustPregnancyDuration.cs b/Patches/Characters/AdjustPregnancyDuration.cs
index 88826a99..ab1dc4ed 100644
--- a/Patches/Characters/AdjustPregnancyDuration.cs
+++ b/Patches/Characters/AdjustPregnancyDuration.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
@@ -12,10 +13,17 @@ public static class AdjustPregnancyDuration
         [HarmonyPostfix]
         public static void PregnancyDurationInDays(ref float __result)
         {
-            if (BannerlordCheatsSettings.Instance?.AdjustPregnancyDuration < 36)
+            try
             {
-                __result = BannerlordCheatsSettings.Instance.AdjustPregnancyDuration;
+                if (BannerlordCheatsSettings.Instance?.AdjustPregnancyDuration < 36)
+                {
+                    __result = BannerlordCheatsSettings.Instance.AdjustPregnancyDuration;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(AdjustPregnancyDuration));
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Characters/AllowSameSexMarriage.cs b/Patches/Characters/AllowSameSexMarriage.cs
index 0fa09083..50221b0b 100644
--- a/Patches/Characters/AllowSameSexMarriage.cs
+++ b/Patches/Characters/AllowSameSexMarriage.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
@@ -19,17 +20,24 @@ public static void IsCoupleSuitableForMarriage(
             ref Hero secondHero,
             ref bool __result)
         {
-            if (BannerlordCheatsSettings.Instance?.AllowSameSexMarriage == true
-                && (firstHero.IsPlayer() || secondHero.IsPlayer()))
+            try
             {
-                __result = (firstHero.Clan?.Leader != firstHero || secondHero.Clan?.Leader != secondHero) 
-                           // && firstHero.IsFemale != secondHero.IsFemale
-                           && !DiscoverAncestors(firstHero, 3).Intersect(DiscoverAncestors(secondHero, 3)).Any()
-                           && firstHero.CanMarry()
-                           && secondHero.CanMarry();
+                if (BannerlordCheatsSettings.Instance?.AllowSameSexMarriage == true
+                    && (firstHero.IsPlayer() || secondHero.IsPlayer()))
+                {
+                    __result = (firstHero.Clan?.Leader != firstHero || secondHero.Clan?.Leader != secondHero)
+                               // && firstHero.IsFemale != secondHero.IsFemale
+                               && !DiscoverAncestors(firstHero, 3).Intersect(DiscoverAncestors(secondHero, 3)).Any()
+                               && firstHero.CanMarry()
+                               && secondHero.CanMarry();
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(AllowSameSexMarriage));
             }
         }
-        
+
         private static IEnumerable<Hero> DiscoverAncestors(Hero hero, int n)
         {
             if (hero != null)
@@ -45,4 +53,4 @@ private static IEnumerable<Hero> DiscoverAncestors(Hero hero, int n)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Characters/BarterOfferAlwaysAccepted.cs b/Patches/Characters/BarterOfferAlwaysAccepted.cs
index 60136a53..8de91d35 100644
--- a/Patches/Characters/BarterOfferAlwaysAccepted.cs
+++ b/Patches/Characters/BarterOfferAlwaysAccepted.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
@@ -12,9 +13,16 @@ public static class BarterOfferAlwaysAccepted
         [HarmonyPostfix]
         public static void IsOfferAcceptable(BarterData args, Hero hero, PartyBase party, ref BarterManager __instance, ref bool __result)
         {
-            if (BannerlordCheatsSettings.Instance?.BarterOfferAlwaysAccepted == true)
+            try
             {
-                __result = true;
+                if (BannerlordCheatsSettings.Instance?.BarterOfferAlwaysAccepted == true)
+                {
+                    __result = true;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(BarterOfferAlwaysAccepted));
             }
         }
     }
diff --git a/Patches/Characters/ConversationAlwaysSuccessful.cs b/Patches/Characters/ConversationAlwaysSuccessful.cs
index 18d01081..5165113c 100644
--- a/Patches/Characters/ConversationAlwaysSuccessful.cs
+++ b/Patches/Characters/ConversationAlwaysSuccessful.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.Conversation.Persuasion;
@@ -13,12 +14,19 @@ public static class ConversationAlwaysSuccessful
         [HarmonyPostfix]
         public static void GetChances(PersuasionOptionArgs optionArgs, ref float successChance, ref float critSuccessChance, ref float critFailChance, ref float failChance, float difficultyMultiplier)
         {
-            if (BannerlordCheatsSettings.Instance?.ConversationAlwaysSuccessful == true)
+            try
             {
-                successChance = 1;
-                critSuccessChance = 1;
-                failChance = 0;
-                critFailChance = 0;
+                if (BannerlordCheatsSettings.Instance?.ConversationAlwaysSuccessful == true)
+                {
+                    successChance = 1;
+                    critSuccessChance = 1;
+                    failChance = 0;
+                    critFailChance = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(ConversationAlwaysSuccessful));
             }
         }
     }
diff --git a/Patches/Characters/NoBarterCooldown.cs b/Patches/Characters/NoBarterCooldown.cs
index 00e3e49b..e852a25a 100644
--- a/Patches/Characters/NoBarterCooldown.cs
+++ b/Patches/Characters/NoBarterCooldown.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
@@ -12,9 +13,16 @@ public static class NoBarterCooldown
         [HarmonyPostfix]
         public static void CanPlayerBarterWithHero(Hero hero, ref bool __result)
         {
-            if (BannerlordCheatsSettings.Instance?.NoBarterCooldown == true)
+            try
             {
-                __result = true;
+                if (BannerlordCheatsSettings.Instance?.NoBarterCooldown == true)
+                {
+                    __result = true;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NoBarterCooldown));
             }
         }
     }
diff --git a/Patches/Characters/PerfectAttraction.cs b/Patches/Characters/PerfectAttraction.cs
index 4ecb3f88..5b963e16 100644
--- a/Patches/Characters/PerfectAttraction.cs
+++ b/Patches/Characters/PerfectAttraction.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -17,11 +18,18 @@ public static void GetAttractionValuePercentage(
             ref Hero heroOfInterest,
             ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.PerfectAttraction == true
-                && heroOfInterest.IsPlayer())
+            try
             {
-                __result = 100;
+                if (BannerlordCheatsSettings.Instance?.PerfectAttraction == true
+                    && heroOfInterest.IsPlayer())
+                {
+                    __result = 100;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PerfectAttraction));
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Characters/PerfectRelationships.cs b/Patches/Characters/PerfectRelationships.cs
index 40f49f48..6f248d46 100644
--- a/Patches/Characters/PerfectRelationships.cs
+++ b/Patches/Characters/PerfectRelationships.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class PerfectRelationships
         [HarmonyPostfix]
         public static void GetRelation(Hero otherHero, ref Hero __instance, ref int __result)
         {
-            if ((__instance.IsPlayer() || otherHero.IsPlayer())
-                && BannerlordCheatsSettings.Instance?.PerfectRelationships == true)
+            try
             {
-                __result = 100;
+                if ((__instance.IsPlayer() || otherHero.IsPlayer())
+                    && BannerlordCheatsSettings.Instance?.PerfectRelationships == true)
+                {
+                    __result = 100;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PerfectRelationships));
             }
         }
     }
diff --git a/Patches/Characters/PregnancyChanceMultiplier.cs b/Patches/Characters/PregnancyChanceMultiplier.cs
index e93aa41d..309fa2e7 100644
--- a/Patches/Characters/PregnancyChanceMultiplier.cs
+++ b/Patches/Characters/PregnancyChanceMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -16,12 +17,19 @@ public static void GetDailyChanceOfPregnancyForHero(
             ref Hero hero,
             ref float __result)
         {
-            if (BannerlordCheatsSettings.Instance?.PregnancyChanceMultiplier > 1.0f
-                && (hero.IsPlayer() || hero.Spouse.IsPlayer()))
+            try
             {
-                __result *= BannerlordCheatsSettings.Instance.PregnancyChanceMultiplier;
+                if (BannerlordCheatsSettings.Instance?.PregnancyChanceMultiplier > 1.0f
+                    && (hero.IsPlayer() || hero.Spouse.IsPlayer()))
+                {
+                    __result *= BannerlordCheatsSettings.Instance.PregnancyChanceMultiplier;
+                }
             }
-        } 
-        
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PregnancyChanceMultiplier));
+            }
+        }
+
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Clan/ExtraClanPartyLimit.cs b/Patches/Clan/ExtraClanPartyLimit.cs
index 90f4f2a1..1f124b4f 100644
--- a/Patches/Clan/ExtraClanPartyLimit.cs
+++ b/Patches/Clan/ExtraClanPartyLimit.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class ExtraClanPartyLimit
         [HarmonyPostfix]
         public static void GetPartyLimitForTier(TaleWorlds.CampaignSystem.Clan clan, int clanTierToCheck, ref int __result)
         {
-            if (clan.IsPlayerClan()
-                && BannerlordCheatsSettings.Instance?.ExtraClanPartyLimit > 0)
+            try
             {
-                __result += BannerlordCheatsSettings.Instance.ExtraClanPartyLimit;
+                if (clan.IsPlayerClan()
+                    && BannerlordCheatsSettings.Instance?.ExtraClanPartyLimit > 0)
+                {
+                    __result += BannerlordCheatsSettings.Instance.ExtraClanPartyLimit;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(ExtraClanPartyLimit));
             }
         }
     }
diff --git a/Patches/Clan/ExtraClanPartySize.cs b/Patches/Clan/ExtraClanPartySize.cs
index 6d00adeb..2229e62f 100644
--- a/Patches/Clan/ExtraClanPartySize.cs
+++ b/Patches/Clan/ExtraClanPartySize.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,11 +15,18 @@ public static class ExtraClanPartySize
         [HarmonyPostfix]
         public static void GetPartyMemberSizeLimit(ref PartyBase party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
-            if (party.IsPlayerClan()
-                && !party.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.ExtraClanPartySize > 0)
+            try
             {
-                __result.Add(BannerlordCheatsSettings.Instance.ExtraClanPartySize);
+                if (party.IsPlayerClan()
+                    && !party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.ExtraClanPartySize > 0)
+                {
+                    __result.Add(BannerlordCheatsSettings.Instance.ExtraClanPartySize);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(ExtraClanPartySize));
             }
         }
     }
diff --git a/Patches/Clan/ExtraCompanionLimit.cs b/Patches/Clan/ExtraCompanionLimit.cs
index 7259f6b8..d0324063 100644
--- a/Patches/Clan/ExtraCompanionLimit.cs
+++ b/Patches/Clan/ExtraCompanionLimit.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class ExtraCompanionLimit
         [HarmonyPostfix]
         public static void GetCompanionLimit(ref TaleWorlds.CampaignSystem.Clan clan, ref int __result)
         {
-            if (clan.IsPlayerClan()
-                && BannerlordCheatsSettings.Instance?.ExtraCompanionLimit > 0)
+            try
             {
-                __result += BannerlordCheatsSettings.Instance.ExtraCompanionLimit;
+                if (clan.IsPlayerClan()
+                    && BannerlordCheatsSettings.Instance?.ExtraCompanionLimit > 0)
+                {
+                    __result += BannerlordCheatsSettings.Instance.ExtraCompanionLimit;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(ExtraCompanionLimit));
             }
         }
     }
diff --git a/Patches/Combat/AlwaysCrushThroughShields.cs b/Patches/Combat/AlwaysCrushThroughShields.cs
index 14473d23..0fdc69b0 100644
--- a/Patches/Combat/AlwaysCrushThroughShields.cs
+++ b/Patches/Combat/AlwaysCrushThroughShields.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,10 +16,17 @@ public class AlwaysCrushThroughShields
         [HarmonyPostfix]
         public static void DecideCrushedThrough(Agent attackerAgent, Agent defenderAgent, float totalAttackEnergy, Agent.UsageDirection attackDirection, StrikeType strikeType, WeaponComponentData defendItem, bool isPassiveUsage, ref bool __result)
         {
-            if (attackerAgent.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.AlwaysCrushThroughShields == true)
+            try
             {
-                __result = true;
+                if (attackerAgent.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.AlwaysCrushThroughShields == true)
+                {
+                    __result = true;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(AlwaysCrushThroughShields));
             }
         }
     }
diff --git a/Patches/Combat/AlwaysKnockDown.cs b/Patches/Combat/AlwaysKnockDown.cs
index 41f42bf3..53d0e332 100644
--- a/Patches/Combat/AlwaysKnockDown.cs
+++ b/Patches/Combat/AlwaysKnockDown.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -20,11 +21,18 @@ public static void DecideAgentKnockedByBlow(
             ref bool isInitialBlowShrugOff,
             ref Blow blow)
         {
-            if (attacker.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.AlwaysKnockDown == true)
+            try
             {
-                blow.BlowFlag &= ~BlowFlags.ShrugOff;
-                blow.BlowFlag |= BlowFlags.KnockDown;
+                if (attacker.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.AlwaysKnockDown == true)
+                {
+                    blow.BlowFlag &= ~BlowFlags.ShrugOff;
+                    blow.BlowFlag |= BlowFlags.KnockDown;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(AlwaysKnockDown));
             }
         }
     }
diff --git a/Patches/Combat/AlwaysWinBattleSimulation.cs b/Patches/Combat/AlwaysWinBattleSimulation.cs
index 1181ea13..40ad40f8 100644
--- a/Patches/Combat/AlwaysWinBattleSimulation.cs
+++ b/Patches/Combat/AlwaysWinBattleSimulation.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class AlwaysWinBattleSimulation
         [HarmonyPostfix]
         public static void SimulateHit(ref CharacterObject strikerTroop, ref CharacterObject struckTroop, ref PartyBase strikerParty, ref PartyBase struckParty, ref float strikerAdvantage, ref MapEvent battle, ref int __result)
         {
-            if (struckParty.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.AlwaysWinBattleSimulation == true)
+            try
             {
-                __result = 0;
+                if (struckParty.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.AlwaysWinBattleSimulation == true)
+                {
+                    __result = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(AlwaysWinBattleSimulation));
             }
         }
     }
diff --git a/Patches/Combat/BanditHideoutTroopLimit.cs b/Patches/Combat/BanditHideoutTroopLimit.cs
index 24acb066..15469803 100644
--- a/Patches/Combat/BanditHideoutTroopLimit.cs
+++ b/Patches/Combat/BanditHideoutTroopLimit.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
@@ -13,9 +14,16 @@ public static class BanditHideoutTroopLimit
         [HarmonyPostfix]
         public static void GetPlayerMaximumTroopCountForHideoutMission(ref MobileParty party, ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.BanditHideoutTroopLimit > 0)
+            try
             {
-                __result += BannerlordCheatsSettings.Instance.BanditHideoutTroopLimit;
+                if (BannerlordCheatsSettings.Instance?.BanditHideoutTroopLimit > 0)
+                {
+                    __result += BannerlordCheatsSettings.Instance.BanditHideoutTroopLimit;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(BanditHideoutTroopLimit));
             }
         }
     }
diff --git a/Patches/Combat/CombatZoomMultiplier.cs b/Patches/Combat/CombatZoomMultiplier.cs
index d7845751..f033c587 100644
--- a/Patches/Combat/CombatZoomMultiplier.cs
+++ b/Patches/Combat/CombatZoomMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class CombatZoomMultiplier
         [HarmonyPostfix]
         public static void CrossbowReloadSpeed(ref Agent agent, ref float __result)
         {
-            if (agent.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.CombatZoomMultiplier > 1f)
+            try
             {
-                __result *= BannerlordCheatsSettings.Instance.CombatZoomMultiplier;
+                if (agent.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.CombatZoomMultiplier > 1f)
+                {
+                    __result *= BannerlordCheatsSettings.Instance.CombatZoomMultiplier;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(CombatZoomMultiplier));
             }
         }
     }
diff --git a/Patches/Combat/CompanionDeathPercentage.cs b/Patches/Combat/CompanionDeathPercentage.cs
index 00930dd8..75903b05 100644
--- a/Patches/Combat/CompanionDeathPercentage.cs
+++ b/Patches/Combat/CompanionDeathPercentage.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,12 +16,19 @@ public static class CompanionDeathPercentage
         [HarmonyPostfix]
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
         {
-            if (effectedAgent.IsPlayerCompanion()
-                && BannerlordCheatsSettings.Instance?.CompanionDeathPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.CompanionDeathPercentage / 100f;
+                if (effectedAgent.IsPlayerCompanion()
+                    && BannerlordCheatsSettings.Instance?.CompanionDeathPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.CompanionDeathPercentage / 100f;
 
-                __result *= factor;
+                    __result *= factor;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(CompanionDeathPercentage));
             }
         }
     }
diff --git a/Patches/Combat/DamageMultiplier.cs b/Patches/Combat/DamageMultiplier.cs
index c7707945..40f5ce37 100644
--- a/Patches/Combat/DamageMultiplier.cs
+++ b/Patches/Combat/DamageMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,11 +16,18 @@ public static class DamageMultiplier
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
-            if (attackInformation.AttackerAgentCharacter.IsPlayer()
-                && !attackInformation.IsFriendlyFire
-                && BannerlordCheatsSettings.Instance?.DamageMultiplier > 1f)
+            try
             {
-                __result *= BannerlordCheatsSettings.Instance.DamageMultiplier;
+                if (attackInformation.AttackerAgentCharacter.IsPlayer()
+                    && !attackInformation.IsFriendlyFire
+                    && BannerlordCheatsSettings.Instance?.DamageMultiplier > 1f)
+                {
+                    __result *= BannerlordCheatsSettings.Instance.DamageMultiplier;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(DamageMultiplier));
             }
         }
     }
diff --git a/Patches/Combat/DamageTakenPercentage.cs b/Patches/Combat/DamageTakenPercentage.cs
index a93e7448..e38b5158 100644
--- a/Patches/Combat/DamageTakenPercentage.cs
+++ b/Patches/Combat/DamageTakenPercentage.cs
@@ -16,14 +16,21 @@ public static class DamageTakenPercentage
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
-            if (attackInformation.VictimAgentCharacter.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.DamageTakenPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.DamageTakenPercentage / 100f;
+                if (attackInformation.VictimAgentCharacter.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.DamageTakenPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.DamageTakenPercentage / 100f;
 
-                var newValue = (int)Math.Round(factor * __result);
+                    var newValue = (int)Math.Round(factor * __result);
 
-                __result = newValue;
+                    __result = newValue;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(DamageTakenPercentage));
             }
         }
     }
diff --git a/Patches/Combat/EnemiesNoRunningAway.cs b/Patches/Combat/EnemiesNoRunningAway.cs
index 1443ed47..82d19d75 100644
--- a/Patches/Combat/EnemiesNoRunningAway.cs
+++ b/Patches/Combat/EnemiesNoRunningAway.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -17,10 +18,17 @@ public static void CalculateMoraleChangeToCharacter(
             ref float maxMoraleChange,
             ref float __result)
         {
-            if (agent.IsPlayerEnemy()
-                && BannerlordCheatsSettings.Instance?.EnemiesNoRunningAway == true)
+            try
             {
-                __result = 0.0f;
+                if (agent.IsPlayerEnemy()
+                    && BannerlordCheatsSettings.Instance?.EnemiesNoRunningAway == true)
+                {
+                    __result = 0.0f;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnemiesNoRunningAway));
             }
         }
     }
diff --git a/Patches/Combat/EnemyDamagePercentage.cs b/Patches/Combat/EnemyDamagePercentage.cs
index 3ac3cf04..e7d05fa1 100644
--- a/Patches/Combat/EnemyDamagePercentage.cs
+++ b/Patches/Combat/EnemyDamagePercentage.cs
@@ -16,14 +16,21 @@ public static class EnemyDamagePercentage
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
-            if (attackInformation.AttackerAgentOrigin.IsOnPlayerEnemySide()
-                && BannerlordCheatsSettings.Instance?.EnemyDamagePercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.EnemyDamagePercentage / 100f;
+                if (attackInformation.AttackerAgentOrigin.IsOnPlayerEnemySide()
+                    && BannerlordCheatsSettings.Instance?.EnemyDamagePercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.EnemyDamagePercentage / 100f;
 
-                var newValue = (int)Math.Round(factor * __result);
+                    var newValue = (int)Math.Round(factor * __result);
 
-                __result = newValue;
+                    __result = newValue;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnemyDamagePercentage));
             }
         }
     }
diff --git a/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs b/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
index d0c8832f..9597b105 100644
--- a/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
+++ b/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,11 +16,18 @@ public static class EnemyLordCombatDeathChanceMultiplier
         [HarmonyPostfix]
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
         {
-            if (effectedAgent.IsHero()
-                && effectedAgent.IsPlayerEnemy()
-                && BannerlordCheatsSettings.Instance?.EnemyLordCombatDeathChanceMultiplier > 1.0f)
+            try
             {
-                __result *= BannerlordCheatsSettings.Instance.EnemyLordCombatDeathChanceMultiplier;
+                if (effectedAgent.IsHero()
+                    && effectedAgent.IsPlayerEnemy()
+                    && BannerlordCheatsSettings.Instance?.EnemyLordCombatDeathChanceMultiplier > 1.0f)
+                {
+                    __result *= BannerlordCheatsSettings.Instance.EnemyLordCombatDeathChanceMultiplier;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnemyLordCombatDeathChanceMultiplier));
             }
         }
     }
diff --git a/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
index 5657a6ea..78eb7593 100644
--- a/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
+++ b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,13 +16,20 @@ public static class EnemyLordCombatDeathPercentageBattle
         [HarmonyPostfix]
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
         {
-            if (effectedAgent.IsHero()
-                && effectedAgent.IsPlayerEnemy()
-                && BannerlordCheatsSettings.Instance?.EnemyLordCombatDeathPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.EnemyLordCombatDeathPercentage / 100f;
+                if (effectedAgent.IsHero()
+                    && effectedAgent.IsPlayerEnemy()
+                    && BannerlordCheatsSettings.Instance?.EnemyLordCombatDeathPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.EnemyLordCombatDeathPercentage / 100f;
 
-                __result *= factor;
+                    __result *= factor;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnemyLordCombatDeathPercentageBattle));
             }
         }
     }
diff --git a/Patches/Combat/EnemyOnlyKnockout.cs b/Patches/Combat/EnemyOnlyKnockout.cs
index cba9b9ed..03d2b62c 100644
--- a/Patches/Combat/EnemyOnlyKnockout.cs
+++ b/Patches/Combat/EnemyOnlyKnockout.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,10 +16,17 @@ public static class EnemyOnlyKnockout
         [HarmonyPostfix]
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
         {
-            if (effectedAgent.IsPlayerEnemy()
-                && BannerlordCheatsSettings.Instance?.EnemyOnlyKnockout == true)
+            try
             {
-                __result = 0f;
+                if (effectedAgent.IsPlayerEnemy()
+                    && BannerlordCheatsSettings.Instance?.EnemyOnlyKnockout == true)
+                {
+                    __result = 0f;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnemyOnlyKnockout));
             }
         }
     }
diff --git a/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
index 6ad3d384..cee3e269 100644
--- a/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
+++ b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,13 +16,20 @@ public static class FriendlyLordCombatDeathPercentageBattle
         [HarmonyPostfix]
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
         {
-            if (effectedAgent.IsHero()
-                &&effectedAgent.IsPlayerAlly()
-                && BannerlordCheatsSettings.Instance?.FriendlyLordCombatDeathPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.FriendlyLordCombatDeathPercentage / 100f;
+                if (effectedAgent.IsHero()
+                    &&effectedAgent.IsPlayerAlly()
+                    && BannerlordCheatsSettings.Instance?.FriendlyLordCombatDeathPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.FriendlyLordCombatDeathPercentage / 100f;
 
-                __result *= factor;
+                    __result *= factor;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(FriendlyLordCombatDeathPercentageBattle));
             }
         }
     }
diff --git a/Patches/Combat/HealthRegeneration.cs b/Patches/Combat/HealthRegeneration.cs
index 3a6e50dc..8af56be7 100644
--- a/Patches/Combat/HealthRegeneration.cs
+++ b/Patches/Combat/HealthRegeneration.cs
@@ -15,29 +15,36 @@ public static class HealthRegeneration
         [HarmonyPostfix]
         public static void OnApplicationTick(float dt)
         {
-            if (Mission.Current != null
-                && Agent.Main != null
-                && MBCommon.IsPaused != true
-                && BannerlordCheatsSettings.Instance?.HealthRegeneration > 0f)
+            try
             {
-                var now = DateTime.Now.Second;
-
-                if (LastSet == null || now != LastSet)
+                if (Mission.Current != null
+                    && Agent.Main != null
+                    && MBCommon.IsPaused != true
+                    && BannerlordCheatsSettings.Instance?.HealthRegeneration > 0f)
                 {
-                    LastSet = now;
-
-                    float health = Agent.Main.Health;
-                    float maxHealth = Agent.Main.HealthLimit;
+                    var now = DateTime.Now.Second;
 
-                    if (health < maxHealth)
+                    if (LastSet == null || now != LastSet)
                     {
-                        float regen = (BannerlordCheatsSettings.Instance.HealthRegeneration / maxHealth) * 100;
-                        float newHealth = (float) Math.Round(health + regen);
+                        LastSet = now;
+
+                        float health = Agent.Main.Health;
+                        float maxHealth = Agent.Main.HealthLimit;
 
-                        Agent.Main.Health = Math.Min(maxHealth, newHealth);
+                        if (health < maxHealth)
+                        {
+                            float regen = (BannerlordCheatsSettings.Instance.HealthRegeneration / maxHealth) * 100;
+                            float newHealth = (float) Math.Round(health + regen);
+
+                            Agent.Main.Health = Math.Min(maxHealth, newHealth);
+                        }
                     }
                 }
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(HealthRegeneration));
+            }
         }
     }
 }
diff --git a/Patches/Combat/InfiniteAmmo.cs b/Patches/Combat/InfiniteAmmo.cs
index ff3474ac..5882ed8b 100644
--- a/Patches/Combat/InfiniteAmmo.cs
+++ b/Patches/Combat/InfiniteAmmo.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -23,20 +24,27 @@ public static void OnAgentShootMissile(
             ref bool isPrimaryWeaponShot,
             ref int forcedMissileIndex)
         {
-            if (shooterAgent.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.InfiniteAmmo == true)
+            try
             {
-                for (var index = EquipmentIndex.WeaponItemBeginSlot; index < EquipmentIndex.NumAllWeaponSlots; ++index)
+                if (shooterAgent.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.InfiniteAmmo == true)
                 {
-                    var missionWeapon = shooterAgent.Equipment[index];
-
-                    if (missionWeapon.IsAnyConsumable(out _)
-                        && missionWeapon.Amount <= missionWeapon.ModifiedMaxAmount)
+                    for (var index = EquipmentIndex.WeaponItemBeginSlot; index < EquipmentIndex.NumAllWeaponSlots; ++index)
                     {
-                        shooterAgent.SetWeaponAmountInSlot(index, missionWeapon.ModifiedMaxAmount, true);
+                        var missionWeapon = shooterAgent.Equipment[index];
+
+                        if (missionWeapon.IsAnyConsumable(out _)
+                            && missionWeapon.Amount <= missionWeapon.ModifiedMaxAmount)
+                        {
+                            shooterAgent.SetWeaponAmountInSlot(index, missionWeapon.ModifiedMaxAmount, true);
+                        }
                     }
                 }
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(InfiniteAmmo));
+            }
         }
     }
 }
diff --git a/Patches/Combat/InfluenceRewardMultiplier.cs b/Patches/Combat/InfluenceRewardMultiplier.cs
index a14e4836..2a3fdb8c 100644
--- a/Patches/Combat/InfluenceRewardMultiplier.cs
+++ b/Patches/Combat/InfluenceRewardMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -18,10 +19,17 @@ public static void CalculateInfluenceGain(
             ref float contributionShare,
             ref ExplainedNumber __result)
         {
-            if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.InfluenceRewardMultiplier > 1f)
+            try
             {
-                __result.AddMultiplier(BannerlordCheatsSettings.Instance.InfluenceRewardMultiplier);
+                if (party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.InfluenceRewardMultiplier > 1f)
+                {
+                    __result.AddMultiplier(BannerlordCheatsSettings.Instance.InfluenceRewardMultiplier);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(InfluenceRewardMultiplier));
             }
         }
     }
diff --git a/Patches/Combat/InstantCrossbowReload.cs b/Patches/Combat/InstantCrossbowReload.cs
index 410ea31d..b6ad8532 100644
--- a/Patches/Combat/InstantCrossbowReload.cs
+++ b/Patches/Combat/InstantCrossbowReload.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using SandBox;
@@ -13,10 +14,17 @@ public static class InstantCrossbowReload
         [HarmonyPrefix]
         public static void GetPerkEffectsOnAgent(ref Agent agent, ref AgentDrivenProperties agentDrivenProperties, ref WeaponComponentData rightHandEquippedItem)
         {
-            if (agent.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.InstantCrossbowReload == true)
+            try
             {
-                agentDrivenProperties.ReloadSpeed = 10f;
+                if (agent.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.InstantCrossbowReload == true)
+                {
+                    agentDrivenProperties.ReloadSpeed = 10f;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(InstantCrossbowReload));
             }
         }
     }
diff --git a/Patches/Combat/Invincible.cs b/Patches/Combat/Invincible.cs
index f3e87161..867d12cc 100644
--- a/Patches/Combat/Invincible.cs
+++ b/Patches/Combat/Invincible.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class Invincible
         [HarmonyPostfix]
         public static void Invulnerable(ref Agent __instance, ref bool __result)
         {
-            if (__instance.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.Invincible == true)
+            try
             {
-                __result = true;
+                if (__instance.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.Invincible == true)
+                {
+                    __result = true;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(Invincible));
             }
         }
     }
diff --git a/Patches/Combat/NeverKnockedBackByAttacks.cs b/Patches/Combat/NeverKnockedBackByAttacks.cs
index 9f90c712..12fe9cab 100644
--- a/Patches/Combat/NeverKnockedBackByAttacks.cs
+++ b/Patches/Combat/NeverKnockedBackByAttacks.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -20,12 +21,19 @@ public static void DecideAgentKnockedByBlow(
             ref bool isInitialBlowShrugOff,
             ref Blow blow)
         {
-            if (victim.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.NeverKnockedBackByAttacks == true)
+            try
             {
-                blow.BlowFlag &= ~BlowFlags.KnockDown;
-                blow.BlowFlag &= ~BlowFlags.KnockBack;
-                blow.BlowFlag |= BlowFlags.ShrugOff;
+                if (victim.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.NeverKnockedBackByAttacks == true)
+                {
+                    blow.BlowFlag &= ~BlowFlags.KnockDown;
+                    blow.BlowFlag &= ~BlowFlags.KnockBack;
+                    blow.BlowFlag |= BlowFlags.ShrugOff;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NeverKnockedBackByAttacks));
             }
         }
     }
diff --git a/Patches/Combat/NoFriendlyFire.cs b/Patches/Combat/NoFriendlyFire.cs
index 136d5f27..7436d75a 100644
--- a/Patches/Combat/NoFriendlyFire.cs
+++ b/Patches/Combat/NoFriendlyFire.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,12 +16,19 @@ public static class NoFriendlyFire
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
-            if (attackInformation.AttackerAgentOrigin.TryGetParty(out var party)
-                && party.IsPlayerParty()
-                && attackInformation.IsFriendlyFire
-                && BannerlordCheatsSettings.Instance?.NoFriendlyFire == true)
+            try
             {
-                __result = 0;
+                if (attackInformation.AttackerAgentOrigin.TryGetParty(out var party)
+                    && party.IsPlayerParty()
+                    && attackInformation.IsFriendlyFire
+                    && BannerlordCheatsSettings.Instance?.NoFriendlyFire == true)
+                {
+                    __result = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NoFriendlyFire));
             }
         }
     }
diff --git a/Patches/Combat/NoRunningAway.cs b/Patches/Combat/NoRunningAway.cs
index b70f7420..7cc2d4e5 100644
--- a/Patches/Combat/NoRunningAway.cs
+++ b/Patches/Combat/NoRunningAway.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -17,11 +18,18 @@ public static void CalculateMoraleChangeToCharacter(
             ref float maxMoraleChange,
             ref float __result)
         {
-            if (agent.Origin.TryGetParty(out var party)
-                && party.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.NoRunningAway == true)
+            try
             {
-                __result = 0.0f;
+                if (agent.Origin.TryGetParty(out var party)
+                    && party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.NoRunningAway == true)
+                {
+                    __result = 0.0f;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NoRunningAway));
             }
         }
     }
diff --git a/Patches/Combat/NoStuckArrows.cs b/Patches/Combat/NoStuckArrows.cs
index 5b88cca4..d42ff2ac 100644
--- a/Patches/Combat/NoStuckArrows.cs
+++ b/Patches/Combat/NoStuckArrows.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -25,11 +26,18 @@ public static void HandleMissileCollisionReaction(
             ref Vec3 bounceBackAngularVelocity,
             ref int forcedSpawnIndex)
         {
-            if (attachedAgent.IsPlayer()
-                && collisionReaction == Mission.MissileCollisionReaction.Stick
-                && BannerlordCheatsSettings.Instance?.NoStuckArrows == true)
+            try
             {
-                collisionReaction = Mission.MissileCollisionReaction.BecomeInvisible;
+                if (attachedAgent.IsPlayer()
+                    && collisionReaction == Mission.MissileCollisionReaction.Stick
+                    && BannerlordCheatsSettings.Instance?.NoStuckArrows == true)
+                {
+                    collisionReaction = Mission.MissileCollisionReaction.BecomeInvisible;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NoStuckArrows));
             }
         }
     }
diff --git a/Patches/Combat/NoTroopSacrificeBreakIn.cs b/Patches/Combat/NoTroopSacrificeBreakIn.cs
index 7ef297b3..40184c96 100644
--- a/Patches/Combat/NoTroopSacrificeBreakIn.cs
+++ b/Patches/Combat/NoTroopSacrificeBreakIn.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class NoTroopSacrificeBreakIn
         [HarmonyPostfix]
         public static void GetLostTroopCountForBreakingInBesiegedSettlement(MobileParty party, SiegeEvent siegeEvent, ref int __result)
         {
-            if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.NoTroopSacrifice == true)
+            try
             {
-                __result = 0;
+                if (party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.NoTroopSacrifice == true)
+                {
+                    __result = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NoTroopSacrificeBreakIn));
             }
         }
     }
diff --git a/Patches/Combat/NoTroopSacrificeBreakOut.cs b/Patches/Combat/NoTroopSacrificeBreakOut.cs
index 355449f0..337b2884 100644
--- a/Patches/Combat/NoTroopSacrificeBreakOut.cs
+++ b/Patches/Combat/NoTroopSacrificeBreakOut.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class NoTroopSacrificeBreakOut
         [HarmonyPostfix]
         public static void GetLostTroopCountForBreakingOutOfBesiegedSettlement(MobileParty party, SiegeEvent siegeEvent, ref int __result)
         {
-            if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.NoTroopSacrifice == true)
+            try
             {
-                __result = 0;
+                if (party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.NoTroopSacrifice == true)
+                {
+                    __result = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NoTroopSacrificeBreakOut));
             }
         }
     }
diff --git a/Patches/Combat/NoTroopSacrificeRunaway.cs b/Patches/Combat/NoTroopSacrificeRunaway.cs
index a6ac3d28..363c84c4 100644
--- a/Patches/Combat/NoTroopSacrificeRunaway.cs
+++ b/Patches/Combat/NoTroopSacrificeRunaway.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
@@ -14,11 +15,18 @@ public static class NoTroopSacrificeRunaway
         [HarmonyPostfix]
         public static void GetNumberOfTroopsSacrificedForTryingToGetAway(BattleSideEnum battleSide, MapEvent mapEvent, ref int __result)
         {
-            if (mapEvent.IsPlayerMapEvent
-                && battleSide == mapEvent.PlayerSide
-                && BannerlordCheatsSettings.Instance?.NoTroopSacrifice == true)
+            try
             {
-                __result = 0;
+                if (mapEvent.IsPlayerMapEvent
+                    && battleSide == mapEvent.PlayerSide
+                    && BannerlordCheatsSettings.Instance?.NoTroopSacrifice == true)
+                {
+                    __result = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NoTroopSacrificeRunaway));
             }
         }
     }
diff --git a/Patches/Combat/OneHitKill.cs b/Patches/Combat/OneHitKill.cs
index 83a49256..0cdf7fa8 100644
--- a/Patches/Combat/OneHitKill.cs
+++ b/Patches/Combat/OneHitKill.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,11 +16,18 @@ public static class OneHitKill
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
-            if (attackInformation.AttackerAgentCharacter.IsPlayer()
-                && !attackInformation.IsFriendlyFire
-                && BannerlordCheatsSettings.Instance?.OneHitKill == true)
+            try
             {
-                __result = 10000;
+                if (attackInformation.AttackerAgentCharacter.IsPlayer()
+                    && !attackInformation.IsFriendlyFire
+                    && BannerlordCheatsSettings.Instance?.OneHitKill == true)
+                {
+                    __result = 10000;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(OneHitKill));
             }
         }
     }
diff --git a/Patches/Combat/PartyDamageMultiplier.cs b/Patches/Combat/PartyDamageMultiplier.cs
index a2f6df55..1c06ebfc 100644
--- a/Patches/Combat/PartyDamageMultiplier.cs
+++ b/Patches/Combat/PartyDamageMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,13 +16,20 @@ public static class PartyDamageMultiplier
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
-            if (attackInformation.AttackerAgentOrigin.TryGetParty(out var party)
-                && party.IsPlayerParty()
-                && !attackInformation.AttackerAgentCharacter.IsPlayer()
-                && !attackInformation.IsFriendlyFire
-                && BannerlordCheatsSettings.Instance?.PartyDamageMultiplier > 1f)
+            try
             {
-                __result *= BannerlordCheatsSettings.Instance.PartyDamageMultiplier;
+                if (attackInformation.AttackerAgentOrigin.TryGetParty(out var party)
+                    && party.IsPlayerParty()
+                    && !attackInformation.AttackerAgentCharacter.IsPlayer()
+                    && !attackInformation.IsFriendlyFire
+                    && BannerlordCheatsSettings.Instance?.PartyDamageMultiplier > 1f)
+                {
+                    __result *= BannerlordCheatsSettings.Instance.PartyDamageMultiplier;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PartyDamageMultiplier));
             }
         }
     }
diff --git a/Patches/Combat/PartyDamageTakenPercentage.cs b/Patches/Combat/PartyDamageTakenPercentage.cs
index 437d37a9..d01398f7 100644
--- a/Patches/Combat/PartyDamageTakenPercentage.cs
+++ b/Patches/Combat/PartyDamageTakenPercentage.cs
@@ -16,16 +16,23 @@ public static class PartyDamageTakenPercentage
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
-            if ( attackInformation.VictimAgentOrigin.TryGetParty(out var party)
-                && party.IsPlayerParty()
-                && !attackInformation.VictimAgentCharacter.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.PartyDamageTakenPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.PartyDamageTakenPercentage / 100f;
+                if ( attackInformation.VictimAgentOrigin.TryGetParty(out var party)
+                     && party.IsPlayerParty()
+                     && !attackInformation.VictimAgentCharacter.IsPlayer()
+                     && BannerlordCheatsSettings.Instance?.PartyDamageTakenPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.PartyDamageTakenPercentage / 100f;
 
-                var newValue = (int)Math.Round(factor * __result);
+                    var newValue = (int)Math.Round(factor * __result);
 
-                __result = newValue;
+                    __result = newValue;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PartyDamageTakenPercentage));
             }
         }
     }
diff --git a/Patches/Combat/PartyHealthRegeneration.cs b/Patches/Combat/PartyHealthRegeneration.cs
index c155856e..86b84614 100644
--- a/Patches/Combat/PartyHealthRegeneration.cs
+++ b/Patches/Combat/PartyHealthRegeneration.cs
@@ -17,39 +17,46 @@ public static class PartyHealthRegeneration
         [HarmonyPostfix]
         public static void OnApplicationTick(float dt)
         {
-            if (Mission.Current != null
-                && Mission.Current.PlayerTeam != null
-                && MBCommon.IsPaused != true
-                && BannerlordCheatsSettings.Instance?.PartyHealthRegeneration > 0f)
+            try
             {
-                var now = DateTime.Now.Second;
-
-                if (PartyHealthRegeneration.LastSet == null || now != PartyHealthRegeneration.LastSet)
+                if (Mission.Current != null
+                    && Mission.Current.PlayerTeam != null
+                    && MBCommon.IsPaused != true
+                    && BannerlordCheatsSettings.Instance?.PartyHealthRegeneration > 0f)
                 {
-                    PartyHealthRegeneration.LastSet = now;
-
-                    var playerPartyAgents = Mission.Current.PlayerTeam.ActiveAgents
-                        .Where(x => x.Health > 0
-                                    && !x.IsPlayer()
-                                    && x.Origin.TryGetParty(out var party)
-                                    && party.IsPlayerParty())
-                        .ToArray();
+                    var now = DateTime.Now.Second;
 
-                    foreach (var agent in playerPartyAgents)
+                    if (PartyHealthRegeneration.LastSet == null || now != PartyHealthRegeneration.LastSet)
                     {
-                        var health = agent.Health;
-                        var maxHealth = agent.HealthLimit;
+                        PartyHealthRegeneration.LastSet = now;
+
+                        var playerPartyAgents = Mission.Current.PlayerTeam.ActiveAgents
+                            .Where(x => x.Health > 0
+                                        && !x.IsPlayer()
+                                        && x.Origin.TryGetParty(out var party)
+                                        && party.IsPlayerParty())
+                            .ToArray();
 
-                        if (health < maxHealth)
+                        foreach (var agent in playerPartyAgents)
                         {
-                            var regen = (BannerlordCheatsSettings.Instance.PartyHealthRegeneration / maxHealth) * 100;
-                            var newHealth = (float)Math.Round(health + regen);
+                            var health = agent.Health;
+                            var maxHealth = agent.HealthLimit;
 
-                            agent.Health = Math.Min(maxHealth, newHealth);
+                            if (health < maxHealth)
+                            {
+                                var regen = (BannerlordCheatsSettings.Instance.PartyHealthRegeneration / maxHealth) * 100;
+                                var newHealth = (float)Math.Round(health + regen);
+
+                                agent.Health = Math.Min(maxHealth, newHealth);
+                            }
                         }
                     }
                 }
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PartyHealthRegeneration));
+            }
         }
     }
 }
diff --git a/Patches/Combat/PartyHeroesInvincible.cs b/Patches/Combat/PartyHeroesInvincible.cs
index b935d69c..7ebcb3fe 100644
--- a/Patches/Combat/PartyHeroesInvincible.cs
+++ b/Patches/Combat/PartyHeroesInvincible.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,14 +14,21 @@ public static class PartyHeroesInvincible
         [HarmonyPostfix]
         public static void Invulnerable(ref Agent __instance, ref bool __result)
         {
-            if (__instance.TryGetHuman(out var agent)
-                && !agent.IsPlayer()
-                && agent.Origin.TryGetParty(out var party)
-                && party.IsPlayerParty()
-                && agent.IsHero()
-                && BannerlordCheatsSettings.Instance?.PartyHeroesInvincible == true)
+            try
             {
-                __result = true;
+                if (__instance.TryGetHuman(out var agent)
+                    && !agent.IsPlayer()
+                    && agent.Origin.TryGetParty(out var party)
+                    && party.IsPlayerParty()
+                    && agent.IsHero()
+                    && BannerlordCheatsSettings.Instance?.PartyHeroesInvincible == true)
+                {
+                    __result = true;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PartyHeroesInvincible));
             }
         }
     }
diff --git a/Patches/Combat/PartyInfiniteAmmo.cs b/Patches/Combat/PartyInfiniteAmmo.cs
index 6814ac93..6d9174db 100644
--- a/Patches/Combat/PartyInfiniteAmmo.cs
+++ b/Patches/Combat/PartyInfiniteAmmo.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -23,22 +24,29 @@ public static void OnAgentShootMissile(
             ref bool isPrimaryWeaponShot,
             ref int forcedMissileIndex)
         {
-            if (!shooterAgent.IsPlayer()
-                && shooterAgent.Origin.TryGetParty(out var party)
-                && party.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.PartyInfiniteAmmo == true)
+            try
             {
-                for (var index = EquipmentIndex.WeaponItemBeginSlot; index < EquipmentIndex.NumAllWeaponSlots; ++index)
+                if (!shooterAgent.IsPlayer()
+                    && shooterAgent.Origin.TryGetParty(out var party)
+                    && party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.PartyInfiniteAmmo == true)
                 {
-                    var missionWeapon = shooterAgent.Equipment[index];
-
-                    if (missionWeapon.IsAnyConsumable(out _)
-                        && missionWeapon.Amount <= missionWeapon.ModifiedMaxAmount)
+                    for (var index = EquipmentIndex.WeaponItemBeginSlot; index < EquipmentIndex.NumAllWeaponSlots; ++index)
                     {
-                        shooterAgent.SetWeaponAmountInSlot(index, missionWeapon.ModifiedMaxAmount, true);
+                        var missionWeapon = shooterAgent.Equipment[index];
+
+                        if (missionWeapon.IsAnyConsumable(out _)
+                            && missionWeapon.Amount <= missionWeapon.ModifiedMaxAmount)
+                        {
+                            shooterAgent.SetWeaponAmountInSlot(index, missionWeapon.ModifiedMaxAmount, true);
+                        }
                     }
                 }
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PartyInfiniteAmmo));
+            }
         }
     }
 }
diff --git a/Patches/Combat/PartyInvincible.cs b/Patches/Combat/PartyInvincible.cs
index a1e18052..8d88f1b2 100644
--- a/Patches/Combat/PartyInvincible.cs
+++ b/Patches/Combat/PartyInvincible.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,13 +14,20 @@ public static class PartyInvincible
         [HarmonyPostfix]
         public static void Invulnerable(ref Agent __instance, ref bool __result)
         {
-            if (__instance.TryGetHuman(out var agent)
-                && agent.Origin.TryGetParty(out var party)
-                && party.IsPlayerParty()
-                && !agent.IsHero()
-                && BannerlordCheatsSettings.Instance?.PartyInvincible == true)
+            try
             {
-                __result = true;
+                if (__instance.TryGetHuman(out var agent)
+                    && agent.Origin.TryGetParty(out var party)
+                    && party.IsPlayerParty()
+                    && !agent.IsHero()
+                    && BannerlordCheatsSettings.Instance?.PartyInvincible == true)
+                {
+                    __result = true;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PartyInvincible));
             }
         }
     }
diff --git a/Patches/Combat/PartyOneHitKill.cs b/Patches/Combat/PartyOneHitKill.cs
index a08b7e15..118f7015 100644
--- a/Patches/Combat/PartyOneHitKill.cs
+++ b/Patches/Combat/PartyOneHitKill.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,13 +16,20 @@ public static class PartyOneHitKill
         [HarmonyPostfix]
         public static void CalculateDamage(ref AttackInformation attackInformation, ref AttackCollisionData collisionData, WeaponComponentData weapon, ref float __result)
         {
-            if (attackInformation.AttackerAgentOrigin.TryGetParty(out var party)
-                && party.IsPlayerParty()
-                && !attackInformation.AttackerAgentCharacter.IsPlayer()
-                && !attackInformation.IsFriendlyFire
-                && BannerlordCheatsSettings.Instance?.PartyOneHitKill == true)
+            try
             {
-                __result = 10000;
+                if (attackInformation.AttackerAgentOrigin.TryGetParty(out var party)
+                    && party.IsPlayerParty()
+                    && !attackInformation.AttackerAgentCharacter.IsPlayer()
+                    && !attackInformation.IsFriendlyFire
+                    && BannerlordCheatsSettings.Instance?.PartyOneHitKill == true)
+                {
+                    __result = 10000;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PartyOneHitKill));
             }
         }
     }
diff --git a/Patches/Combat/PartyOnlyKnockout.cs b/Patches/Combat/PartyOnlyKnockout.cs
index 51d29007..7b1f7639 100644
--- a/Patches/Combat/PartyOnlyKnockout.cs
+++ b/Patches/Combat/PartyOnlyKnockout.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,12 +16,19 @@ public static class PartyOnlyKnockout
         [HarmonyPostfix]
         public static void GetAgentStateProbability(Agent affectorAgent, Agent effectedAgent, DamageTypes damageType, float useSurgeryProbability, ref float __result)
         {
-            if (effectedAgent.Origin.TryGetParty(out var party)
-                && party.IsPlayerParty()
-                && !effectedAgent.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.PartyOnlyKnockout == true)
+            try
             {
-                __result = 0f;
+                if (effectedAgent.Origin.TryGetParty(out var party)
+                    && party.IsPlayerParty()
+                    && !effectedAgent.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.PartyOnlyKnockout == true)
+                {
+                    __result = 0f;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PartyOnlyKnockout));
             }
         }
     }
diff --git a/Patches/Combat/PlayerHorseInvincible.cs b/Patches/Combat/PlayerHorseInvincible.cs
index 19665a65..27abdc28 100644
--- a/Patches/Combat/PlayerHorseInvincible.cs
+++ b/Patches/Combat/PlayerHorseInvincible.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,12 +14,19 @@ public static class PlayerHorseInvincible
         [HarmonyPostfix]
         public static void Invulnerable(ref Agent __instance, ref bool __result)
         {
-            if (__instance.IsMount
-                && __instance.TryGetHuman(out var rider)
-                && rider.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.PlayerHorseInvincible == true)
+            try
             {
-                __result = true;
+                if (__instance.IsMount
+                    && __instance.TryGetHuman(out var rider)
+                    && rider.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.PlayerHorseInvincible == true)
+                {
+                    __result = true;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PlayerHorseInvincible));
             }
         }
     }
diff --git a/Patches/Combat/RenownRewardMultiplierBattle.cs b/Patches/Combat/RenownRewardMultiplierBattle.cs
index fe04fbd0..523d799f 100644
--- a/Patches/Combat/RenownRewardMultiplierBattle.cs
+++ b/Patches/Combat/RenownRewardMultiplierBattle.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -18,10 +19,17 @@ public static void CalculateRenownGain(
             ref float contributionShare,
             ref ExplainedNumber __result)
         {
-            if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.RenownRewardMultiplier > 1f)
+            try
             {
-                __result.AddMultiplier(BannerlordCheatsSettings.Instance.RenownRewardMultiplier);
+                if (party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.RenownRewardMultiplier > 1f)
+                {
+                    __result.AddMultiplier(BannerlordCheatsSettings.Instance.RenownRewardMultiplier);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(RenownRewardMultiplierBattle));
             }
         }
     }
diff --git a/Patches/Combat/RenownRewardMultiplierTournament.cs b/Patches/Combat/RenownRewardMultiplierTournament.cs
index e4bad80f..687bed08 100644
--- a/Patches/Combat/RenownRewardMultiplierTournament.cs
+++ b/Patches/Combat/RenownRewardMultiplierTournament.cs
@@ -15,10 +15,17 @@ public static class RenownRewardMultiplierTournament
         [HarmonyPostfix]
         public static void GetRenownReward(Hero winner, Town town, ref int __result)
         {
-            if (winner.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.RenownRewardMultiplier > 1f)
+            try
             {
-                __result = (int) Math.Round(__result * BannerlordCheatsSettings.Instance.RenownRewardMultiplier);
+                if (winner.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.RenownRewardMultiplier > 1f)
+                {
+                    __result = (int) Math.Round(__result * BannerlordCheatsSettings.Instance.RenownRewardMultiplier);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(RenownRewardMultiplierTournament));
             }
         }
     }
diff --git a/Patches/Combat/SliceThroughEveryonePassive.cs b/Patches/Combat/SliceThroughEveryonePassive.cs
index ae9d06a9..3e9f9032 100644
--- a/Patches/Combat/SliceThroughEveryonePassive.cs
+++ b/Patches/Combat/SliceThroughEveryonePassive.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -18,10 +19,17 @@ public static void DecidePassiveAttackCollisionReaction(
             ref bool isFatalHit,
             ref MeleeCollisionReaction __result)
         {
-            if (attacker.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.SliceThroughEveryone == true)
+            try
             {
-                __result = MeleeCollisionReaction.SlicedThrough;
+                if (attacker.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.SliceThroughEveryone == true)
+                {
+                    __result = MeleeCollisionReaction.SlicedThrough;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(SliceThroughEveryonePassive));
             }
         }
     }
diff --git a/Patches/Combat/SliceThroughEveryoneWeapon.cs b/Patches/Combat/SliceThroughEveryoneWeapon.cs
index 8cc82a43..7c31705d 100644
--- a/Patches/Combat/SliceThroughEveryoneWeapon.cs
+++ b/Patches/Combat/SliceThroughEveryoneWeapon.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -21,10 +22,17 @@ public static void DecideWeaponCollisionReaction(
             ref bool isShruggedOff,
             ref MeleeCollisionReaction colReaction)
         {
-            if (attacker.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.SliceThroughEveryone == true)
+            try
             {
-                colReaction = MeleeCollisionReaction.SlicedThrough;
+                if (attacker.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.SliceThroughEveryone == true)
+                {
+                    colReaction = MeleeCollisionReaction.SlicedThrough;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(SliceThroughEveryoneWeapon));
             }
         }
     }
diff --git a/Patches/Experience/CompanionExperienceMultiplier.cs b/Patches/Experience/CompanionExperienceMultiplier.cs
index 4e4c465f..34612034 100644
--- a/Patches/Experience/CompanionExperienceMultiplier.cs
+++ b/Patches/Experience/CompanionExperienceMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,11 +15,18 @@ public static class CompanionExperienceMultiplier
         [HarmonyPostfix]
         public static void GetXpMultiplier(ref Hero hero, ref float __result)
         {
-            if (!hero.IsPlayer()
-                && hero.IsPlayerCompanion()
-                && BannerlordCheatsSettings.Instance?.CompanionExperienceMultiplier > 1f)
+            try
             {
-                __result *= BannerlordCheatsSettings.Instance.CompanionExperienceMultiplier;
+                if (!hero.IsPlayer()
+                    && hero.IsPlayerCompanion()
+                    && BannerlordCheatsSettings.Instance?.CompanionExperienceMultiplier > 1f)
+                {
+                    __result *= BannerlordCheatsSettings.Instance.CompanionExperienceMultiplier;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(CompanionExperienceMultiplier));
             }
         }
     }
diff --git a/Patches/Experience/CompanionLearningRateMultiplier.cs b/Patches/Experience/CompanionLearningRateMultiplier.cs
index b403c530..066d3994 100644
--- a/Patches/Experience/CompanionLearningRateMultiplier.cs
+++ b/Patches/Experience/CompanionLearningRateMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,11 +16,18 @@ public static class CompanionLearningRateMultiplier
         [HarmonyPostfix]
         public static void CalculateLearningRate(ref Hero hero, ref SkillObject skill, ref float __result)
         {
-            if (!hero.IsPlayer()
-                && hero.IsPlayerCompanion()
-                && BannerlordCheatsSettings.Instance?.CompanionLearningRateMultiplier > 1f)
+            try
             {
-                __result *= BannerlordCheatsSettings.Instance.CompanionLearningRateMultiplier;
+                if (!hero.IsPlayer()
+                    && hero.IsPlayerCompanion()
+                    && BannerlordCheatsSettings.Instance?.CompanionLearningRateMultiplier > 1f)
+                {
+                    __result *= BannerlordCheatsSettings.Instance.CompanionLearningRateMultiplier;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(CompanionLearningRateMultiplier));
             }
         }
     }
diff --git a/Patches/Experience/ExperienceMultiplier.cs b/Patches/Experience/ExperienceMultiplier.cs
index 93cb907f..724e6ba3 100644
--- a/Patches/Experience/ExperienceMultiplier.cs
+++ b/Patches/Experience/ExperienceMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class ExperienceMultiplier
         [HarmonyPostfix]
         public static void GetXpMultiplier(Hero hero, ref float __result)
         {
-            if (hero.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.ExperienceMultiplier > 1f)
+            try
             {
-                __result *= BannerlordCheatsSettings.Instance.ExperienceMultiplier;
+                if (hero.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.ExperienceMultiplier > 1f)
+                {
+                    __result *= BannerlordCheatsSettings.Instance.ExperienceMultiplier;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(ExperienceMultiplier));
             }
         }
     }
diff --git a/Patches/Experience/FreeFocusPointAssignment.cs b/Patches/Experience/FreeFocusPointAssignment.cs
index 62388683..722a4465 100644
--- a/Patches/Experience/FreeFocusPointAssignment.cs
+++ b/Patches/Experience/FreeFocusPointAssignment.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
@@ -13,9 +14,16 @@ public static class FreeFocusPointAssignment
         [HarmonyPostfix]
         public static void GetRequiredFocusPointsToAddFocus(ref SkillObject skill, ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.FreeFocusPointAssignment == true)
+            try
             {
-                __result = 0;
+                if (BannerlordCheatsSettings.Instance?.FreeFocusPointAssignment == true)
+                {
+                    __result = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(FreeFocusPointAssignment));
             }
         }
     }
diff --git a/Patches/Experience/LearningLimitMultiplier.cs b/Patches/Experience/LearningLimitMultiplier.cs
index 7209675a..b11aac86 100644
--- a/Patches/Experience/LearningLimitMultiplier.cs
+++ b/Patches/Experience/LearningLimitMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -20,9 +21,16 @@ public static void CalculateLearningLimit(
             ref bool includeDescriptions,
             ref ExplainedNumber __result)
         {
-            if (BannerlordCheatsSettings.Instance?.LearningLimitMultiplier > 1f)
+            try
             {
-                __result.AddMultiplier(BannerlordCheatsSettings.Instance.LearningLimitMultiplier);
+                if (BannerlordCheatsSettings.Instance?.LearningLimitMultiplier > 1f)
+                {
+                    __result.AddMultiplier(BannerlordCheatsSettings.Instance.LearningLimitMultiplier);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(LearningLimitMultiplier));
             }
         }
     }
diff --git a/Patches/Experience/LearningRateMultiplier.cs b/Patches/Experience/LearningRateMultiplier.cs
index d416718e..7b4a6619 100644
--- a/Patches/Experience/LearningRateMultiplier.cs
+++ b/Patches/Experience/LearningRateMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -15,10 +16,17 @@ public static class LearningRateMultiplier
         [HarmonyPostfix]
         public static void CalculateLearningRate(ref Hero hero, SkillObject skill, ref float __result)
         {
-            if (hero.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.LearningRateMultiplier > 1f)
+            try
             {
-                __result *= BannerlordCheatsSettings.Instance.LearningRateMultiplier;
+                if (hero.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.LearningRateMultiplier > 1f)
+                {
+                    __result *= BannerlordCheatsSettings.Instance.LearningRateMultiplier;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(LearningRateMultiplier));
             }
         }
     }
diff --git a/Patches/Experience/TroopExperienceMultiplier.cs b/Patches/Experience/TroopExperienceMultiplier.cs
index ce2110fa..cd860b5e 100644
--- a/Patches/Experience/TroopExperienceMultiplier.cs
+++ b/Patches/Experience/TroopExperienceMultiplier.cs
@@ -23,11 +23,18 @@ public static void GetXpFromHit(
             ref CombatXpModel.MissionTypeEnum missionType,
             ref int xpAmount)
         {
-            if (party.IsPlayerParty()
-                && !attackerTroop.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.TroopExperienceMultiplier > 1f)
+            try
             {
-                xpAmount = (int) Math.Round(xpAmount * BannerlordCheatsSettings.Instance.TroopExperienceMultiplier);
+                if (party.IsPlayerParty()
+                    && !attackerTroop.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.TroopExperienceMultiplier > 1f)
+                {
+                    xpAmount = (int) Math.Round(xpAmount * BannerlordCheatsSettings.Instance.TroopExperienceMultiplier);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(TroopExperienceMultiplier));
             }
         }
     }
diff --git a/Patches/General/EnableHotkeyTipsEncyclopedia.cs b/Patches/General/EnableHotkeyTipsEncyclopedia.cs
index b0e7a7c9..1bd17bf4 100644
--- a/Patches/General/EnableHotkeyTipsEncyclopedia.cs
+++ b/Patches/General/EnableHotkeyTipsEncyclopedia.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,12 +14,19 @@ public static class EnableHotkeyTipsEncyclopedia
         [HarmonyPostfix]
         public static void OpenEncyclopedia()
         {
-            if (BannerlordCheatsSettings.Instance?.EnableHotkeys == true
-                && BannerlordCheatsSettings.Instance?.EnableHotkeyTips == true)
+            try
             {
-                Message.Show("Encyclopedia Screen Cheat Hotkeys:");
-                Message.Show("CTRL + H: Add 1 soldier of the selected troop type to the party.");
-                Message.Show("CTRL + SHIFT + H: Add 10 soldiers of the selected troop type to the party.");
+                if (BannerlordCheatsSettings.Instance?.EnableHotkeys == true
+                    && BannerlordCheatsSettings.Instance?.EnableHotkeyTips == true)
+                {
+                    Message.Show("Encyclopedia Screen Cheat Hotkeys:");
+                    Message.Show("CTRL + H: Add 1 soldier of the selected troop type to the party.");
+                    Message.Show("CTRL + SHIFT + H: Add 10 soldiers of the selected troop type to the party.");
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnableHotkeyTipsEncyclopedia));
             }
         }
     }
diff --git a/Patches/General/EnableHotkeyTipsScreens.cs b/Patches/General/EnableHotkeyTipsScreens.cs
index 87513aa4..f2940ea5 100644
--- a/Patches/General/EnableHotkeyTipsScreens.cs
+++ b/Patches/General/EnableHotkeyTipsScreens.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,35 +15,42 @@ public static class EnableHotkeyTipsScreens
         [HarmonyPostfix]
         public static void PushScreen(ref ScreenBase screen)
         {
-            if (BannerlordCheatsSettings.Instance?.EnableHotkeys == true
-                && BannerlordCheatsSettings.Instance?.EnableHotkeyTips == true)
+            try
             {
-                switch (screen)
+                if (BannerlordCheatsSettings.Instance?.EnableHotkeys == true
+                    && BannerlordCheatsSettings.Instance?.EnableHotkeyTips == true)
                 {
-                    case InventoryGauntletScreen inventoryGauntletScreen:
-                        Message.Show("Inventory Screen Cheat Hotkeys:");
-                        Message.Show("CTRL + X: Add 1.000 gold.");
-                        Message.Show("CTRL + SHIFT + X: Add 100.000 gold.");
-                        Message.Show("CTRL + H: Add 1 to the selected item type.");
-                        Message.Show("CTRL + SHIFT + H: Add 100 to the selected item type.");
-                        break;
-                    case GauntletClanScreen gauntletClanScreen:
-                        Message.Show("Clan Screen Cheat Hotkeys:");
-                        Message.Show("CTRL + X: Add 1.000 influence.");
-                        break;
-                    case GauntletPartyScreen gauntletPartyScreen:
-                        Message.Show("Party Screen Cheat Hotkeys:");
-                        Message.Show("CTRL + H: Add 1 soldier to the selected troop.");
-                        Message.Show("CTRL + SHIFT + H: Add 10 soldiers to the selected troop.");
-                        Message.Show("CTRL + X: Add experience to the selected troop.");
-                        break;
-                    case GauntletCharacterDeveloperScreen gauntletCharacterDeveloperScreen:
-                        Message.Show("Character Screen Cheat Hotkeys:");
-                        Message.Show("CTRL + A: Set all character attributes to 10.");
-                        Message.Show("CTRL + (1-6): Add 1 point to the attribute at the given index.");
-                        break;
+                    switch (screen)
+                    {
+                        case InventoryGauntletScreen inventoryGauntletScreen:
+                            Message.Show("Inventory Screen Cheat Hotkeys:");
+                            Message.Show("CTRL + X: Add 1.000 gold.");
+                            Message.Show("CTRL + SHIFT + X: Add 100.000 gold.");
+                            Message.Show("CTRL + H: Add 1 to the selected item type.");
+                            Message.Show("CTRL + SHIFT + H: Add 100 to the selected item type.");
+                            break;
+                        case GauntletClanScreen gauntletClanScreen:
+                            Message.Show("Clan Screen Cheat Hotkeys:");
+                            Message.Show("CTRL + X: Add 1.000 influence.");
+                            break;
+                        case GauntletPartyScreen gauntletPartyScreen:
+                            Message.Show("Party Screen Cheat Hotkeys:");
+                            Message.Show("CTRL + H: Add 1 soldier to the selected troop.");
+                            Message.Show("CTRL + SHIFT + H: Add 10 soldiers to the selected troop.");
+                            Message.Show("CTRL + X: Add experience to the selected troop.");
+                            break;
+                        case GauntletCharacterDeveloperScreen gauntletCharacterDeveloperScreen:
+                            Message.Show("Character Screen Cheat Hotkeys:");
+                            Message.Show("CTRL + A: Set all character attributes to 10.");
+                            Message.Show("CTRL + (1-6): Add 1 point to the attribute at the given index.");
+                            break;
+                    }
                 }
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnableHotkeyTipsScreens));
+            }
         }
     }
 }
diff --git a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
index b8f74536..6b9f6947 100644
--- a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
+++ b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
@@ -18,19 +19,26 @@ public static class EnableHotkeysAddEncyclopediaTroops
         [HarmonyPostfix]
         public static void OnTick(ref EncyclopediaPageVM __instance)
         {
-            if (__instance is EncyclopediaUnitPageVM
-                && __instance.Obj is CharacterObject characterObject
-                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
+            try
             {
-                if (Keys.IsKeyPressed(InputKey.H, InputKey.LeftShift, InputKey.LeftControl))
+                if (__instance is EncyclopediaUnitPageVM
+                    && __instance.Obj is CharacterObject characterObject
+                    && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
                 {
-                    EnableHotkeysAddEncyclopediaTroops.AddTroops(characterObject, 10);
-                }
-                else if (Keys.IsKeyPressed(InputKey.H, InputKey.LeftControl))
-                {
-                    EnableHotkeysAddEncyclopediaTroops.AddTroops(characterObject, 1);
+                    if (Keys.IsKeyPressed(InputKey.H, InputKey.LeftShift, InputKey.LeftControl))
+                    {
+                        EnableHotkeysAddEncyclopediaTroops.AddTroops(characterObject, 10);
+                    }
+                    else if (Keys.IsKeyPressed(InputKey.H, InputKey.LeftControl))
+                    {
+                        EnableHotkeysAddEncyclopediaTroops.AddTroops(characterObject, 1);
+                    }
                 }
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnableHotkeysAddEncyclopediaTroops));
+            }
         }
 
         private static void AddTroops(CharacterObject characterObject, int count)
diff --git a/Patches/General/EnableHotkeysAddItems.cs b/Patches/General/EnableHotkeysAddItems.cs
index 829d2ff4..87c6b19c 100644
--- a/Patches/General/EnableHotkeysAddItems.cs
+++ b/Patches/General/EnableHotkeysAddItems.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
@@ -20,18 +21,25 @@ public static class EnableHotkeysAddItems
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
-            if (ScreenManager.TopScreen is InventoryGauntletScreen
-                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
+            try
             {
-                if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.LeftShift, InputKey.H))
+                if (ScreenManager.TopScreen is InventoryGauntletScreen
+                    && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
                 {
-                    EnableHotkeysAddItems.AddItems(100);
-                }
-                else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.H))
-                {
-                    EnableHotkeysAddItems.AddItems(1);
+                    if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.LeftShift, InputKey.H))
+                    {
+                        EnableHotkeysAddItems.AddItems(100);
+                    }
+                    else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.H))
+                    {
+                        EnableHotkeysAddItems.AddItems(1);
+                    }
                 }
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnableHotkeysAddItems));
+            }
         }
 
         private static void AddItems(int count)
diff --git a/Patches/General/EnableHotkeysCharacterAttributes.cs b/Patches/General/EnableHotkeysCharacterAttributes.cs
index 7c8acd43..4979a635 100644
--- a/Patches/General/EnableHotkeysCharacterAttributes.cs
+++ b/Patches/General/EnableHotkeysCharacterAttributes.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
@@ -21,53 +22,60 @@ public static class EnableHotkeysCharacterAttributes
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
-            if (ScreenManager.TopScreen is GauntletCharacterDeveloperScreen
-                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
+            try
             {
-                if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.A))
+                if (ScreenManager.TopScreen is GauntletCharacterDeveloperScreen
+                    && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
                 {
-                    var charVM = ScreenManager.TopScreen.GetViewModel<CharacterDeveloperVM>();
-
-                    var currentHero = charVM.CurrentCharacter.Hero;
-
-                    EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Control);
-                    EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Cunning);
-                    EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Endurance);
-                    EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Intelligence);
-                    EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Social);
-                    EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Vigor);
-
-                    charVM.RefreshValues();
-
-                    var message = string.Format(L10N.GetText("SetAllAttributesMessage"), currentHero.Name);
-
-                    Message.Show(message);
-                }
-                else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D1))
-                {
-                    EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Vigor);
-                }
-                else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D2))
-                {
-                    EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Control);
-                }
-                else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D3))
-                {
-                    EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Endurance);
-                }
-                else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D4))
-                {
-                    EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Cunning);
-                }
-                else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D5))
-                {
-                    EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Social);
-                }
-                else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D6))
-                {
-                    EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Intelligence);
+                    if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.A))
+                    {
+                        var charVM = ScreenManager.TopScreen.GetViewModel<CharacterDeveloperVM>();
+
+                        var currentHero = charVM.CurrentCharacter.Hero;
+
+                        EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Control);
+                        EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Cunning);
+                        EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Endurance);
+                        EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Intelligence);
+                        EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Social);
+                        EnableHotkeysCharacterAttributes.SetMaximum(currentHero, DefaultCharacterAttributes.Vigor);
+
+                        charVM.RefreshValues();
+
+                        var message = string.Format(L10N.GetText("SetAllAttributesMessage"), currentHero.Name);
+
+                        Message.Show(message);
+                    }
+                    else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D1))
+                    {
+                        EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Vigor);
+                    }
+                    else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D2))
+                    {
+                        EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Control);
+                    }
+                    else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D3))
+                    {
+                        EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Endurance);
+                    }
+                    else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D4))
+                    {
+                        EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Cunning);
+                    }
+                    else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D5))
+                    {
+                        EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Social);
+                    }
+                    else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.D6))
+                    {
+                        EnableHotkeysCharacterAttributes.AddPoint(DefaultCharacterAttributes.Intelligence);
+                    }
                 }
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnableHotkeysCharacterAttributes));
+            }
         }
 
         private static void SetMaximum(Hero hero, CharacterAttribute attribute)
diff --git a/Patches/General/EnableHotkeysCharacterPoints.cs b/Patches/General/EnableHotkeysCharacterPoints.cs
index 3e5478d5..0515fba7 100644
--- a/Patches/General/EnableHotkeysCharacterPoints.cs
+++ b/Patches/General/EnableHotkeysCharacterPoints.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
@@ -20,38 +21,45 @@ public static class EnableHotkeysCharacterPoints
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
-            if (ScreenManager.TopScreen is GauntletCharacterDeveloperScreen
-                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
+            try
             {
-                if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.F))
+                if (ScreenManager.TopScreen is GauntletCharacterDeveloperScreen
+                    && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
                 {
-                    var charVM = ScreenManager.TopScreen.GetViewModel<CharacterDeveloperVM>();
+                    if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.F))
+                    {
+                        var charVM = ScreenManager.TopScreen.GetViewModel<CharacterDeveloperVM>();
 
-                    var currentHero = charVM.CurrentCharacter.Hero;
+                        var currentHero = charVM.CurrentCharacter.Hero;
 
-                    currentHero.HeroDeveloper.UnspentFocusPoints++;
+                        currentHero.HeroDeveloper.UnspentFocusPoints++;
 
-                    charVM.CurrentCharacter.UnspentCharacterPoints++;
+                        charVM.CurrentCharacter.UnspentCharacterPoints++;
 
-                    var message = string.Format(L10N.GetText("AddUnspentFocusPointMessage"), currentHero.Name);
+                        var message = string.Format(L10N.GetText("AddUnspentFocusPointMessage"), currentHero.Name);
 
-                    Message.Show(message);
-                }
-                else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.G))
-                {
-                    var charVM = ScreenManager.TopScreen.GetViewModel<CharacterDeveloperVM>();
+                        Message.Show(message);
+                    }
+                    else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.G))
+                    {
+                        var charVM = ScreenManager.TopScreen.GetViewModel<CharacterDeveloperVM>();
 
-                    var currentHero = charVM.CurrentCharacter.Hero;
+                        var currentHero = charVM.CurrentCharacter.Hero;
 
-                    currentHero.HeroDeveloper.UnspentAttributePoints++;
+                        currentHero.HeroDeveloper.UnspentAttributePoints++;
 
-                    charVM.CurrentCharacter.UnspentAttributePoints++;
+                        charVM.CurrentCharacter.UnspentAttributePoints++;
 
-                    var message = string.Format(L10N.GetText("AddUnspentAttributePointMessage"), currentHero.Name);
+                        var message = string.Format(L10N.GetText("AddUnspentAttributePointMessage"), currentHero.Name);
 
-                    Message.Show(message);
+                        Message.Show(message);
+                    }
                 }
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnableHotkeysCharacterPoints));
+            }
         }
     }
 }
diff --git a/Patches/General/EnableHotkeysInfluence.cs b/Patches/General/EnableHotkeysInfluence.cs
index 2d2abcdb..fa3d11e8 100644
--- a/Patches/General/EnableHotkeysInfluence.cs
+++ b/Patches/General/EnableHotkeysInfluence.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
@@ -20,13 +21,20 @@ public static class EnableHotkeysInfluence
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
-            if (ScreenManager.TopScreen is GauntletClanScreen
-                && Keys.IsKeyPressed(InputKey.LeftControl, InputKey.X)
-                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
+            try
             {
-                Hero.MainHero.AddInfluenceWithKingdom(1000);
+                if (ScreenManager.TopScreen is GauntletClanScreen
+                    && Keys.IsKeyPressed(InputKey.LeftControl, InputKey.X)
+                    && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
+                {
+                    Hero.MainHero.AddInfluenceWithKingdom(1000);
 
-                Message.Show(L10N.GetText("AddInfluenceMessage"));
+                    Message.Show(L10N.GetText("AddInfluenceMessage"));
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnableHotkeysInfluence));
             }
         }
     }
diff --git a/Patches/General/EnableHotkeysMoney.cs b/Patches/General/EnableHotkeysMoney.cs
index 27b61c7a..6852fe79 100644
--- a/Patches/General/EnableHotkeysMoney.cs
+++ b/Patches/General/EnableHotkeysMoney.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
@@ -20,22 +21,29 @@ public static class EnableHotkeysMoney
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
-            if (ScreenManager.TopScreen is InventoryGauntletScreen
-                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
+            try
             {
-                if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.LeftShift, InputKey.X))
+                if (ScreenManager.TopScreen is InventoryGauntletScreen
+                    && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
                 {
-                    Hero.MainHero.ChangeHeroGold(100000);
+                    if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.LeftShift, InputKey.X))
+                    {
+                        Hero.MainHero.ChangeHeroGold(100000);
 
-                    Message.Show(string.Format(L10N.GetText("AddGoldMessage"), 100000));
-                }
-                else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.X))
-                {
-                    Hero.MainHero.ChangeHeroGold(1000);
+                        Message.Show(string.Format(L10N.GetText("AddGoldMessage"), 100000));
+                    }
+                    else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.X))
+                    {
+                        Hero.MainHero.ChangeHeroGold(1000);
 
-                    Message.Show(string.Format(L10N.GetText("AddGoldMessage"), 1000));
+                        Message.Show(string.Format(L10N.GetText("AddGoldMessage"), 1000));
+                    }
                 }
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnableHotkeysMoney));
+            }
         }
     }
 }
diff --git a/Patches/General/EnableHotkeysTroopCount.cs b/Patches/General/EnableHotkeysTroopCount.cs
index 2f62c77f..f0d84bbd 100644
--- a/Patches/General/EnableHotkeysTroopCount.cs
+++ b/Patches/General/EnableHotkeysTroopCount.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
@@ -21,18 +22,25 @@ public static class EnableHotkeysTroopCount
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
-            if (ScreenManager.TopScreen is GauntletPartyScreen
-                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
+            try
             {
-                if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.LeftShift, InputKey.H))
+                if (ScreenManager.TopScreen is GauntletPartyScreen
+                    && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
                 {
-                    EnableHotkeysTroopCount.AddTroops(10);
-                }
-                else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.H))
-                {
-                    EnableHotkeysTroopCount.AddTroops(1);
+                    if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.LeftShift, InputKey.H))
+                    {
+                        EnableHotkeysTroopCount.AddTroops(10);
+                    }
+                    else if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.H))
+                    {
+                        EnableHotkeysTroopCount.AddTroops(1);
+                    }
                 }
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnableHotkeysTroopCount));
+            }
         }
 
         private static void AddTroops(int count)
diff --git a/Patches/General/EnableHotkeysTroopExperience.cs b/Patches/General/EnableHotkeysTroopExperience.cs
index 8ca9ec0e..249c5283 100644
--- a/Patches/General/EnableHotkeysTroopExperience.cs
+++ b/Patches/General/EnableHotkeysTroopExperience.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Localization;
 using BannerlordCheats.Settings;
 using HarmonyLib;
@@ -21,33 +22,40 @@ public static class EnableHotkeysTroopExperience
         [HarmonyPostfix]
         public static void OnApplicationTick()
         {
-            if (ScreenManager.TopScreen is GauntletPartyScreen
-                && Keys.IsKeyPressed(InputKey.LeftControl, InputKey.X)
-                && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
+            try
             {
-                var partyScreen = ScreenManager.TopScreen as GauntletPartyScreen;
+                if (ScreenManager.TopScreen is GauntletPartyScreen
+                    && Keys.IsKeyPressed(InputKey.LeftControl, InputKey.X)
+                    && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
+                {
+                    var partyScreen = ScreenManager.TopScreen as GauntletPartyScreen;
 
-                var partyVM = partyScreen.GetViewModel<PartyVM>();
+                    var partyVM = partyScreen.GetViewModel<PartyVM>();
 
-                var selectedCharacter = partyVM.CurrentCharacter;
+                    var selectedCharacter = partyVM.CurrentCharacter;
 
-                if (selectedCharacter.IsHero || !selectedCharacter.IsUpgradableTroop) { return; }
+                    if (selectedCharacter.IsHero || !selectedCharacter.IsUpgradableTroop) { return; }
 
-                var index = PartyBase.MainParty.MemberRoster.FindIndexOfTroop(selectedCharacter.Character);
+                    var index = PartyBase.MainParty.MemberRoster.FindIndexOfTroop(selectedCharacter.Character);
 
-                var missingXp = selectedCharacter.MaxXP * selectedCharacter.Number - selectedCharacter.CurrentXP;
+                    var missingXp = selectedCharacter.MaxXP * selectedCharacter.Number - selectedCharacter.CurrentXP;
 
-                PartyBase.MainParty.MemberRoster.AddXpToTroopAtIndex(missingXp, index);
+                    PartyBase.MainParty.MemberRoster.AddXpToTroopAtIndex(missingXp, index);
 
-                var newTroop = selectedCharacter.Troop;
-                newTroop.Xp = selectedCharacter.MaxXP * selectedCharacter.Number;
-                selectedCharacter.Troop = newTroop;
+                    var newTroop = selectedCharacter.Troop;
+                    newTroop.Xp = selectedCharacter.MaxXP * selectedCharacter.Number;
+                    selectedCharacter.Troop = newTroop;
 
-                selectedCharacter.InitializeUpgrades();
+                    selectedCharacter.InitializeUpgrades();
 
-                var message = string.Format(L10N.GetText("AddTroopXpMessage"), selectedCharacter.Name);
+                    var message = string.Format(L10N.GetText("AddTroopXpMessage"), selectedCharacter.Name);
 
-                Message.Show(message);
+                    Message.Show(message);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnableHotkeysTroopExperience));
             }
         }
     }
diff --git a/Patches/Inventory/ExtraInventoryCapacity.cs b/Patches/Inventory/ExtraInventoryCapacity.cs
index 02ead579..bd1cc703 100644
--- a/Patches/Inventory/ExtraInventoryCapacity.cs
+++ b/Patches/Inventory/ExtraInventoryCapacity.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class ExtraInventoryCapacity
         [HarmonyPostfix]
         public static void CalculateInventoryCapacity(ref MobileParty mobileParty, ref bool includeDescriptions, ref int additionalTroops, ref int additionalSpareMounts, ref int additionalPackAnimals, ref bool includeFollowers, ref ExplainedNumber __result)
         {
-            if (mobileParty.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.ExtraInventoryCapacity > 0)
+            try
             {
-                __result.Add(BannerlordCheatsSettings.Instance.ExtraInventoryCapacity);
+                if (mobileParty.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.ExtraInventoryCapacity > 0)
+                {
+                    __result.Add(BannerlordCheatsSettings.Instance.ExtraInventoryCapacity);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(ExtraInventoryCapacity));
             }
         }
     }
diff --git a/Patches/Inventory/NativeItemSpawning.cs b/Patches/Inventory/NativeItemSpawning.cs
index 22186650..c493a8c7 100644
--- a/Patches/Inventory/NativeItemSpawning.cs
+++ b/Patches/Inventory/NativeItemSpawning.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -24,18 +25,25 @@ public static void Initialize(
             ref bool useBasePrices,
             ref TextObject leftRosterName)
         {
-            if (party.IsPlayerParty()
-                && !isTrading
-                && !Game.Current.CheatMode
-                && BannerlordCheatsSettings.Instance?.NativeItemSpawning == true)
+            try
             {
-                var objectTypeList = Game.Current.ObjectManager.GetObjectTypeList<ItemObject>();
-                for (var index = 0; index != objectTypeList.Count; ++index)
+                if (party.IsPlayerParty()
+                    && !isTrading
+                    && !Game.Current.CheatMode
+                    && BannerlordCheatsSettings.Instance?.NativeItemSpawning == true)
                 {
-                    var itemObject = objectTypeList[index];
-                    leftItemRoster.AddToCounts(itemObject, 10);
+                    var objectTypeList = Game.Current.ObjectManager.GetObjectTypeList<ItemObject>();
+                    for (var index = 0; index != objectTypeList.Count; ++index)
+                    {
+                        var itemObject = objectTypeList[index];
+                        leftItemRoster.AddToCounts(itemObject, 10);
+                    }
                 }
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NativeItemSpawning));
+            }
         }
     }
 }
diff --git a/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs b/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
index 70343e17..d94f0fca 100644
--- a/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
+++ b/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
@@ -18,13 +18,20 @@ public static void GetInfluenceRequiredToOverrideKingdomDecision(
             ref KingdomDecision decision,
             ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.DecisionOverrideInfluenceCostPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.DecisionOverrideInfluenceCostPercentage / 100.0f;
+                if (BannerlordCheatsSettings.Instance?.DecisionOverrideInfluenceCostPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.DecisionOverrideInfluenceCostPercentage / 100.0f;
 
-                var newValue = __result * factor;
+                    var newValue = __result * factor;
 
-                __result = (int) Math.Round(newValue);
+                    __result = (int) Math.Round(newValue);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(DecisionOverrideInfluenceCostPercentage));
             }
         }
     }
diff --git a/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs b/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs
index d19d1bac..2d1d4a08 100644
--- a/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs
+++ b/Patches/Kingdom/KingdomDecisionWeightMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using System.Linq;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class KingdomDecisionWeightMultiplier
         [HarmonyPostfix]
         public static void Getter(ref DecisionOutcome __instance, ref float __result)
         {
-            if (__instance.SupporterList.Any(x => x.IsPlayer)
-                && BannerlordCheatsSettings.Instance?.KingdomDecisionWeightMultiplier > 1f)
+            try
             {
-                __result *= BannerlordCheatsSettings.Instance.KingdomDecisionWeightMultiplier;
+                if (__instance.SupporterList.Any(x => x.IsPlayer)
+                    && BannerlordCheatsSettings.Instance?.KingdomDecisionWeightMultiplier > 1f)
+                {
+                    __result *= BannerlordCheatsSettings.Instance.KingdomDecisionWeightMultiplier;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(KingdomDecisionWeightMultiplier));
             }
         }
     }
diff --git a/Patches/Kingdom/NoCrimeRatingForCrimes.cs b/Patches/Kingdom/NoCrimeRatingForCrimes.cs
index b5d4148d..88ae285b 100644
--- a/Patches/Kingdom/NoCrimeRatingForCrimes.cs
+++ b/Patches/Kingdom/NoCrimeRatingForCrimes.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
@@ -13,9 +14,16 @@ public static class NoCrimeRatingForCrimes
         [HarmonyPostfix]
         public static void GetCrimeRatingOf(ref CrimeModel.CrimeType crime, ref object[] additionalArgs, ref float __result)
         {
-            if (BannerlordCheatsSettings.Instance?.NoCrimeRatingForCrimes == true)
+            try
             {
-                __result = 0f;
+                if (BannerlordCheatsSettings.Instance?.NoCrimeRatingForCrimes == true)
+                {
+                    __result = 0f;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NoCrimeRatingForCrimes));
             }
         }
     }
diff --git a/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
index c7ffee4f..5640e256 100644
--- a/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
@@ -12,9 +13,16 @@ public static class NoRelationshipLossOnDecisionArmyDisband
         [HarmonyPostfix]
         public static void GetRelationCostOfDisbandingArmy(bool isLeaderParty, ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.NoRelationshipLossOnDecision == true)
+            try
             {
-                __result = 0;
+                if (BannerlordCheatsSettings.Instance?.NoRelationshipLossOnDecision == true)
+                {
+                    __result = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NoRelationshipLossOnDecisionArmyDisband));
             }
         }
     }
diff --git a/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
index f8f10dc0..40665916 100644
--- a/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
@@ -12,9 +13,16 @@ public static class NoRelationshipLossOnDecisionExpellingClan
         [HarmonyPostfix]
         public static void GetRelationCostOfExpellingClanFromKingdom(ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.NoRelationshipLossOnDecision == true)
+            try
             {
-                __result = 0;
+                if (BannerlordCheatsSettings.Instance?.NoRelationshipLossOnDecision == true)
+                {
+                    __result = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NoRelationshipLossOnDecisionExpellingClan));
             }
         }
     }
diff --git a/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs
index 4df3b878..63c78453 100644
--- a/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionKingdomDecision.cs
@@ -13,9 +13,16 @@ public static class NoRelationshipLossOnDecisionKingdomDecision
         [HarmonyPostfix]
         public static void GetRelationChangeWithSponsor(Supporter.SupportWeights supportWeight, bool isOpposingSides, ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.NoRelationshipLossOnDecision == true)
+            try
             {
-                __result = Math.Max(__result, 0);
+                if (BannerlordCheatsSettings.Instance?.NoRelationshipLossOnDecision == true)
+                {
+                    __result = Math.Max(__result, 0);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NoRelationshipLossOnDecisionKingdomDecision));
             }
         }
     }
diff --git a/Patches/Map/MapSpeedMultiplier.cs b/Patches/Map/MapSpeedMultiplier.cs
index 278a5288..2dab9eab 100644
--- a/Patches/Map/MapSpeedMultiplier.cs
+++ b/Patches/Map/MapSpeedMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class MapSpeedMultiplier
         [HarmonyPostfix]
         public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
         {
-            if (mobileParty.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.MapSpeedMultiplier > 1f)
+            try
             {
-                __result.AddMultiplier(BannerlordCheatsSettings.Instance.MapSpeedMultiplier);
+                if (mobileParty.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.MapSpeedMultiplier > 1f)
+                {
+                    __result.AddMultiplier(BannerlordCheatsSettings.Instance.MapSpeedMultiplier);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(MapSpeedMultiplier));
             }
         }
     }
diff --git a/Patches/Map/MapVisibilityMultiplier.cs b/Patches/Map/MapVisibilityMultiplier.cs
index 976cd475..ef052b07 100644
--- a/Patches/Map/MapVisibilityMultiplier.cs
+++ b/Patches/Map/MapVisibilityMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class MapVisibilityMultiplier
         [HarmonyPostfix]
         public static void GetPartySpottingRange(ref MobileParty party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
-            if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.MapVisibilityMultiplier > 1f)
+            try
             {
-                __result.AddMultiplier(BannerlordCheatsSettings.Instance.MapVisibilityMultiplier);
+                if (party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.MapVisibilityMultiplier > 1f)
+                {
+                    __result.AddMultiplier(BannerlordCheatsSettings.Instance.MapVisibilityMultiplier);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(MapVisibilityMultiplier));
             }
         }
     }
diff --git a/Patches/Map/NpcMapSpeedPercentage.cs b/Patches/Map/NpcMapSpeedPercentage.cs
index 18e802be..a48648db 100644
--- a/Patches/Map/NpcMapSpeedPercentage.cs
+++ b/Patches/Map/NpcMapSpeedPercentage.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class NpcMapSpeedPercentage
         [HarmonyPostfix]
         public static void CalculateFinalSpeed(ref MobileParty mobileParty, ref ExplainedNumber finalSpeed, ref ExplainedNumber __result)
         {
-            if (!mobileParty.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.NpcMapSpeedPercentage > 100f)
+            try
             {
-                __result.AddPercentage(BannerlordCheatsSettings.Instance.NpcMapSpeedPercentage);
+                if (!mobileParty.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.NpcMapSpeedPercentage > 100f)
+                {
+                    __result.AddPercentage(BannerlordCheatsSettings.Instance.NpcMapSpeedPercentage);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NpcMapSpeedPercentage));
             }
         }
     }
diff --git a/Patches/Map/PartyInvisibleOnMap.cs b/Patches/Map/PartyInvisibleOnMap.cs
index c9a528e4..1af0acd8 100644
--- a/Patches/Map/PartyInvisibleOnMap.cs
+++ b/Patches/Map/PartyInvisibleOnMap.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class PartyInvisibleOnMap
         [HarmonyPostfix]
         public static void ShouldBeIgnored(ref MobileParty __instance, ref bool __result)
         {
-            if (__instance.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.PartyInvisibleOnMap == true)
+            try
             {
-                __result = true;
+                if (__instance.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.PartyInvisibleOnMap == true)
+                {
+                    __result = true;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PartyInvisibleOnMap));
             }
         }
     }
diff --git a/Patches/Party/ExtraPartyMemberSize.cs b/Patches/Party/ExtraPartyMemberSize.cs
index a61be297..a04305c3 100644
--- a/Patches/Party/ExtraPartyMemberSize.cs
+++ b/Patches/Party/ExtraPartyMemberSize.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class ExtraPartyMemberSize
         [HarmonyPostfix]
         public static void GetPartyMemberSizeLimit(ref PartyBase party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
-            if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.ExtraPartyMemberSize > 0)
+            try
             {
-                __result.Add(BannerlordCheatsSettings.Instance.ExtraPartyMemberSize);
+                if (party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.ExtraPartyMemberSize > 0)
+                {
+                    __result.Add(BannerlordCheatsSettings.Instance.ExtraPartyMemberSize);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(ExtraPartyMemberSize));
             }
         }
     }
diff --git a/Patches/Party/ExtraPartyMorale.cs b/Patches/Party/ExtraPartyMorale.cs
index f517c2cf..6314ba45 100644
--- a/Patches/Party/ExtraPartyMorale.cs
+++ b/Patches/Party/ExtraPartyMorale.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class ExtraPartyMorale
         [HarmonyPostfix]
         public static void GetEffectivePartyMorale(ref MobileParty mobileParty, ref bool includeDescription, ref ExplainedNumber __result)
         {
-            if (mobileParty.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.ExtraPartyMorale > 0)
+            try
             {
-                __result.Add(BannerlordCheatsSettings.Instance.ExtraPartyMorale);
+                if (mobileParty.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.ExtraPartyMorale > 0)
+                {
+                    __result.Add(BannerlordCheatsSettings.Instance.ExtraPartyMorale);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(ExtraPartyMorale));
             }
         }
     }
diff --git a/Patches/Party/ExtraPartyPrisonerSize.cs b/Patches/Party/ExtraPartyPrisonerSize.cs
index 78de2612..b9afb915 100644
--- a/Patches/Party/ExtraPartyPrisonerSize.cs
+++ b/Patches/Party/ExtraPartyPrisonerSize.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class ExtraPartyPrisonerSize
         [HarmonyPostfix]
         public static void GetPartyPrisonerSizeLimit(ref PartyBase party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
-            if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.ExtraPartyPrisonerSize > 0)
+            try
             {
-                __result.Add(BannerlordCheatsSettings.Instance.ExtraPartyPrisonerSize);
+                if (party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.ExtraPartyPrisonerSize > 0)
+                {
+                    __result.Add(BannerlordCheatsSettings.Instance.ExtraPartyPrisonerSize);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(ExtraPartyPrisonerSize));
             }
         }
     }
diff --git a/Patches/Party/FoodConsumptionPercentage.cs b/Patches/Party/FoodConsumptionPercentage.cs
index 39b3d617..bb6b902d 100644
--- a/Patches/Party/FoodConsumptionPercentage.cs
+++ b/Patches/Party/FoodConsumptionPercentage.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class FoodConsumptionPercentage
         [HarmonyPostfix]
         public static void CalculateDailyFoodConsumptionf(ref MobileParty party, ref bool includeDescription, ref ExplainedNumber __result)
         {
-            if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.FoodConsumptionPercentage < 100f)
+            try
             {
-                __result.AddPercentage(BannerlordCheatsSettings.Instance.FoodConsumptionPercentage);
+                if (party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.FoodConsumptionPercentage < 100f)
+                {
+                    __result.AddPercentage(BannerlordCheatsSettings.Instance.FoodConsumptionPercentage);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(FoodConsumptionPercentage));
             }
         }
     }
diff --git a/Patches/Party/FreeCompanionHiring.cs b/Patches/Party/FreeCompanionHiring.cs
index 1ba9aa83..c13ff061 100644
--- a/Patches/Party/FreeCompanionHiring.cs
+++ b/Patches/Party/FreeCompanionHiring.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
@@ -13,9 +14,16 @@ public static class FreeCompanionHiring
         [HarmonyPostfix]
         public static void GetCompanionHiringPrice(Hero companion, ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.FreeCompanionHiring == true)
+            try
             {
-                __result = 0;
+                if (BannerlordCheatsSettings.Instance?.FreeCompanionHiring == true)
+                {
+                    __result = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(FreeCompanionHiring));
             }
         }
     }
diff --git a/Patches/Party/FreeTroopUpgrades.cs b/Patches/Party/FreeTroopUpgrades.cs
index b9790452..ba78eef8 100644
--- a/Patches/Party/FreeTroopUpgrades.cs
+++ b/Patches/Party/FreeTroopUpgrades.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class FreeTroopUpgrades
         [HarmonyPostfix]
         public static void GetGoldCostForUpgrade(ref PartyBase party, ref CharacterObject characterObject, ref CharacterObject upgradeTarget, ref int __result)
         {
-            if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.FreeTroopUpgrades == true)
+            try
             {
-                __result = 0;
+                if (party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.FreeTroopUpgrades == true)
+                {
+                    __result = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(FreeTroopUpgrades));
             }
         }
     }
diff --git a/Patches/Party/InstantEscape.cs b/Patches/Party/InstantEscape.cs
index 4820498e..6a1ccd00 100644
--- a/Patches/Party/InstantEscape.cs
+++ b/Patches/Party/InstantEscape.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
@@ -13,9 +14,16 @@ public static class InstantEscape
         [HarmonyPostfix]
         public static void CheckCaptivityChange(float dt, ref string __result)
         {
-            if (BannerlordCheatsSettings.Instance?.InstantEscape == true)
+            try
             {
-                PlayerCaptivity.EndCaptivity();
+                if (BannerlordCheatsSettings.Instance?.InstantEscape == true)
+                {
+                    PlayerCaptivity.EndCaptivity();
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(InstantEscape));
             }
         }
     }
diff --git a/Patches/Party/InstantPrisonerRecruitment.cs b/Patches/Party/InstantPrisonerRecruitment.cs
index 01b665f0..e022c7ea 100644
--- a/Patches/Party/InstantPrisonerRecruitment.cs
+++ b/Patches/Party/InstantPrisonerRecruitment.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,11 +15,18 @@ public static class InstantPrisonerRecruitment
         [HarmonyPostfix]
         public static void  CalculateRecruitableNumber(ref PartyBase party, ref CharacterObject character, ref int __result)
         {
-            if (party.IsPlayerParty()
-                && !character.IsHero()
-                && BannerlordCheatsSettings.Instance?.InstantPrisonerRecruitment == true)
+            try
             {
-                __result = party.PrisonRoster.GetTroopCount(character);
+                if (party.IsPlayerParty()
+                    && !character.IsHero()
+                    && BannerlordCheatsSettings.Instance?.InstantPrisonerRecruitment == true)
+                {
+                    __result = party.PrisonRoster.GetTroopCount(character);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(InstantPrisonerRecruitment));
             }
         }
     }
diff --git a/Patches/Party/NoPrisonerEscape.cs b/Patches/Party/NoPrisonerEscape.cs
index 4ec04b74..e67a1422 100644
--- a/Patches/Party/NoPrisonerEscape.cs
+++ b/Patches/Party/NoPrisonerEscape.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.Actions;
@@ -11,15 +12,24 @@ public static class NoPrisonerEscape
         [HarmonyPrefix]
         public static bool ApplyByEscape(Hero character, Hero facilitator)
         {
-            if (character.IsPrisoner
-                && character.PartyBelongedToAsPrisoner != null
-                && character.PartyBelongedToAsPrisoner.MapFaction == Hero.MainHero.MapFaction
-                && BannerlordCheatsSettings.Instance?.NoPrisonerEscape == true)
+            try
             {
-                return false;
+                if (character.IsPrisoner
+                    && character.PartyBelongedToAsPrisoner != null
+                    && character.PartyBelongedToAsPrisoner.MapFaction == Hero.MainHero.MapFaction
+                    && BannerlordCheatsSettings.Instance?.NoPrisonerEscape == true)
+                {
+                    return false;
+                }
+
+                return true;
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NoPrisonerEscape));
 
-            return true;
+                return true;
+            }
         }
     }
 }
diff --git a/Patches/Party/PartyHealingMultiplierHeroes.cs b/Patches/Party/PartyHealingMultiplierHeroes.cs
index e11704ae..06e50c97 100644
--- a/Patches/Party/PartyHealingMultiplierHeroes.cs
+++ b/Patches/Party/PartyHealingMultiplierHeroes.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class PartyHealingMultiplierHeroes
         [HarmonyPostfix]
         public static void GetDailyHealingHpForHeroes(ref MobileParty party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
-            if (party.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.PartyHealingMultiplier > 1f)
+            try
             {
-                __result.AddMultiplier(BannerlordCheatsSettings.Instance.PartyHealingMultiplier);
+                if (party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.PartyHealingMultiplier > 1f)
+                {
+                    __result.AddMultiplier(BannerlordCheatsSettings.Instance.PartyHealingMultiplier);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PartyHealingMultiplierHeroes));
             }
         }
     }
diff --git a/Patches/Party/PartyHealingMultiplierTroops.cs b/Patches/Party/PartyHealingMultiplierTroops.cs
index eb51c362..4f867d14 100644
--- a/Patches/Party/PartyHealingMultiplierTroops.cs
+++ b/Patches/Party/PartyHealingMultiplierTroops.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class PartyHealingMultiplierTroops
         [HarmonyPostfix]
         public static void GetDailyHealingForRegulars(ref MobileParty party, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
-            if (party.IsPlayerParty()
-            && BannerlordCheatsSettings.Instance?.PartyHealingMultiplier > 1f)
+            try
             {
-                __result.AddMultiplier(BannerlordCheatsSettings.Instance.PartyHealingMultiplier);
+                if (party.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.PartyHealingMultiplier > 1f)
+                {
+                    __result.AddMultiplier(BannerlordCheatsSettings.Instance.PartyHealingMultiplier);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(PartyHealingMultiplierTroops));
             }
         }
     }
diff --git a/Patches/Party/TroopWagesPercentage.cs b/Patches/Party/TroopWagesPercentage.cs
index 13e27877..625a2c41 100644
--- a/Patches/Party/TroopWagesPercentage.cs
+++ b/Patches/Party/TroopWagesPercentage.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class TroopWagesPercentage
         [HarmonyPostfix]
         public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
-            if (mobileParty.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.TroopWagesPercentage < 100f)
+            try
             {
-                __result.AddPercentage(BannerlordCheatsSettings.Instance.TroopWagesPercentage);
+                if (mobileParty.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.TroopWagesPercentage < 100f)
+                {
+                    __result.AddPercentage(BannerlordCheatsSettings.Instance.TroopWagesPercentage);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(TroopWagesPercentage));
             }
         }
     }
diff --git a/Patches/Settlements/ConstructionPowerMultiplier.cs b/Patches/Settlements/ConstructionPowerMultiplier.cs
index b58a8864..18cb521b 100644
--- a/Patches/Settlements/ConstructionPowerMultiplier.cs
+++ b/Patches/Settlements/ConstructionPowerMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -17,10 +18,17 @@ public static void CalculateDailyConstructionPower(
             ref bool includeDescriptions,
             ref ExplainedNumber __result)
         {
-            if (town.IsPlayerTown()
-                && BannerlordCheatsSettings.Instance?.ConstructionPowerMultiplier > 1f)
+            try
             {
-                __result.AddMultiplier(BannerlordCheatsSettings.Instance.ConstructionPowerMultiplier);
+                if (town.IsPlayerTown()
+                    && BannerlordCheatsSettings.Instance?.ConstructionPowerMultiplier > 1f)
+                {
+                    __result.AddMultiplier(BannerlordCheatsSettings.Instance.ConstructionPowerMultiplier);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(ConstructionPowerMultiplier));
             }
         }
     }
diff --git a/Patches/Settlements/DailyFoodBonus.cs b/Patches/Settlements/DailyFoodBonus.cs
index 8eb86285..5dc260e1 100644
--- a/Patches/Settlements/DailyFoodBonus.cs
+++ b/Patches/Settlements/DailyFoodBonus.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class DailyFoodBonus
         [HarmonyPostfix]
         public static void FoodChange(ref Town __instance, ref float __result)
         {
-            if (__instance.IsPlayerTown()
-                && BannerlordCheatsSettings.Instance?.DailyFoodBonus > 0)
+            try
             {
-                __result += BannerlordCheatsSettings.Instance.DailyFoodBonus;
+                if (__instance.IsPlayerTown()
+                    && BannerlordCheatsSettings.Instance?.DailyFoodBonus > 0)
+                {
+                    __result += BannerlordCheatsSettings.Instance.DailyFoodBonus;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(DailyFoodBonus));
             }
         }
     }
diff --git a/Patches/Settlements/DailyGarrisonBonus.cs b/Patches/Settlements/DailyGarrisonBonus.cs
index 7e4c48b4..afc15207 100644
--- a/Patches/Settlements/DailyGarrisonBonus.cs
+++ b/Patches/Settlements/DailyGarrisonBonus.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class DailyGarrisonBonus
         [HarmonyPostfix]
         public static void GarrisonChange(ref Town __instance, ref int __result)
         {
-            if (__instance.IsPlayerTown()
-                && BannerlordCheatsSettings.Instance?.DailyGarrisonBonus > 0)
+            try
             {
-                __result += BannerlordCheatsSettings.Instance.DailyGarrisonBonus;
+                if (__instance.IsPlayerTown()
+                    && BannerlordCheatsSettings.Instance?.DailyGarrisonBonus > 0)
+                {
+                    __result += BannerlordCheatsSettings.Instance.DailyGarrisonBonus;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(DailyGarrisonBonus));
             }
         }
     }
diff --git a/Patches/Settlements/DailyHearthsBonus.cs b/Patches/Settlements/DailyHearthsBonus.cs
index 695e2976..0e1fec27 100644
--- a/Patches/Settlements/DailyHearthsBonus.cs
+++ b/Patches/Settlements/DailyHearthsBonus.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class DailyHearthsBonus
         [HarmonyPostfix]
         public static void HearthChange(ref Village __instance, ref float __result)
         {
-            if (__instance.IsPlayerVillage()
-                && BannerlordCheatsSettings.Instance?.DailyHearthsBonus > 0)
+            try
             {
-                __result += BannerlordCheatsSettings.Instance.DailyHearthsBonus;
+                if (__instance.IsPlayerVillage()
+                    && BannerlordCheatsSettings.Instance?.DailyHearthsBonus > 0)
+                {
+                    __result += BannerlordCheatsSettings.Instance.DailyHearthsBonus;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(DailyHearthsBonus));
             }
         }
     }
diff --git a/Patches/Settlements/DailyLoyaltyBonus.cs b/Patches/Settlements/DailyLoyaltyBonus.cs
index 084e9ca7..b785e434 100644
--- a/Patches/Settlements/DailyLoyaltyBonus.cs
+++ b/Patches/Settlements/DailyLoyaltyBonus.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class DailyLoyaltyBonus
         [HarmonyPostfix]
         public static void LoyaltyChange(ref Town __instance, ref float __result)
         {
-            if (__instance.IsPlayerTown()
-                && BannerlordCheatsSettings.Instance?.DailyLoyaltyBonus > 0)
+            try
             {
-                __result += BannerlordCheatsSettings.Instance.DailyLoyaltyBonus;
+                if (__instance.IsPlayerTown()
+                    && BannerlordCheatsSettings.Instance?.DailyLoyaltyBonus > 0)
+                {
+                    __result += BannerlordCheatsSettings.Instance.DailyLoyaltyBonus;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(DailyLoyaltyBonus));
             }
         }
     }
diff --git a/Patches/Settlements/DailyMilitiaBonusTown.cs b/Patches/Settlements/DailyMilitiaBonusTown.cs
index 376b908b..b04e647b 100644
--- a/Patches/Settlements/DailyMilitiaBonusTown.cs
+++ b/Patches/Settlements/DailyMilitiaBonusTown.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class DailyMilitiaBonusTown
         [HarmonyPostfix]
         public static void MilitiaChange(ref Town __instance, ref float __result)
         {
-            if (__instance.IsPlayerTown()
-                && BannerlordCheatsSettings.Instance?.DailyMilitiaBonus > 0)
+            try
             {
-                __result += BannerlordCheatsSettings.Instance.DailyMilitiaBonus;
+                if (__instance.IsPlayerTown()
+                    && BannerlordCheatsSettings.Instance?.DailyMilitiaBonus > 0)
+                {
+                    __result += BannerlordCheatsSettings.Instance.DailyMilitiaBonus;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(DailyMilitiaBonusTown));
             }
         }
     }
diff --git a/Patches/Settlements/DailyMilitiaBonusVillage.cs b/Patches/Settlements/DailyMilitiaBonusVillage.cs
index 434fe658..8f737e21 100644
--- a/Patches/Settlements/DailyMilitiaBonusVillage.cs
+++ b/Patches/Settlements/DailyMilitiaBonusVillage.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class DailyMilitiaBonusVillage
         [HarmonyPostfix]
         public static void MilitiaChange(ref Village __instance, ref float __result)
         {
-            if (__instance.IsPlayerVillage()
-                && BannerlordCheatsSettings.Instance?.DailyMilitiaBonus > 0)
+            try
             {
-                __result += BannerlordCheatsSettings.Instance.DailyMilitiaBonus;
+                if (__instance.IsPlayerVillage()
+                    && BannerlordCheatsSettings.Instance?.DailyMilitiaBonus > 0)
+                {
+                    __result += BannerlordCheatsSettings.Instance.DailyMilitiaBonus;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(DailyMilitiaBonusVillage));
             }
         }
     }
diff --git a/Patches/Settlements/DailyProsperityBonus.cs b/Patches/Settlements/DailyProsperityBonus.cs
index 1be01aa3..097988c3 100644
--- a/Patches/Settlements/DailyProsperityBonus.cs
+++ b/Patches/Settlements/DailyProsperityBonus.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class DailyProsperityBonus
         [HarmonyPostfix]
         public static void ProsperityChange(ref Town __instance, ref float __result)
         {
-            if (__instance.IsPlayerTown()
-                && BannerlordCheatsSettings.Instance?.DailyProsperityBonus > 0)
+            try
             {
-                __result += BannerlordCheatsSettings.Instance.DailyProsperityBonus;
+                if (__instance.IsPlayerTown()
+                    && BannerlordCheatsSettings.Instance?.DailyProsperityBonus > 0)
+                {
+                    __result += BannerlordCheatsSettings.Instance.DailyProsperityBonus;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(DailyProsperityBonus));
             }
         }
     }
diff --git a/Patches/Settlements/DailySecurityBonus.cs b/Patches/Settlements/DailySecurityBonus.cs
index cbee4e60..e01384a0 100644
--- a/Patches/Settlements/DailySecurityBonus.cs
+++ b/Patches/Settlements/DailySecurityBonus.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -13,10 +14,17 @@ public static class DailySecurityBonus
         [HarmonyPostfix]
         public static void SecurityChange(ref Town __instance, ref float __result)
         {
-            if (__instance.IsPlayerTown()
-                && BannerlordCheatsSettings.Instance?.DailySecurityBonus > 0)
+            try
             {
-                __result += BannerlordCheatsSettings.Instance.DailySecurityBonus;
+                if (__instance.IsPlayerTown()
+                    && BannerlordCheatsSettings.Instance?.DailySecurityBonus > 0)
+                {
+                    __result += BannerlordCheatsSettings.Instance.DailySecurityBonus;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(DailySecurityBonus));
             }
         }
     }
diff --git a/Patches/Settlements/DisguiseAlwaysWorks.cs b/Patches/Settlements/DisguiseAlwaysWorks.cs
index 26649430..388523a8 100644
--- a/Patches/Settlements/DisguiseAlwaysWorks.cs
+++ b/Patches/Settlements/DisguiseAlwaysWorks.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
@@ -13,9 +14,16 @@ public static class DisguiseAlwaysWorks
         [HarmonyPostfix]
         public static void CalculateDisguiseDetectionProbability(Settlement settlement, ref float __result)
         {
-            if (BannerlordCheatsSettings.Instance?.DisguiseAlwaysWorks == true)
+            try
             {
-                __result = 1;
+                if (BannerlordCheatsSettings.Instance?.DisguiseAlwaysWorks == true)
+                {
+                    __result = 1;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(DisguiseAlwaysWorks));
             }
         }
     }
diff --git a/Patches/Settlements/FreeTroopRecruitment.cs b/Patches/Settlements/FreeTroopRecruitment.cs
index b334eccd..c1d51609 100644
--- a/Patches/Settlements/FreeTroopRecruitment.cs
+++ b/Patches/Settlements/FreeTroopRecruitment.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,10 +15,17 @@ public static class FreeTroopRecruitment
         [HarmonyPostfix]
         public static void GetTroopRecruitmentCost(CharacterObject troop, Hero buyerHero, bool withoutItemCost, ref int __result)
         {
-            if (buyerHero.IsPlayer()
-                && BannerlordCheatsSettings.Instance?.FreeTroopRecruitment == true)
+            try
             {
-                __result = 1;
+                if (buyerHero.IsPlayer()
+                    && BannerlordCheatsSettings.Instance?.FreeTroopRecruitment == true)
+                {
+                    __result = 1;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(FreeTroopRecruitment));
             }
         }
     }
diff --git a/Patches/Settlements/GarrisonWagesPercentage.cs b/Patches/Settlements/GarrisonWagesPercentage.cs
index cbb62968..9e45b716 100644
--- a/Patches/Settlements/GarrisonWagesPercentage.cs
+++ b/Patches/Settlements/GarrisonWagesPercentage.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -14,11 +15,18 @@ public static class GarrisonWagesPercentage
         [HarmonyPostfix]
         public static void GetTotalWage(ref MobileParty mobileParty, ref bool includeDescriptions, ref ExplainedNumber __result)
         {
-            if (mobileParty.IsGarrison
-                && mobileParty.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.GarrisonWagesPercentage < 100f)
+            try
             {
-                __result.AddPercentage(BannerlordCheatsSettings.Instance.GarrisonWagesPercentage);
+                if (mobileParty.IsGarrison
+                    && mobileParty.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.GarrisonWagesPercentage < 100f)
+                {
+                    __result.AddPercentage(BannerlordCheatsSettings.Instance.GarrisonWagesPercentage);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(GarrisonWagesPercentage));
             }
         }
     }
diff --git a/Patches/Settlements/ItemTradingCostPercentage.cs b/Patches/Settlements/ItemTradingCostPercentage.cs
index 0ee6cfc8..67afdb3c 100644
--- a/Patches/Settlements/ItemTradingCostPercentage.cs
+++ b/Patches/Settlements/ItemTradingCostPercentage.cs
@@ -16,15 +16,22 @@ public static class ItemTradingCostPercentage
         [HarmonyPostfix]
         public static void GetPrice(EquipmentElement itemRosterElement, MobileParty clientParty, PartyBase merchant, bool isSelling, float inStoreValue, float supply, float demand, ref int __result)
         {
-            if (clientParty.IsPlayerParty()
-                && !isSelling
-                && BannerlordCheatsSettings.Instance?.ItemTradingCostPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.ItemTradingCostPercentage / 100f;
+                if (clientParty.IsPlayerParty()
+                    && !isSelling
+                    && BannerlordCheatsSettings.Instance?.ItemTradingCostPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.ItemTradingCostPercentage / 100f;
 
-                var newValue = (int)Math.Round(factor * __result);
+                    var newValue = (int)Math.Round(factor * __result);
 
-                __result = newValue;
+                    __result = newValue;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(ItemTradingCostPercentage));
             }
         }
     }
diff --git a/Patches/Settlements/NeverRequireCivilianEquipment.cs b/Patches/Settlements/NeverRequireCivilianEquipment.cs
index f32d33e8..593e7810 100644
--- a/Patches/Settlements/NeverRequireCivilianEquipment.cs
+++ b/Patches/Settlements/NeverRequireCivilianEquipment.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.MountAndBlade;
@@ -12,9 +13,16 @@ public static class NeverRequireCivilianEquipment
         [HarmonyPostfix]
         public static void DoesMissionRequireCivilianEquipment(ref Mission __instance, ref bool __result)
         {
-            if (BannerlordCheatsSettings.Instance?.NeverRequireCivilianEquipment == true)
+            try
             {
-                __result = false;
+                if (BannerlordCheatsSettings.Instance?.NeverRequireCivilianEquipment == true)
+                {
+                    __result = false;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NeverRequireCivilianEquipment));
             }
         }
     }
diff --git a/Patches/Settlements/NoBribeToEnterKeep.cs b/Patches/Settlements/NoBribeToEnterKeep.cs
index f8282bea..42cfa0a7 100644
--- a/Patches/Settlements/NoBribeToEnterKeep.cs
+++ b/Patches/Settlements/NoBribeToEnterKeep.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
@@ -13,10 +14,17 @@ public static class NoBribeToEnterKeep
         [HarmonyPostfix]
         public static void IsBribeNotNeededToEnterKeep(Settlement settlement, ref bool __result)
         {
-            if (BannerlordCheatsSettings.Instance?.NoBribeToEnterKeep == true)
+            try
             {
-                __result = true;
+                if (BannerlordCheatsSettings.Instance?.NoBribeToEnterKeep == true)
+                {
+                    __result = true;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(NoBribeToEnterKeep));
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Settlements/SellingPriceMultiplier.cs b/Patches/Settlements/SellingPriceMultiplier.cs
index 41ff5f4c..5a30352d 100644
--- a/Patches/Settlements/SellingPriceMultiplier.cs
+++ b/Patches/Settlements/SellingPriceMultiplier.cs
@@ -16,11 +16,18 @@ public static class SellingPriceMultiplier
         [HarmonyPostfix]
         public static void GetPrice(EquipmentElement itemRosterElement, MobileParty clientParty, PartyBase merchant, bool isSelling, float inStoreValue, float supply, float demand, ref int __result)
         {
-            if (clientParty.IsPlayerParty()
-                && isSelling
-                && BannerlordCheatsSettings.Instance?.SellingPriceMultiplier > 1f)
+            try
             {
-                __result = (int) Math.Round(__result * BannerlordCheatsSettings.Instance.SellingPriceMultiplier);
+                if (clientParty.IsPlayerParty()
+                    && isSelling
+                    && BannerlordCheatsSettings.Instance?.SellingPriceMultiplier > 1f)
+                {
+                    __result = (int) Math.Round(__result * BannerlordCheatsSettings.Instance.SellingPriceMultiplier);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(SellingPriceMultiplier));
             }
         }
     }
diff --git a/Patches/Settlements/TournamentMaximumBetMultiplier.cs b/Patches/Settlements/TournamentMaximumBetMultiplier.cs
index 257c0376..601aef1f 100644
--- a/Patches/Settlements/TournamentMaximumBetMultiplier.cs
+++ b/Patches/Settlements/TournamentMaximumBetMultiplier.cs
@@ -13,11 +13,18 @@ public static class TournamentMaximumBetMultiplier
         [HarmonyPostfix]
         public static void GetMaximumBet(ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.TournamentMaximumBetMultiplier > 1)
+            try
             {
-                var newValue = (int) Math.Round(__result * BannerlordCheatsSettings.Instance.TournamentMaximumBetMultiplier);
+                if (BannerlordCheatsSettings.Instance?.TournamentMaximumBetMultiplier > 1)
+                {
+                    var newValue = (int) Math.Round(__result * BannerlordCheatsSettings.Instance.TournamentMaximumBetMultiplier);
 
-                __result = newValue;
+                    __result = newValue;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(TournamentMaximumBetMultiplier));
             }
         }
     }
diff --git a/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
index f7f32091..3559f664 100644
--- a/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
+++ b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using System.Linq;
 using BannerlordCheats.Extensions;
@@ -16,27 +17,34 @@ public static class EnemySiegeBuildingSpeedPercentage
         [HarmonyPostfix]
         public static void GetConstructionProgressPerHour(ref SiegeEngineType type, ref SiegeEvent siegeEvent, ref ISiegeEventSide side, ref float __result)
         {
-            BattleSideEnum otherSide;
-            switch (side.BattleSide)
+            try
             {
-                case BattleSideEnum.Attacker:
-                    otherSide = BattleSideEnum.Defender;
-                    break;
-                case BattleSideEnum.Defender:
-                    otherSide = BattleSideEnum.Attacker;
-                    break;
-                default:
-                    return;
-            }
+                BattleSideEnum otherSide;
+                switch (side.BattleSide)
+                {
+                    case BattleSideEnum.Attacker:
+                        otherSide = BattleSideEnum.Defender;
+                        break;
+                    case BattleSideEnum.Defender:
+                        otherSide = BattleSideEnum.Attacker;
+                        break;
+                    default:
+                        return;
+                }
 
-            if ((siegeEvent.GetSiegeEventSide(otherSide)?.SiegeParties.Any(x => x.IsPlayerParty()) ?? false)
-                && BannerlordCheatsSettings.Instance?.EnemySiegeBuildingSpeedPercentage < 100f)
-            {
-                var factor = BannerlordCheatsSettings.Instance.EnemySiegeBuildingSpeedPercentage / 100f;
+                if ((siegeEvent.GetSiegeEventSide(otherSide)?.SiegeParties.Any(x => x.IsPlayerParty()) ?? false)
+                    && BannerlordCheatsSettings.Instance?.EnemySiegeBuildingSpeedPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.EnemySiegeBuildingSpeedPercentage / 100f;
 
-                var newValue = factor * __result;
+                    var newValue = factor * __result;
 
-                __result = newValue;
+                    __result = newValue;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EnemySiegeBuildingSpeedPercentage));
             }
         }
     }
diff --git a/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs b/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
index 93f5760e..71fdd036 100644
--- a/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
+++ b/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using BannerlordCheats.Extensions;
 using JetBrains.Annotations;
@@ -15,10 +16,17 @@ public static class SiegeBuildingSpeedMultiplier
         [HarmonyPostfix]
         public static void GetConstructionProgressPerHour(ref SiegeEngineType type, ref SiegeEvent siegeEvent, ref ISiegeEventSide side, ref float __result)
         {
-            if (side.IsPlayerSide()
-                && BannerlordCheatsSettings.Instance?.SiegeBuildingSpeedMultiplier > 1f)
+            try
             {
-                __result *= BannerlordCheatsSettings.Instance.SiegeBuildingSpeedMultiplier;
+                if (side.IsPlayerSide()
+                    && BannerlordCheatsSettings.Instance?.SiegeBuildingSpeedMultiplier > 1f)
+                {
+                    __result *= BannerlordCheatsSettings.Instance.SiegeBuildingSpeedMultiplier;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(SiegeBuildingSpeedMultiplier));
             }
         }
     }
diff --git a/Patches/Smithing/CraftedWeaponModifierBonus.cs b/Patches/Smithing/CraftedWeaponModifierBonus.cs
index 8c4a5a10..5e9b7baa 100644
--- a/Patches/Smithing/CraftedWeaponModifierBonus.cs
+++ b/Patches/Smithing/CraftedWeaponModifierBonus.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
@@ -13,29 +14,36 @@ public static class CraftedWeaponModifierBonus
         [HarmonyPostfix]
         public static void GetModifierChanges(int modifierTier, ref OverrideData __result)
         {
-            if (BannerlordCheatsSettings.Instance?.CraftedWeaponHandlingBonus > 0)
+            try
             {
-                __result.Handling += BannerlordCheatsSettings.Instance.CraftedWeaponHandlingBonus;
-            }
+                if (BannerlordCheatsSettings.Instance?.CraftedWeaponHandlingBonus > 0)
+                {
+                    __result.Handling += BannerlordCheatsSettings.Instance.CraftedWeaponHandlingBonus;
+                }
 
-            if (BannerlordCheatsSettings.Instance?.CraftedWeaponSwingDamageBonus > 0)
-            {
-                __result.SwingDamageOverriden += BannerlordCheatsSettings.Instance.CraftedWeaponSwingDamageBonus;
-            }
+                if (BannerlordCheatsSettings.Instance?.CraftedWeaponSwingDamageBonus > 0)
+                {
+                    __result.SwingDamageOverriden += BannerlordCheatsSettings.Instance.CraftedWeaponSwingDamageBonus;
+                }
 
-            if (BannerlordCheatsSettings.Instance?.CraftedWeaponSwingSpeedBonus > 0)
-            {
-                __result.SwingSpeedOverriden += BannerlordCheatsSettings.Instance.CraftedWeaponSwingSpeedBonus;
-            }
+                if (BannerlordCheatsSettings.Instance?.CraftedWeaponSwingSpeedBonus > 0)
+                {
+                    __result.SwingSpeedOverriden += BannerlordCheatsSettings.Instance.CraftedWeaponSwingSpeedBonus;
+                }
 
-            if (BannerlordCheatsSettings.Instance?.CraftedWeaponThrustDamageBonus > 0)
-            {
-                __result.ThrustDamageOverriden += BannerlordCheatsSettings.Instance.CraftedWeaponThrustDamageBonus;
-            }
+                if (BannerlordCheatsSettings.Instance?.CraftedWeaponThrustDamageBonus > 0)
+                {
+                    __result.ThrustDamageOverriden += BannerlordCheatsSettings.Instance.CraftedWeaponThrustDamageBonus;
+                }
 
-            if (BannerlordCheatsSettings.Instance?.CraftedWeaponThrustSpeedBonus > 0)
+                if (BannerlordCheatsSettings.Instance?.CraftedWeaponThrustSpeedBonus > 0)
+                {
+                    __result.ThrustSpeedOverriden += BannerlordCheatsSettings.Instance.CraftedWeaponThrustSpeedBonus;
+                }
+            }
+            catch (Exception e)
             {
-                __result.ThrustSpeedOverriden += BannerlordCheatsSettings.Instance.CraftedWeaponThrustSpeedBonus;
+                SubModule.LogError(e, typeof(CraftedWeaponModifierBonus));
             }
         }
     }
diff --git a/Patches/Smithing/SmithingCostPercentage.cs b/Patches/Smithing/SmithingCostPercentage.cs
index 51c234d8..dafa4328 100644
--- a/Patches/Smithing/SmithingCostPercentage.cs
+++ b/Patches/Smithing/SmithingCostPercentage.cs
@@ -14,17 +14,24 @@ public static class SmithingCostPercentage
         [HarmonyPostfix]
         public static void GetSmithingCostsForWeaponDesign(WeaponDesign weaponDesign, ref int[] __result)
         {
-            if (BannerlordCheatsSettings.Instance?.SmithingCostPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.SmithingCostPercentage / 100f;
-
-                for (var i = 0; i < __result.Length; i++)
+                if (BannerlordCheatsSettings.Instance?.SmithingCostPercentage < 100f)
                 {
-                    var newValue = (int)Math.Round(factor * __result[i]);
+                    var factor = BannerlordCheatsSettings.Instance.SmithingCostPercentage / 100f;
+
+                    for (var i = 0; i < __result.Length; i++)
+                    {
+                        var newValue = (int)Math.Round(factor * __result[i]);
 
-                    __result[i] = newValue;
+                        __result[i] = newValue;
+                    }
                 }
             }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(SmithingCostPercentage));
+            }
         }
     }
 }
diff --git a/Patches/Smithing/SmithingDifficultyPercentage.cs b/Patches/Smithing/SmithingDifficultyPercentage.cs
index da336737..849fdeb0 100644
--- a/Patches/Smithing/SmithingDifficultyPercentage.cs
+++ b/Patches/Smithing/SmithingDifficultyPercentage.cs
@@ -14,13 +14,20 @@ public static class SmithingDifficultyPercentage
         [HarmonyPostfix]
         public static void GetCraftingPartDifficulty(CraftingPiece craftingPiece, ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.SmithingDifficultyPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.SmithingDifficultyPercentage / 100f;
+                if (BannerlordCheatsSettings.Instance?.SmithingDifficultyPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.SmithingDifficultyPercentage / 100f;
 
-                var newValue = (int)Math.Round(factor * __result);
+                    var newValue = (int)Math.Round(factor * __result);
 
-                __result = newValue;
+                    __result = newValue;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(SmithingDifficultyPercentage));
             }
         }
     }
diff --git a/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs b/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
index 5019c71a..fc6b64fa 100644
--- a/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
@@ -16,14 +16,21 @@ public static class SmithingEnergyCostPercentageRefining
         [HarmonyPostfix]
         public static void GetEnergyCostForRefining(ref Crafting.RefiningFormula refineFormula, Hero hero, ref int __result)
         {
-            if (hero.PartyBelongedTo.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.SmithingEnergyCostPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.SmithingEnergyCostPercentage / 100f;
+                if (hero.PartyBelongedTo.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.SmithingEnergyCostPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.SmithingEnergyCostPercentage / 100f;
 
-                var newValue = (int)Math.Round(factor * __result);
+                    var newValue = (int)Math.Round(factor * __result);
 
-                __result = newValue;
+                    __result = newValue;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(SmithingEnergyCostPercentageRefining));
             }
         }
     }
diff --git a/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs b/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
index 22cc8545..f1d41bb3 100644
--- a/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
@@ -16,14 +16,21 @@ public static class SmithingEnergyCostPercentageSmelting
         [HarmonyPostfix]
         public static void GetEnergyCostForSmelting(ItemObject item, Hero hero, ref int __result)
         {
-            if (hero.PartyBelongedTo.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.SmithingEnergyCostPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.SmithingEnergyCostPercentage / 100f;
+                if (hero.PartyBelongedTo.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.SmithingEnergyCostPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.SmithingEnergyCostPercentage / 100f;
 
-                var newValue = (int)Math.Round(factor * __result);
+                    var newValue = (int)Math.Round(factor * __result);
 
-                __result = newValue;
+                    __result = newValue;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(SmithingEnergyCostPercentageSmelting));
             }
         }
     }
diff --git a/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs b/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
index aa75d7d0..10456a8e 100644
--- a/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
@@ -16,14 +16,21 @@ public static class SmithingEnergyCostPercentageSmithing
         [HarmonyPostfix]
         public static void GetEnergyCostForSmithing(ItemObject item, Hero hero, ref int __result)
         {
-            if (hero.PartyBelongedTo.IsPlayerParty()
-                && BannerlordCheatsSettings.Instance?.SmithingEnergyCostPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.SmithingEnergyCostPercentage / 100f;
+                if (hero.PartyBelongedTo.IsPlayerParty()
+                    && BannerlordCheatsSettings.Instance?.SmithingEnergyCostPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.SmithingEnergyCostPercentage / 100f;
 
-                var newValue = (int)Math.Round(factor * __result);
+                    var newValue = (int)Math.Round(factor * __result);
 
-                __result = newValue;
+                    __result = newValue;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(SmithingEnergyCostPercentageSmithing));
             }
         }
     }
diff --git a/Patches/Smithing/UnlockAllParts.cs b/Patches/Smithing/UnlockAllParts.cs
index b33aa354..a779c3de 100644
--- a/Patches/Smithing/UnlockAllParts.cs
+++ b/Patches/Smithing/UnlockAllParts.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.CampaignBehaviors;
@@ -13,9 +14,16 @@ public static class UnlockAllParts
         [HarmonyPostfix]
         public static void IsOpened(CraftingPiece craftingPiece, ref bool __result)
         {
-            if (BannerlordCheatsSettings.Instance?.UnlockAllParts == true)
+            try
             {
-                __result = true;
+                if (BannerlordCheatsSettings.Instance?.UnlockAllParts == true)
+                {
+                    __result = true;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(UnlockAllParts));
             }
         }
     }
diff --git a/Patches/Workshops/EveryoneBuysWorkshopsCost.cs b/Patches/Workshops/EveryoneBuysWorkshopsCost.cs
index abd0d3d6..828dbac3 100644
--- a/Patches/Workshops/EveryoneBuysWorkshopsCost.cs
+++ b/Patches/Workshops/EveryoneBuysWorkshopsCost.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -22,12 +23,19 @@ public static void ApplyByTrade(
             ref int cost,
             ref TextObject customName)
         {
-            if (BannerlordCheatsSettings.Instance?.EveryoneBuysWorkshops == true
-                && workshop.Owner.IsPlayer()
-                && cost > newOwner.Gold)
+            try
             {
-                newOwner.Gold = cost;
+                if (BannerlordCheatsSettings.Instance?.EveryoneBuysWorkshops == true
+                    && workshop.Owner.IsPlayer()
+                    && cost > newOwner.Gold)
+                {
+                    newOwner.Gold = cost;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EveryoneBuysWorkshopsCost));
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Workshops/EveryoneBuysWorkshopsSelectOwner.cs b/Patches/Workshops/EveryoneBuysWorkshopsSelectOwner.cs
index d1533926..8b7c86cb 100644
--- a/Patches/Workshops/EveryoneBuysWorkshopsSelectOwner.cs
+++ b/Patches/Workshops/EveryoneBuysWorkshopsSelectOwner.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Extensions;
+using System;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -18,11 +19,18 @@ public static void SelectNextOwnerForWorkshop(
             ref Hero excludedHero,
             ref int requiredGold)
         {
-            if (BannerlordCheatsSettings.Instance?.EveryoneBuysWorkshops == true
-                && excludedHero.IsPlayer())
+            try
             {
-                requiredGold = 0;
+                if (BannerlordCheatsSettings.Instance?.EveryoneBuysWorkshops == true
+                    && excludedHero.IsPlayer())
+                {
+                    requiredGold = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(EveryoneBuysWorkshopsSelectOwner));
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Patches/Workshops/WorkshopBuyingCostPercentage.cs b/Patches/Workshops/WorkshopBuyingCostPercentage.cs
index bb837730..16849c10 100644
--- a/Patches/Workshops/WorkshopBuyingCostPercentage.cs
+++ b/Patches/Workshops/WorkshopBuyingCostPercentage.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
@@ -13,11 +14,18 @@ public static class WorkshopBuyingCostPercentage
         [HarmonyPostfix]
         public static void GetBuyingCostForPlayer(ref Workshop workshop, ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.WorkshopBuyingCostPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.WorkshopBuyingCostPercentage / 100f;
+                if (BannerlordCheatsSettings.Instance?.WorkshopBuyingCostPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.WorkshopBuyingCostPercentage / 100f;
 
-                __result = (int) (__result * factor);
+                    __result = (int) (__result * factor);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(WorkshopBuyingCostPercentage));
             }
         }
     }
diff --git a/Patches/Workshops/WorkshopDailyExpensePercentage.cs b/Patches/Workshops/WorkshopDailyExpensePercentage.cs
index 5fc53a8d..a0bb68d2 100644
--- a/Patches/Workshops/WorkshopDailyExpensePercentage.cs
+++ b/Patches/Workshops/WorkshopDailyExpensePercentage.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
@@ -12,11 +13,18 @@ public static class WorkshopDailyExpensePercentage
         [HarmonyPostfix]
         public static void GetDailyExpense(ref int level, ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.WorkshopDailyExpensePercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.WorkshopDailyExpensePercentage / 100f;
+                if (BannerlordCheatsSettings.Instance?.WorkshopDailyExpensePercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.WorkshopDailyExpensePercentage / 100f;
 
-                __result = (int) (__result * factor);
+                    __result = (int) (__result * factor);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(WorkshopDailyExpensePercentage));
             }
         }
     }
diff --git a/Patches/Workshops/WorkshopSellingCostMultiplier.cs b/Patches/Workshops/WorkshopSellingCostMultiplier.cs
index a0003a0b..93aa888c 100644
--- a/Patches/Workshops/WorkshopSellingCostMultiplier.cs
+++ b/Patches/Workshops/WorkshopSellingCostMultiplier.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
@@ -13,9 +14,16 @@ public static class WorkshopSellingCostMultiplier
         [HarmonyPostfix]
         public static void GetSellingCost(ref Workshop workshop, ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.WorkshopSellingCostMultiplier > 1f)
+            try
             {
-                __result = (int) (__result * BannerlordCheatsSettings.Instance.WorkshopSellingCostMultiplier);
+                if (BannerlordCheatsSettings.Instance?.WorkshopSellingCostMultiplier > 1f)
+                {
+                    __result = (int) (__result * BannerlordCheatsSettings.Instance.WorkshopSellingCostMultiplier);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(WorkshopSellingCostMultiplier));
             }
         }
     }
diff --git a/Patches/Workshops/WorkshopUpgradeCostPercentage.cs b/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
index 13818073..0d232033 100644
--- a/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
+++ b/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
@@ -1,4 +1,5 @@
-using BannerlordCheats.Settings;
+using System;
+using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.SandBox.GameComponents;
@@ -12,11 +13,18 @@ public static class WorkshopUpgradeCostPercentage
         [HarmonyPostfix]
         public static void GetUpgradeCost(ref int currentLevel, ref int __result)
         {
-            if (BannerlordCheatsSettings.Instance?.WorkshopUpgradeCostPercentage < 100f)
+            try
             {
-                var factor = BannerlordCheatsSettings.Instance.WorkshopUpgradeCostPercentage / 100f;
+                if (BannerlordCheatsSettings.Instance?.WorkshopUpgradeCostPercentage < 100f)
+                {
+                    var factor = BannerlordCheatsSettings.Instance.WorkshopUpgradeCostPercentage / 100f;
 
-                __result = (int) (__result * factor);
+                    __result = (int) (__result * factor);
+                }
+            }
+            catch (Exception e)
+            {
+                SubModule.LogError(e, typeof(WorkshopUpgradeCostPercentage));
             }
         }
     }

From e769599d6a03594287586470b3a1495cded8c33a Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 31 Jan 2022 17:32:43 +0100
Subject: [PATCH 092/177] Remove unused usings

---
 .../Combat/EnemyLordCombatDeathPercentageSimulation.cs | 10 +---------
 .../FriendlyLordCombatDeathPercentageSimulation.cs     | 10 +---------
 Patches/General/EnableHotkeysAddEncyclopediaTroops.cs  |  2 --
 Patches/General/EnableHotkeysAddItems.cs               |  2 --
 Patches/General/EnableHotkeysCharacterAttributes.cs    |  1 -
 Patches/General/EnableHotkeysCharacterPoints.cs        |  2 --
 Patches/General/EnableHotkeysInfluence.cs              |  2 --
 Patches/General/EnableHotkeysMoney.cs                  |  2 --
 Patches/General/EnableHotkeysTroopCount.cs             |  2 --
 Patches/General/EnableHotkeysTroopExperience.cs        |  2 --
 10 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs b/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
index f9d19409..f0e43c0b 100644
--- a/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
+++ b/Patches/Combat/EnemyLordCombatDeathPercentageSimulation.cs
@@ -1,12 +1,4 @@
-using System;
-using BannerlordCheats.Extensions;
-using BannerlordCheats.Settings;
-using HarmonyLib;
-using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
-
-namespace BannerlordCheats.Patches.Combat
+namespace BannerlordCheats.Patches.Combat
 {
     /*
     [HarmonyPatch(typeof(DefaultCombatSimulationModel), nameof(DefaultCombatSimulationModel.SimulateHit))]
diff --git a/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs b/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
index c0b719ac..24021b72 100644
--- a/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
+++ b/Patches/Combat/FriendlyLordCombatDeathPercentageSimulation.cs
@@ -1,12 +1,4 @@
-using System;
-using BannerlordCheats.Extensions;
-using BannerlordCheats.Settings;
-using HarmonyLib;
-using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
-
-namespace BannerlordCheats.Patches.Combat
+namespace BannerlordCheats.Patches.Combat
 {
     /*
     [HarmonyPatch(typeof(DefaultCombatSimulationModel), nameof(DefaultCombatSimulationModel.SimulateHit))]
diff --git a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
index 6b9f6947..e2e0e664 100644
--- a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
+++ b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
@@ -6,9 +6,7 @@
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.ViewModelCollection.Encyclopedia;
-using TaleWorlds.Core;
 using TaleWorlds.InputSystem;
-using TaleWorlds.Library;
 
 namespace BannerlordCheats.Patches.General
 {
diff --git a/Patches/General/EnableHotkeysAddItems.cs b/Patches/General/EnableHotkeysAddItems.cs
index 87c6b19c..ddafd358 100644
--- a/Patches/General/EnableHotkeysAddItems.cs
+++ b/Patches/General/EnableHotkeysAddItems.cs
@@ -6,10 +6,8 @@
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
-using TaleWorlds.Core;
 using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
-using TaleWorlds.Library;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.General
diff --git a/Patches/General/EnableHotkeysCharacterAttributes.cs b/Patches/General/EnableHotkeysCharacterAttributes.cs
index 4979a635..8b98cb77 100644
--- a/Patches/General/EnableHotkeysCharacterAttributes.cs
+++ b/Patches/General/EnableHotkeysCharacterAttributes.cs
@@ -10,7 +10,6 @@
 using TaleWorlds.Core;
 using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
-using TaleWorlds.Library;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.General
diff --git a/Patches/General/EnableHotkeysCharacterPoints.cs b/Patches/General/EnableHotkeysCharacterPoints.cs
index 0515fba7..57aa77bd 100644
--- a/Patches/General/EnableHotkeysCharacterPoints.cs
+++ b/Patches/General/EnableHotkeysCharacterPoints.cs
@@ -6,10 +6,8 @@
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
-using TaleWorlds.Core;
 using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
-using TaleWorlds.Library;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.General
diff --git a/Patches/General/EnableHotkeysInfluence.cs b/Patches/General/EnableHotkeysInfluence.cs
index fa3d11e8..9d554f00 100644
--- a/Patches/General/EnableHotkeysInfluence.cs
+++ b/Patches/General/EnableHotkeysInfluence.cs
@@ -6,10 +6,8 @@
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.Core;
 using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
-using TaleWorlds.Library;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.General
diff --git a/Patches/General/EnableHotkeysMoney.cs b/Patches/General/EnableHotkeysMoney.cs
index 6852fe79..928aeb71 100644
--- a/Patches/General/EnableHotkeysMoney.cs
+++ b/Patches/General/EnableHotkeysMoney.cs
@@ -6,10 +6,8 @@
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.Core;
 using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
-using TaleWorlds.Library;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.General
diff --git a/Patches/General/EnableHotkeysTroopCount.cs b/Patches/General/EnableHotkeysTroopCount.cs
index f0d84bbd..d05beb4d 100644
--- a/Patches/General/EnableHotkeysTroopCount.cs
+++ b/Patches/General/EnableHotkeysTroopCount.cs
@@ -7,10 +7,8 @@
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
-using TaleWorlds.Core;
 using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
-using TaleWorlds.Library;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.General
diff --git a/Patches/General/EnableHotkeysTroopExperience.cs b/Patches/General/EnableHotkeysTroopExperience.cs
index 249c5283..9934e18f 100644
--- a/Patches/General/EnableHotkeysTroopExperience.cs
+++ b/Patches/General/EnableHotkeysTroopExperience.cs
@@ -7,10 +7,8 @@
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
-using TaleWorlds.Core;
 using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
-using TaleWorlds.Library;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.General

From 6a472be694938f1ac6cfbd02c32a58a27256bbe2 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 31 Jan 2022 20:04:12 +0100
Subject: [PATCH 093/177] Set GitHub release prerelease status based on game
 branch

---
 .github/workflows/build.yml   | 6 ++++++
 .github/workflows/release.yml | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 41df8965..ce99d4c2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,6 +54,12 @@ jobs:
           Write-Host "::set-output name=repo_branch::$RepoBranch"
           Write-Host "RepoBranch: ""$RepoBranch"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $Prerelease = "${{github.ref}}"
+          $Prerelease = $Prerelease.Split("/")[-1]
+          If ($Prerelease -eq "stable") { $Prerelease = "false" } Else { $Prerelease = "true" }
+          Write-Host "::set-output name=prerelease::$Prerelease"
+          Write-Host "Prerelease: ""$Prerelease"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
           $ZipName = "BannerlordCheats_v$($ModVersion)_for_$($GameBranch)_e$($GameVersion)"
           Write-Host "::set-output name=zip_name::$ZipName"
           Write-Host "ZipName: ""$ZipName"""
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4f75d676..89fefca8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -53,6 +53,12 @@ jobs:
           Write-Host "::set-output name=repo_branch::$RepoBranch"
           Write-Host "RepoBranch: ""$RepoBranch"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $Prerelease = "${{github.ref}}"
+          $Prerelease = $Prerelease.Split("/")[-1]
+          If ($Prerelease -eq "stable") { $Prerelease = "false" } Else { $Prerelease = "true" }
+          Write-Host "::set-output name=prerelease::$Prerelease"
+          Write-Host "Prerelease: ""$Prerelease"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
           $ZipName = "BannerlordCheats_v$($ModVersion)_for_$($GameBranch)_e$($GameVersion)"
           Write-Host "::set-output name=zip_name::$ZipName"
           Write-Host "ZipName: ""$ZipName"""
@@ -81,7 +87,7 @@ jobs:
           tag_name: ${{steps.versions.outputs.tag_name}}
           release_name: ${{steps.versions.outputs.release_title}}
           draft: false
-          prerelease: false
+          prerelease: ${{steps.versions.outputs.prerelease}}
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 

From 24d2e4b504c3649036b2fd40deed057c2230c5fa Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 31 Jan 2022 20:05:59 +0100
Subject: [PATCH 094/177] Update MCM to v4.3.21

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 068b1eb2..ac75dcfb 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <GameVersion>1.7.1.299545</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.0</HarmonyVersion>
-    <MCMVersion>4.3.18</MCMVersion>
+    <MCMVersion>4.3.21</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\mb2b_beta</GameFolder>

From 7e76724c6bb1753d175a426ff2a9d6f8ca90810f Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 16 Mar 2022 15:17:39 +0100
Subject: [PATCH 095/177] Update to v2.10.1

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index ac75dcfb..1c49c8b6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.10.0.0</Version>
+    <Version>2.10.1.0</Version>
     <GameVersion>1.7.1.299545</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.0</HarmonyVersion>

From 54621fc3423bd5210f326956f08a213cdd6ae836 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 16 Mar 2022 15:18:06 +0100
Subject: [PATCH 096/177] Update game to e1.7.2.306299

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 1c49c8b6..c1ecb977 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.10.1.0</Version>
-    <GameVersion>1.7.1.299545</GameVersion>
+    <GameVersion>1.7.2.306299</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.0</HarmonyVersion>
     <MCMVersion>4.3.21</MCMVersion>

From 09037de40f23017fe24926d795d177eb28f18be2 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 16 Mar 2022 15:18:25 +0100
Subject: [PATCH 097/177] Update Harmony to v2.2.1

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index c1ecb977..eee98544 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
     <Version>2.10.1.0</Version>
     <GameVersion>1.7.2.306299</GameVersion>
     <GameBranch>Beta</GameBranch>
-    <HarmonyVersion>2.2.0</HarmonyVersion>
+    <HarmonyVersion>2.2.1</HarmonyVersion>
     <MCMVersion>4.3.21</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>

From 66d61f71bf51f0256a2c909ec9ad8e026b81cec5 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 16 Mar 2022 15:32:03 +0100
Subject: [PATCH 098/177] Fix launch directory path

---
 Directory.Build.props | 2 +-
 Launch.run.xml        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index eee98544..01f77ba1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,7 +7,7 @@
     <MCMVersion>4.3.21</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
-    <GameFolder>C:\SteamCMD\mb2b_beta</GameFolder>
+    <GameFolder>C:\SteamCMD\apps\mb2b_beta</GameFolder>
     <UseNuGetAssemblies>True</UseNuGetAssemblies>
   </PropertyGroup>
 </Project>
diff --git a/Launch.run.xml b/Launch.run.xml
index 40c211c9..b6330083 100644
--- a/Launch.run.xml
+++ b/Launch.run.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Launch" type="RunExe" factoryName=".NET Executable">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../../../../SteamCMD/mb2b_beta/bin/Win64_Shipping_Client/Bannerlord.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../../../../SteamCMD/apps/mb2b_beta/bin/Win64_Shipping_Client/Bannerlord.exe" />
     <option name="PROGRAM_PARAMETERS" value="/singleplayer _MODULES_*Bannerlord.Harmony*Bannerlord.ButterLib*Bannerlord.UIExtenderEx*Bannerlord.MBOptionScreen*Native*SandBoxCore*CustomBattle*SandBox*StoryMode*Cheats*_MODULES_" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../SteamCMD/mb2b_beta/bin/Win64_Shipping_Client" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../../../SteamCMD/apps/mb2b_beta/bin/Win64_Shipping_Client" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />

From 0e0efacde2e2d97a3898bc9d0d9c37002daa1576 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 16 Mar 2022 15:38:42 +0100
Subject: [PATCH 099/177] Fix namespaces for beta

---
 Extensions/AgentExtensions.cs                              | 3 ++-
 Extensions/ArmyExtensions.cs                               | 1 +
 Extensions/ClanExtensions.cs                               | 1 +
 Extensions/KingdomExtensions.cs                            | 1 +
 Extensions/PartyExtensions.cs                              | 2 +-
 Extensions/Reflection.cs                                   | 2 +-
 Extensions/SettlementExtensions.cs                         | 2 +-
 Extensions/SiegeExtensions.cs                              | 2 +-
 Patches/Army/ArmyFoodConsumptionPercentage.cs              | 3 ++-
 Patches/Characters/AdjustPregnancyDuration.cs              | 2 +-
 Patches/Characters/AllowSameSexMarriage.cs                 | 2 +-
 Patches/Characters/BarterOfferAlwaysAccepted.cs            | 2 ++
 Patches/Characters/ConversationAlwaysSuccessful.cs         | 2 +-
 Patches/Characters/NoBarterCooldown.cs                     | 1 +
 Patches/Characters/PerfectAttraction.cs                    | 2 +-
 Patches/Characters/PregnancyChanceMultiplier.cs            | 2 +-
 Patches/Clan/ExtraClanPartyLimit.cs                        | 2 +-
 Patches/Clan/ExtraClanPartySize.cs                         | 3 ++-
 Patches/Clan/ExtraCompanionLimit.cs                        | 2 +-
 Patches/Combat/AlwaysCrushThroughShields.cs                | 2 +-
 Patches/Combat/AlwaysWinBattleSimulation.cs                | 4 +++-
 Patches/Combat/BanditHideoutTroopLimit.cs                  | 4 ++--
 Patches/Combat/CombatZoomMultiplier.cs                     | 2 +-
 Patches/Combat/CompanionDeathPercentage.cs                 | 2 +-
 Patches/Combat/DamageMultiplier.cs                         | 2 +-
 Patches/Combat/DamageTakenPercentage.cs                    | 2 +-
 Patches/Combat/EnemiesNoRunningAway.cs                     | 2 +-
 Patches/Combat/EnemyDamagePercentage.cs                    | 2 +-
 Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs     | 2 +-
 Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs     | 2 +-
 Patches/Combat/EnemyOnlyKnockout.cs                        | 2 +-
 Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs  | 2 +-
 Patches/Combat/InfluenceRewardMultiplier.cs                | 3 ++-
 Patches/Combat/InstantCrossbowReload.cs                    | 2 +-
 Patches/Combat/NoFriendlyFire.cs                           | 2 +-
 Patches/Combat/NoRunningAway.cs                            | 2 +-
 Patches/Combat/NoTroopSacrificeBreakIn.cs                  | 5 +++--
 Patches/Combat/NoTroopSacrificeBreakOut.cs                 | 5 +++--
 Patches/Combat/NoTroopSacrificeRunaway.cs                  | 4 ++--
 Patches/Combat/OneHitKill.cs                               | 2 +-
 Patches/Combat/PartyDamageMultiplier.cs                    | 2 +-
 Patches/Combat/PartyDamageTakenPercentage.cs               | 2 +-
 Patches/Combat/PartyOneHitKill.cs                          | 2 +-
 Patches/Combat/PartyOnlyKnockout.cs                        | 2 +-
 Patches/Combat/RenownRewardMultiplierBattle.cs             | 3 ++-
 Patches/Combat/RenownRewardMultiplierTournament.cs         | 3 ++-
 Patches/Combat/SliceThroughEveryonePassive.cs              | 2 +-
 Patches/Experience/CompanionExperienceMultiplier.cs        | 2 +-
 Patches/Experience/CompanionLearningRateMultiplier.cs      | 2 +-
 Patches/Experience/ExperienceMultiplier.cs                 | 2 +-
 Patches/Experience/FreeFocusPointAssignment.cs             | 2 +-
 Patches/Experience/LearningLimitMultiplier.cs              | 2 +-
 Patches/Experience/LearningRateMultiplier.cs               | 2 +-
 Patches/Experience/TroopExperienceMultiplier.cs            | 4 +++-
 Patches/General/EnableHotkeyTipsScreens.cs                 | 2 +-
 Patches/General/EnableHotkeysAddEncyclopediaTroops.cs      | 1 +
 Patches/General/EnableHotkeysAddItems.cs                   | 7 ++++---
 Patches/General/EnableHotkeysCharacterAttributes.cs        | 2 +-
 Patches/General/EnableHotkeysCharacterPoints.cs            | 2 +-
 Patches/General/EnableHotkeysInfluence.cs                  | 2 +-
 Patches/General/EnableHotkeysMoney.cs                      | 2 +-
 Patches/General/EnableHotkeysTroopCount.cs                 | 4 ++--
 Patches/General/EnableHotkeysTroopExperience.cs            | 4 ++--
 Patches/Inventory/ExtraInventoryCapacity.cs                | 3 ++-
 Patches/Inventory/NativeItemSpawning.cs                    | 4 ++++
 Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs | 2 +-
 Patches/Kingdom/NoCrimeRatingForCrimes.cs                  | 4 ++--
 Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs | 2 +-
 .../Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs   | 2 +-
 Patches/Map/MapSpeedMultiplier.cs                          | 3 ++-
 Patches/Map/MapVisibilityMultiplier.cs                     | 3 ++-
 Patches/Map/NpcMapSpeedPercentage.cs                       | 3 ++-
 Patches/Map/PartyInvisibleOnMap.cs                         | 2 +-
 Patches/Party/ExtraPartyMemberSize.cs                      | 3 ++-
 Patches/Party/ExtraPartyMorale.cs                          | 3 ++-
 Patches/Party/ExtraPartyPrisonerSize.cs                    | 3 ++-
 Patches/Party/FoodConsumptionPercentage.cs                 | 3 ++-
 Patches/Party/FreeCompanionHiring.cs                       | 2 +-
 Patches/Party/FreeTroopUpgrades.cs                         | 3 ++-
 Patches/Party/InstantEscape.cs                             | 2 +-
 Patches/Party/InstantPrisonerRecruitment.cs                | 3 ++-
 Patches/Party/PartyHealingMultiplierHeroes.cs              | 3 ++-
 Patches/Party/PartyHealingMultiplierTroops.cs              | 3 ++-
 Patches/Party/TroopWagesPercentage.cs                      | 3 ++-
 Patches/Settlements/ConstructionPowerMultiplier.cs         | 3 ++-
 Patches/Settlements/DailyFoodBonus.cs                      | 2 +-
 Patches/Settlements/DailyGarrisonBonus.cs                  | 2 +-
 Patches/Settlements/DailyHearthsBonus.cs                   | 2 +-
 Patches/Settlements/DailyLoyaltyBonus.cs                   | 2 +-
 Patches/Settlements/DailyMilitiaBonusTown.cs               | 2 +-
 Patches/Settlements/DailyMilitiaBonusVillage.cs            | 2 +-
 Patches/Settlements/DailyProsperityBonus.cs                | 2 +-
 Patches/Settlements/DailySecurityBonus.cs                  | 2 +-
 Patches/Settlements/DisguiseAlwaysWorks.cs                 | 4 ++--
 Patches/Settlements/FreeTroopRecruitment.cs                | 2 +-
 Patches/Settlements/GarrisonWagesPercentage.cs             | 3 ++-
 Patches/Settlements/ItemTradingCostPercentage.cs           | 4 ++--
 Patches/Settlements/NoBribeToEnterKeep.cs                  | 4 ++--
 Patches/Settlements/SellingPriceMultiplier.cs              | 4 ++--
 Patches/Settlements/TournamentMaximumBetMultiplier.cs      | 2 +-
 Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs        | 4 ++--
 Patches/Sieges/SiegeBuildingSpeedMultiplier.cs             | 4 ++--
 Patches/Smithing/CraftedWeaponModifierBonus.cs             | 2 +-
 Patches/Smithing/SmithingCostPercentage.cs                 | 2 +-
 Patches/Smithing/SmithingDifficultyPercentage.cs           | 2 +-
 Patches/Smithing/SmithingEnergyCostPercentageRefining.cs   | 2 +-
 Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs   | 2 +-
 Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs   | 2 +-
 Patches/Smithing/UnlockAllParts.cs                         | 2 +-
 Patches/Workshops/EveryoneBuysWorkshopsCost.cs             | 1 +
 Patches/Workshops/EveryoneBuysWorkshopsSelectOwner.cs      | 4 +++-
 Patches/Workshops/WorkshopBuyingCostPercentage.cs          | 4 ++--
 Patches/Workshops/WorkshopDailyExpensePercentage.cs        | 2 +-
 Patches/Workshops/WorkshopSellingCostMultiplier.cs         | 4 ++--
 Patches/Workshops/WorkshopUpgradeCostPercentage.cs         | 2 +-
 115 files changed, 166 insertions(+), 124 deletions(-)

diff --git a/Extensions/AgentExtensions.cs b/Extensions/AgentExtensions.cs
index 2206bab0..8f62b4f9 100644
--- a/Extensions/AgentExtensions.cs
+++ b/Extensions/AgentExtensions.cs
@@ -1,4 +1,5 @@
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.AgentOrigins;
+using TaleWorlds.CampaignSystem.Party;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Extensions/ArmyExtensions.cs b/Extensions/ArmyExtensions.cs
index bf9c7c5f..4202a2d8 100644
--- a/Extensions/ArmyExtensions.cs
+++ b/Extensions/ArmyExtensions.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Extensions
 {
diff --git a/Extensions/ClanExtensions.cs b/Extensions/ClanExtensions.cs
index e151548b..c75af1b2 100644
--- a/Extensions/ClanExtensions.cs
+++ b/Extensions/ClanExtensions.cs
@@ -1,4 +1,5 @@
 using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Extensions
 {
diff --git a/Extensions/KingdomExtensions.cs b/Extensions/KingdomExtensions.cs
index 5e9ba0ef..e94d3692 100644
--- a/Extensions/KingdomExtensions.cs
+++ b/Extensions/KingdomExtensions.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Extensions
 {
diff --git a/Extensions/PartyExtensions.cs b/Extensions/PartyExtensions.cs
index 0874ec21..4cc50214 100644
--- a/Extensions/PartyExtensions.cs
+++ b/Extensions/PartyExtensions.cs
@@ -1,4 +1,4 @@
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Extensions
 {
diff --git a/Extensions/Reflection.cs b/Extensions/Reflection.cs
index 2838cc3a..ffa5345c 100644
--- a/Extensions/Reflection.cs
+++ b/Extensions/Reflection.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
-using TaleWorlds.Engine.Screens;
+using TaleWorlds.ScreenSystem;
 
 namespace BannerlordCheats.Extensions
 {
diff --git a/Extensions/SettlementExtensions.cs b/Extensions/SettlementExtensions.cs
index 66e95c15..8474d8d8 100644
--- a/Extensions/SettlementExtensions.cs
+++ b/Extensions/SettlementExtensions.cs
@@ -1,4 +1,4 @@
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Settlements;
 
 namespace BannerlordCheats.Extensions
 {
diff --git a/Extensions/SiegeExtensions.cs b/Extensions/SiegeExtensions.cs
index 33f122c1..aa977c44 100644
--- a/Extensions/SiegeExtensions.cs
+++ b/Extensions/SiegeExtensions.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Siege;
 
 namespace BannerlordCheats.Extensions
 {
diff --git a/Patches/Army/ArmyFoodConsumptionPercentage.cs b/Patches/Army/ArmyFoodConsumptionPercentage.cs
index 30e46f85..f60fd653 100644
--- a/Patches/Army/ArmyFoodConsumptionPercentage.cs
+++ b/Patches/Army/ArmyFoodConsumptionPercentage.cs
@@ -4,7 +4,8 @@
 using BannerlordCheats.Extensions;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Army
 {
diff --git a/Patches/Characters/AdjustPregnancyDuration.cs b/Patches/Characters/AdjustPregnancyDuration.cs
index ab1dc4ed..66b5c225 100644
--- a/Patches/Characters/AdjustPregnancyDuration.cs
+++ b/Patches/Characters/AdjustPregnancyDuration.cs
@@ -2,7 +2,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Characters
 {
diff --git a/Patches/Characters/AllowSameSexMarriage.cs b/Patches/Characters/AllowSameSexMarriage.cs
index 50221b0b..55c212ab 100644
--- a/Patches/Characters/AllowSameSexMarriage.cs
+++ b/Patches/Characters/AllowSameSexMarriage.cs
@@ -6,7 +6,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Characters
 {
diff --git a/Patches/Characters/BarterOfferAlwaysAccepted.cs b/Patches/Characters/BarterOfferAlwaysAccepted.cs
index 8de91d35..58591daa 100644
--- a/Patches/Characters/BarterOfferAlwaysAccepted.cs
+++ b/Patches/Characters/BarterOfferAlwaysAccepted.cs
@@ -3,6 +3,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.BarterSystem;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Characters
 {
diff --git a/Patches/Characters/ConversationAlwaysSuccessful.cs b/Patches/Characters/ConversationAlwaysSuccessful.cs
index 5165113c..d31a8d61 100644
--- a/Patches/Characters/ConversationAlwaysSuccessful.cs
+++ b/Patches/Characters/ConversationAlwaysSuccessful.cs
@@ -3,7 +3,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.Conversation.Persuasion;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Characters
 {
diff --git a/Patches/Characters/NoBarterCooldown.cs b/Patches/Characters/NoBarterCooldown.cs
index e852a25a..27d4254a 100644
--- a/Patches/Characters/NoBarterCooldown.cs
+++ b/Patches/Characters/NoBarterCooldown.cs
@@ -3,6 +3,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.BarterSystem;
 
 namespace BannerlordCheats.Patches.Characters
 {
diff --git a/Patches/Characters/PerfectAttraction.cs b/Patches/Characters/PerfectAttraction.cs
index 5b963e16..7110e4fe 100644
--- a/Patches/Characters/PerfectAttraction.cs
+++ b/Patches/Characters/PerfectAttraction.cs
@@ -4,7 +4,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Characters
 {
diff --git a/Patches/Characters/PregnancyChanceMultiplier.cs b/Patches/Characters/PregnancyChanceMultiplier.cs
index 309fa2e7..303a3243 100644
--- a/Patches/Characters/PregnancyChanceMultiplier.cs
+++ b/Patches/Characters/PregnancyChanceMultiplier.cs
@@ -4,7 +4,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Characters
 {
diff --git a/Patches/Clan/ExtraClanPartyLimit.cs b/Patches/Clan/ExtraClanPartyLimit.cs
index 1f124b4f..80509649 100644
--- a/Patches/Clan/ExtraClanPartyLimit.cs
+++ b/Patches/Clan/ExtraClanPartyLimit.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Clan
 {
diff --git a/Patches/Clan/ExtraClanPartySize.cs b/Patches/Clan/ExtraClanPartySize.cs
index 2229e62f..edf027c0 100644
--- a/Patches/Clan/ExtraClanPartySize.cs
+++ b/Patches/Clan/ExtraClanPartySize.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Clan
 {
diff --git a/Patches/Clan/ExtraCompanionLimit.cs b/Patches/Clan/ExtraCompanionLimit.cs
index d0324063..6c5825ea 100644
--- a/Patches/Clan/ExtraCompanionLimit.cs
+++ b/Patches/Clan/ExtraCompanionLimit.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Clan
 {
diff --git a/Patches/Combat/AlwaysCrushThroughShields.cs b/Patches/Combat/AlwaysCrushThroughShields.cs
index 0fdc69b0..98c78a48 100644
--- a/Patches/Combat/AlwaysCrushThroughShields.cs
+++ b/Patches/Combat/AlwaysCrushThroughShields.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/AlwaysWinBattleSimulation.cs b/Patches/Combat/AlwaysWinBattleSimulation.cs
index 40ad40f8..4a05df6e 100644
--- a/Patches/Combat/AlwaysWinBattleSimulation.cs
+++ b/Patches/Combat/AlwaysWinBattleSimulation.cs
@@ -4,7 +4,9 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.MapEvents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Combat
 {
diff --git a/Patches/Combat/BanditHideoutTroopLimit.cs b/Patches/Combat/BanditHideoutTroopLimit.cs
index 15469803..e85c903d 100644
--- a/Patches/Combat/BanditHideoutTroopLimit.cs
+++ b/Patches/Combat/BanditHideoutTroopLimit.cs
@@ -2,8 +2,8 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Combat
 {
diff --git a/Patches/Combat/CombatZoomMultiplier.cs b/Patches/Combat/CombatZoomMultiplier.cs
index f033c587..ccf0886b 100644
--- a/Patches/Combat/CombatZoomMultiplier.cs
+++ b/Patches/Combat/CombatZoomMultiplier.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
diff --git a/Patches/Combat/CompanionDeathPercentage.cs b/Patches/Combat/CompanionDeathPercentage.cs
index 75903b05..b962681b 100644
--- a/Patches/Combat/CompanionDeathPercentage.cs
+++ b/Patches/Combat/CompanionDeathPercentage.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/DamageMultiplier.cs b/Patches/Combat/DamageMultiplier.cs
index 40f5ce37..de9e4575 100644
--- a/Patches/Combat/DamageMultiplier.cs
+++ b/Patches/Combat/DamageMultiplier.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/DamageTakenPercentage.cs b/Patches/Combat/DamageTakenPercentage.cs
index e38b5158..ff3139db 100644
--- a/Patches/Combat/DamageTakenPercentage.cs
+++ b/Patches/Combat/DamageTakenPercentage.cs
@@ -1,9 +1,9 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
-using SandBox;
 using System;
 using BannerlordCheats.Extensions;
 using JetBrains.Annotations;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/EnemiesNoRunningAway.cs b/Patches/Combat/EnemiesNoRunningAway.cs
index 82d19d75..b22ca960 100644
--- a/Patches/Combat/EnemiesNoRunningAway.cs
+++ b/Patches/Combat/EnemiesNoRunningAway.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
diff --git a/Patches/Combat/EnemyDamagePercentage.cs b/Patches/Combat/EnemyDamagePercentage.cs
index e7d05fa1..b2585233 100644
--- a/Patches/Combat/EnemyDamagePercentage.cs
+++ b/Patches/Combat/EnemyDamagePercentage.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs b/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
index 9597b105..b1f23864 100644
--- a/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
+++ b/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
index 78eb7593..66f76796 100644
--- a/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
+++ b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/EnemyOnlyKnockout.cs b/Patches/Combat/EnemyOnlyKnockout.cs
index 03d2b62c..b37a72a0 100644
--- a/Patches/Combat/EnemyOnlyKnockout.cs
+++ b/Patches/Combat/EnemyOnlyKnockout.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
index cee3e269..b51092b0 100644
--- a/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
+++ b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/InfluenceRewardMultiplier.cs b/Patches/Combat/InfluenceRewardMultiplier.cs
index 2a3fdb8c..da7af74a 100644
--- a/Patches/Combat/InfluenceRewardMultiplier.cs
+++ b/Patches/Combat/InfluenceRewardMultiplier.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Combat
 {
diff --git a/Patches/Combat/InstantCrossbowReload.cs b/Patches/Combat/InstantCrossbowReload.cs
index b6ad8532..bb13cb3c 100644
--- a/Patches/Combat/InstantCrossbowReload.cs
+++ b/Patches/Combat/InstantCrossbowReload.cs
@@ -2,7 +2,7 @@
 using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/NoFriendlyFire.cs b/Patches/Combat/NoFriendlyFire.cs
index 7436d75a..48c64616 100644
--- a/Patches/Combat/NoFriendlyFire.cs
+++ b/Patches/Combat/NoFriendlyFire.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/NoRunningAway.cs b/Patches/Combat/NoRunningAway.cs
index 7cc2d4e5..51dca874 100644
--- a/Patches/Combat/NoRunningAway.cs
+++ b/Patches/Combat/NoRunningAway.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
diff --git a/Patches/Combat/NoTroopSacrificeBreakIn.cs b/Patches/Combat/NoTroopSacrificeBreakIn.cs
index 40184c96..440765de 100644
--- a/Patches/Combat/NoTroopSacrificeBreakIn.cs
+++ b/Patches/Combat/NoTroopSacrificeBreakIn.cs
@@ -3,8 +3,9 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
+using TaleWorlds.CampaignSystem.Siege;
 
 namespace BannerlordCheats.Patches.Combat
 {
diff --git a/Patches/Combat/NoTroopSacrificeBreakOut.cs b/Patches/Combat/NoTroopSacrificeBreakOut.cs
index 337b2884..10e6ad36 100644
--- a/Patches/Combat/NoTroopSacrificeBreakOut.cs
+++ b/Patches/Combat/NoTroopSacrificeBreakOut.cs
@@ -3,8 +3,9 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
+using TaleWorlds.CampaignSystem.Siege;
 
 namespace BannerlordCheats.Patches.Combat
 {
diff --git a/Patches/Combat/NoTroopSacrificeRunaway.cs b/Patches/Combat/NoTroopSacrificeRunaway.cs
index 363c84c4..68efbb8e 100644
--- a/Patches/Combat/NoTroopSacrificeRunaway.cs
+++ b/Patches/Combat/NoTroopSacrificeRunaway.cs
@@ -2,8 +2,8 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.MapEvents;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Combat
diff --git a/Patches/Combat/OneHitKill.cs b/Patches/Combat/OneHitKill.cs
index 0cdf7fa8..e56e3bef 100644
--- a/Patches/Combat/OneHitKill.cs
+++ b/Patches/Combat/OneHitKill.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/PartyDamageMultiplier.cs b/Patches/Combat/PartyDamageMultiplier.cs
index 1c06ebfc..01c966d8 100644
--- a/Patches/Combat/PartyDamageMultiplier.cs
+++ b/Patches/Combat/PartyDamageMultiplier.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/PartyDamageTakenPercentage.cs b/Patches/Combat/PartyDamageTakenPercentage.cs
index d01398f7..eaa92236 100644
--- a/Patches/Combat/PartyDamageTakenPercentage.cs
+++ b/Patches/Combat/PartyDamageTakenPercentage.cs
@@ -1,9 +1,9 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
-using SandBox;
 using System;
 using BannerlordCheats.Extensions;
 using JetBrains.Annotations;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/PartyOneHitKill.cs b/Patches/Combat/PartyOneHitKill.cs
index 118f7015..1bef8fc4 100644
--- a/Patches/Combat/PartyOneHitKill.cs
+++ b/Patches/Combat/PartyOneHitKill.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/PartyOnlyKnockout.cs b/Patches/Combat/PartyOnlyKnockout.cs
index 7b1f7639..fd5fcb79 100644
--- a/Patches/Combat/PartyOnlyKnockout.cs
+++ b/Patches/Combat/PartyOnlyKnockout.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/RenownRewardMultiplierBattle.cs b/Patches/Combat/RenownRewardMultiplierBattle.cs
index 523d799f..167d71bd 100644
--- a/Patches/Combat/RenownRewardMultiplierBattle.cs
+++ b/Patches/Combat/RenownRewardMultiplierBattle.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Combat
 {
diff --git a/Patches/Combat/RenownRewardMultiplierTournament.cs b/Patches/Combat/RenownRewardMultiplierTournament.cs
index 687bed08..9f932fe9 100644
--- a/Patches/Combat/RenownRewardMultiplierTournament.cs
+++ b/Patches/Combat/RenownRewardMultiplierTournament.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Settlements;
 
 namespace BannerlordCheats.Patches.Combat
 {
diff --git a/Patches/Combat/SliceThroughEveryonePassive.cs b/Patches/Combat/SliceThroughEveryonePassive.cs
index 3e9f9032..cb2ec5bc 100644
--- a/Patches/Combat/SliceThroughEveryonePassive.cs
+++ b/Patches/Combat/SliceThroughEveryonePassive.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox;
+using SandBox.GameComponents;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
diff --git a/Patches/Experience/CompanionExperienceMultiplier.cs b/Patches/Experience/CompanionExperienceMultiplier.cs
index 34612034..1fe433d9 100644
--- a/Patches/Experience/CompanionExperienceMultiplier.cs
+++ b/Patches/Experience/CompanionExperienceMultiplier.cs
@@ -4,7 +4,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Experience
 {
diff --git a/Patches/Experience/CompanionLearningRateMultiplier.cs b/Patches/Experience/CompanionLearningRateMultiplier.cs
index 066d3994..c53dac08 100644
--- a/Patches/Experience/CompanionLearningRateMultiplier.cs
+++ b/Patches/Experience/CompanionLearningRateMultiplier.cs
@@ -4,7 +4,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Experience
diff --git a/Patches/Experience/ExperienceMultiplier.cs b/Patches/Experience/ExperienceMultiplier.cs
index 724e6ba3..8330b001 100644
--- a/Patches/Experience/ExperienceMultiplier.cs
+++ b/Patches/Experience/ExperienceMultiplier.cs
@@ -4,7 +4,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Experience
 {
diff --git a/Patches/Experience/FreeFocusPointAssignment.cs b/Patches/Experience/FreeFocusPointAssignment.cs
index 722a4465..91f3f526 100644
--- a/Patches/Experience/FreeFocusPointAssignment.cs
+++ b/Patches/Experience/FreeFocusPointAssignment.cs
@@ -2,7 +2,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.CharacterDevelopment;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Experience
diff --git a/Patches/Experience/LearningLimitMultiplier.cs b/Patches/Experience/LearningLimitMultiplier.cs
index b11aac86..64acb360 100644
--- a/Patches/Experience/LearningLimitMultiplier.cs
+++ b/Patches/Experience/LearningLimitMultiplier.cs
@@ -4,7 +4,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 using TaleWorlds.Localization;
 
 namespace BannerlordCheats.Patches.Experience
diff --git a/Patches/Experience/LearningRateMultiplier.cs b/Patches/Experience/LearningRateMultiplier.cs
index 7b4a6619..10e62da1 100644
--- a/Patches/Experience/LearningRateMultiplier.cs
+++ b/Patches/Experience/LearningRateMultiplier.cs
@@ -4,7 +4,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Experience
diff --git a/Patches/Experience/TroopExperienceMultiplier.cs b/Patches/Experience/TroopExperienceMultiplier.cs
index cd860b5e..0494f8db 100644
--- a/Patches/Experience/TroopExperienceMultiplier.cs
+++ b/Patches/Experience/TroopExperienceMultiplier.cs
@@ -4,7 +4,9 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.ComponentInterfaces;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Experience
 {
diff --git a/Patches/General/EnableHotkeyTipsScreens.cs b/Patches/General/EnableHotkeyTipsScreens.cs
index f2940ea5..59694577 100644
--- a/Patches/General/EnableHotkeyTipsScreens.cs
+++ b/Patches/General/EnableHotkeyTipsScreens.cs
@@ -4,7 +4,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
-using TaleWorlds.Engine.Screens;
+using TaleWorlds.ScreenSystem;
 
 namespace BannerlordCheats.Patches.General
 {
diff --git a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
index e2e0e664..cc18c529 100644
--- a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
+++ b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
@@ -5,6 +5,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Party;
 using TaleWorlds.CampaignSystem.ViewModelCollection.Encyclopedia;
 using TaleWorlds.InputSystem;
 
diff --git a/Patches/General/EnableHotkeysAddItems.cs b/Patches/General/EnableHotkeysAddItems.cs
index ddafd358..a4be92e9 100644
--- a/Patches/General/EnableHotkeysAddItems.cs
+++ b/Patches/General/EnableHotkeysAddItems.cs
@@ -5,10 +5,11 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
+using TaleWorlds.CampaignSystem.Party;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
-using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
+using TaleWorlds.ScreenSystem;
 
 namespace BannerlordCheats.Patches.General
 {
@@ -50,11 +51,11 @@ private static void AddItems(int count)
 
             if (selectedItem == null) { return; }
 
-            var index = TaleWorlds.CampaignSystem.PartyBase.MainParty.ItemRoster.FindIndexOfElement(selectedItem.ItemRosterElement.EquipmentElement);
+            var index = PartyBase.MainParty.ItemRoster.FindIndexOfElement(selectedItem.ItemRosterElement.EquipmentElement);
 
             if (index < 0) { return; }
 
-            TaleWorlds.CampaignSystem.PartyBase.MainParty.ItemRoster.AddToCounts(selectedItem.ItemRosterElement.EquipmentElement, count);
+            PartyBase.MainParty.ItemRoster.AddToCounts(selectedItem.ItemRosterElement.EquipmentElement, count);
 
             selectedItem.ItemCount += count;
 
diff --git a/Patches/General/EnableHotkeysCharacterAttributes.cs b/Patches/General/EnableHotkeysCharacterAttributes.cs
index 8b98cb77..68aecd21 100644
--- a/Patches/General/EnableHotkeysCharacterAttributes.cs
+++ b/Patches/General/EnableHotkeysCharacterAttributes.cs
@@ -8,9 +8,9 @@
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
 using TaleWorlds.Core;
-using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
+using TaleWorlds.ScreenSystem;
 
 namespace BannerlordCheats.Patches.General
 {
diff --git a/Patches/General/EnableHotkeysCharacterPoints.cs b/Patches/General/EnableHotkeysCharacterPoints.cs
index 57aa77bd..c867f3d9 100644
--- a/Patches/General/EnableHotkeysCharacterPoints.cs
+++ b/Patches/General/EnableHotkeysCharacterPoints.cs
@@ -6,9 +6,9 @@
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
-using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
+using TaleWorlds.ScreenSystem;
 
 namespace BannerlordCheats.Patches.General
 {
diff --git a/Patches/General/EnableHotkeysInfluence.cs b/Patches/General/EnableHotkeysInfluence.cs
index 9d554f00..30b44750 100644
--- a/Patches/General/EnableHotkeysInfluence.cs
+++ b/Patches/General/EnableHotkeysInfluence.cs
@@ -6,9 +6,9 @@
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
+using TaleWorlds.ScreenSystem;
 
 namespace BannerlordCheats.Patches.General
 {
diff --git a/Patches/General/EnableHotkeysMoney.cs b/Patches/General/EnableHotkeysMoney.cs
index 928aeb71..79f4276e 100644
--- a/Patches/General/EnableHotkeysMoney.cs
+++ b/Patches/General/EnableHotkeysMoney.cs
@@ -6,9 +6,9 @@
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
+using TaleWorlds.ScreenSystem;
 
 namespace BannerlordCheats.Patches.General
 {
diff --git a/Patches/General/EnableHotkeysTroopCount.cs b/Patches/General/EnableHotkeysTroopCount.cs
index d05beb4d..ddeefd8d 100644
--- a/Patches/General/EnableHotkeysTroopCount.cs
+++ b/Patches/General/EnableHotkeysTroopCount.cs
@@ -5,11 +5,11 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Party;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
-using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
+using TaleWorlds.ScreenSystem;
 
 namespace BannerlordCheats.Patches.General
 {
diff --git a/Patches/General/EnableHotkeysTroopExperience.cs b/Patches/General/EnableHotkeysTroopExperience.cs
index 9934e18f..b3dc689c 100644
--- a/Patches/General/EnableHotkeysTroopExperience.cs
+++ b/Patches/General/EnableHotkeysTroopExperience.cs
@@ -5,11 +5,11 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Party;
 using TaleWorlds.CampaignSystem.ViewModelCollection;
-using TaleWorlds.Engine.Screens;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
+using TaleWorlds.ScreenSystem;
 
 namespace BannerlordCheats.Patches.General
 {
diff --git a/Patches/Inventory/ExtraInventoryCapacity.cs b/Patches/Inventory/ExtraInventoryCapacity.cs
index bd1cc703..e4127f18 100644
--- a/Patches/Inventory/ExtraInventoryCapacity.cs
+++ b/Patches/Inventory/ExtraInventoryCapacity.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Inventory
 {
diff --git a/Patches/Inventory/NativeItemSpawning.cs b/Patches/Inventory/NativeItemSpawning.cs
index c493a8c7..377cde4b 100644
--- a/Patches/Inventory/NativeItemSpawning.cs
+++ b/Patches/Inventory/NativeItemSpawning.cs
@@ -4,6 +4,10 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Inventory;
+using TaleWorlds.CampaignSystem.Party;
+using TaleWorlds.CampaignSystem.Roster;
+using TaleWorlds.CampaignSystem.Settlements;
 using TaleWorlds.Core;
 using TaleWorlds.Localization;
 
diff --git a/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs b/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
index d94f0fca..803314b4 100644
--- a/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
+++ b/Patches/Kingdom/DecisionOverrideInfluenceCostPercentage.cs
@@ -3,7 +3,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.Election;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Kingdom
 {
diff --git a/Patches/Kingdom/NoCrimeRatingForCrimes.cs b/Patches/Kingdom/NoCrimeRatingForCrimes.cs
index 88ae285b..69dec5ea 100644
--- a/Patches/Kingdom/NoCrimeRatingForCrimes.cs
+++ b/Patches/Kingdom/NoCrimeRatingForCrimes.cs
@@ -2,8 +2,8 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.ComponentInterfaces;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Kingdom
 {
diff --git a/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
index 5640e256..0ff67b95 100644
--- a/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionArmyDisband.cs
@@ -2,7 +2,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Kingdom
 {
diff --git a/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs b/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
index 40665916..d3e33a12 100644
--- a/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
+++ b/Patches/Kingdom/NoRelationshipLossOnDecisionExpellingClan.cs
@@ -2,7 +2,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Kingdom
 {
diff --git a/Patches/Map/MapSpeedMultiplier.cs b/Patches/Map/MapSpeedMultiplier.cs
index 2dab9eab..006a1322 100644
--- a/Patches/Map/MapSpeedMultiplier.cs
+++ b/Patches/Map/MapSpeedMultiplier.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Map
 {
diff --git a/Patches/Map/MapVisibilityMultiplier.cs b/Patches/Map/MapVisibilityMultiplier.cs
index ef052b07..6e30a856 100644
--- a/Patches/Map/MapVisibilityMultiplier.cs
+++ b/Patches/Map/MapVisibilityMultiplier.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Map
 {
diff --git a/Patches/Map/NpcMapSpeedPercentage.cs b/Patches/Map/NpcMapSpeedPercentage.cs
index a48648db..6ad5aa72 100644
--- a/Patches/Map/NpcMapSpeedPercentage.cs
+++ b/Patches/Map/NpcMapSpeedPercentage.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Map
 {
diff --git a/Patches/Map/PartyInvisibleOnMap.cs b/Patches/Map/PartyInvisibleOnMap.cs
index 1af0acd8..6e88a981 100644
--- a/Patches/Map/PartyInvisibleOnMap.cs
+++ b/Patches/Map/PartyInvisibleOnMap.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Map
 {
diff --git a/Patches/Party/ExtraPartyMemberSize.cs b/Patches/Party/ExtraPartyMemberSize.cs
index a04305c3..5b6027cd 100644
--- a/Patches/Party/ExtraPartyMemberSize.cs
+++ b/Patches/Party/ExtraPartyMemberSize.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Party
 {
diff --git a/Patches/Party/ExtraPartyMorale.cs b/Patches/Party/ExtraPartyMorale.cs
index 6314ba45..7d9b7846 100644
--- a/Patches/Party/ExtraPartyMorale.cs
+++ b/Patches/Party/ExtraPartyMorale.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Party
 {
diff --git a/Patches/Party/ExtraPartyPrisonerSize.cs b/Patches/Party/ExtraPartyPrisonerSize.cs
index b9afb915..60b72ae4 100644
--- a/Patches/Party/ExtraPartyPrisonerSize.cs
+++ b/Patches/Party/ExtraPartyPrisonerSize.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Party
 {
diff --git a/Patches/Party/FoodConsumptionPercentage.cs b/Patches/Party/FoodConsumptionPercentage.cs
index bb6b902d..6a7ad4d9 100644
--- a/Patches/Party/FoodConsumptionPercentage.cs
+++ b/Patches/Party/FoodConsumptionPercentage.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Party
 {
diff --git a/Patches/Party/FreeCompanionHiring.cs b/Patches/Party/FreeCompanionHiring.cs
index c13ff061..d361b448 100644
--- a/Patches/Party/FreeCompanionHiring.cs
+++ b/Patches/Party/FreeCompanionHiring.cs
@@ -3,7 +3,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Party
 {
diff --git a/Patches/Party/FreeTroopUpgrades.cs b/Patches/Party/FreeTroopUpgrades.cs
index ba78eef8..73f3f6ed 100644
--- a/Patches/Party/FreeTroopUpgrades.cs
+++ b/Patches/Party/FreeTroopUpgrades.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Party
 {
diff --git a/Patches/Party/InstantEscape.cs b/Patches/Party/InstantEscape.cs
index 6a1ccd00..6e921510 100644
--- a/Patches/Party/InstantEscape.cs
+++ b/Patches/Party/InstantEscape.cs
@@ -3,7 +3,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Party
 {
diff --git a/Patches/Party/InstantPrisonerRecruitment.cs b/Patches/Party/InstantPrisonerRecruitment.cs
index e022c7ea..31020b73 100644
--- a/Patches/Party/InstantPrisonerRecruitment.cs
+++ b/Patches/Party/InstantPrisonerRecruitment.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Party
 {
diff --git a/Patches/Party/PartyHealingMultiplierHeroes.cs b/Patches/Party/PartyHealingMultiplierHeroes.cs
index 06e50c97..115f5df3 100644
--- a/Patches/Party/PartyHealingMultiplierHeroes.cs
+++ b/Patches/Party/PartyHealingMultiplierHeroes.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Party
 {
diff --git a/Patches/Party/PartyHealingMultiplierTroops.cs b/Patches/Party/PartyHealingMultiplierTroops.cs
index 4f867d14..5e21893b 100644
--- a/Patches/Party/PartyHealingMultiplierTroops.cs
+++ b/Patches/Party/PartyHealingMultiplierTroops.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Party
 {
diff --git a/Patches/Party/TroopWagesPercentage.cs b/Patches/Party/TroopWagesPercentage.cs
index 625a2c41..a4865808 100644
--- a/Patches/Party/TroopWagesPercentage.cs
+++ b/Patches/Party/TroopWagesPercentage.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Party
 {
diff --git a/Patches/Settlements/ConstructionPowerMultiplier.cs b/Patches/Settlements/ConstructionPowerMultiplier.cs
index 18cb521b..2d19f6fe 100644
--- a/Patches/Settlements/ConstructionPowerMultiplier.cs
+++ b/Patches/Settlements/ConstructionPowerMultiplier.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Settlements;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Settlements/DailyFoodBonus.cs b/Patches/Settlements/DailyFoodBonus.cs
index 5dc260e1..08861945 100644
--- a/Patches/Settlements/DailyFoodBonus.cs
+++ b/Patches/Settlements/DailyFoodBonus.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Settlements;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Settlements/DailyGarrisonBonus.cs b/Patches/Settlements/DailyGarrisonBonus.cs
index afc15207..fbbfe2a5 100644
--- a/Patches/Settlements/DailyGarrisonBonus.cs
+++ b/Patches/Settlements/DailyGarrisonBonus.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Settlements;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Settlements/DailyHearthsBonus.cs b/Patches/Settlements/DailyHearthsBonus.cs
index 0e1fec27..9e21b1a9 100644
--- a/Patches/Settlements/DailyHearthsBonus.cs
+++ b/Patches/Settlements/DailyHearthsBonus.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Settlements;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Settlements/DailyLoyaltyBonus.cs b/Patches/Settlements/DailyLoyaltyBonus.cs
index b785e434..10f2be01 100644
--- a/Patches/Settlements/DailyLoyaltyBonus.cs
+++ b/Patches/Settlements/DailyLoyaltyBonus.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Settlements;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Settlements/DailyMilitiaBonusTown.cs b/Patches/Settlements/DailyMilitiaBonusTown.cs
index b04e647b..cc120f6c 100644
--- a/Patches/Settlements/DailyMilitiaBonusTown.cs
+++ b/Patches/Settlements/DailyMilitiaBonusTown.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Settlements;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Settlements/DailyMilitiaBonusVillage.cs b/Patches/Settlements/DailyMilitiaBonusVillage.cs
index 8f737e21..83c6418c 100644
--- a/Patches/Settlements/DailyMilitiaBonusVillage.cs
+++ b/Patches/Settlements/DailyMilitiaBonusVillage.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Settlements;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Settlements/DailyProsperityBonus.cs b/Patches/Settlements/DailyProsperityBonus.cs
index 097988c3..3c4eb384 100644
--- a/Patches/Settlements/DailyProsperityBonus.cs
+++ b/Patches/Settlements/DailyProsperityBonus.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Settlements;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Settlements/DailySecurityBonus.cs b/Patches/Settlements/DailySecurityBonus.cs
index e01384a0..33021b6a 100644
--- a/Patches/Settlements/DailySecurityBonus.cs
+++ b/Patches/Settlements/DailySecurityBonus.cs
@@ -3,7 +3,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Settlements;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Settlements/DisguiseAlwaysWorks.cs b/Patches/Settlements/DisguiseAlwaysWorks.cs
index 388523a8..9a9335e6 100644
--- a/Patches/Settlements/DisguiseAlwaysWorks.cs
+++ b/Patches/Settlements/DisguiseAlwaysWorks.cs
@@ -2,8 +2,8 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Settlements;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Settlements/FreeTroopRecruitment.cs b/Patches/Settlements/FreeTroopRecruitment.cs
index c1d51609..c36f0028 100644
--- a/Patches/Settlements/FreeTroopRecruitment.cs
+++ b/Patches/Settlements/FreeTroopRecruitment.cs
@@ -4,7 +4,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Settlements/GarrisonWagesPercentage.cs b/Patches/Settlements/GarrisonWagesPercentage.cs
index 9e45b716..d40e3239 100644
--- a/Patches/Settlements/GarrisonWagesPercentage.cs
+++ b/Patches/Settlements/GarrisonWagesPercentage.cs
@@ -4,7 +4,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Settlements/ItemTradingCostPercentage.cs b/Patches/Settlements/ItemTradingCostPercentage.cs
index 67afdb3c..94bf69d8 100644
--- a/Patches/Settlements/ItemTradingCostPercentage.cs
+++ b/Patches/Settlements/ItemTradingCostPercentage.cs
@@ -3,8 +3,8 @@
 using System;
 using BannerlordCheats.Extensions;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Settlements
diff --git a/Patches/Settlements/NoBribeToEnterKeep.cs b/Patches/Settlements/NoBribeToEnterKeep.cs
index 42cfa0a7..8da3b870 100644
--- a/Patches/Settlements/NoBribeToEnterKeep.cs
+++ b/Patches/Settlements/NoBribeToEnterKeep.cs
@@ -2,8 +2,8 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Settlements;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Settlements/SellingPriceMultiplier.cs b/Patches/Settlements/SellingPriceMultiplier.cs
index 5a30352d..71f7f5db 100644
--- a/Patches/Settlements/SellingPriceMultiplier.cs
+++ b/Patches/Settlements/SellingPriceMultiplier.cs
@@ -3,8 +3,8 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Party;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Settlements
diff --git a/Patches/Settlements/TournamentMaximumBetMultiplier.cs b/Patches/Settlements/TournamentMaximumBetMultiplier.cs
index 601aef1f..fe653190 100644
--- a/Patches/Settlements/TournamentMaximumBetMultiplier.cs
+++ b/Patches/Settlements/TournamentMaximumBetMultiplier.cs
@@ -2,7 +2,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox.TournamentMissions.Missions;
+using SandBox.Tournaments.MissionLogics;
 
 namespace BannerlordCheats.Patches.Settlements
 {
diff --git a/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
index 3559f664..e3a4e9b1 100644
--- a/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
+++ b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
@@ -4,8 +4,8 @@
 using System.Linq;
 using BannerlordCheats.Extensions;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Siege;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Sieges
diff --git a/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs b/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
index 71fdd036..d04b2058 100644
--- a/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
+++ b/Patches/Sieges/SiegeBuildingSpeedMultiplier.cs
@@ -3,8 +3,8 @@
 using HarmonyLib;
 using BannerlordCheats.Extensions;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Siege;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Sieges
diff --git a/Patches/Smithing/CraftedWeaponModifierBonus.cs b/Patches/Smithing/CraftedWeaponModifierBonus.cs
index 5e9b7baa..1d0c383e 100644
--- a/Patches/Smithing/CraftedWeaponModifierBonus.cs
+++ b/Patches/Smithing/CraftedWeaponModifierBonus.cs
@@ -2,7 +2,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
 using static TaleWorlds.Core.Crafting;
 
 namespace BannerlordCheats.Patches.Smithing
diff --git a/Patches/Smithing/SmithingCostPercentage.cs b/Patches/Smithing/SmithingCostPercentage.cs
index dafa4328..21f0e558 100644
--- a/Patches/Smithing/SmithingCostPercentage.cs
+++ b/Patches/Smithing/SmithingCostPercentage.cs
@@ -2,7 +2,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Smithing
diff --git a/Patches/Smithing/SmithingDifficultyPercentage.cs b/Patches/Smithing/SmithingDifficultyPercentage.cs
index 849fdeb0..a6537766 100644
--- a/Patches/Smithing/SmithingDifficultyPercentage.cs
+++ b/Patches/Smithing/SmithingDifficultyPercentage.cs
@@ -2,7 +2,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Smithing
diff --git a/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs b/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
index fc6b64fa..6a40e915 100644
--- a/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageRefining.cs
@@ -4,7 +4,7 @@
 using BannerlordCheats.Extensions;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Smithing
diff --git a/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs b/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
index f1d41bb3..752da643 100644
--- a/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageSmelting.cs
@@ -4,7 +4,7 @@
 using BannerlordCheats.Extensions;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Smithing
diff --git a/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs b/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
index 10456a8e..93769ffe 100644
--- a/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
+++ b/Patches/Smithing/SmithingEnergyCostPercentageSmithing.cs
@@ -4,7 +4,7 @@
 using BannerlordCheats.Extensions;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Map;
+using TaleWorlds.CampaignSystem.GameComponents;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Smithing
diff --git a/Patches/Smithing/UnlockAllParts.cs b/Patches/Smithing/UnlockAllParts.cs
index a779c3de..e6dc879b 100644
--- a/Patches/Smithing/UnlockAllParts.cs
+++ b/Patches/Smithing/UnlockAllParts.cs
@@ -2,7 +2,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem.SandBox.CampaignBehaviors;
+using TaleWorlds.CampaignSystem.CampaignBehaviors;
 using TaleWorlds.Core;
 
 namespace BannerlordCheats.Patches.Smithing
diff --git a/Patches/Workshops/EveryoneBuysWorkshopsCost.cs b/Patches/Workshops/EveryoneBuysWorkshopsCost.cs
index 828dbac3..7cf5f7e0 100644
--- a/Patches/Workshops/EveryoneBuysWorkshopsCost.cs
+++ b/Patches/Workshops/EveryoneBuysWorkshopsCost.cs
@@ -5,6 +5,7 @@
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.Actions;
+using TaleWorlds.CampaignSystem.Settlements.Workshops;
 using TaleWorlds.Localization;
 
 namespace BannerlordCheats.Patches.Workshops
diff --git a/Patches/Workshops/EveryoneBuysWorkshopsSelectOwner.cs b/Patches/Workshops/EveryoneBuysWorkshopsSelectOwner.cs
index 8b7c86cb..b7da4ac7 100644
--- a/Patches/Workshops/EveryoneBuysWorkshopsSelectOwner.cs
+++ b/Patches/Workshops/EveryoneBuysWorkshopsSelectOwner.cs
@@ -4,7 +4,9 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Settlements;
+using TaleWorlds.CampaignSystem.Settlements.Workshops;
 
 namespace BannerlordCheats.Patches.Workshops
 {
diff --git a/Patches/Workshops/WorkshopBuyingCostPercentage.cs b/Patches/Workshops/WorkshopBuyingCostPercentage.cs
index 16849c10..9e722350 100644
--- a/Patches/Workshops/WorkshopBuyingCostPercentage.cs
+++ b/Patches/Workshops/WorkshopBuyingCostPercentage.cs
@@ -2,8 +2,8 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Settlements.Workshops;
 
 namespace BannerlordCheats.Patches.Workshops
 {
diff --git a/Patches/Workshops/WorkshopDailyExpensePercentage.cs b/Patches/Workshops/WorkshopDailyExpensePercentage.cs
index a0bb68d2..bdde0d02 100644
--- a/Patches/Workshops/WorkshopDailyExpensePercentage.cs
+++ b/Patches/Workshops/WorkshopDailyExpensePercentage.cs
@@ -2,7 +2,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Workshops
 {
diff --git a/Patches/Workshops/WorkshopSellingCostMultiplier.cs b/Patches/Workshops/WorkshopSellingCostMultiplier.cs
index 93aa888c..12b8153e 100644
--- a/Patches/Workshops/WorkshopSellingCostMultiplier.cs
+++ b/Patches/Workshops/WorkshopSellingCostMultiplier.cs
@@ -2,8 +2,8 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem.Settlements.Workshops;
 
 namespace BannerlordCheats.Patches.Workshops
 {
diff --git a/Patches/Workshops/WorkshopUpgradeCostPercentage.cs b/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
index 0d232033..4f4ab736 100644
--- a/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
+++ b/Patches/Workshops/WorkshopUpgradeCostPercentage.cs
@@ -2,7 +2,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents;
+using TaleWorlds.CampaignSystem.GameComponents;
 
 namespace BannerlordCheats.Patches.Workshops
 {

From c1ea3c7ca73f7ace2225ffc45f0b2eb3719fe04b Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 17 Mar 2022 00:08:10 +0100
Subject: [PATCH 100/177] Fix crash when accessing bandit party owner

---
 Extensions/PartyExtensions.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Extensions/PartyExtensions.cs b/Extensions/PartyExtensions.cs
index 4cc50214..e27fcc34 100644
--- a/Extensions/PartyExtensions.cs
+++ b/Extensions/PartyExtensions.cs
@@ -1,4 +1,5 @@
-using TaleWorlds.CampaignSystem.Party;
+using System;
+using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Extensions
 {
@@ -7,12 +8,17 @@ public static class PartyExtensions
         public static bool IsPlayerParty(this PartyBase party)
         {
             // Workaround for crash on accessing BanditPartyComponent.Owner
-            if (party?.MapFaction?.IsBanditFaction == true)
+            Hero owner;
+            try
+            {
+                owner = party?.Owner;
+            }
+            catch (NullReferenceException)
             {
                 return false;
             }
 
-            return party?.Owner?.IsHumanPlayerCharacter ?? false;
+            return owner?.IsHumanPlayerCharacter ?? false;
         }
 
         public static bool IsPlayerParty(this MobileParty party)

From 0cd23d6025a7813ac5226e12c0c1c0857e76d59d Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 17 Mar 2022 00:12:15 +0100
Subject: [PATCH 101/177] Fix namespaces for beta

---
 Extensions/PartyExtensions.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Extensions/PartyExtensions.cs b/Extensions/PartyExtensions.cs
index e27fcc34..2eab5d1e 100644
--- a/Extensions/PartyExtensions.cs
+++ b/Extensions/PartyExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.Party;
 
 namespace BannerlordCheats.Extensions

From 79e56ac67722f5b8a00771206069ebf30df17a6b Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 17 Mar 2022 00:20:01 +0100
Subject: [PATCH 102/177] Add reference to TaleWorlds.ScreenSystem

---
 BannerlordCheats.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BannerlordCheats.csproj b/BannerlordCheats.csproj
index c14cd51b..bb787207 100644
--- a/BannerlordCheats.csproj
+++ b/BannerlordCheats.csproj
@@ -181,6 +181,10 @@
         <HintPath>$(GameFolder)\bin\Win64_Shipping_Client\TaleWorlds.SaveSystem.dll</HintPath>
         <Private>False</Private>
       </Reference>
+      <Reference Include="TaleWorlds.ScreenSystem">
+        <HintPath>$(GameFolder)\bin\Win64_Shipping_Client\TaleWorlds.ScreenSystem.dll</HintPath>
+        <Private>False</Private>
+      </Reference>
       <Reference Include="TaleWorlds.Starter.DotNetCore">
         <HintPath>$(GameFolder)\bin\Win64_Shipping_Client\TaleWorlds.Starter.DotNetCore.dll</HintPath>
         <Private>False</Private>

From 7066503b8fb39e48e3d557ae7a00cb981c00601c Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sun, 20 Mar 2022 11:36:24 +0100
Subject: [PATCH 103/177] Add Visual Studio launch profile

---
 Properties/launchSettings.json | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 Properties/launchSettings.json

diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
new file mode 100644
index 00000000..eb1a915e
--- /dev/null
+++ b/Properties/launchSettings.json
@@ -0,0 +1,10 @@
+{
+  "profiles": {
+    "Launch": {
+      "commandName": "Executable",
+      "executablePath": "C:\\SteamCMD\\apps\\mb2b_beta\\bin\\Win64_Shipping_Client\\Bannerlord.exe",
+      "commandLineArgs": "/singleplayer _MODULES_*Bannerlord.Harmony*Bannerlord.ButterLib*Bannerlord.UIExtenderEx*Bannerlord.MBOptionScreen*Native*SandBoxCore*CustomBattle*SandBox*StoryMode*Cheats*_MODULES_",
+      "workingDirectory": "C:\\SteamCMD\\apps\\mb2b_beta\\bin\\Win64_Shipping_Client"
+    }
+  }
+}
\ No newline at end of file

From 2574771ac8fbb432e9585ac41c27910344a9166f Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sun, 20 Mar 2022 11:49:46 +0100
Subject: [PATCH 104/177] Update MCM to v4.5.0

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 01f77ba1..ba695429 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <GameVersion>1.7.2.306299</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.1</HarmonyVersion>
-    <MCMVersion>4.3.21</MCMVersion>
+    <MCMVersion>4.5.0</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\apps\mb2b_beta</GameFolder>

From 8cfe5b1900772e308b187aaffcf828aba0248eb0 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 21 Apr 2022 18:28:29 +0200
Subject: [PATCH 105/177] Update game to e1.7.2.310327

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index ba695429..ac166f16 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.10.1.0</Version>
-    <GameVersion>1.7.2.306299</GameVersion>
+    <GameVersion>1.7.2.310327</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.1</HarmonyVersion>
     <MCMVersion>4.5.0</MCMVersion>

From 01e0d024f0e4f55731b51870109ea8638e0c51ea Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 21 Apr 2022 18:28:44 +0200
Subject: [PATCH 106/177] Update to v2.10.2

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index ac166f16..4910c075 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.10.1.0</Version>
+    <Version>2.10.2.0</Version>
     <GameVersion>1.7.2.310327</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.1</HarmonyVersion>

From 8ffaba61fafb885a43b283e69817941a55544373 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 21 Apr 2022 18:32:48 +0200
Subject: [PATCH 107/177] Update MCM to v4.6.0

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 4910c075..a580d370 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <GameVersion>1.7.2.310327</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.1</HarmonyVersion>
-    <MCMVersion>4.5.0</MCMVersion>
+    <MCMVersion>4.6.0</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\apps\mb2b_beta</GameFolder>

From 93ffae20d67fa278f5ddc43b633f964607278c8e Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Sat, 4 Jun 2022 01:57:16 +0200
Subject: [PATCH 108/177] Update game to e1.7.2.314809

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index a580d370..53d70c40 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.10.2.0</Version>
-    <GameVersion>1.7.2.310327</GameVersion>
+    <GameVersion>1.7.2.314809</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.1</HarmonyVersion>
     <MCMVersion>4.6.0</MCMVersion>

From c7877426e49747ce89ab6176ebe80257d2647f29 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 10 Jun 2022 19:35:21 +0200
Subject: [PATCH 109/177] Update game to e1.8.0.315545

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 53d70c40..b9653082 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.10.2.0</Version>
-    <GameVersion>1.7.2.314809</GameVersion>
+    <GameVersion>1.8.0.315545</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.1</HarmonyVersion>
     <MCMVersion>4.6.0</MCMVersion>

From dcfe98a1a17cebbbd67ee0dbcab6f63f7bd23fd5 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 10 Jun 2022 19:35:57 +0200
Subject: [PATCH 110/177] Update MCM to v4.6.1

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index b9653082..c300333d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <GameVersion>1.8.0.315545</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.1</HarmonyVersion>
-    <MCMVersion>4.6.0</MCMVersion>
+    <MCMVersion>4.6.1</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\apps\mb2b_beta</GameFolder>

From c5e11928adde2d72fa77ed15768e5b96e75ff700 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 10 Jun 2022 20:11:53 +0200
Subject: [PATCH 111/177] Update usings for new game version

---
 Extensions/Message.cs                                     | 3 +--
 Extensions/Reflection.cs                                  | 3 ++-
 Extensions/SiegeExtensions.cs                             | 3 +--
 Patches/Combat/CompanionDeathPercentage.cs                | 1 -
 Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs    | 1 -
 Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs    | 1 -
 Patches/Combat/EnemyOnlyKnockout.cs                       | 1 -
 Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs | 1 -
 Patches/Combat/PartyOnlyKnockout.cs                       | 1 -
 Patches/General/EnableHotkeysAddEncyclopediaTroops.cs     | 2 +-
 Patches/General/EnableHotkeysAddItems.cs                  | 3 +--
 Patches/General/EnableHotkeysCharacterAttributes.cs       | 2 +-
 Patches/General/EnableHotkeysCharacterPoints.cs           | 2 +-
 Patches/General/EnableHotkeysMoney.cs                     | 1 -
 Patches/General/EnableHotkeysTroopCount.cs                | 2 +-
 Patches/General/EnableHotkeysTroopExperience.cs           | 2 +-
 Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs       | 2 --
 17 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/Extensions/Message.cs b/Extensions/Message.cs
index 212558c8..a7089d47 100644
--- a/Extensions/Message.cs
+++ b/Extensions/Message.cs
@@ -1,5 +1,4 @@
-using TaleWorlds.Core;
-using TaleWorlds.Library;
+using TaleWorlds.Library;
 
 namespace BannerlordCheats.Extensions
 {
diff --git a/Extensions/Reflection.cs b/Extensions/Reflection.cs
index ffa5345c..abc54308 100644
--- a/Extensions/Reflection.cs
+++ b/Extensions/Reflection.cs
@@ -1,5 +1,6 @@
 using System.Reflection;
-using TaleWorlds.CampaignSystem.ViewModelCollection;
+using TaleWorlds.CampaignSystem.ViewModelCollection.Inventory;
+using TaleWorlds.CampaignSystem.ViewModelCollection.Party;
 using TaleWorlds.ScreenSystem;
 
 namespace BannerlordCheats.Extensions
diff --git a/Extensions/SiegeExtensions.cs b/Extensions/SiegeExtensions.cs
index aa977c44..de3b9b95 100644
--- a/Extensions/SiegeExtensions.cs
+++ b/Extensions/SiegeExtensions.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using TaleWorlds.CampaignSystem.Siege;
+using TaleWorlds.CampaignSystem.Siege;
 
 namespace BannerlordCheats.Extensions
 {
diff --git a/Patches/Combat/CompanionDeathPercentage.cs b/Patches/Combat/CompanionDeathPercentage.cs
index b962681b..7ab62060 100644
--- a/Patches/Combat/CompanionDeathPercentage.cs
+++ b/Patches/Combat/CompanionDeathPercentage.cs
@@ -3,7 +3,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs b/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
index b1f23864..6d220f53 100644
--- a/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
+++ b/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
@@ -3,7 +3,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
index 66f76796..f605cb80 100644
--- a/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
+++ b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
@@ -3,7 +3,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/EnemyOnlyKnockout.cs b/Patches/Combat/EnemyOnlyKnockout.cs
index b37a72a0..87e245cd 100644
--- a/Patches/Combat/EnemyOnlyKnockout.cs
+++ b/Patches/Combat/EnemyOnlyKnockout.cs
@@ -3,7 +3,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
index b51092b0..022785aa 100644
--- a/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
+++ b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
@@ -3,7 +3,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/Combat/PartyOnlyKnockout.cs b/Patches/Combat/PartyOnlyKnockout.cs
index fd5fcb79..70a465a2 100644
--- a/Patches/Combat/PartyOnlyKnockout.cs
+++ b/Patches/Combat/PartyOnlyKnockout.cs
@@ -3,7 +3,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
diff --git a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
index cc18c529..5feaecf6 100644
--- a/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
+++ b/Patches/General/EnableHotkeysAddEncyclopediaTroops.cs
@@ -6,7 +6,7 @@
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.CampaignSystem.Party;
-using TaleWorlds.CampaignSystem.ViewModelCollection.Encyclopedia;
+using TaleWorlds.CampaignSystem.ViewModelCollection.Encyclopedia.Pages;
 using TaleWorlds.InputSystem;
 
 namespace BannerlordCheats.Patches.General
diff --git a/Patches/General/EnableHotkeysAddItems.cs b/Patches/General/EnableHotkeysAddItems.cs
index a4be92e9..f8fdfc17 100644
--- a/Patches/General/EnableHotkeysAddItems.cs
+++ b/Patches/General/EnableHotkeysAddItems.cs
@@ -4,9 +4,8 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem.Party;
-using TaleWorlds.CampaignSystem.ViewModelCollection;
+using TaleWorlds.CampaignSystem.ViewModelCollection.Inventory;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
 using TaleWorlds.ScreenSystem;
diff --git a/Patches/General/EnableHotkeysCharacterAttributes.cs b/Patches/General/EnableHotkeysCharacterAttributes.cs
index 68aecd21..ee45cf74 100644
--- a/Patches/General/EnableHotkeysCharacterAttributes.cs
+++ b/Patches/General/EnableHotkeysCharacterAttributes.cs
@@ -6,7 +6,7 @@
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.ViewModelCollection;
+using TaleWorlds.CampaignSystem.ViewModelCollection.CharacterDeveloper;
 using TaleWorlds.Core;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
diff --git a/Patches/General/EnableHotkeysCharacterPoints.cs b/Patches/General/EnableHotkeysCharacterPoints.cs
index c867f3d9..875a35a5 100644
--- a/Patches/General/EnableHotkeysCharacterPoints.cs
+++ b/Patches/General/EnableHotkeysCharacterPoints.cs
@@ -5,7 +5,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
-using TaleWorlds.CampaignSystem.ViewModelCollection;
+using TaleWorlds.CampaignSystem.ViewModelCollection.CharacterDeveloper;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
 using TaleWorlds.ScreenSystem;
diff --git a/Patches/General/EnableHotkeysMoney.cs b/Patches/General/EnableHotkeysMoney.cs
index 79f4276e..4838a49d 100644
--- a/Patches/General/EnableHotkeysMoney.cs
+++ b/Patches/General/EnableHotkeysMoney.cs
@@ -4,7 +4,6 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
diff --git a/Patches/General/EnableHotkeysTroopCount.cs b/Patches/General/EnableHotkeysTroopCount.cs
index ddeefd8d..a6f87c2c 100644
--- a/Patches/General/EnableHotkeysTroopCount.cs
+++ b/Patches/General/EnableHotkeysTroopCount.cs
@@ -6,7 +6,7 @@
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem.Party;
-using TaleWorlds.CampaignSystem.ViewModelCollection;
+using TaleWorlds.CampaignSystem.ViewModelCollection.Party;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
 using TaleWorlds.ScreenSystem;
diff --git a/Patches/General/EnableHotkeysTroopExperience.cs b/Patches/General/EnableHotkeysTroopExperience.cs
index b3dc689c..c21eef78 100644
--- a/Patches/General/EnableHotkeysTroopExperience.cs
+++ b/Patches/General/EnableHotkeysTroopExperience.cs
@@ -6,7 +6,7 @@
 using JetBrains.Annotations;
 using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem.Party;
-using TaleWorlds.CampaignSystem.ViewModelCollection;
+using TaleWorlds.CampaignSystem.ViewModelCollection.Party;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
 using TaleWorlds.ScreenSystem;
diff --git a/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
index e3a4e9b1..4c3240ee 100644
--- a/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
+++ b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
@@ -1,8 +1,6 @@
 using System;
 using BannerlordCheats.Settings;
 using HarmonyLib;
-using System.Linq;
-using BannerlordCheats.Extensions;
 using JetBrains.Annotations;
 using TaleWorlds.CampaignSystem.GameComponents;
 using TaleWorlds.CampaignSystem.Siege;

From 6750e078bef786e0fde4135fdb26f8c81f26b083 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 10 Jun 2022 20:22:34 +0200
Subject: [PATCH 112/177] Use new Agent.MortalityState for Invulnerable cheats

---
 Patches/Combat/Invincible.cs            | 6 +++---
 Patches/Combat/PartyHeroesInvincible.cs | 6 +++---
 Patches/Combat/PartyInvincible.cs       | 6 +++---
 Patches/Combat/PlayerHorseInvincible.cs | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Patches/Combat/Invincible.cs b/Patches/Combat/Invincible.cs
index 867d12cc..117707fe 100644
--- a/Patches/Combat/Invincible.cs
+++ b/Patches/Combat/Invincible.cs
@@ -7,19 +7,19 @@
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(Agent), nameof(Agent.Invulnerable), MethodType.Getter)]
+    [HarmonyPatch(typeof(Agent), nameof(Agent.CurrentMortalityState), MethodType.Getter)]
     public static class Invincible
     {
         [UsedImplicitly]
         [HarmonyPostfix]
-        public static void Invulnerable(ref Agent __instance, ref bool __result)
+        public static void Invulnerable(ref Agent __instance, ref Agent.MortalityState __result)
         {
             try
             {
                 if (__instance.IsPlayer()
                     && BannerlordCheatsSettings.Instance?.Invincible == true)
                 {
-                    __result = true;
+                    __result = Agent.MortalityState.Invulnerable;
                 }
             }
             catch (Exception e)
diff --git a/Patches/Combat/PartyHeroesInvincible.cs b/Patches/Combat/PartyHeroesInvincible.cs
index 7ebcb3fe..f2d8c424 100644
--- a/Patches/Combat/PartyHeroesInvincible.cs
+++ b/Patches/Combat/PartyHeroesInvincible.cs
@@ -7,12 +7,12 @@
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(Agent), nameof(Agent.Invulnerable), MethodType.Getter)]
+    [HarmonyPatch(typeof(Agent), nameof(Agent.CurrentMortalityState), MethodType.Getter)]
     public static class PartyHeroesInvincible
     {
         [UsedImplicitly]
         [HarmonyPostfix]
-        public static void Invulnerable(ref Agent __instance, ref bool __result)
+        public static void Invulnerable(ref Agent __instance, ref Agent.MortalityState __result)
         {
             try
             {
@@ -23,7 +23,7 @@ public static void Invulnerable(ref Agent __instance, ref bool __result)
                     && agent.IsHero()
                     && BannerlordCheatsSettings.Instance?.PartyHeroesInvincible == true)
                 {
-                    __result = true;
+                    __result = Agent.MortalityState.Invulnerable;
                 }
             }
             catch (Exception e)
diff --git a/Patches/Combat/PartyInvincible.cs b/Patches/Combat/PartyInvincible.cs
index 8d88f1b2..8db73563 100644
--- a/Patches/Combat/PartyInvincible.cs
+++ b/Patches/Combat/PartyInvincible.cs
@@ -7,12 +7,12 @@
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(Agent), nameof(Agent.Invulnerable), MethodType.Getter)]
+    [HarmonyPatch(typeof(Agent), nameof(Agent.CurrentMortalityState), MethodType.Getter)]
     public static class PartyInvincible
     {
         [UsedImplicitly]
         [HarmonyPostfix]
-        public static void Invulnerable(ref Agent __instance, ref bool __result)
+        public static void Invulnerable(ref Agent __instance, ref Agent.MortalityState __result)
         {
             try
             {
@@ -22,7 +22,7 @@ public static void Invulnerable(ref Agent __instance, ref bool __result)
                     && !agent.IsHero()
                     && BannerlordCheatsSettings.Instance?.PartyInvincible == true)
                 {
-                    __result = true;
+                    __result = Agent.MortalityState.Invulnerable;
                 }
             }
             catch (Exception e)
diff --git a/Patches/Combat/PlayerHorseInvincible.cs b/Patches/Combat/PlayerHorseInvincible.cs
index 27abdc28..99dc537a 100644
--- a/Patches/Combat/PlayerHorseInvincible.cs
+++ b/Patches/Combat/PlayerHorseInvincible.cs
@@ -7,12 +7,12 @@
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(Agent), nameof(Agent.Invulnerable), MethodType.Getter)]
+    [HarmonyPatch(typeof(Agent), nameof(Agent.CurrentMortalityState), MethodType.Getter)]
     public static class PlayerHorseInvincible
     {
         [UsedImplicitly]
         [HarmonyPostfix]
-        public static void Invulnerable(ref Agent __instance, ref bool __result)
+        public static void Invulnerable(ref Agent __instance, ref Agent.MortalityState __result)
         {
             try
             {
@@ -21,7 +21,7 @@ public static void Invulnerable(ref Agent __instance, ref bool __result)
                     && rider.IsPlayer()
                     && BannerlordCheatsSettings.Instance?.PlayerHorseInvincible == true)
                 {
-                    __result = true;
+                    __result = Agent.MortalityState.Invulnerable;
                 }
             }
             catch (Exception e)

From e7088d3b3241f80062f50fe1963a98f569ecf92c Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 10 Jun 2022 20:23:32 +0200
Subject: [PATCH 113/177] Fix Army Cohesion cheat

---
 Patches/Army/ArmyCohesionLossPercentage.cs        | 2 +-
 Patches/Army/FactionArmyCohesionLossPercentage.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Patches/Army/ArmyCohesionLossPercentage.cs b/Patches/Army/ArmyCohesionLossPercentage.cs
index 0cfdf348..115b8dac 100644
--- a/Patches/Army/ArmyCohesionLossPercentage.cs
+++ b/Patches/Army/ArmyCohesionLossPercentage.cs
@@ -7,7 +7,7 @@
 
 namespace BannerlordCheats.Patches.Army
 {
-    [HarmonyPatch(typeof(ArmyObj), nameof(ArmyObj.CohesionChange), MethodType.Getter)]
+    [HarmonyPatch(typeof(ArmyObj), nameof(ArmyObj.DailyCohesionChange), MethodType.Getter)]
     public static class ArmyCohesionLossPercentage
     {
         [UsedImplicitly]
diff --git a/Patches/Army/FactionArmyCohesionLossPercentage.cs b/Patches/Army/FactionArmyCohesionLossPercentage.cs
index 03b50187..059c6a21 100644
--- a/Patches/Army/FactionArmyCohesionLossPercentage.cs
+++ b/Patches/Army/FactionArmyCohesionLossPercentage.cs
@@ -7,7 +7,7 @@
 
 namespace BannerlordCheats.Patches.Army
 {
-    [HarmonyPatch(typeof(ArmyObj), nameof(ArmyObj.CohesionChange), MethodType.Getter)]
+    [HarmonyPatch(typeof(ArmyObj), nameof(ArmyObj.DailyCohesionChange), MethodType.Getter)]
     public static class FactionArmyCohesionLossPercentage
     {
         [UsedImplicitly]

From e0280ef0d83a6e6f781c54f69723f1e2134ea4e6 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 10 Jun 2022 20:28:41 +0200
Subject: [PATCH 114/177] Fix screen names

---
 Patches/General/EnableHotkeyTipsScreens.cs | 8 ++++----
 Patches/General/EnableHotkeysAddItems.cs   | 5 +++--
 Patches/General/EnableHotkeysMoney.cs      | 3 ++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Patches/General/EnableHotkeyTipsScreens.cs b/Patches/General/EnableHotkeyTipsScreens.cs
index 59694577..79082ce5 100644
--- a/Patches/General/EnableHotkeyTipsScreens.cs
+++ b/Patches/General/EnableHotkeyTipsScreens.cs
@@ -22,24 +22,24 @@ public static void PushScreen(ref ScreenBase screen)
                 {
                     switch (screen)
                     {
-                        case InventoryGauntletScreen inventoryGauntletScreen:
+                        case GauntletInventoryScreen _:
                             Message.Show("Inventory Screen Cheat Hotkeys:");
                             Message.Show("CTRL + X: Add 1.000 gold.");
                             Message.Show("CTRL + SHIFT + X: Add 100.000 gold.");
                             Message.Show("CTRL + H: Add 1 to the selected item type.");
                             Message.Show("CTRL + SHIFT + H: Add 100 to the selected item type.");
                             break;
-                        case GauntletClanScreen gauntletClanScreen:
+                        case GauntletClanScreen _:
                             Message.Show("Clan Screen Cheat Hotkeys:");
                             Message.Show("CTRL + X: Add 1.000 influence.");
                             break;
-                        case GauntletPartyScreen gauntletPartyScreen:
+                        case GauntletPartyScreen _:
                             Message.Show("Party Screen Cheat Hotkeys:");
                             Message.Show("CTRL + H: Add 1 soldier to the selected troop.");
                             Message.Show("CTRL + SHIFT + H: Add 10 soldiers to the selected troop.");
                             Message.Show("CTRL + X: Add experience to the selected troop.");
                             break;
-                        case GauntletCharacterDeveloperScreen gauntletCharacterDeveloperScreen:
+                        case GauntletCharacterDeveloperScreen _:
                             Message.Show("Character Screen Cheat Hotkeys:");
                             Message.Show("CTRL + A: Set all character attributes to 10.");
                             Message.Show("CTRL + (1-6): Add 1 point to the attribute at the given index.");
diff --git a/Patches/General/EnableHotkeysAddItems.cs b/Patches/General/EnableHotkeysAddItems.cs
index f8fdfc17..67f42766 100644
--- a/Patches/General/EnableHotkeysAddItems.cs
+++ b/Patches/General/EnableHotkeysAddItems.cs
@@ -4,6 +4,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
+using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem.Party;
 using TaleWorlds.CampaignSystem.ViewModelCollection.Inventory;
 using TaleWorlds.InputSystem;
@@ -21,7 +22,7 @@ public static void OnApplicationTick()
         {
             try
             {
-                if (ScreenManager.TopScreen is InventoryGauntletScreen
+                if (ScreenManager.TopScreen is GauntletInventoryScreen
                     && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
                 {
                     if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.LeftShift, InputKey.H))
@@ -42,7 +43,7 @@ public static void OnApplicationTick()
 
         private static void AddItems(int count)
         {
-            var inventoryScreen = ScreenManager.TopScreen as InventoryGauntletScreen;
+            var inventoryScreen = ScreenManager.TopScreen as GauntletInventoryScreen;
 
             var inventoryVM = inventoryScreen.GetViewModel<SPInventoryVM>();
 
diff --git a/Patches/General/EnableHotkeysMoney.cs b/Patches/General/EnableHotkeysMoney.cs
index 4838a49d..e98176ee 100644
--- a/Patches/General/EnableHotkeysMoney.cs
+++ b/Patches/General/EnableHotkeysMoney.cs
@@ -4,6 +4,7 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
+using SandBox.GauntletUI;
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.InputSystem;
 using TaleWorlds.MountAndBlade;
@@ -20,7 +21,7 @@ public static void OnApplicationTick()
         {
             try
             {
-                if (ScreenManager.TopScreen is InventoryGauntletScreen
+                if (ScreenManager.TopScreen is GauntletInventoryScreen
                     && BannerlordCheatsSettings.Instance?.EnableHotkeys == true)
                 {
                     if (Keys.IsKeyPressed(InputKey.LeftControl, InputKey.LeftShift, InputKey.X))

From 7c7eebbc9179d1cb62bfd2e7a59308391afa6ed7 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 10 Jun 2022 20:37:47 +0200
Subject: [PATCH 115/177] Fix No Crime Rating For Crimes cheat

---
 Patches/Kingdom/NoCrimeRatingForCrimes.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Patches/Kingdom/NoCrimeRatingForCrimes.cs b/Patches/Kingdom/NoCrimeRatingForCrimes.cs
index 69dec5ea..54670706 100644
--- a/Patches/Kingdom/NoCrimeRatingForCrimes.cs
+++ b/Patches/Kingdom/NoCrimeRatingForCrimes.cs
@@ -2,23 +2,26 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
-using TaleWorlds.CampaignSystem.ComponentInterfaces;
-using TaleWorlds.CampaignSystem.GameComponents;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Actions;
 
 namespace BannerlordCheats.Patches.Kingdom
 {
-    [HarmonyPatch(typeof(DefaultCrimeModel), nameof(DefaultCrimeModel.GetCrimeRatingOf))]
+    [HarmonyPatch(typeof(ChangeCrimeRatingAction), nameof(ChangeCrimeRatingAction.Apply))]
     public static class NoCrimeRatingForCrimes
     {
         [UsedImplicitly]
-        [HarmonyPostfix]
-        public static void GetCrimeRatingOf(ref CrimeModel.CrimeType crime, ref object[] additionalArgs, ref float __result)
+        [HarmonyPrefix]
+        public static void Apply(
+            ref IFaction faction,
+            ref float deltaCrimeRating,
+            ref bool showNotification)
         {
             try
             {
                 if (BannerlordCheatsSettings.Instance?.NoCrimeRatingForCrimes == true)
                 {
-                    __result = 0f;
+                    deltaCrimeRating = 0f;
                 }
             }
             catch (Exception e)

From 352632b6e09e0110f3739e6f5cf3aba162b43cc5 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 10 Jun 2022 20:38:25 +0200
Subject: [PATCH 116/177] Fix Infinite Ammo cheats

---
 Patches/Combat/InfiniteAmmo.cs      | 2 +-
 Patches/Combat/PartyInfiniteAmmo.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Patches/Combat/InfiniteAmmo.cs b/Patches/Combat/InfiniteAmmo.cs
index 5882ed8b..3ada282c 100644
--- a/Patches/Combat/InfiniteAmmo.cs
+++ b/Patches/Combat/InfiniteAmmo.cs
@@ -33,7 +33,7 @@ public static void OnAgentShootMissile(
                     {
                         var missionWeapon = shooterAgent.Equipment[index];
 
-                        if (missionWeapon.IsAnyConsumable(out _)
+                        if (missionWeapon.IsAnyConsumable()
                             && missionWeapon.Amount <= missionWeapon.ModifiedMaxAmount)
                         {
                             shooterAgent.SetWeaponAmountInSlot(index, missionWeapon.ModifiedMaxAmount, true);
diff --git a/Patches/Combat/PartyInfiniteAmmo.cs b/Patches/Combat/PartyInfiniteAmmo.cs
index 6d9174db..28c41cd3 100644
--- a/Patches/Combat/PartyInfiniteAmmo.cs
+++ b/Patches/Combat/PartyInfiniteAmmo.cs
@@ -35,7 +35,7 @@ public static void OnAgentShootMissile(
                     {
                         var missionWeapon = shooterAgent.Equipment[index];
 
-                        if (missionWeapon.IsAnyConsumable(out _)
+                        if (missionWeapon.IsAnyConsumable()
                             && missionWeapon.Amount <= missionWeapon.ModifiedMaxAmount)
                         {
                             shooterAgent.SetWeaponAmountInSlot(index, missionWeapon.ModifiedMaxAmount, true);

From 17e46bbf78d530f240e6c5b406fd602c860a9c00 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 10 Jun 2022 20:41:11 +0200
Subject: [PATCH 117/177] Fix Siege Parties accessor

---
 Extensions/SiegeExtensions.cs                       | 5 +++--
 Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Extensions/SiegeExtensions.cs b/Extensions/SiegeExtensions.cs
index de3b9b95..9de07609 100644
--- a/Extensions/SiegeExtensions.cs
+++ b/Extensions/SiegeExtensions.cs
@@ -1,4 +1,5 @@
-using TaleWorlds.CampaignSystem.Siege;
+using System.Linq;
+using TaleWorlds.CampaignSystem.Siege;
 
 namespace BannerlordCheats.Extensions
 {
@@ -6,7 +7,7 @@ public static class SiegeExtensions
     {
         public static bool IsPlayerSide(this ISiegeEventSide side)
         {
-            return side?.SiegeParties?.Any(x => x.IsPlayerParty()) ?? false;
+            return side?.GetInvolvedPartiesForEventType()?.Any(x => x.IsPlayerParty()) ?? false;
         }
     }
 }
diff --git a/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
index 4c3240ee..92e72895 100644
--- a/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
+++ b/Patches/Sieges/EnemySiegeBuildingSpeedPercentage.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Linq;
+using BannerlordCheats.Extensions;
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
@@ -30,7 +32,7 @@ public static void GetConstructionProgressPerHour(ref SiegeEngineType type, ref
                         return;
                 }
 
-                if ((siegeEvent.GetSiegeEventSide(otherSide)?.SiegeParties.Any(x => x.IsPlayerParty()) ?? false)
+                if ((siegeEvent.GetSiegeEventSide(otherSide)?.GetInvolvedPartiesForEventType().Any(x => x.IsPlayerParty()) ?? false)
                     && BannerlordCheatsSettings.Instance?.EnemySiegeBuildingSpeedPercentage < 100f)
                 {
                     var factor = BannerlordCheatsSettings.Instance.EnemySiegeBuildingSpeedPercentage / 100f;

From 541266eb552d21c72800f7c9aa23affc7126a649 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 10 Jun 2022 20:55:16 +0200
Subject: [PATCH 118/177] Set platform target

---
 BannerlordCheats.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BannerlordCheats.csproj b/BannerlordCheats.csproj
index bb787207..492f0557 100644
--- a/BannerlordCheats.csproj
+++ b/BannerlordCheats.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
       <IsPackable>false</IsPackable>
       <AssemblyVersion>$(Version)</AssemblyVersion>
+      <PlatformTarget>x64</PlatformTarget>
     </PropertyGroup>
 
     <ItemGroup>

From b54190a41710b1b191d9322e4d7c26f1a5804120 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 20 Jun 2022 12:06:59 +0200
Subject: [PATCH 119/177] Update version to v2.10.3

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index c300333d..28ab5478 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.10.2.0</Version>
+    <Version>2.10.3.0</Version>
     <GameVersion>1.8.0.315545</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.1</HarmonyVersion>

From 723eebcc66c37d69b005385402361690db5af2e5 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 20 Jun 2022 12:08:11 +0200
Subject: [PATCH 120/177] Update game to e1.8.0.316217

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 28ab5478..76565e3b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.10.3.0</Version>
-    <GameVersion>1.8.0.315545</GameVersion>
+    <GameVersion>1.8.0.316217</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.1</HarmonyVersion>
     <MCMVersion>4.6.1</MCMVersion>

From 637fb72ce3906a194a9bc8d30420fc33867ac2ce Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 20 Jun 2022 12:08:41 +0200
Subject: [PATCH 121/177] Update MCM to v4.7.3

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 76565e3b..660567fb 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <GameVersion>1.8.0.316217</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.1</HarmonyVersion>
-    <MCMVersion>4.6.1</MCMVersion>
+    <MCMVersion>4.7.3</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\apps\mb2b_beta</GameFolder>

From 767083e5e4f3295da2075840ca87a3e605c25d7b Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 20 Jun 2022 12:21:27 +0200
Subject: [PATCH 122/177] Fix Knockback / Knockdown cheats for beta

---
 Patches/Combat/AlwaysKnockDown.cs           | 9 ++++-----
 Patches/Combat/NeverKnockedBackByAttacks.cs | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Patches/Combat/AlwaysKnockDown.cs b/Patches/Combat/AlwaysKnockDown.cs
index 53d0e332..4d3541d0 100644
--- a/Patches/Combat/AlwaysKnockDown.cs
+++ b/Patches/Combat/AlwaysKnockDown.cs
@@ -8,22 +8,21 @@
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(Mission), "DecideAgentKnockedByBlow")]
+    [HarmonyPatch(typeof(DefaultAgentApplyDamageModel), nameof(DefaultAgentApplyDamageModel.DecideAgentKnockedDownByBlow))]
     public static class AlwaysKnockDown
     {
         [UsedImplicitly]
         [HarmonyPostfix]
         public static void DecideAgentKnockedByBlow(
-            ref Agent attacker,
-            ref Agent victim,
+            ref Agent attackerAgent,
+            ref Agent victimAgent,
             ref AttackCollisionData collisionData,
             ref WeaponComponentData attackerWeapon,
-            ref bool isInitialBlowShrugOff,
             ref Blow blow)
         {
             try
             {
-                if (attacker.IsPlayer()
+                if (attackerAgent.IsPlayer()
                     && BannerlordCheatsSettings.Instance?.AlwaysKnockDown == true)
                 {
                     blow.BlowFlag &= ~BlowFlags.ShrugOff;
diff --git a/Patches/Combat/NeverKnockedBackByAttacks.cs b/Patches/Combat/NeverKnockedBackByAttacks.cs
index 12fe9cab..96f37c66 100644
--- a/Patches/Combat/NeverKnockedBackByAttacks.cs
+++ b/Patches/Combat/NeverKnockedBackByAttacks.cs
@@ -8,22 +8,21 @@
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(Mission), "DecideAgentKnockedByBlow")]
+    [HarmonyPatch(typeof(DefaultAgentApplyDamageModel), nameof(DefaultAgentApplyDamageModel.DecideAgentKnockedBackByBlow))]
     public static class NeverKnockedBackByAttacks
     {
         [UsedImplicitly]
         [HarmonyPostfix]
         public static void DecideAgentKnockedByBlow(
-            ref Agent attacker,
-            ref Agent victim,
+            ref Agent attackerAgent,
+            ref Agent victimAgent,
             ref AttackCollisionData collisionData,
             ref WeaponComponentData attackerWeapon,
-            ref bool isInitialBlowShrugOff,
             ref Blow blow)
         {
             try
             {
-                if (victim.IsPlayer()
+                if (victimAgent.IsPlayer()
                     && BannerlordCheatsSettings.Instance?.NeverKnockedBackByAttacks == true)
                 {
                     blow.BlowFlag &= ~BlowFlags.KnockDown;

From f4611baeb71e5d84e1c836e277f7adacd0866cf2 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 20 Jun 2022 12:21:54 +0200
Subject: [PATCH 123/177] Fix food consumption cheats for beta

---
 Patches/Army/ArmyFoodConsumptionPercentage.cs | 5 ++++-
 Patches/Party/FoodConsumptionPercentage.cs    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Patches/Army/ArmyFoodConsumptionPercentage.cs b/Patches/Army/ArmyFoodConsumptionPercentage.cs
index f60fd653..5bb34459 100644
--- a/Patches/Army/ArmyFoodConsumptionPercentage.cs
+++ b/Patches/Army/ArmyFoodConsumptionPercentage.cs
@@ -14,7 +14,10 @@ public static class ArmyFoodConsumptionPercentage
     {
         [UsedImplicitly]
         [HarmonyPostfix]
-        public static void CalculateDailyFoodConsumptionf(ref MobileParty party, ref bool includeDescription, ref ExplainedNumber __result)
+        public static void CalculateDailyFoodConsumptionf(
+            ref MobileParty party,
+            ref ExplainedNumber baseConsumption,
+            ref ExplainedNumber __result)
         {
             try
             {
diff --git a/Patches/Party/FoodConsumptionPercentage.cs b/Patches/Party/FoodConsumptionPercentage.cs
index 6a7ad4d9..215709c4 100644
--- a/Patches/Party/FoodConsumptionPercentage.cs
+++ b/Patches/Party/FoodConsumptionPercentage.cs
@@ -14,7 +14,10 @@ public static class FoodConsumptionPercentage
     {
         [UsedImplicitly]
         [HarmonyPostfix]
-        public static void CalculateDailyFoodConsumptionf(ref MobileParty party, ref bool includeDescription, ref ExplainedNumber __result)
+        public static void CalculateDailyFoodConsumptionf(
+            ref MobileParty party,
+            ref ExplainedNumber baseConsumption,
+            ref ExplainedNumber __result)
         {
             try
             {

From 14dcd6d4277ec5383c83b4f39589be14baf7c895 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 27 Jul 2022 16:58:27 +0200
Subject: [PATCH 124/177] Update game to e1.7.2.316994

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 92fcd34c..639a7ec2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.10.3.0</Version>
-    <GameVersion>1.7.2.316284</GameVersion>
+    <GameVersion>1.7.2.316994</GameVersion>
     <GameBranch>Stable</GameBranch>
     <HarmonyVersion>2.2.1</HarmonyVersion>
     <MCMVersion>4.7.3</MCMVersion>

From aa49e8b8e25b7a5175988dd766a20d05ca5c6dbf Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 27 Jul 2022 16:58:47 +0200
Subject: [PATCH 125/177] Update Harmony to v2.2.2

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 639a7ec2..03f6ca1a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
     <Version>2.10.3.0</Version>
     <GameVersion>1.7.2.316994</GameVersion>
     <GameBranch>Stable</GameBranch>
-    <HarmonyVersion>2.2.1</HarmonyVersion>
+    <HarmonyVersion>2.2.2</HarmonyVersion>
     <MCMVersion>4.7.3</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>

From a577a10eb60638990c63a929347b24ec5305cef3 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 27 Jul 2022 17:00:03 +0200
Subject: [PATCH 126/177] Update MCM to v4.7.7

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 03f6ca1a..f24441e7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <GameVersion>1.7.2.316994</GameVersion>
     <GameBranch>Stable</GameBranch>
     <HarmonyVersion>2.2.2</HarmonyVersion>
-    <MCMVersion>4.7.3</MCMVersion>
+    <MCMVersion>4.7.7</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\apps\mb2b_stable</GameFolder>

From 22d76ad59be63fd68b0ebe3d170103386226f405 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 27 Jul 2022 17:05:15 +0200
Subject: [PATCH 127/177] Update game to e1.8.0.318937

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 660567fb..cb9ac1c7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.10.3.0</Version>
-    <GameVersion>1.8.0.316217</GameVersion>
+    <GameVersion>1.8.0.318937</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.1</HarmonyVersion>
     <MCMVersion>4.7.3</MCMVersion>

From c0a135326d9650ba0d597011a3ce9a4ad7b0b269 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 27 Jul 2022 17:05:34 +0200
Subject: [PATCH 128/177] Update Harmony to v2.2.2

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index cb9ac1c7..1585cf6b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
     <Version>2.10.3.0</Version>
     <GameVersion>1.8.0.318937</GameVersion>
     <GameBranch>Beta</GameBranch>
-    <HarmonyVersion>2.2.1</HarmonyVersion>
+    <HarmonyVersion>2.2.2</HarmonyVersion>
     <MCMVersion>4.7.3</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>

From d7b3af234934d6d30a5d24a8dd3a9f8d7dc7b734 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 27 Jul 2022 17:05:57 +0200
Subject: [PATCH 129/177] Update MCM to v4.7.7

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 1585cf6b..d6317044 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
     <GameVersion>1.8.0.318937</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.2</HarmonyVersion>
-    <MCMVersion>4.7.3</MCMVersion>
+    <MCMVersion>4.7.7</MCMVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\apps\mb2b_beta</GameFolder>

From 0d7a8b1bbbbff0180284a80db5c5959244fddb50 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 24 Aug 2022 14:32:31 +0200
Subject: [PATCH 130/177] Update to v2.10.4

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index d6317044..80782df7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.10.3.0</Version>
+    <Version>2.10.4.0</Version>
     <GameVersion>1.8.0.318937</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.2</HarmonyVersion>

From b6c4cd6a323a2c584d3f9e6144110cdb440074dd Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 24 Aug 2022 14:33:03 +0200
Subject: [PATCH 131/177] Update game to e1.8.0.321460

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 80782df7..69399dc8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.10.4.0</Version>
-    <GameVersion>1.8.0.318937</GameVersion>
+    <GameVersion>1.8.0.321460</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <MCMVersion>4.7.7</MCMVersion>

From 146bd7ac4bf7d4f00889650f78558924740db6f4 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 24 Aug 2022 16:01:05 +0200
Subject: [PATCH 132/177] Update models for beta

---
 Patches/Combat/AlwaysKnockDown.cs                         | 3 ++-
 Patches/Combat/CompanionDeathPercentage.cs                | 3 ++-
 Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs    | 3 ++-
 Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs    | 3 ++-
 Patches/Combat/EnemyOnlyKnockout.cs                       | 3 ++-
 Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs | 3 ++-
 Patches/Combat/NeverKnockedBackByAttacks.cs               | 3 ++-
 Patches/Combat/PartyOnlyKnockout.cs                       | 3 ++-
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Patches/Combat/AlwaysKnockDown.cs b/Patches/Combat/AlwaysKnockDown.cs
index 4d3541d0..02e63c27 100644
--- a/Patches/Combat/AlwaysKnockDown.cs
+++ b/Patches/Combat/AlwaysKnockDown.cs
@@ -3,12 +3,13 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(DefaultAgentApplyDamageModel), nameof(DefaultAgentApplyDamageModel.DecideAgentKnockedDownByBlow))]
+    [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.DecideAgentKnockedDownByBlow))]
     public static class AlwaysKnockDown
     {
         [UsedImplicitly]
diff --git a/Patches/Combat/CompanionDeathPercentage.cs b/Patches/Combat/CompanionDeathPercentage.cs
index 7ab62060..ef8f48e9 100644
--- a/Patches/Combat/CompanionDeathPercentage.cs
+++ b/Patches/Combat/CompanionDeathPercentage.cs
@@ -3,12 +3,13 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
+    [HarmonyPatch(typeof(SandboxAgentDecideKilledOrUnconsciousModel), nameof(SandboxAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
     public static class CompanionDeathPercentage
     {
         [UsedImplicitly]
diff --git a/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs b/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
index 6d220f53..965c90ca 100644
--- a/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
+++ b/Patches/Combat/EnemyLordCombatDeathChanceMultiplier.cs
@@ -3,12 +3,13 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
+    [HarmonyPatch(typeof(SandboxAgentDecideKilledOrUnconsciousModel), nameof(SandboxAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
     public static class EnemyLordCombatDeathChanceMultiplier
     {
         [UsedImplicitly]
diff --git a/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
index f605cb80..55ea9d50 100644
--- a/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
+++ b/Patches/Combat/EnemyLordCombatDeathPercentageBattle.cs
@@ -3,12 +3,13 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
+    [HarmonyPatch(typeof(SandboxAgentDecideKilledOrUnconsciousModel), nameof(SandboxAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
     public static class EnemyLordCombatDeathPercentageBattle
     {
         [UsedImplicitly]
diff --git a/Patches/Combat/EnemyOnlyKnockout.cs b/Patches/Combat/EnemyOnlyKnockout.cs
index 87e245cd..74a9867c 100644
--- a/Patches/Combat/EnemyOnlyKnockout.cs
+++ b/Patches/Combat/EnemyOnlyKnockout.cs
@@ -3,12 +3,13 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
+    [HarmonyPatch(typeof(SandboxAgentDecideKilledOrUnconsciousModel), nameof(SandboxAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
     public static class EnemyOnlyKnockout
     {
         [UsedImplicitly]
diff --git a/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
index 022785aa..5e9a608e 100644
--- a/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
+++ b/Patches/Combat/FriendlyLordCombatDeathPercentageBattle.cs
@@ -3,12 +3,13 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
+    [HarmonyPatch(typeof(SandboxAgentDecideKilledOrUnconsciousModel), nameof(SandboxAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
     public static class FriendlyLordCombatDeathPercentageBattle
     {
         [UsedImplicitly]
diff --git a/Patches/Combat/NeverKnockedBackByAttacks.cs b/Patches/Combat/NeverKnockedBackByAttacks.cs
index 96f37c66..4e9d8358 100644
--- a/Patches/Combat/NeverKnockedBackByAttacks.cs
+++ b/Patches/Combat/NeverKnockedBackByAttacks.cs
@@ -3,12 +3,13 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(DefaultAgentApplyDamageModel), nameof(DefaultAgentApplyDamageModel.DecideAgentKnockedBackByBlow))]
+    [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.DecideAgentKnockedBackByBlow))]
     public static class NeverKnockedBackByAttacks
     {
         [UsedImplicitly]
diff --git a/Patches/Combat/PartyOnlyKnockout.cs b/Patches/Combat/PartyOnlyKnockout.cs
index 70a465a2..0615f5ba 100644
--- a/Patches/Combat/PartyOnlyKnockout.cs
+++ b/Patches/Combat/PartyOnlyKnockout.cs
@@ -3,12 +3,13 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(DefaultAgentDecideKilledOrUnconsciousModel), nameof(DefaultAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
+    [HarmonyPatch(typeof(SandboxAgentDecideKilledOrUnconsciousModel), nameof(SandboxAgentDecideKilledOrUnconsciousModel.GetAgentStateProbability))]
     public static class PartyOnlyKnockout
     {
         [UsedImplicitly]

From acaeb8a25ae1be885cbc81c8265ee726d2bfaee6 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Wed, 24 Aug 2022 16:02:20 +0200
Subject: [PATCH 133/177] Update to v2.10.4

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index f24441e7..47a4f973 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.10.3.0</Version>
+    <Version>2.10.4.0</Version>
     <GameVersion>1.7.2.316994</GameVersion>
     <GameBranch>Stable</GameBranch>
     <HarmonyVersion>2.2.2</HarmonyVersion>

From 0dad9a710b468254595d80cf097d5e5e57994c78 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 8 Sep 2022 18:46:15 +0200
Subject: [PATCH 134/177] Include release steps in build workflow

---
 .github/workflows/build.yml | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ce99d4c2..2fb7a8cc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,12 +2,11 @@ name: Build
 
 on:
   push:
-    branches: [ stable-develop, beta-develop ]
   workflow_dispatch:
 
 jobs:
   build:
-    name: Build
+    name: Build & Release
     runs-on: windows-latest
 
     steps:
@@ -80,3 +79,27 @@ jobs:
         with:
           name: ${{steps.versions.outputs.zip_name}}
           path: ./game/Modules/*
+
+      - name: Create Release
+        uses: actions/create-release@v1
+        id: create_release
+        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        with:
+          tag_name: ${{steps.versions.outputs.tag_name}}
+          release_name: ${{steps.versions.outputs.release_title}}
+          draft: false
+          prerelease: ${{steps.versions.outputs.prerelease}}
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        id: upload_release_asset
+        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        with:
+          upload_url: ${{steps.create_release.outputs.upload_url}}
+          asset_path: ./${{steps.versions.outputs.zip_name}}.zip
+          asset_name: ${{steps.versions.outputs.zip_name}}.zip
+          asset_content_type: application/zip
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

From 925ce6e637ca5a6f339c84b48ff51d86ae1f745a Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 8 Sep 2022 18:46:15 +0200
Subject: [PATCH 135/177] Include release steps in build workflow

---
 .github/workflows/build.yml | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ce99d4c2..2fb7a8cc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,12 +2,11 @@ name: Build
 
 on:
   push:
-    branches: [ stable-develop, beta-develop ]
   workflow_dispatch:
 
 jobs:
   build:
-    name: Build
+    name: Build & Release
     runs-on: windows-latest
 
     steps:
@@ -80,3 +79,27 @@ jobs:
         with:
           name: ${{steps.versions.outputs.zip_name}}
           path: ./game/Modules/*
+
+      - name: Create Release
+        uses: actions/create-release@v1
+        id: create_release
+        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        with:
+          tag_name: ${{steps.versions.outputs.tag_name}}
+          release_name: ${{steps.versions.outputs.release_title}}
+          draft: false
+          prerelease: ${{steps.versions.outputs.prerelease}}
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        id: upload_release_asset
+        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        with:
+          upload_url: ${{steps.create_release.outputs.upload_url}}
+          asset_path: ./${{steps.versions.outputs.zip_name}}.zip
+          asset_name: ${{steps.versions.outputs.zip_name}}.zip
+          asset_content_type: application/zip
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

From 92b8c7a3a61952e2618a4e5553797daab23b1bf7 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 8 Sep 2022 18:50:02 +0200
Subject: [PATCH 136/177] Remove release workflow

---
 .github/workflows/release.yml | 103 ----------------------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 89fefca8..00000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-name: Release
-
-on:
-  push:
-    branches: [ stable, beta ]
-
-jobs:
-  build:
-    name: Build & Release
-    runs-on: windows-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@master
-        with:
-          dotnet-version: 3.1.x
-          source-url: https://nuget.pkg.github.com/BUTR/index.json
-        env:
-          NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-          DOTNET_NOLOGO: 1
-          DOTNET_CLI_TELEMETRY_OPTOUT: 1
-
-      - name: Build BannerlordCheats
-        run: dotnet build BannerlordCheats.csproj  --configuration Release -p:GameFolder="$PWD\game"
-        env:
-          DOTNET_NOLOGO: 1
-          DOTNET_CLI_TELEMETRY_OPTOUT: 1
-
-      - name: Get Versions
-        id: versions
-        run: |
-          $ModVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<Version>([\d.]+)<\/Version>" | % { $($_.Matches.Groups[1]).Value }
-          $ModVersion = $ModVersion -replace "\.0",""
-          If ($ModVersion -notmatch "\.") { $ModVersion = "$ModVersion.0" }
-          Write-Host "::set-output name=mod_version::$ModVersion"
-          Write-Host "ModVersion: ""$ModVersion"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $GameVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameVersion>([\d.]+)<\/GameVersion>" | % { $($_.Matches.Groups[1]).Value }
-          Write-Host "::set-output name=game_version::$GameVersion"
-          Write-Host "GameVersion: ""$GameVersion"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $GameBranch = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameBranch>(.+)<\/GameBranch>" | % { $($_.Matches.Groups[1]).Value }
-          Write-Host "::set-output name=game_branch::$GameBranch"
-          Write-Host "GameBranch: ""$GameBranch"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $RepoBranch = "${{github.ref}}"
-          $RepoBranch = $RepoBranch.Split("/")[-1]
-          If ($RepoBranch -eq "stable") { $RepoBranch = "" }
-          If ($RepoBranch) { $RepoBranch = "-$RepoBranch" }
-          Write-Host "::set-output name=repo_branch::$RepoBranch"
-          Write-Host "RepoBranch: ""$RepoBranch"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $Prerelease = "${{github.ref}}"
-          $Prerelease = $Prerelease.Split("/")[-1]
-          If ($Prerelease -eq "stable") { $Prerelease = "false" } Else { $Prerelease = "true" }
-          Write-Host "::set-output name=prerelease::$Prerelease"
-          Write-Host "Prerelease: ""$Prerelease"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $ZipName = "BannerlordCheats_v$($ModVersion)_for_$($GameBranch)_e$($GameVersion)"
-          Write-Host "::set-output name=zip_name::$ZipName"
-          Write-Host "ZipName: ""$ZipName"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $TagName = "v$ModVersion$RepoBranch"
-          Write-Host "::set-output name=tag_name::$TagName"
-          Write-Host "TagName: ""$TagName"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $ReleaseTitle = "Release v$($ModVersion) for $($GameBranch) e$($GameVersion)"
-          Write-Host "::set-output name=release_title::$ReleaseTitle"
-          Write-Host "ReleaseTitle: ""$ReleaseTitle"""
-
-      - name: Package Mod Files
-        run: 7z a -tzip ${{steps.versions.outputs.zip_name}}.zip ./game/Modules/*
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{steps.versions.outputs.zip_name}}
-          path: ./game/Modules/*
-
-      - name: Create Release
-        uses: actions/create-release@v1
-        id: create_release
-        with:
-          tag_name: ${{steps.versions.outputs.tag_name}}
-          release_name: ${{steps.versions.outputs.release_title}}
-          draft: false
-          prerelease: ${{steps.versions.outputs.prerelease}}
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-
-      - name: Upload Release Asset
-        id: upload_release_asset
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{steps.create_release.outputs.upload_url}}
-          asset_path: ./${{steps.versions.outputs.zip_name}}.zip
-          asset_name: ${{steps.versions.outputs.zip_name}}.zip
-          asset_content_type: application/zip
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

From e0de208499601143df4b1e7f24634ece08bed450 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Thu, 8 Sep 2022 18:50:02 +0200
Subject: [PATCH 137/177] Remove release workflow

---
 .github/workflows/release.yml | 103 ----------------------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 89fefca8..00000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-name: Release
-
-on:
-  push:
-    branches: [ stable, beta ]
-
-jobs:
-  build:
-    name: Build & Release
-    runs-on: windows-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@master
-        with:
-          dotnet-version: 3.1.x
-          source-url: https://nuget.pkg.github.com/BUTR/index.json
-        env:
-          NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-          DOTNET_NOLOGO: 1
-          DOTNET_CLI_TELEMETRY_OPTOUT: 1
-
-      - name: Build BannerlordCheats
-        run: dotnet build BannerlordCheats.csproj  --configuration Release -p:GameFolder="$PWD\game"
-        env:
-          DOTNET_NOLOGO: 1
-          DOTNET_CLI_TELEMETRY_OPTOUT: 1
-
-      - name: Get Versions
-        id: versions
-        run: |
-          $ModVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<Version>([\d.]+)<\/Version>" | % { $($_.Matches.Groups[1]).Value }
-          $ModVersion = $ModVersion -replace "\.0",""
-          If ($ModVersion -notmatch "\.") { $ModVersion = "$ModVersion.0" }
-          Write-Host "::set-output name=mod_version::$ModVersion"
-          Write-Host "ModVersion: ""$ModVersion"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $GameVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameVersion>([\d.]+)<\/GameVersion>" | % { $($_.Matches.Groups[1]).Value }
-          Write-Host "::set-output name=game_version::$GameVersion"
-          Write-Host "GameVersion: ""$GameVersion"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $GameBranch = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameBranch>(.+)<\/GameBranch>" | % { $($_.Matches.Groups[1]).Value }
-          Write-Host "::set-output name=game_branch::$GameBranch"
-          Write-Host "GameBranch: ""$GameBranch"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $RepoBranch = "${{github.ref}}"
-          $RepoBranch = $RepoBranch.Split("/")[-1]
-          If ($RepoBranch -eq "stable") { $RepoBranch = "" }
-          If ($RepoBranch) { $RepoBranch = "-$RepoBranch" }
-          Write-Host "::set-output name=repo_branch::$RepoBranch"
-          Write-Host "RepoBranch: ""$RepoBranch"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $Prerelease = "${{github.ref}}"
-          $Prerelease = $Prerelease.Split("/")[-1]
-          If ($Prerelease -eq "stable") { $Prerelease = "false" } Else { $Prerelease = "true" }
-          Write-Host "::set-output name=prerelease::$Prerelease"
-          Write-Host "Prerelease: ""$Prerelease"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $ZipName = "BannerlordCheats_v$($ModVersion)_for_$($GameBranch)_e$($GameVersion)"
-          Write-Host "::set-output name=zip_name::$ZipName"
-          Write-Host "ZipName: ""$ZipName"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $TagName = "v$ModVersion$RepoBranch"
-          Write-Host "::set-output name=tag_name::$TagName"
-          Write-Host "TagName: ""$TagName"""
-          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $ReleaseTitle = "Release v$($ModVersion) for $($GameBranch) e$($GameVersion)"
-          Write-Host "::set-output name=release_title::$ReleaseTitle"
-          Write-Host "ReleaseTitle: ""$ReleaseTitle"""
-
-      - name: Package Mod Files
-        run: 7z a -tzip ${{steps.versions.outputs.zip_name}}.zip ./game/Modules/*
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{steps.versions.outputs.zip_name}}
-          path: ./game/Modules/*
-
-      - name: Create Release
-        uses: actions/create-release@v1
-        id: create_release
-        with:
-          tag_name: ${{steps.versions.outputs.tag_name}}
-          release_name: ${{steps.versions.outputs.release_title}}
-          draft: false
-          prerelease: ${{steps.versions.outputs.prerelease}}
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-
-      - name: Upload Release Asset
-        id: upload_release_asset
-        uses: actions/upload-release-asset@v1
-        with:
-          upload_url: ${{steps.create_release.outputs.upload_url}}
-          asset_path: ./${{steps.versions.outputs.zip_name}}.zip
-          asset_name: ${{steps.versions.outputs.zip_name}}.zip
-          asset_content_type: application/zip
-        env:
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

From 1dab257ddf1af68d874d6a4918cb7cd4237d02b4 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 13:33:01 +0200
Subject: [PATCH 138/177] Add action that uses Steam depots instead of NuGet
 references

---
 .github/workflows/build-depots.yml | 42 ++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 .github/workflows/build-depots.yml

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
new file mode 100644
index 00000000..cc3cb7e3
--- /dev/null
+++ b/.github/workflows/build-depots.yml
@@ -0,0 +1,42 @@
+name: Build (Depots)
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build & Release (Depots)
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@master
+
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@master
+        with:
+          dotnet-version: 6.0.x
+        env:
+          DOTNET_NOLOGO: 1
+          DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+      - name: Download DepotDownloader 2.4.7
+        uses: i3h/download-release-asset@v1.3.2
+        with:
+          owner: SteamRE
+          repo: DepotDownloader
+          tag: DepotDownloader_2.4.7
+          file: depotdownloader-2.4.7.zip
+
+      - name: Extract DepotDownloader 2.4.7
+        uses: DuckSoft/extract-7z-action@v1.0
+        with:
+          pathSource: depotdownloader-2.4.7.zip
+          pathTarget: depotdownloader
+
+      - name: Download Game Binaries
+        run: >-
+          dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta e1.8.0 -username ${{secrets.STEAM_USERNAME}}
+          -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -dir bannerlord;
+        shell: pwsh

From 9f74310cb1a116700623cc3d9023b4c50eb31c90 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 13:44:16 +0200
Subject: [PATCH 139/177] Add filelist filter to depots download

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index cc3cb7e3..783e16aa 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -38,5 +38,5 @@ jobs:
       - name: Download Game Binaries
         run: >-
           dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta e1.8.0 -username ${{secrets.STEAM_USERNAME}}
-          -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -dir bannerlord;
+          -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist regex:*\.dll -dir bannerlord;
         shell: pwsh

From 5678b60ba21a8ae9685c8d81d7c6991f04ab3a71 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 13:56:39 +0200
Subject: [PATCH 140/177] Add filelist filter as file

---
 .github/resources/depotdownloader.txt | 1 +
 .github/workflows/build-depots.yml    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 .github/resources/depotdownloader.txt

diff --git a/.github/resources/depotdownloader.txt b/.github/resources/depotdownloader.txt
new file mode 100644
index 00000000..e246f50c
--- /dev/null
+++ b/.github/resources/depotdownloader.txt
@@ -0,0 +1 @@
+regex:Modules\/[A-Za-z]+\/bin\/Win64_Shipping_Client\/[^\/]+\.dll
\ No newline at end of file
diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 783e16aa..35ef65a1 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -38,5 +38,5 @@ jobs:
       - name: Download Game Binaries
         run: >-
           dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta e1.8.0 -username ${{secrets.STEAM_USERNAME}}
-          -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist regex:*\.dll -dir bannerlord;
+          -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
         shell: pwsh

From 86401c5c6f4f6c74ea0734738e86c7b16f51632d Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:04:17 +0200
Subject: [PATCH 141/177] Try building mod with game files

---
 .github/resources/depotdownloader.txt | 3 ++-
 .github/workflows/build-depots.yml    | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/resources/depotdownloader.txt b/.github/resources/depotdownloader.txt
index e246f50c..836f2e35 100644
--- a/.github/resources/depotdownloader.txt
+++ b/.github/resources/depotdownloader.txt
@@ -1 +1,2 @@
-regex:Modules\/[A-Za-z]+\/bin\/Win64_Shipping_Client\/[^\/]+\.dll
\ No newline at end of file
+regex:bin\/Win64_Shipping_Client\/[^\/]+\.dll
+regex:Modules\/[A-Za-z]+\/bin\/Win64_Shipping_Client\/[^\/]+\.dll
diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 35ef65a1..8c24aa18 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -40,3 +40,9 @@ jobs:
           dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta e1.8.0 -username ${{secrets.STEAM_USERNAME}}
           -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
         shell: pwsh
+
+      - name: Build BannerlordCheats
+        run: dotnet build BannerlordCheats.csproj  --configuration Release -p:GameFolder="$PWD\bannerlord" -p:UseNuGetAssemblies="False"
+        env:
+          DOTNET_NOLOGO: 1
+          DOTNET_CLI_TELEMETRY_OPTOUT: 1

From b275848ac4fd9e81a3bf643e90c87a0e2a37a7b3 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:13:03 +0200
Subject: [PATCH 142/177] Use actual game version for depot downloading

---
 .github/workflows/build-depots.yml | 44 +++++++++++++++++++++++++++++-
 .github/workflows/build.yml        |  2 +-
 Directory.Build.props              |  2 +-
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 8c24aa18..7fd2d61d 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -13,6 +13,48 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@master
 
+      - name: Get Versions
+        id: versions
+        run: |
+          $ModVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<Version>([\d.]+)<\/Version>" | % { $($_.Matches.Groups[1]).Value }
+          $ModVersion = $ModVersion -replace "\.0",""
+          If ($ModVersion -notmatch "\.") { $ModVersion = "$ModVersion.0" }
+          Write-Host "::set-output name=mod_version::$ModVersion"
+          Write-Host "ModVersion: ""$ModVersion"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $GameVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameVersion>([\d.]+)<\/GameVersion>" | % { $($_.Matches.Groups[1]).Value }
+          Write-Host "::set-output name=game_version::$GameVersion"
+          Write-Host "GameVersion: ""$GameVersion"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $GameBranch = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameBranch>(.+)<\/GameBranch>" | % { $($_.Matches.Groups[1]).Value }
+          Write-Host "::set-output name=game_branch::$GameBranch"
+          Write-Host "GameBranch: ""$GameBranch"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $RepoBranch = "${{github.ref}}"
+          $RepoBranch = $RepoBranch.Split("/")[-1]
+          If ($RepoBranch -eq "stable") { $RepoBranch = "" }
+          If ($RepoBranch) { $RepoBranch = "-$RepoBranch" }
+          Write-Host "::set-output name=repo_branch::$RepoBranch"
+          Write-Host "RepoBranch: ""$RepoBranch"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $Prerelease = "${{github.ref}}"
+          $Prerelease = $Prerelease.Split("/")[-1]
+          If ($Prerelease -eq "stable") { $Prerelease = "false" } Else { $Prerelease = "true" }
+          Write-Host "::set-output name=prerelease::$Prerelease"
+          Write-Host "Prerelease: ""$Prerelease"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $ZipName = "BannerlordCheats_v$($ModVersion)_for_$($GameBranch)_$($GameVersion)"
+          Write-Host "::set-output name=zip_name::$ZipName"
+          Write-Host "ZipName: ""$ZipName"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $TagName = "v$ModVersion$RepoBranch"
+          Write-Host "::set-output name=tag_name::$TagName"
+          Write-Host "TagName: ""$TagName"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $ReleaseTitle = "Release v$($ModVersion) for $($GameBranch) $($GameVersion)"
+          Write-Host "::set-output name=release_title::$ReleaseTitle"
+          Write-Host "ReleaseTitle: ""$ReleaseTitle"""
+
       - name: Setup .NET Core
         uses: actions/setup-dotnet@master
         with:
@@ -37,7 +79,7 @@ jobs:
 
       - name: Download Game Binaries
         run: >-
-          dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta e1.8.0 -username ${{secrets.STEAM_USERNAME}}
+          dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta ${{steps.versions.outputs.game_version}} -username ${{secrets.STEAM_USERNAME}}
           -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
         shell: pwsh
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2fb7a8cc..7635b189 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 name: Build
 
 on:
-  push:
+  #push:
   workflow_dispatch:
 
 jobs:
diff --git a/Directory.Build.props b/Directory.Build.props
index 47a4f973..b5851f8b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.10.4.0</Version>
-    <GameVersion>1.7.2.316994</GameVersion>
+    <GameVersion>e1.7.2</GameVersion>
     <GameBranch>Stable</GameBranch>
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <MCMVersion>4.7.7</MCMVersion>

From 6652362747bb0f2d9a2165cfa49be64ae920da13 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:16:59 +0200
Subject: [PATCH 143/177] Fix game version pattern

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 7fd2d61d..9a2cbfd5 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -22,7 +22,7 @@ jobs:
           Write-Host "::set-output name=mod_version::$ModVersion"
           Write-Host "ModVersion: ""$ModVersion"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $GameVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameVersion>([\d.]+)<\/GameVersion>" | % { $($_.Matches.Groups[1]).Value }
+          $GameVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameVersion>(e[\d.]+)<\/GameVersion>" | % { $($_.Matches.Groups[1]).Value }
           Write-Host "::set-output name=game_version::$GameVersion"
           Write-Host "GameVersion: ""$GameVersion"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------

From e60a32c37dfd4791ddaba92c6b71d2eaa1347570 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:25:02 +0200
Subject: [PATCH 144/177] Add remaining workflow steps

---
 .github/workflows/build-depots.yml | 34 ++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 9a2cbfd5..c96f47f2 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -88,3 +88,37 @@ jobs:
         env:
           DOTNET_NOLOGO: 1
           DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+      - name: Package Mod Files
+        run: 7z a -tzip ${{steps.versions.outputs.zip_name}}.zip Cheats/
+        working-directory: ./bannerlord/Modules
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{steps.versions.outputs.zip_name}}
+          path: ./bannerlord/Modules/*
+
+      - name: Create Release
+        uses: actions/create-release@v1
+        id: create_release
+        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        with:
+          tag_name: ${{steps.versions.outputs.tag_name}}
+          release_name: ${{steps.versions.outputs.release_title}}
+          draft: false
+          prerelease: ${{steps.versions.outputs.prerelease}}
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        id: upload_release_asset
+        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        with:
+          upload_url: ${{steps.create_release.outputs.upload_url}}
+          asset_path: ./${{steps.versions.outputs.zip_name}}.zip
+          asset_name: ${{steps.versions.outputs.zip_name}}.zip
+          asset_content_type: application/zip
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

From 8d1da7f019cf399cb66633959177901e1797b578 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:29:58 +0200
Subject: [PATCH 145/177] Try fixing artifacts paths

---
 .github/workflows/build-depots.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index c96f47f2..edcbcd75 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -90,14 +90,14 @@ jobs:
           DOTNET_CLI_TELEMETRY_OPTOUT: 1
 
       - name: Package Mod Files
-        run: 7z a -tzip ${{steps.versions.outputs.zip_name}}.zip Cheats/
+        run: 7z a -tzip ../../${{steps.versions.outputs.zip_name}}.zip Cheats/
         working-directory: ./bannerlord/Modules
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v2
         with:
           name: ${{steps.versions.outputs.zip_name}}
-          path: ./bannerlord/Modules/*
+          path: ./bannerlord/Modules/Cheats/
 
       - name: Create Release
         uses: actions/create-release@v1

From 6587274db7612f86eedac58dd3b8bfb5c5935f38 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:35:57 +0200
Subject: [PATCH 146/177] Try fixing artifacts paths Pt.2

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index edcbcd75..6218204e 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -97,7 +97,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: ${{steps.versions.outputs.zip_name}}
-          path: ./bannerlord/Modules/Cheats/
+          path: ./bannerlord/Modules/Cheats
 
       - name: Create Release
         uses: actions/create-release@v1

From 2aa04161adfca72200940719d45d15bf767210ae Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:39:32 +0200
Subject: [PATCH 147/177] Update upload-artifacts action

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 6218204e..5fa178a0 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -94,7 +94,7 @@ jobs:
         working-directory: ./bannerlord/Modules
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{steps.versions.outputs.zip_name}}
           path: ./bannerlord/Modules/Cheats

From 1528685d7a78a667b12266ea389995c074a674ce Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:43:33 +0200
Subject: [PATCH 148/177] Test release and release artifacts creation

---
 .github/workflows/build-depots.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 5fa178a0..4ab47f5b 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -102,11 +102,11 @@ jobs:
       - name: Create Release
         uses: actions/create-release@v1
         id: create_release
-        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        #if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
         with:
           tag_name: ${{steps.versions.outputs.tag_name}}
           release_name: ${{steps.versions.outputs.release_title}}
-          draft: false
+          draft: true
           prerelease: ${{steps.versions.outputs.prerelease}}
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -114,7 +114,7 @@ jobs:
       - name: Upload Release Asset
         uses: actions/upload-release-asset@v1
         id: upload_release_asset
-        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        #if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
         with:
           upload_url: ${{steps.create_release.outputs.upload_url}}
           asset_path: ./${{steps.versions.outputs.zip_name}}.zip

From 0fdae14dc1541c378a5872eb6f111148c18e0d7b Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:48:48 +0200
Subject: [PATCH 149/177] Remove release tests

---
 .github/workflows/build-depots.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 4ab47f5b..5fa178a0 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -102,11 +102,11 @@ jobs:
       - name: Create Release
         uses: actions/create-release@v1
         id: create_release
-        #if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
         with:
           tag_name: ${{steps.versions.outputs.tag_name}}
           release_name: ${{steps.versions.outputs.release_title}}
-          draft: true
+          draft: false
           prerelease: ${{steps.versions.outputs.prerelease}}
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -114,7 +114,7 @@ jobs:
       - name: Upload Release Asset
         uses: actions/upload-release-asset@v1
         id: upload_release_asset
-        #if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
         with:
           upload_url: ${{steps.create_release.outputs.upload_url}}
           asset_path: ./${{steps.versions.outputs.zip_name}}.zip

From 983198a7c0c05e94a2faab082e1f714afd0b040c Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:50:14 +0200
Subject: [PATCH 150/177] Try uploading the zipped mod file as artifact

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 5fa178a0..56669d34 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -97,7 +97,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: ${{steps.versions.outputs.zip_name}}
-          path: ./bannerlord/Modules/Cheats
+          path: ./${{steps.versions.outputs.zip_name}}.zip
 
       - name: Create Release
         uses: actions/create-release@v1

From a8d03fe99d7ed7deb791d37c83cbe0c03a6e644b Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 13:33:01 +0200
Subject: [PATCH 151/177] Add action that uses Steam depots instead of NuGet
 references

---
 .github/workflows/build-depots.yml | 42 ++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 .github/workflows/build-depots.yml

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
new file mode 100644
index 00000000..cc3cb7e3
--- /dev/null
+++ b/.github/workflows/build-depots.yml
@@ -0,0 +1,42 @@
+name: Build (Depots)
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build & Release (Depots)
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@master
+
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@master
+        with:
+          dotnet-version: 6.0.x
+        env:
+          DOTNET_NOLOGO: 1
+          DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+      - name: Download DepotDownloader 2.4.7
+        uses: i3h/download-release-asset@v1.3.2
+        with:
+          owner: SteamRE
+          repo: DepotDownloader
+          tag: DepotDownloader_2.4.7
+          file: depotdownloader-2.4.7.zip
+
+      - name: Extract DepotDownloader 2.4.7
+        uses: DuckSoft/extract-7z-action@v1.0
+        with:
+          pathSource: depotdownloader-2.4.7.zip
+          pathTarget: depotdownloader
+
+      - name: Download Game Binaries
+        run: >-
+          dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta e1.8.0 -username ${{secrets.STEAM_USERNAME}}
+          -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -dir bannerlord;
+        shell: pwsh

From e2262a6d796c538229de5572ede327ae37d5e05c Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 13:44:16 +0200
Subject: [PATCH 152/177] Add filelist filter to depots download

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index cc3cb7e3..783e16aa 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -38,5 +38,5 @@ jobs:
       - name: Download Game Binaries
         run: >-
           dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta e1.8.0 -username ${{secrets.STEAM_USERNAME}}
-          -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -dir bannerlord;
+          -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist regex:*\.dll -dir bannerlord;
         shell: pwsh

From 9666addfcbac0b90b1d9705b0cefccfdb66083c0 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 13:56:39 +0200
Subject: [PATCH 153/177] Add filelist filter as file

---
 .github/resources/depotdownloader.txt | 1 +
 .github/workflows/build-depots.yml    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 .github/resources/depotdownloader.txt

diff --git a/.github/resources/depotdownloader.txt b/.github/resources/depotdownloader.txt
new file mode 100644
index 00000000..e246f50c
--- /dev/null
+++ b/.github/resources/depotdownloader.txt
@@ -0,0 +1 @@
+regex:Modules\/[A-Za-z]+\/bin\/Win64_Shipping_Client\/[^\/]+\.dll
\ No newline at end of file
diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 783e16aa..35ef65a1 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -38,5 +38,5 @@ jobs:
       - name: Download Game Binaries
         run: >-
           dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta e1.8.0 -username ${{secrets.STEAM_USERNAME}}
-          -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist regex:*\.dll -dir bannerlord;
+          -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
         shell: pwsh

From 62b821291379c949e1a9a0fea20e1c2acf2ad0f8 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:04:17 +0200
Subject: [PATCH 154/177] Try building mod with game files

---
 .github/resources/depotdownloader.txt | 3 ++-
 .github/workflows/build-depots.yml    | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/resources/depotdownloader.txt b/.github/resources/depotdownloader.txt
index e246f50c..836f2e35 100644
--- a/.github/resources/depotdownloader.txt
+++ b/.github/resources/depotdownloader.txt
@@ -1 +1,2 @@
-regex:Modules\/[A-Za-z]+\/bin\/Win64_Shipping_Client\/[^\/]+\.dll
\ No newline at end of file
+regex:bin\/Win64_Shipping_Client\/[^\/]+\.dll
+regex:Modules\/[A-Za-z]+\/bin\/Win64_Shipping_Client\/[^\/]+\.dll
diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 35ef65a1..8c24aa18 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -40,3 +40,9 @@ jobs:
           dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta e1.8.0 -username ${{secrets.STEAM_USERNAME}}
           -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
         shell: pwsh
+
+      - name: Build BannerlordCheats
+        run: dotnet build BannerlordCheats.csproj  --configuration Release -p:GameFolder="$PWD\bannerlord" -p:UseNuGetAssemblies="False"
+        env:
+          DOTNET_NOLOGO: 1
+          DOTNET_CLI_TELEMETRY_OPTOUT: 1

From 66a1b5bf9718757091e395e63f57aca3f741470f Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:13:03 +0200
Subject: [PATCH 155/177] Use actual game version for depot downloading

---
 .github/workflows/build-depots.yml | 44 +++++++++++++++++++++++++++++-
 .github/workflows/build.yml        |  2 +-
 Directory.Build.props              |  2 +-
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 8c24aa18..7fd2d61d 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -13,6 +13,48 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@master
 
+      - name: Get Versions
+        id: versions
+        run: |
+          $ModVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<Version>([\d.]+)<\/Version>" | % { $($_.Matches.Groups[1]).Value }
+          $ModVersion = $ModVersion -replace "\.0",""
+          If ($ModVersion -notmatch "\.") { $ModVersion = "$ModVersion.0" }
+          Write-Host "::set-output name=mod_version::$ModVersion"
+          Write-Host "ModVersion: ""$ModVersion"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $GameVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameVersion>([\d.]+)<\/GameVersion>" | % { $($_.Matches.Groups[1]).Value }
+          Write-Host "::set-output name=game_version::$GameVersion"
+          Write-Host "GameVersion: ""$GameVersion"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $GameBranch = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameBranch>(.+)<\/GameBranch>" | % { $($_.Matches.Groups[1]).Value }
+          Write-Host "::set-output name=game_branch::$GameBranch"
+          Write-Host "GameBranch: ""$GameBranch"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $RepoBranch = "${{github.ref}}"
+          $RepoBranch = $RepoBranch.Split("/")[-1]
+          If ($RepoBranch -eq "stable") { $RepoBranch = "" }
+          If ($RepoBranch) { $RepoBranch = "-$RepoBranch" }
+          Write-Host "::set-output name=repo_branch::$RepoBranch"
+          Write-Host "RepoBranch: ""$RepoBranch"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $Prerelease = "${{github.ref}}"
+          $Prerelease = $Prerelease.Split("/")[-1]
+          If ($Prerelease -eq "stable") { $Prerelease = "false" } Else { $Prerelease = "true" }
+          Write-Host "::set-output name=prerelease::$Prerelease"
+          Write-Host "Prerelease: ""$Prerelease"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $ZipName = "BannerlordCheats_v$($ModVersion)_for_$($GameBranch)_$($GameVersion)"
+          Write-Host "::set-output name=zip_name::$ZipName"
+          Write-Host "ZipName: ""$ZipName"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $TagName = "v$ModVersion$RepoBranch"
+          Write-Host "::set-output name=tag_name::$TagName"
+          Write-Host "TagName: ""$TagName"""
+          #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+          $ReleaseTitle = "Release v$($ModVersion) for $($GameBranch) $($GameVersion)"
+          Write-Host "::set-output name=release_title::$ReleaseTitle"
+          Write-Host "ReleaseTitle: ""$ReleaseTitle"""
+
       - name: Setup .NET Core
         uses: actions/setup-dotnet@master
         with:
@@ -37,7 +79,7 @@ jobs:
 
       - name: Download Game Binaries
         run: >-
-          dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta e1.8.0 -username ${{secrets.STEAM_USERNAME}}
+          dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta ${{steps.versions.outputs.game_version}} -username ${{secrets.STEAM_USERNAME}}
           -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
         shell: pwsh
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2fb7a8cc..7635b189 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 name: Build
 
 on:
-  push:
+  #push:
   workflow_dispatch:
 
 jobs:
diff --git a/Directory.Build.props b/Directory.Build.props
index 69399dc8..ff035f97 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.10.4.0</Version>
-    <GameVersion>1.8.0.321460</GameVersion>
+    <GameVersion>e1.8.0</GameVersion>
     <GameBranch>Beta</GameBranch>
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <MCMVersion>4.7.7</MCMVersion>

From fb9e0b8ff1ffa76d3d15f6097e7703590b6788f8 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:16:59 +0200
Subject: [PATCH 156/177] Fix game version pattern

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 7fd2d61d..9a2cbfd5 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -22,7 +22,7 @@ jobs:
           Write-Host "::set-output name=mod_version::$ModVersion"
           Write-Host "ModVersion: ""$ModVersion"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-          $GameVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameVersion>([\d.]+)<\/GameVersion>" | % { $($_.Matches.Groups[1]).Value }
+          $GameVersion = Get-Content .\Directory.Build.props | Select-String -Pattern "<GameVersion>(e[\d.]+)<\/GameVersion>" | % { $($_.Matches.Groups[1]).Value }
           Write-Host "::set-output name=game_version::$GameVersion"
           Write-Host "GameVersion: ""$GameVersion"""
           #---------------------------------------------------------------------------------------------------------------------------------------------------------------------

From 6283aace509cc6b3109a5a6d6245d6722abbad9d Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:25:02 +0200
Subject: [PATCH 157/177] Add remaining workflow steps

---
 .github/workflows/build-depots.yml | 34 ++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 9a2cbfd5..c96f47f2 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -88,3 +88,37 @@ jobs:
         env:
           DOTNET_NOLOGO: 1
           DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+      - name: Package Mod Files
+        run: 7z a -tzip ${{steps.versions.outputs.zip_name}}.zip Cheats/
+        working-directory: ./bannerlord/Modules
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{steps.versions.outputs.zip_name}}
+          path: ./bannerlord/Modules/*
+
+      - name: Create Release
+        uses: actions/create-release@v1
+        id: create_release
+        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        with:
+          tag_name: ${{steps.versions.outputs.tag_name}}
+          release_name: ${{steps.versions.outputs.release_title}}
+          draft: false
+          prerelease: ${{steps.versions.outputs.prerelease}}
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        id: upload_release_asset
+        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        with:
+          upload_url: ${{steps.create_release.outputs.upload_url}}
+          asset_path: ./${{steps.versions.outputs.zip_name}}.zip
+          asset_name: ${{steps.versions.outputs.zip_name}}.zip
+          asset_content_type: application/zip
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

From ec5d0a67f52e161dace19e6e9ee038fdb9583eb1 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:29:58 +0200
Subject: [PATCH 158/177] Try fixing artifacts paths

---
 .github/workflows/build-depots.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index c96f47f2..edcbcd75 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -90,14 +90,14 @@ jobs:
           DOTNET_CLI_TELEMETRY_OPTOUT: 1
 
       - name: Package Mod Files
-        run: 7z a -tzip ${{steps.versions.outputs.zip_name}}.zip Cheats/
+        run: 7z a -tzip ../../${{steps.versions.outputs.zip_name}}.zip Cheats/
         working-directory: ./bannerlord/Modules
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v2
         with:
           name: ${{steps.versions.outputs.zip_name}}
-          path: ./bannerlord/Modules/*
+          path: ./bannerlord/Modules/Cheats/
 
       - name: Create Release
         uses: actions/create-release@v1

From cdb1b6f668f824e72489f79b33723414aa8576c0 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:35:57 +0200
Subject: [PATCH 159/177] Try fixing artifacts paths Pt.2

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index edcbcd75..6218204e 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -97,7 +97,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: ${{steps.versions.outputs.zip_name}}
-          path: ./bannerlord/Modules/Cheats/
+          path: ./bannerlord/Modules/Cheats
 
       - name: Create Release
         uses: actions/create-release@v1

From 50ffb57388e7165ceb1eba8ed85f67da768a2f46 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:39:32 +0200
Subject: [PATCH 160/177] Update upload-artifacts action

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 6218204e..5fa178a0 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -94,7 +94,7 @@ jobs:
         working-directory: ./bannerlord/Modules
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{steps.versions.outputs.zip_name}}
           path: ./bannerlord/Modules/Cheats

From e2d05cd563ef5307ad55782010d11ab5e6a5638c Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:43:33 +0200
Subject: [PATCH 161/177] Test release and release artifacts creation

---
 .github/workflows/build-depots.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 5fa178a0..4ab47f5b 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -102,11 +102,11 @@ jobs:
       - name: Create Release
         uses: actions/create-release@v1
         id: create_release
-        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        #if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
         with:
           tag_name: ${{steps.versions.outputs.tag_name}}
           release_name: ${{steps.versions.outputs.release_title}}
-          draft: false
+          draft: true
           prerelease: ${{steps.versions.outputs.prerelease}}
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -114,7 +114,7 @@ jobs:
       - name: Upload Release Asset
         uses: actions/upload-release-asset@v1
         id: upload_release_asset
-        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        #if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
         with:
           upload_url: ${{steps.create_release.outputs.upload_url}}
           asset_path: ./${{steps.versions.outputs.zip_name}}.zip

From a008656afdbb427a990cfe44618fbd3c9fa506c3 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:48:48 +0200
Subject: [PATCH 162/177] Remove release tests

---
 .github/workflows/build-depots.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 4ab47f5b..5fa178a0 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -102,11 +102,11 @@ jobs:
       - name: Create Release
         uses: actions/create-release@v1
         id: create_release
-        #if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
         with:
           tag_name: ${{steps.versions.outputs.tag_name}}
           release_name: ${{steps.versions.outputs.release_title}}
-          draft: true
+          draft: false
           prerelease: ${{steps.versions.outputs.prerelease}}
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -114,7 +114,7 @@ jobs:
       - name: Upload Release Asset
         uses: actions/upload-release-asset@v1
         id: upload_release_asset
-        #if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
+        if: ${{ github.ref_name == 'stable' || github.ref_name == 'beta' }}
         with:
           upload_url: ${{steps.create_release.outputs.upload_url}}
           asset_path: ./${{steps.versions.outputs.zip_name}}.zip

From 3e6bec6bb70892b543d9f91f5863a5d4b8a9c169 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 14:50:14 +0200
Subject: [PATCH 163/177] Try uploading the zipped mod file as artifact

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 5fa178a0..56669d34 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -97,7 +97,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: ${{steps.versions.outputs.zip_name}}
-          path: ./bannerlord/Modules/Cheats
+          path: ./${{steps.versions.outputs.zip_name}}.zip
 
       - name: Create Release
         uses: actions/create-release@v1

From cbd194a28a961c6a86f3256ecea633244df17b5a Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 15:02:54 +0200
Subject: [PATCH 164/177] Remove duplicate launch profile

---
 Properties/launchSettings.json | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 Properties/launchSettings.json

diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
deleted file mode 100644
index eb1a915e..00000000
--- a/Properties/launchSettings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "profiles": {
-    "Launch": {
-      "commandName": "Executable",
-      "executablePath": "C:\\SteamCMD\\apps\\mb2b_beta\\bin\\Win64_Shipping_Client\\Bannerlord.exe",
-      "commandLineArgs": "/singleplayer _MODULES_*Bannerlord.Harmony*Bannerlord.ButterLib*Bannerlord.UIExtenderEx*Bannerlord.MBOptionScreen*Native*SandBoxCore*CustomBattle*SandBox*StoryMode*Cheats*_MODULES_",
-      "workingDirectory": "C:\\SteamCMD\\apps\\mb2b_beta\\bin\\Win64_Shipping_Client"
-    }
-  }
-}
\ No newline at end of file

From 8be9caadcf1abc1fd39b6a1fe6d4cb26612557e4 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 15:08:34 +0200
Subject: [PATCH 165/177] Disable NuGet packages

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index b5851f8b..4ce096b1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -8,6 +8,6 @@
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\apps\mb2b_stable</GameFolder>
-    <UseNuGetAssemblies>True</UseNuGetAssemblies>
+    <UseNuGetAssemblies>False</UseNuGetAssemblies>
   </PropertyGroup>
 </Project>

From 91402c50673244081761438f8a2f81126558dd0c Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 15:09:01 +0200
Subject: [PATCH 166/177] Disable NuGet packages

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index ff035f97..9f71cfdb 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -8,6 +8,6 @@
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <GameFolder>C:\SteamCMD\apps\mb2b_beta</GameFolder>
-    <UseNuGetAssemblies>True</UseNuGetAssemblies>
+    <UseNuGetAssemblies>False</UseNuGetAssemblies>
   </PropertyGroup>
 </Project>

From c64e2b78395a86ba163d82cf8864b38284a8fdb5 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 15:18:01 +0200
Subject: [PATCH 167/177] Try to build mod in correct game folder

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 56669d34..c3a9d631 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -84,7 +84,7 @@ jobs:
         shell: pwsh
 
       - name: Build BannerlordCheats
-        run: dotnet build BannerlordCheats.csproj  --configuration Release -p:GameFolder="$PWD\bannerlord" -p:UseNuGetAssemblies="False"
+        run: dotnet build BannerlordCheats.csproj  --configuration Release -p:GameFolder="${{github.workspace}}/bannerlord" -p:UseNuGetAssemblies="False"
         env:
           DOTNET_NOLOGO: 1
           DOTNET_CLI_TELEMETRY_OPTOUT: 1

From b218b5035f5254e3014b297664f5de695d98cf23 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 15:20:44 +0200
Subject: [PATCH 168/177] Fix path

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index c3a9d631..ca752dda 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -84,7 +84,7 @@ jobs:
         shell: pwsh
 
       - name: Build BannerlordCheats
-        run: dotnet build BannerlordCheats.csproj  --configuration Release -p:GameFolder="${{github.workspace}}/bannerlord" -p:UseNuGetAssemblies="False"
+        run: dotnet build BannerlordCheats.csproj  --configuration Release -p:GameFolder="${{github.workspace}}\bannerlord" -p:UseNuGetAssemblies="False"
         env:
           DOTNET_NOLOGO: 1
           DOTNET_CLI_TELEMETRY_OPTOUT: 1

From 4feb46b0d2d9538b406f291d00957d9f5c4315fa Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 15:18:01 +0200
Subject: [PATCH 169/177] Try to build mod in correct game folder

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index 56669d34..c3a9d631 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -84,7 +84,7 @@ jobs:
         shell: pwsh
 
       - name: Build BannerlordCheats
-        run: dotnet build BannerlordCheats.csproj  --configuration Release -p:GameFolder="$PWD\bannerlord" -p:UseNuGetAssemblies="False"
+        run: dotnet build BannerlordCheats.csproj  --configuration Release -p:GameFolder="${{github.workspace}}/bannerlord" -p:UseNuGetAssemblies="False"
         env:
           DOTNET_NOLOGO: 1
           DOTNET_CLI_TELEMETRY_OPTOUT: 1

From 3bd78dba85a041f9964c1a75b8e8bc064587c3e5 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 15:20:44 +0200
Subject: [PATCH 170/177] Fix path

---
 .github/workflows/build-depots.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index c3a9d631..ca752dda 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -84,7 +84,7 @@ jobs:
         shell: pwsh
 
       - name: Build BannerlordCheats
-        run: dotnet build BannerlordCheats.csproj  --configuration Release -p:GameFolder="${{github.workspace}}/bannerlord" -p:UseNuGetAssemblies="False"
+        run: dotnet build BannerlordCheats.csproj  --configuration Release -p:GameFolder="${{github.workspace}}\bannerlord" -p:UseNuGetAssemblies="False"
         env:
           DOTNET_NOLOGO: 1
           DOTNET_CLI_TELEMETRY_OPTOUT: 1

From f9e9e8f6180dee9775d9ae9bfcd0c583f28789ba Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Fri, 9 Sep 2022 15:24:50 +0200
Subject: [PATCH 171/177] Remove duplicate launch profile

---
 Properties/launchSettings.json | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 Properties/launchSettings.json

diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
deleted file mode 100644
index e5c2720c..00000000
--- a/Properties/launchSettings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "profiles": {
-    "Launch": {
-      "commandName": "Executable",
-      "executablePath": "C:\\SteamCMD\\apps\\mb2b_stable\\bin\\Win64_Shipping_Client\\Bannerlord.exe",
-      "commandLineArgs": "/singleplayer _MODULES_*Bannerlord.Harmony*Bannerlord.ButterLib*Bannerlord.UIExtenderEx*Bannerlord.MBOptionScreen*Native*SandBoxCore*CustomBattle*SandBox*StoryMode*Cheats*_MODULES_",
-      "workingDirectory": "C:\\SteamCMD\\apps\\mb2b_stable\\bin\\Win64_Shipping_Client"
-    }
-  }
-}
\ No newline at end of file

From eb17a7655520e26f5fa31daa0ea51f20b382f0d9 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 12 Sep 2022 19:28:51 +0200
Subject: [PATCH 172/177] Download files from both relevant depots

---
 .github/workflows/build-depots.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index ca752dda..abdf68bd 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -79,8 +79,10 @@ jobs:
 
       - name: Download Game Binaries
         run: >-
-          dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta ${{steps.versions.outputs.game_version}} -username ${{secrets.STEAM_USERNAME}}
-          -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
+          foreach ($depot in @(261551, 261552)) {
+            dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot $depot -beta ${{steps.versions.outputs.game_version}} -username ${{secrets.STEAM_USERNAME}}
+            -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
+          }
         shell: pwsh
 
       - name: Build BannerlordCheats

From dc938d97fe75cb888bf100b20d2bc60c6e52d9f5 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 12 Sep 2022 19:32:56 +0200
Subject: [PATCH 173/177] Fix line break

---
 .github/workflows/build-depots.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index abdf68bd..a7aec051 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -80,8 +80,7 @@ jobs:
       - name: Download Game Binaries
         run: >-
           foreach ($depot in @(261551, 261552)) {
-            dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot $depot -beta ${{steps.versions.outputs.game_version}} -username ${{secrets.STEAM_USERNAME}}
-            -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
+            dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot $depot -beta ${{steps.versions.outputs.game_version}} -username ${{secrets.STEAM_USERNAME}} -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
           }
         shell: pwsh
 

From ee8434e6489e351e451d34e80dfcc2bf04fcdbc6 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 12 Sep 2022 19:28:51 +0200
Subject: [PATCH 174/177] Download files from both relevant depots

---
 .github/workflows/build-depots.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index ca752dda..abdf68bd 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -79,8 +79,10 @@ jobs:
 
       - name: Download Game Binaries
         run: >-
-          dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta ${{steps.versions.outputs.game_version}} -username ${{secrets.STEAM_USERNAME}}
-          -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
+          foreach ($depot in @(261551, 261552)) {
+            dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot $depot -beta ${{steps.versions.outputs.game_version}} -username ${{secrets.STEAM_USERNAME}}
+            -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
+          }
         shell: pwsh
 
       - name: Build BannerlordCheats

From 3592aeff297e77864550994f0d5e4c002751172e Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 12 Sep 2022 19:32:56 +0200
Subject: [PATCH 175/177] Fix line break

---
 .github/workflows/build-depots.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build-depots.yml b/.github/workflows/build-depots.yml
index abdf68bd..a7aec051 100644
--- a/.github/workflows/build-depots.yml
+++ b/.github/workflows/build-depots.yml
@@ -80,8 +80,7 @@ jobs:
       - name: Download Game Binaries
         run: >-
           foreach ($depot in @(261551, 261552)) {
-            dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot $depot -beta ${{steps.versions.outputs.game_version}} -username ${{secrets.STEAM_USERNAME}}
-            -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
+            dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot $depot -beta ${{steps.versions.outputs.game_version}} -username ${{secrets.STEAM_USERNAME}} -password ${{secrets.STEAM_PASSWORD}} -os windows -osarch 64 -filelist ./.github/resources/depotdownloader.txt -dir bannerlord;
           }
         shell: pwsh
 

From 66ae1001df7555fa20049bdce08dfc953740e122 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 12 Sep 2022 23:00:42 +0200
Subject: [PATCH 176/177] Update to e1.8.0

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 4ce096b1..c8cc3e62 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Version>2.10.4.0</Version>
-    <GameVersion>e1.7.2</GameVersion>
+    <GameVersion>e1.8.0</GameVersion>
     <GameBranch>Stable</GameBranch>
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <MCMVersion>4.7.7</MCMVersion>

From 5bd7a4d45a38eb3897a2ece4baff156fb1211537 Mon Sep 17 00:00:00 2001
From: Nico Welles <nico@welles.io>
Date: Mon, 12 Sep 2022 23:21:18 +0200
Subject: [PATCH 177/177] Update Always Knock Down for new version

---
 Patches/Combat/AlwaysKnockDown.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Patches/Combat/AlwaysKnockDown.cs b/Patches/Combat/AlwaysKnockDown.cs
index 53d0e332..02e63c27 100644
--- a/Patches/Combat/AlwaysKnockDown.cs
+++ b/Patches/Combat/AlwaysKnockDown.cs
@@ -3,27 +3,27 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
 using JetBrains.Annotations;
+using SandBox.GameComponents;
 using TaleWorlds.Core;
 using TaleWorlds.MountAndBlade;
 
 namespace BannerlordCheats.Patches.Combat
 {
-    [HarmonyPatch(typeof(Mission), "DecideAgentKnockedByBlow")]
+    [HarmonyPatch(typeof(SandboxAgentApplyDamageModel), nameof(SandboxAgentApplyDamageModel.DecideAgentKnockedDownByBlow))]
     public static class AlwaysKnockDown
     {
         [UsedImplicitly]
         [HarmonyPostfix]
         public static void DecideAgentKnockedByBlow(
-            ref Agent attacker,
-            ref Agent victim,
+            ref Agent attackerAgent,
+            ref Agent victimAgent,
             ref AttackCollisionData collisionData,
             ref WeaponComponentData attackerWeapon,
-            ref bool isInitialBlowShrugOff,
             ref Blow blow)
         {
             try
             {
-                if (attacker.IsPlayer()
+                if (attackerAgent.IsPlayer()
                     && BannerlordCheatsSettings.Instance?.AlwaysKnockDown == true)
                 {
                     blow.BlowFlag &= ~BlowFlags.ShrugOff;