diff --git a/README.md b/README.md index 8744afc..b51decd 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ git config --local user.email "USERNAME@SOMETHING.com" ## Requirements -- Escape From Tarkov 24964 +- Escape From Tarkov 25206 - BepInEx 5.4.19 - Visual Studio Code - .NET 6 SDK diff --git a/project/Aki.Core/Patches/TransportPrefixPatch.cs b/project/Aki.Core/Patches/TransportPrefixPatch.cs index 2d2fc0a..e9fef70 100644 --- a/project/Aki.Core/Patches/TransportPrefixPatch.cs +++ b/project/Aki.Core/Patches/TransportPrefixPatch.cs @@ -15,7 +15,7 @@ namespace Aki.Core.Patches { try { - var type = PatchConstants.EftTypes.Single(t => t.Name == "Class226"); + var type = PatchConstants.EftTypes.Single(t => t.Name == "Class227"); var value = Traverse.Create(type).Field("TransportPrefixes").GetValue>(); value[ETransportProtocolType.HTTPS] = "http://"; value[ETransportProtocolType.WSS] = "ws://"; diff --git a/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs b/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs index 358ed2d..84b88ec 100644 --- a/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs +++ b/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs @@ -33,7 +33,7 @@ namespace Aki.Custom.Patches var player = Singleton.Instance.MainPlayer; if (profileId == player?.Profile.Id) { - GClass2975.Instance.CloseAllScreensForced(); + GClass2977.Instance.CloseAllScreensForced(); } return true; diff --git a/project/Aki.Custom/Patches/PmcFirstAidPatch.cs b/project/Aki.Custom/Patches/PmcFirstAidPatch.cs index 6e96d0f..5299a1b 100644 --- a/project/Aki.Custom/Patches/PmcFirstAidPatch.cs +++ b/project/Aki.Custom/Patches/PmcFirstAidPatch.cs @@ -14,7 +14,7 @@ namespace Aki.Custom.Patches protected override MethodBase GetTargetMethod() { - return typeof(GClass397).GetMethod(methodName); + return typeof(GClass399).GetMethod(methodName, BindingFlags.Instance | BindingFlags.NonPublic); } [PatchPrefix] diff --git a/project/Aki.PrePatch/AkiBotsPrePatcher.cs b/project/Aki.PrePatch/AkiBotsPrePatcher.cs index 42db019..cc88f99 100644 --- a/project/Aki.PrePatch/AkiBotsPrePatcher.cs +++ b/project/Aki.PrePatch/AkiBotsPrePatcher.cs @@ -7,8 +7,8 @@ namespace Aki.PrePatch { public static IEnumerable TargetDLLs { get; } = new[] { "Assembly-CSharp.dll" }; - public static int sptUsecValue = 33; - public static int sptBearValue = 34; + public static int sptUsecValue = 34; + public static int sptBearValue = 35; public static void Patch(ref AssemblyDefinition assembly) { diff --git a/project/Aki.SinglePlayer/Patches/Progression/OfflineSpawnPointPatch.cs b/project/Aki.SinglePlayer/Patches/Progression/OfflineSpawnPointPatch.cs index d6f9f87..ab8eb32 100644 --- a/project/Aki.SinglePlayer/Patches/Progression/OfflineSpawnPointPatch.cs +++ b/project/Aki.SinglePlayer/Patches/Progression/OfflineSpawnPointPatch.cs @@ -33,6 +33,7 @@ namespace Aki.SinglePlayer.Patches.Progression { // GClass1812 as of 17349 // GClass1886 as of 18876 + // Remapped to SpawnSystemClass return (type.GetMethods(PatchConstants.PrivateFlags).Any(x => x.Name.IndexOf("CheckFarthestFromOtherPlayers", StringComparison.OrdinalIgnoreCase) != -1) && type.IsClass); } diff --git a/project/Aki.SinglePlayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs b/project/Aki.SinglePlayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs index a73bf4e..f6dcc80 100644 --- a/project/Aki.SinglePlayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs +++ b/project/Aki.SinglePlayer/Patches/RaidFix/GetNewBotTemplatesPatch.cs @@ -55,7 +55,7 @@ namespace Aki.SinglePlayer.Patches.RaidFix /// BotsPresets.GetNewProfile() /// [PatchPrefix] - private static bool PatchPrefix(ref Task __result, BotsPresets __instance, List ___list_0, GClass626 data, ref bool withDelete) + private static bool PatchPrefix(ref Task __result, BotsPresets __instance, List ___list_0, GClass628 data, ref bool withDelete) { /* When client wants new bot and GetNewProfile() return null (if not more available templates or they don't satisfy by Role and Difficulty condition) diff --git a/project/Aki.SinglePlayer/Patches/RaidFix/PostRaidHealingPricePatch.cs b/project/Aki.SinglePlayer/Patches/RaidFix/PostRaidHealingPricePatch.cs index 158740e..a9f9364 100644 --- a/project/Aki.SinglePlayer/Patches/RaidFix/PostRaidHealingPricePatch.cs +++ b/project/Aki.SinglePlayer/Patches/RaidFix/PostRaidHealingPricePatch.cs @@ -2,7 +2,7 @@ using HarmonyLib; using System; using System.Reflection; -using TraderInfo = EFT.Profile.GClass1727; +using TraderInfo = EFT.Profile.GClass1729; namespace Aki.SinglePlayer.Patches.RaidFix { diff --git a/project/Aki.SinglePlayer/Patches/RaidFix/RemoveUsedBotProfilePatch.cs b/project/Aki.SinglePlayer/Patches/RaidFix/RemoveUsedBotProfilePatch.cs index 4740b12..0b060bd 100644 --- a/project/Aki.SinglePlayer/Patches/RaidFix/RemoveUsedBotProfilePatch.cs +++ b/project/Aki.SinglePlayer/Patches/RaidFix/RemoveUsedBotProfilePatch.cs @@ -39,8 +39,10 @@ namespace Aki.SinglePlayer.Patches.RaidFix return _targetInterface.IsAssignableFrom(type) && _targetInterface.IsAssignableFrom(type.BaseType); } + /// + /// BotsPresets.GetNewProfile() [PatchPrefix] - private static bool PatchPrefix(ref Profile __result, object __instance, GClass626 data, ref bool withDelete) + private static bool PatchPrefix(ref Profile __result, object __instance, GClass628 data, ref bool withDelete) { withDelete = true; diff --git a/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs b/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs index 6b763e9..db6ca08 100644 --- a/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs +++ b/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs @@ -114,9 +114,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("gclass3028_0").GetValue(); + var matchmakerPlayersController = Traverse.Create(menuController).Field("gclass3030_0").GetValue(); - var gclass = new MatchmakerOfflineRaidScreen.GClass3017(profile?.Info, ref raidSettings, matchmakerPlayersController); + var gclass = new MatchmakerOfflineRaidScreen.GClass3019(profile?.Info, ref raidSettings, matchmakerPlayersController); gclass.OnShowNextScreen += LoadOfflineRaidNextScreen; diff --git a/project/Shared/Hollowed/hollowed.dll b/project/Shared/Hollowed/hollowed.dll index 8666fba..299f6c2 100644 Binary files a/project/Shared/Hollowed/hollowed.dll and b/project/Shared/Hollowed/hollowed.dll differ