From 91bc0ed1e0c6880142b7f40e0db5d7085718db56 Mon Sep 17 00:00:00 2001 From: Dev Date: Mon, 15 Apr 2024 12:04:31 +0100 Subject: [PATCH] Update class refs to get project building --- .../BTR/Patches/BTRActivateTraderDialogPatch.cs | 2 +- project/Aki.Custom/Patches/ExitWhileLootingPatch.cs | 2 +- project/Aki.Custom/Patches/RagfairFeePatch.cs | 12 ++++++------ .../Aki.Debugging/Patches/BTRDebugCommandPatch.cs | 2 +- project/Aki.Debugging/Patches/ExfilDumper.cs | 2 +- .../Patches/PMCBotSpawnLocationPatch.cs | 4 ++-- .../Patches/RaidFix/GetNewBotTemplatesPatch.cs | 2 +- .../Patches/ScavMode/LoadOfflineRaidScreenPatch.cs | 2 +- .../Patches/ScavMode/ScavRepAdjustmentPatch.cs | 2 +- .../Utils/TraderServices/TraderServicesManager.cs | 6 +++--- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs b/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs index 1d12e75..f44e8e8 100644 --- a/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs @@ -6,7 +6,7 @@ using EFT.Vehicle; using HarmonyLib; using System; using System.Reflection; -using BTRDialog = EFT.UI.TraderDialogScreen.GClass3149; +using BTRDialog = EFT.UI.TraderDialogScreen.GClass3151; namespace Aki.Custom.BTR.Patches { diff --git a/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs b/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs index 4cb2fe3..9203f90 100644 --- a/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs +++ b/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs @@ -31,7 +31,7 @@ namespace Aki.Custom.Patches var player = Singleton.Instance.MainPlayer; if (profileId == player?.Profile.Id) { - GClass3123.Instance.CloseAllScreensForced(); + GClass3125.Instance.CloseAllScreensForced(); } return true; diff --git a/project/Aki.Custom/Patches/RagfairFeePatch.cs b/project/Aki.Custom/Patches/RagfairFeePatch.cs index fd105e4..909fa21 100644 --- a/project/Aki.Custom/Patches/RagfairFeePatch.cs +++ b/project/Aki.Custom/Patches/RagfairFeePatch.cs @@ -17,8 +17,8 @@ namespace Aki.Custom.Patches public RagfairFeePatch() { // Remember to update prefix parameter if below lines are broken - _ = nameof(GClass3083.IsAllSelectedItemSame); - _ = nameof(GClass3083.AutoSelectSimilar); + _ = nameof(GClass3085.IsAllSelectedItemSame); + _ = nameof(GClass3085.AutoSelectSimilar); } protected override MethodBase GetTargetMethod() @@ -30,18 +30,18 @@ namespace Aki.Custom.Patches /// Calculate tax to charge player and send to server before the offer is sent /// /// Item sold - /// OfferItemCount + /// OfferItemCount /// RequirementsPrice /// SellInOnePiece [PatchPrefix] - private static void PatchPrefix(ref Item ___item_0, ref GClass3083 ___gclass3083_0, ref double ___double_0, ref bool ___bool_0) + private static void PatchPrefix(ref Item ___item_0, ref GClass3085 ___gclass3085_0, ref double ___double_0, ref bool ___bool_0) { RequestHandler.PutJson("/client/ragfair/offerfees", new { id = ___item_0.Id, tpl = ___item_0.TemplateId, - count = ___gclass3083_0.OfferItemCount, - fee = Mathf.CeilToInt((float)GClass2100.CalculateTaxPrice(___item_0, ___gclass3083_0.OfferItemCount, ___double_0, ___bool_0)) + count = ___gclass3085_0.OfferItemCount, + fee = Mathf.CeilToInt((float)GClass2101.CalculateTaxPrice(___item_0, ___gclass3085_0.OfferItemCount, ___double_0, ___bool_0)) }.ToJson()); } } diff --git a/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs b/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs index a59c1f4..3934e83 100644 --- a/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs +++ b/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs @@ -5,7 +5,7 @@ using EFT; using EFT.UI; using HarmonyLib; using System.Reflection; -using DialogControlClass = GClass1968; +using DialogControlClass = GClass1969; namespace Aki.Debugging.Patches { diff --git a/project/Aki.Debugging/Patches/ExfilDumper.cs b/project/Aki.Debugging/Patches/ExfilDumper.cs index abe1156..a84d9f1 100644 --- a/project/Aki.Debugging/Patches/ExfilDumper.cs +++ b/project/Aki.Debugging/Patches/ExfilDumper.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; -using ExitSettingsClass = GClass1233; +using ExitSettingsClass = GClass1234; namespace Aki.Debugging.Patches { diff --git a/project/Aki.Debugging/Patches/PMCBotSpawnLocationPatch.cs b/project/Aki.Debugging/Patches/PMCBotSpawnLocationPatch.cs index 8c7ea94..e3fc948 100644 --- a/project/Aki.Debugging/Patches/PMCBotSpawnLocationPatch.cs +++ b/project/Aki.Debugging/Patches/PMCBotSpawnLocationPatch.cs @@ -21,7 +21,7 @@ namespace Aki.Debugging.Patches public SptSpawnHelper() { - IEnumerable locationSpawnPoints = GClass2942.CreateFromScene(); + IEnumerable locationSpawnPoints = GClass2944.CreateFromScene(); var playerSpawns = locationSpawnPoints.Where(x => x.Categories.HasFlag(ESpawnCategoryMask.Player)).ToList(); this.playerSpawnPoints = locationSpawnPoints.Where(x => x.Categories.HasFlag(ESpawnCategoryMask.Player)).ToList(); @@ -62,7 +62,7 @@ namespace Aki.Debugging.Patches } [PatchPrefix] - public static bool PatchPrefix(GClass1480 __instance, GClass590 data) + public static bool PatchPrefix(GClass1481 __instance, GClass591 data) { var firstBotRole = data.Profiles[0].Info.Settings.Role; diff --git a/project/Aki.SinglePlayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs b/project/Aki.SinglePlayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs index e6780a8..c330e25 100644 --- a/project/Aki.SinglePlayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs +++ b/project/Aki.SinglePlayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs @@ -44,7 +44,7 @@ namespace Aki.SinglePlayer.Patches.RaidFix /// BotsPresets.GetNewProfile() /// [PatchPrefix] - private static bool PatchPrefix(ref Task __result, BotsPresets __instance, List ___list_0, GClass590 data, ref bool withDelete) + private static bool PatchPrefix(ref Task __result, BotsPresets __instance, List ___list_0, GClass591 data, ref bool withDelete) { /* When client wants new bot and GetNewProfile() return null (if not more available templates or they don't satisfy by Role and Difficulty condition) diff --git a/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs b/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs index 86bc468..c1bf601 100644 --- a/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs +++ b/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs @@ -123,7 +123,7 @@ namespace Aki.SinglePlayer.Patches.ScavMode .Single(field => field.FieldType == typeof(MatchmakerPlayerControllerClass)) ?.GetValue(menuController) as MatchmakerPlayerControllerClass; - var gclass = new MatchmakerOfflineRaidScreen.GClass3174(profile?.Info, ref raidSettings, matchmakerPlayersController); + var gclass = new MatchmakerOfflineRaidScreen.GClass3176(profile?.Info, ref raidSettings, matchmakerPlayersController); gclass.OnShowNextScreen += LoadOfflineRaidNextScreen; diff --git a/project/Aki.SinglePlayer/Patches/ScavMode/ScavRepAdjustmentPatch.cs b/project/Aki.SinglePlayer/Patches/ScavMode/ScavRepAdjustmentPatch.cs index 69317b5..57072ab 100644 --- a/project/Aki.SinglePlayer/Patches/ScavMode/ScavRepAdjustmentPatch.cs +++ b/project/Aki.SinglePlayer/Patches/ScavMode/ScavRepAdjustmentPatch.cs @@ -12,7 +12,7 @@ namespace Aki.SinglePlayer.Patches.ScavMode // TODO: REMAP/UPDATE GCLASS REF protected override MethodBase GetTargetMethod() { - return AccessTools.Method(typeof(GClass1798), nameof(GClass1798.OnEnemyKill)); + return AccessTools.Method(typeof(GClass1799), nameof(GClass1799.OnEnemyKill)); } [PatchPrefix] diff --git a/project/Aki.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs b/project/Aki.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs index 4d5be56..2ca7eef 100644 --- a/project/Aki.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs +++ b/project/Aki.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs @@ -10,9 +10,9 @@ using System.Linq; using System.Reflection; using UnityEngine; using static BackendConfigSettingsClass; -using TraderServiceClass = GClass1802; -using QuestDictClass = GClass2141; -using StandingListClass = GClass2143; +using TraderServiceClass = GClass1803; +using QuestDictClass = GClass2143; +using StandingListClass = GClass2145; namespace Aki.SinglePlayer.Utils.TraderServices {