From 6c9bd09de0c6e49ad4b366774ff32d5211f11703 Mon Sep 17 00:00:00 2001 From: Dev Date: Thu, 13 Jun 2024 14:25:36 +0100 Subject: [PATCH] Updated module patches to allow project to build --- .../BTR/Patches/BTRActivateTraderDialogPatch.cs | 2 +- project/SPT.Custom/Patches/ExitWhileLootingPatch.cs | 2 +- project/SPT.Custom/Patches/RagfairFeePatch.cs | 10 +++++----- project/SPT.Debugging/Patches/BTRDebugCommandPatch.cs | 2 +- .../SPT.Debugging/Patches/PMCBotSpawnLocationPatch.cs | 2 +- .../Patches/ScavMode/LoadOfflineRaidScreenPatch.cs | 2 +- .../Patches/ScavMode/ScavRepAdjustmentPatch.cs | 2 +- .../Utils/TraderServices/TraderServicesManager.cs | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/project/SPT.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs b/project/SPT.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs index cfe47ba..193152c 100644 --- a/project/SPT.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs +++ b/project/SPT.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs @@ -6,7 +6,7 @@ using EFT.Vehicle; using HarmonyLib; using System; using System.Reflection; -using BTRDialog = EFT.UI.TraderDialogScreen.GClass3156; +using BTRDialog = EFT.UI.TraderDialogScreen.GClass3157; namespace SPT.Custom.BTR.Patches { diff --git a/project/SPT.Custom/Patches/ExitWhileLootingPatch.cs b/project/SPT.Custom/Patches/ExitWhileLootingPatch.cs index 034cebc..f34c854 100644 --- a/project/SPT.Custom/Patches/ExitWhileLootingPatch.cs +++ b/project/SPT.Custom/Patches/ExitWhileLootingPatch.cs @@ -31,7 +31,7 @@ namespace SPT.Custom.Patches var player = Singleton.Instance.MainPlayer; if (profileId == player?.Profile.Id) { - GClass3130.Instance.CloseAllScreensForced(); + GClass3131.Instance.CloseAllScreensForced(); } return true; diff --git a/project/SPT.Custom/Patches/RagfairFeePatch.cs b/project/SPT.Custom/Patches/RagfairFeePatch.cs index caec366..6fe4726 100644 --- a/project/SPT.Custom/Patches/RagfairFeePatch.cs +++ b/project/SPT.Custom/Patches/RagfairFeePatch.cs @@ -17,8 +17,8 @@ namespace SPT.Custom.Patches public RagfairFeePatch() { // Remember to update prefix parameter if below lines are broken - _ = nameof(GClass3090.IsAllSelectedItemSame); - _ = nameof(GClass3090.AutoSelectSimilar); + _ = nameof(GClass3091.IsAllSelectedItemSame); + _ = nameof(GClass3091.AutoSelectSimilar); } protected override MethodBase GetTargetMethod() @@ -34,14 +34,14 @@ namespace SPT.Custom.Patches /// RequirementsPrice /// SellInOnePiece [PatchPrefix] - private static void PatchPrefix(ref Item ___item_0, ref GClass3090 ___gclass3090_0, ref double ___double_0, ref bool ___bool_0) + private static void PatchPrefix(ref Item ___item_0, ref GClass3091 ___gclass3091_0, ref double ___double_0, ref bool ___bool_0) { RequestHandler.PutJson("/client/ragfair/offerfees", new { id = ___item_0.Id, tpl = ___item_0.TemplateId, - count = ___gclass3090_0.OfferItemCount, - fee = Mathf.CeilToInt((float)GClass2104.CalculateTaxPrice(___item_0, ___gclass3090_0.OfferItemCount, ___double_0, ___bool_0)) + count = ___gclass3091_0.OfferItemCount, + fee = Mathf.CeilToInt((float)GClass2105.CalculateTaxPrice(___item_0, ___gclass3091_0.OfferItemCount, ___double_0, ___bool_0)) }.ToJson()); } } diff --git a/project/SPT.Debugging/Patches/BTRDebugCommandPatch.cs b/project/SPT.Debugging/Patches/BTRDebugCommandPatch.cs index 5ca33cb..8fd53e7 100644 --- a/project/SPT.Debugging/Patches/BTRDebugCommandPatch.cs +++ b/project/SPT.Debugging/Patches/BTRDebugCommandPatch.cs @@ -5,7 +5,7 @@ using EFT; using EFT.UI; using HarmonyLib; using System.Reflection; -using DialogControlClass = GClass1972; +using DialogControlClass = GClass1973; namespace SPT.Debugging.Patches { diff --git a/project/SPT.Debugging/Patches/PMCBotSpawnLocationPatch.cs b/project/SPT.Debugging/Patches/PMCBotSpawnLocationPatch.cs index 52068ae..9356ebc 100644 --- a/project/SPT.Debugging/Patches/PMCBotSpawnLocationPatch.cs +++ b/project/SPT.Debugging/Patches/PMCBotSpawnLocationPatch.cs @@ -20,7 +20,7 @@ namespace SPT.Debugging.Patches public SptSpawnHelper() { - IEnumerable locationSpawnPoints = GClass2948.CreateFromScene(); + IEnumerable locationSpawnPoints = GClass2949.CreateFromScene(); var playerSpawns = locationSpawnPoints.Where(x => x.Categories.HasFlag(ESpawnCategoryMask.Player)).ToList(); this.playerSpawnPoints = locationSpawnPoints.Where(x => x.Categories.HasFlag(ESpawnCategoryMask.Player)).ToList(); diff --git a/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs b/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs index bb17467..5fc583c 100644 --- a/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs +++ b/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs @@ -124,7 +124,7 @@ namespace SPT.SinglePlayer.Patches.ScavMode .Single(field => field.FieldType == typeof(MatchmakerPlayerControllerClass)) ?.GetValue(menuController) as MatchmakerPlayerControllerClass; - var gclass = new MatchmakerOfflineRaidScreen.GClass3181(profile?.Info, ref raidSettings, matchmakerPlayersController, ESessionMode.Regular); + var gclass = new MatchmakerOfflineRaidScreen.GClass3182(profile?.Info, ref raidSettings, matchmakerPlayersController, ESessionMode.Regular); gclass.OnShowNextScreen += LoadOfflineRaidNextScreen; diff --git a/project/SPT.SinglePlayer/Patches/ScavMode/ScavRepAdjustmentPatch.cs b/project/SPT.SinglePlayer/Patches/ScavMode/ScavRepAdjustmentPatch.cs index f91b74d..5dd0e23 100644 --- a/project/SPT.SinglePlayer/Patches/ScavMode/ScavRepAdjustmentPatch.cs +++ b/project/SPT.SinglePlayer/Patches/ScavMode/ScavRepAdjustmentPatch.cs @@ -13,7 +13,7 @@ namespace SPT.SinglePlayer.Patches.ScavMode protected override MethodBase GetTargetMethod() { // Correct Gclass has sessionCounters - return AccessTools.Method(typeof(GClass1801), nameof(GClass1801.OnEnemyKill)); + return AccessTools.Method(typeof(GClass1802), nameof(GClass1802.OnEnemyKill)); } [PatchPrefix] diff --git a/project/SPT.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs b/project/SPT.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs index ae5bbeb..c3287cd 100644 --- a/project/SPT.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs +++ b/project/SPT.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs @@ -10,9 +10,9 @@ using System.Linq; using System.Reflection; using UnityEngine; using static BackendConfigSettingsClass; -using TraderServiceClass = GClass1805; -using QuestDictClass = GClass2146; -using StandingListClass = GClass2148; +using TraderServiceClass = GClass1806; +using QuestDictClass = GClass2147; +using StandingListClass = GClass2149; namespace SPT.SinglePlayer.Utils.TraderServices {