Release v1.7.2 - Beta

welles · Nov 29, 2020 · 515ea22 · 515ea22
2 parents b75fe7a + 347a0de
commit 515ea22
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>1.7.1.0</Version>
+    <Version>1.7.2.0</Version>
     <GameVersion>1.5.5</GameVersion>
     <GameBranch>Beta</GameBranch>
     <AdditionalInfo></AdditionalInfo>

diff --git a/Patches/Party/FreeTroopUpgradesPatch.cs b/Patches/Party/FreeTroopUpgradesPatch.cs
@@ -1,22 +1,17 @@
 using BannerlordCheats.Settings;
 using HarmonyLib;
-using System.Linq;
 using TaleWorlds.CampaignSystem;
-using TaleWorlds.CampaignSystem.SandBox.GameComponents.Party;
+using TaleWorlds.CampaignSystem.SandBox.GameComponents;
 
 namespace BannerlordCheats.Patches
 {
-    [HarmonyPatch(typeof(DefaultPartyWageModel), nameof(DefaultPartyWageModel.GetGoldCostForUpgrade))]
+    [HarmonyPatch(typeof(DefaultPartyTroopUpgradeModel), nameof(DefaultPartyTroopUpgradeModel.GetGoldCostForUpgrade))]
     public static class FreeTroopUpgradesPatch
     {
         [HarmonyPostfix]
-        public static void GetGoldCostForUpgrade(CharacterObject characterObject, CharacterObject upgradeTarget, ref int __result)
+        public static void GetGoldCostForUpgrade(ref PartyBase party, ref CharacterObject characterObject, ref CharacterObject upgradeTarget, ref int __result)
         {
-            var playerTeam = PartyBase.MainParty?.MemberRoster?.Select(x => x.Character?.Id).ToArray();
-
-            if (playerTeam != null
-                && characterObject?.Id != null
-                && (playerTeam.Contains(characterObject?.Id))
+            if ((party?.Leader?.IsPlayerCharacter ?? false)
                 && BannerlordCheatsSettings.Instance.FreeTroopUpgrades)
             {
                 __result = 0;