diff --git a/README.md b/README.md index ccf1042..631661d 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ git config --local user.email "USERNAME@SOMETHING.com" ``` ## Requirements -- Escape From Tarkov 30626 +- Escape From Tarkov 31124 - 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.Debugging/Patches/PMCBotSpawnLocationPatch.cs b/project/SPT.Debugging/Patches/PMCBotSpawnLocationPatch.cs index ffdd5c2..c7bdd39 100644 --- a/project/SPT.Debugging/Patches/PMCBotSpawnLocationPatch.cs +++ b/project/SPT.Debugging/Patches/PMCBotSpawnLocationPatch.cs @@ -61,7 +61,7 @@ namespace SPT.Debugging.Patches } [PatchPrefix] - public static bool PatchPrefix(GClass1502 __instance, BotCreationDataClass data) + public static bool PatchPrefix(GClass1503 __instance, BotCreationDataClass data) { var firstBotRole = data.Profiles[0].Info.Settings.Role; if (firstBotRole != WildSpawnType.pmcBEAR || firstBotRole != WildSpawnType.pmcUSEC) diff --git a/project/SPT.SinglePlayer/Patches/MainMenu/EnableRefIntermScreenPatch.cs b/project/SPT.SinglePlayer/Patches/MainMenu/EnableRefIntermScreenPatch.cs index d8b0234..b401bdc 100644 --- a/project/SPT.SinglePlayer/Patches/MainMenu/EnableRefIntermScreenPatch.cs +++ b/project/SPT.SinglePlayer/Patches/MainMenu/EnableRefIntermScreenPatch.cs @@ -12,7 +12,7 @@ namespace SPT.SinglePlayer.Patches.MainMenu { protected override MethodBase GetTargetMethod() { - return AccessTools.Method(typeof(MerchantsList.Class2715), nameof(MerchantsList.Class2715.method_0)); + return AccessTools.Method(typeof(MerchantsList.Class2719), nameof(MerchantsList.Class2719.method_0)); } [PatchPrefix] diff --git a/project/SPT.SinglePlayer/Patches/MainMenu/PVEModeWelcomeMessagePatch.cs b/project/SPT.SinglePlayer/Patches/MainMenu/PVEModeWelcomeMessagePatch.cs index b37aa43..26c098c 100644 --- a/project/SPT.SinglePlayer/Patches/MainMenu/PVEModeWelcomeMessagePatch.cs +++ b/project/SPT.SinglePlayer/Patches/MainMenu/PVEModeWelcomeMessagePatch.cs @@ -8,7 +8,7 @@ namespace SPT.SinglePlayer.Patches.MainMenu { protected override MethodBase GetTargetMethod() { - return AccessTools.Method(typeof(GClass1849), nameof(GClass1849.GetBoolForProfile)); + return AccessTools.Method(typeof(GClass1850), nameof(GClass1850.GetBoolForProfile)); } [PatchPrefix] diff --git a/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs b/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs index 49878e4..c030caf 100644 --- a/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs +++ b/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs @@ -118,13 +118,15 @@ namespace SPT.SinglePlayer.Patches.ScavMode // Get fields from MainMenuController.cs var raidSettings = Traverse.Create(menuController).Field("raidSettings_0").GetValue(); + var offlineRaidSettings = Traverse.Create(menuController).Field("raidSettings_1").GetValue(); + // Find the private field of type `MatchmakerPlayerControllerClass` var matchmakerPlayersController = menuController.GetType() .GetFields(AccessTools.all) .Single(field => field.FieldType == typeof(MatchmakerPlayerControllerClass)) ?.GetValue(menuController) as MatchmakerPlayerControllerClass; - var gclass = new MatchmakerOfflineRaidScreen.CreateRaidSettingsForProfileClass(profile?.Info, ref raidSettings, matchmakerPlayersController, ESessionMode.Pve); + var gclass = new MatchmakerOfflineRaidScreen.CreateRaidSettingsForProfileClass(profile?.Info, ref raidSettings, ref offlineRaidSettings, matchmakerPlayersController, ESessionMode.Pve); gclass.OnShowNextScreen += LoadOfflineRaidNextScreen; diff --git a/project/Shared/Hollowed/hollowed.dll b/project/Shared/Hollowed/hollowed.dll index 902ebdb..f11145d 100644 Binary files a/project/Shared/Hollowed/hollowed.dll and b/project/Shared/Hollowed/hollowed.dll differ