diff --git a/README.md b/README.md index 8640cb7..60a038f 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ git config --local user.email "USERNAME@SOMETHING.com" ``` ## Requirements -- Escape From Tarkov 29997 +- Escape From Tarkov 30150 - Visual Studio Code -OR- Visual Studio 2022 - .NET 6 SDK - [PowerShell v7](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows) diff --git a/project/SPT.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs b/project/SPT.Custom/BTR/Patches/BTRActivateTraderDialogPatch.cs index fc11712..1cf5d20 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.GClass3153; +using BTRDialog = EFT.UI.TraderDialogScreen.GClass3152; namespace SPT.Custom.BTR.Patches { diff --git a/project/SPT.Custom/Patches/ExitWhileLootingPatch.cs b/project/SPT.Custom/Patches/ExitWhileLootingPatch.cs index 32a1d9a..423db17 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) { - GClass3127.Instance.CloseAllScreensForced(); + GClass3126.Instance.CloseAllScreensForced(); } return true; diff --git a/project/SPT.Custom/Patches/RagfairFeePatch.cs b/project/SPT.Custom/Patches/RagfairFeePatch.cs index e64137a..3214d9e 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(GClass3087.IsAllSelectedItemSame); - _ = nameof(GClass3087.AutoSelectSimilar); + _ = nameof(GClass3086.IsAllSelectedItemSame); + _ = nameof(GClass3086.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 GClass3087 ___gclass3087_0, ref double ___double_0, ref bool ___bool_0) + private static void PatchPrefix(ref Item ___item_0, ref GClass3086 ___gclass3086_0, ref double ___double_0, ref bool ___bool_0) { RequestHandler.PutJson("/client/ragfair/offerfees", new { id = ___item_0.Id, tpl = ___item_0.TemplateId, - count = ___gclass3087_0.OfferItemCount, - fee = Mathf.CeilToInt((float)GClass2103.CalculateTaxPrice(___item_0, ___gclass3087_0.OfferItemCount, ___double_0, ___bool_0)) + count = ___gclass3086_0.OfferItemCount, + fee = Mathf.CeilToInt((float)GClass2102.CalculateTaxPrice(___item_0, ___gclass3086_0.OfferItemCount, ___double_0, ___bool_0)) }.ToJson()); } } diff --git a/project/SPT.Debugging/Patches/BTRDebugCommandPatch.cs b/project/SPT.Debugging/Patches/BTRDebugCommandPatch.cs index ebf866c..d614e74 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 = GClass1971; +using DialogControlClass = GClass1970; namespace SPT.Debugging.Patches { diff --git a/project/SPT.Debugging/Patches/PMCBotSpawnLocationPatch.cs b/project/SPT.Debugging/Patches/PMCBotSpawnLocationPatch.cs index ef57c39..a3b3ba3 100644 --- a/project/SPT.Debugging/Patches/PMCBotSpawnLocationPatch.cs +++ b/project/SPT.Debugging/Patches/PMCBotSpawnLocationPatch.cs @@ -21,7 +21,7 @@ namespace SPT.Debugging.Patches public SptSpawnHelper() { - IEnumerable locationSpawnPoints = GClass2946.CreateFromScene(); + IEnumerable locationSpawnPoints = GClass2945.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 93e1540..bd2fe48 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.GClass3178(profile?.Info, ref raidSettings, matchmakerPlayersController, ESessionMode.Regular); + var gclass = new MatchmakerOfflineRaidScreen.GClass3177(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 61396cd..d425cc9 100644 --- a/project/SPT.SinglePlayer/Patches/ScavMode/ScavRepAdjustmentPatch.cs +++ b/project/SPT.SinglePlayer/Patches/ScavMode/ScavRepAdjustmentPatch.cs @@ -12,7 +12,7 @@ namespace SPT.SinglePlayer.Patches.ScavMode // TODO: REMAP/UPDATE GCLASS REF protected override MethodBase GetTargetMethod() { - return AccessTools.Method(typeof(GClass1799), nameof(GClass1799.OnEnemyKill)); + return AccessTools.Method(typeof(GClass1798), nameof(GClass1798.OnEnemyKill)); } [PatchPrefix] diff --git a/project/SPT.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs b/project/SPT.SinglePlayer/Utils/TraderServices/TraderServicesManager.cs index d85b5c5..0afd340 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 = GClass2145; -using StandingListClass = GClass2147; +using TraderServiceClass = GClass1804; +using QuestDictClass = GClass2144; +using StandingListClass = GClass2146; namespace SPT.SinglePlayer.Utils.TraderServices { diff --git a/project/Shared/Hollowed/hollowed.dll b/project/Shared/Hollowed/hollowed.dll index b4e5c95..c436342 100644 Binary files a/project/Shared/Hollowed/hollowed.dll and b/project/Shared/Hollowed/hollowed.dll differ