diff --git a/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs b/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs index 687699f..7004cbb 100644 --- a/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs @@ -7,6 +7,7 @@ using HarmonyLib; using System; using System.Reflection; using static EFT.UI.TraderDialogScreen; +using BTRDialog = EFT.UI.TraderDialogScreen.GClass3132; namespace Aki.Custom.BTR.Patches { @@ -45,7 +46,7 @@ namespace Aki.Custom.BTR.Patches InventoryControllerClass inventoryController = _playerInventoryControllerField.GetValue(player) as InventoryControllerClass; AbstractQuestControllerClass questController = _playerQuestControllerField.GetValue(player) as AbstractQuestControllerClass; - GClass3130 btrDialog = new GClass3130(player.Profile, Profile.TraderInfo.TraderServiceToId[Profile.ETraderServiceSource.Btr], questController, inventoryController, null); + BTRDialog btrDialog = new BTRDialog(player.Profile, Profile.TraderInfo.TraderServiceToId[Profile.ETraderServiceSource.Btr], questController, inventoryController, null); btrDialog.OnClose += player.UpdateInteractionCast; btrDialog.ShowScreen(EScreenState.Queued); diff --git a/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs b/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs index 5b72b04..82a14fd 100644 --- a/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs +++ b/project/Aki.Custom/BTR/Patches/BTRInteractionPatch.cs @@ -5,7 +5,7 @@ using EFT.GlobalEvents; using EFT.Vehicle; using HarmonyLib; using System.Reflection; -using GlobalEventHandler = GClass2909; +using GlobalEventHandler = GClass2911; namespace Aki.Custom.BTR.Patches { diff --git a/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs b/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs index 87725ef..c4ecb70 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) { - GClass3105.Instance.CloseAllScreensForced(); + GClass3107.Instance.CloseAllScreensForced(); } return true; diff --git a/project/Aki.Custom/Patches/RagfairFeePatch.cs b/project/Aki.Custom/Patches/RagfairFeePatch.cs index ab90b72..de4c3b0 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(GClass3067.IsAllSelectedItemSame); - _ = nameof(GClass3067.AutoSelectSimilar); + _ = nameof(GClass3069.IsAllSelectedItemSame); + _ = nameof(GClass3069.AutoSelectSimilar); } protected override MethodBase GetTargetMethod() @@ -34,14 +34,14 @@ namespace Aki.Custom.Patches /// RequirementsPrice /// SellInOnePiece [PatchPrefix] - private static void PatchPrefix(ref Item ___item_0, ref GClass3067 ___gclass3067_0, ref double ___double_0, ref bool ___bool_0) + private static void PatchPrefix(ref Item ___item_0, ref GClass3069 ___gclass3069_0, ref double ___double_0, ref bool ___bool_0) { RequestHandler.PutJson("/client/ragfair/offerfees", new { id = ___item_0.Id, tpl = ___item_0.TemplateId, - count = ___gclass3067_0.OfferItemCount, - fee = Mathf.CeilToInt((float)GClass2084.CalculateTaxPrice(___item_0, ___gclass3067_0.OfferItemCount, ___double_0, ___bool_0)) + count = ___gclass3069_0.OfferItemCount, + fee = Mathf.CeilToInt((float)GClass2086.CalculateTaxPrice(___item_0, ___gclass3069_0.OfferItemCount, ___double_0, ___bool_0)) }.ToJson()); } } diff --git a/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs b/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs index 64991e7..42e2f5a 100644 --- a/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs +++ b/project/Aki.Debugging/Patches/BTRDebugCommandPatch.cs @@ -5,6 +5,7 @@ using EFT; using EFT.UI; using HarmonyLib; using System.Reflection; +using DialogControlClass = GClass1954; namespace Aki.Debugging.Patches { @@ -19,7 +20,7 @@ namespace Aki.Debugging.Patches [PatchPostfix] internal static void PatchPostfix() { - ConsoleScreen.Processor.RegisterCommandGroup(); + ConsoleScreen.Processor.RegisterCommandGroup(); ConsoleScreen.Processor.RegisterCommand("btr_deliver_items", new System.Action(BtrDeliverItemsCommand)); } @@ -35,7 +36,7 @@ namespace Aki.Debugging.Patches { protected override MethodBase GetTargetMethod() { - return AccessTools.Method(typeof(GClass1952), nameof(GClass1952.ShowDialogScreen)); + return AccessTools.Method(typeof(DialogControlClass), nameof(DialogControlClass.ShowDialogScreen)); } [PatchPrefix] diff --git a/project/Aki.Debugging/Patches/PMCBotSpawnLocationPatch.cs b/project/Aki.Debugging/Patches/PMCBotSpawnLocationPatch.cs index c999752..3596d99 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 = GClass2922.CreateFromScene(); + IEnumerable locationSpawnPoints = GClass2924.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(GClass1468 __instance, GClass588 data) + public static bool PatchPrefix(GClass1470 __instance, GClass588 data) { var firstBotRole = data.Profiles[0].Info.Settings.Role; diff --git a/project/Aki.SinglePlayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs b/project/Aki.SinglePlayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs index 656581d..056a299 100644 --- a/project/Aki.SinglePlayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs +++ b/project/Aki.SinglePlayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs @@ -43,7 +43,7 @@ namespace Aki.SinglePlayer.Patches.RaidFix } var inventoryController = Traverse.Create(player).Field("_inventoryController").Value; - GClass2768.Remove(accessCardItem, inventoryController, false, true); + GClass2770.Remove(accessCardItem, inventoryController, false, true); } } } \ No newline at end of file diff --git a/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs b/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs index 50be17e..398f420 100644 --- a/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs +++ b/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Reflection; using System.Reflection.Emit; using OfflineRaidAction = System.Action; +using SettingsClass = GClass3166; // DON'T FORGET TO UPDATE REFERENCES IN CONSTRUCTOR // AND IN THE LoadOfflineRaidScreenForScavs METHOD AS WELL @@ -29,7 +30,7 @@ namespace Aki.SinglePlayer.Patches.ScavMode _ = nameof(TimeAndWeatherSettings.IsRandomWeather); _ = nameof(BotControllerSettings.IsScavWars); _ = nameof(WavesSettings.IsBosses); - _ = GClass3164.MAX_SCAV_COUNT; // UPDATE REFS TO THIS CLASS BELOW !!! + _ = SettingsClass.MAX_SCAV_COUNT; // UPDATE REFS TO THIS CLASS BELOW !!! // `MatchmakerInsuranceScreen` OnShowNextScreen _onReadyScreenMethod = AccessTools.Method(typeof(MainMenuController), nameof(MainMenuController.method_42)); @@ -116,9 +117,9 @@ namespace Aki.SinglePlayer.Patches.ScavMode // Get fields from MainMenuController.cs var raidSettings = Traverse.Create(menuController).Field("raidSettings_0").GetValue(); - var matchmakerPlayersController = Traverse.Create(menuController).Field($"{nameof(GClass3164).ToLowerInvariant()}_0").GetValue(); + var matchmakerPlayersController = Traverse.Create(menuController).Field($"{nameof(SettingsClass).ToLowerInvariant()}_0").GetValue(); - var gclass = new MatchmakerOfflineRaidScreen.GClass3153(profile?.Info, ref raidSettings, matchmakerPlayersController); + var gclass = new MatchmakerOfflineRaidScreen.GClass3155(profile?.Info, ref raidSettings, matchmakerPlayersController); gclass.OnShowNextScreen += LoadOfflineRaidNextScreen; diff --git a/project/Aki.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs b/project/Aki.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs index 8321a8e..14d225b 100644 --- a/project/Aki.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs +++ b/project/Aki.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using UnityEngine; using static BackendConfigSettingsClass; -using TraderServiceClass = GClass1789; +using TraderServiceClass = GClass1791; namespace Aki.SinglePlayer.Utils.TraderServices {