diff --git a/README.md b/README.md index f153bc5..f70ad99 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ git config --local user.email "USERNAME@SOMETHING.com" ## Requirements -- Escape From Tarkov 34720 +- Escape From Tarkov 34861 - 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.SinglePlayer/Patches/MainMenu/InsuranceScreenPatch.cs b/project/SPT.SinglePlayer/Patches/MainMenu/InsuranceScreenPatch.cs index 690f05f..f6c3ad2 100644 --- a/project/SPT.SinglePlayer/Patches/MainMenu/InsuranceScreenPatch.cs +++ b/project/SPT.SinglePlayer/Patches/MainMenu/InsuranceScreenPatch.cs @@ -27,7 +27,7 @@ namespace SPT.SinglePlayer.Patches.MainMenu // this.method_41(); //} - return AccessTools.Method(typeof(MainMenuControllerClass), nameof(MainMenuControllerClass.method_76)); + return AccessTools.Method(typeof(MainMenuControllerClass), nameof(MainMenuControllerClass.method_77)); } [PatchPrefix] diff --git a/project/SPT.SinglePlayer/Patches/RaidFix/DisableDevMaskCheckPatch.cs b/project/SPT.SinglePlayer/Patches/RaidFix/DisableDevMaskCheckPatch.cs index 962e483..a836163 100644 --- a/project/SPT.SinglePlayer/Patches/RaidFix/DisableDevMaskCheckPatch.cs +++ b/project/SPT.SinglePlayer/Patches/RaidFix/DisableDevMaskCheckPatch.cs @@ -20,7 +20,7 @@ public class DisableDevMaskCheckPatch : ModulePatch { protected override MethodBase GetTargetMethod() { - return AccessTools.Method(typeof(LocalPlayer.Struct521), nameof(LocalPlayer.Struct521.MoveNext)); + return AccessTools.Method(typeof(LocalPlayer.Struct522), nameof(LocalPlayer.Struct522.MoveNext)); } [PatchTranspiler] diff --git a/project/SPT.SinglePlayer/Patches/ScavMode/EnablePlayerScavPatch.cs b/project/SPT.SinglePlayer/Patches/ScavMode/EnablePlayerScavPatch.cs index 39a7e32..3cffc06 100644 --- a/project/SPT.SinglePlayer/Patches/ScavMode/EnablePlayerScavPatch.cs +++ b/project/SPT.SinglePlayer/Patches/ScavMode/EnablePlayerScavPatch.cs @@ -13,7 +13,7 @@ namespace SPT.SinglePlayer.Patches.ScavMode /// protected override MethodBase GetTargetMethod() { - return AccessTools.Method(typeof(MainMenuControllerClass), nameof(MainMenuControllerClass.method_24)); + return AccessTools.Method(typeof(MainMenuControllerClass), nameof(MainMenuControllerClass.method_25)); } [PatchPrefix] diff --git a/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs b/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs index af359e9..22f27ae 100644 --- a/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs +++ b/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs @@ -32,7 +32,7 @@ namespace SPT.SinglePlayer.Patches.ScavMode _ = MatchmakerPlayerControllerClass.MAX_SCAV_COUNT; // UPDATE REFS TO THIS CLASS BELOW !!! // `MatchmakerInsuranceScreen` OnShowNextScreen - _onReadyScreenMethod = AccessTools.Method(typeof(MainMenuControllerClass), nameof(MainMenuControllerClass.method_48)); + _onReadyScreenMethod = AccessTools.Method(typeof(MainMenuControllerClass), nameof(MainMenuControllerClass.method_49)); _isLocalField = AccessTools.Field(typeof(MainMenuControllerClass), "bool_0"); _menuControllerField = typeof(TarkovApplication).GetFields(PatchConstants.PrivateFlags).FirstOrDefault(x => x.FieldType == typeof(MainMenuControllerClass)); @@ -46,7 +46,7 @@ namespace SPT.SinglePlayer.Patches.ScavMode protected override MethodBase GetTargetMethod() { // `MatchMakerSelectionLocationScreen` OnShowNextScreen - return AccessTools.Method(typeof(MainMenuControllerClass), nameof(MainMenuControllerClass.method_75)); + return AccessTools.Method(typeof(MainMenuControllerClass), nameof(MainMenuControllerClass.method_76)); } [PatchTranspiler] @@ -131,7 +131,7 @@ namespace SPT.SinglePlayer.Patches.ScavMode gclass.OnShowNextScreen += LoadOfflineRaidNextScreen; // `MatchmakerOfflineRaidScreen` OnShowReadyScreen - gclass.OnShowReadyScreen += (OfflineRaidAction)Delegate.CreateDelegate(typeof(OfflineRaidAction), menuController, nameof(MainMenuControllerClass.method_78)); + gclass.OnShowReadyScreen += (OfflineRaidAction)Delegate.CreateDelegate(typeof(OfflineRaidAction), menuController, nameof(MainMenuControllerClass.method_79)); gclass.ShowScreen(EScreenState.Queued); } diff --git a/project/SPT.SinglePlayer/Patches/ScavMode/ScavPrestigeFixPatch.cs b/project/SPT.SinglePlayer/Patches/ScavMode/ScavPrestigeFixPatch.cs index 78b2358..1eb12b6 100644 --- a/project/SPT.SinglePlayer/Patches/ScavMode/ScavPrestigeFixPatch.cs +++ b/project/SPT.SinglePlayer/Patches/ScavMode/ScavPrestigeFixPatch.cs @@ -17,7 +17,7 @@ public class ScavPrestigeFixPatch : ModulePatch { protected override MethodBase GetTargetMethod() { - return AccessTools.Constructor(typeof(GClass3693), new Type[] { typeof(Profile), typeof(InventoryController), typeof(GClass3868), typeof(ISession) }, false); + return AccessTools.Constructor(typeof(GClass3693), new Type[] { typeof(Profile), typeof(InventoryController), typeof(GClass3869), typeof(ISession) }, false); } [PatchPrefix] diff --git a/project/Shared/Hollowed/hollowed.dll b/project/Shared/Hollowed/hollowed.dll index 0cf0135..868f0a8 100644 Binary files a/project/Shared/Hollowed/hollowed.dll and b/project/Shared/Hollowed/hollowed.dll differ