diff --git a/README.md b/README.md index 97f1efb..f153bc5 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ git config --local user.email "USERNAME@SOMETHING.com" ## Requirements -- Escape From Tarkov 34644 +- Escape From Tarkov 34720 - 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/Patches/AllowAirdropsInPvEPatch.cs b/project/SPT.Custom/Patches/AllowAirdropsInPvEPatch.cs index bd35bce..39c604b 100644 --- a/project/SPT.Custom/Patches/AllowAirdropsInPvEPatch.cs +++ b/project/SPT.Custom/Patches/AllowAirdropsInPvEPatch.cs @@ -11,7 +11,7 @@ namespace SPT.Custom.Patches { protected override MethodBase GetTargetMethod() { - return typeof(GClass2452).GetProperty(nameof(GClass2452.Int32_0)).GetGetMethod(); + return typeof(GClass2452).GetProperty(nameof(GClass2454.Int32_0)).GetGetMethod(); } [PatchPrefix] diff --git a/project/SPT.Custom/Patches/EnablePrestigeTabPatch.cs b/project/SPT.Custom/Patches/EnablePrestigeTabPatch.cs index 9220539..caac44e 100644 --- a/project/SPT.Custom/Patches/EnablePrestigeTabPatch.cs +++ b/project/SPT.Custom/Patches/EnablePrestigeTabPatch.cs @@ -13,11 +13,11 @@ namespace SPT.Custom.Patches { protected override MethodBase GetTargetMethod() { - return AccessTools.Method(typeof(InventoryScreen.Class2751), nameof(InventoryScreen.Class2751.MoveNext)); + return AccessTools.Method(typeof(InventoryScreen.Class2752), nameof(InventoryScreen.Class2752.MoveNext)); } [PatchPostfix] - public static void Postfix(InventoryScreen.Class2751 __instance) + public static void Postfix(InventoryScreen.Class2752 __instance) { var inventoryScreen = __instance.inventoryScreen_0; var tabDictionary = Traverse.Create(inventoryScreen).Field>("_tabDictionary").Value; diff --git a/project/SPT.Custom/Patches/FixAirdropFlareDisposePatch.cs b/project/SPT.Custom/Patches/FixAirdropFlareDisposePatch.cs index bf1deef..61bf6cf 100644 --- a/project/SPT.Custom/Patches/FixAirdropFlareDisposePatch.cs +++ b/project/SPT.Custom/Patches/FixAirdropFlareDisposePatch.cs @@ -13,7 +13,7 @@ namespace SPT.Custom.Patches { protected override MethodBase GetTargetMethod() { - return typeof(GClass2456).GetMethod(nameof(GClass2456.Dispose)); + return typeof(GClass2458).GetMethod(nameof(GClass2458.Dispose)); } [PatchPrefix] diff --git a/project/SPT.Custom/Patches/QTEPatch.cs b/project/SPT.Custom/Patches/QTEPatch.cs index cf90424..5488482 100644 --- a/project/SPT.Custom/Patches/QTEPatch.cs +++ b/project/SPT.Custom/Patches/QTEPatch.cs @@ -18,7 +18,7 @@ namespace SPT.Custom.Patches { RequestHandler.PutJson("/client/hideout/workout", new { - skills = new GClass1985(__instance.HideoutPlayer.Skills) + skills = new GClass1987(__instance.HideoutPlayer.Skills) } .ToJson()); } diff --git a/project/SPT.Custom/Utils/MenuNotificationManager.cs b/project/SPT.Custom/Utils/MenuNotificationManager.cs index 450f196..b7fcc0d 100644 --- a/project/SPT.Custom/Utils/MenuNotificationManager.cs +++ b/project/SPT.Custom/Utils/MenuNotificationManager.cs @@ -5,7 +5,6 @@ using BepInEx.Bootstrap; using BepInEx.Logging; using Comfort.Common; using EFT.UI; -using System; using System.Collections.Generic; using System.Linq; using SPT.Custom.Patches; @@ -41,7 +40,7 @@ namespace SPT.Custom.Utils private ManualLogSource _logger; // This GClass can be found by looking at ErrorScreen.cs and seeing what the ErrorClass class inherits from: `Window` - private GClass3540 _betaMessageContext; + private GClass3543 _betaMessageContext; public void Start() { diff --git a/project/SPT.Debugging/Patches/DumpyLibPatch.cs b/project/SPT.Debugging/Patches/DumpyLibPatch.cs index a46bd31..179c8c0 100644 --- a/project/SPT.Debugging/Patches/DumpyLibPatch.cs +++ b/project/SPT.Debugging/Patches/DumpyLibPatch.cs @@ -38,8 +38,8 @@ public class DumplyLibMono : MonoBehaviour public LocalRaidSettings _localRaidSettings; public RaidSettings _raidSettings; public LocationSettingsClass _locationSettings; - public GClass1952 _endRaidClass; - public GClass1991 _completeProfile; + public GClass1954 _endRaidClass; + public GClass1993 _completeProfile; public GClass822 _parsedDataProfile; // Class references are as of assembly 33420 - 26/12/2024 @@ -91,7 +91,7 @@ public class DumplyLibMono : MonoBehaviour PlayersSpawnPlace = EPlayersSpawnPlace.SamePlace }; _locationSettings = _session.LocationSettings; - _endRaidClass = new GClass1952 + _endRaidClass = new GClass1954 { profile = null, result = ExitStatus.Left, @@ -104,7 +104,7 @@ public class DumplyLibMono : MonoBehaviour InsuredItems = new InsuredItemClass[] {}, ProfileId = "" }; - _completeProfile = new GClass1991(_session.Profile, GClass2000.Instance); + _completeProfile = new GClass1993(_session.Profile, GClass2002.Instance); _parsedDataProfile = _completeProfile.ToUnparsedData(); _endRaidClass.profile = _completeProfile.ToUnparsedData(); diff --git a/project/SPT.SinglePlayer/Patches/MainMenu/DisableWelcomeToPVEModeMessagePatch.cs b/project/SPT.SinglePlayer/Patches/MainMenu/DisableWelcomeToPVEModeMessagePatch.cs index 76e2164..1a119a5 100644 --- a/project/SPT.SinglePlayer/Patches/MainMenu/DisableWelcomeToPVEModeMessagePatch.cs +++ b/project/SPT.SinglePlayer/Patches/MainMenu/DisableWelcomeToPVEModeMessagePatch.cs @@ -8,7 +8,7 @@ namespace SPT.SinglePlayer.Patches.MainMenu { protected override MethodBase GetTargetMethod() { - return AccessTools.Method(typeof(GClass2057), nameof(GClass2057.GetBoolForProfile)); + return AccessTools.Method(typeof(GClass2059), nameof(GClass2059.GetBoolForProfile)); } [PatchPrefix] diff --git a/project/SPT.SinglePlayer/Patches/MainMenu/EnableRefIntermScreenPatch.cs b/project/SPT.SinglePlayer/Patches/MainMenu/EnableRefIntermScreenPatch.cs index f618eee..a2a08c1 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.Class2906), nameof(MerchantsList.Class2906.method_0)); + return AccessTools.Method(typeof(MerchantsList.Class2907), nameof(MerchantsList.Class2907.method_0)); } [PatchPrefix] diff --git a/project/SPT.SinglePlayer/Patches/MainMenu/RemoveClothingItemExternalObtainLabelPatch.cs b/project/SPT.SinglePlayer/Patches/MainMenu/RemoveClothingItemExternalObtainLabelPatch.cs index 80185bc..016d85f 100644 --- a/project/SPT.SinglePlayer/Patches/MainMenu/RemoveClothingItemExternalObtainLabelPatch.cs +++ b/project/SPT.SinglePlayer/Patches/MainMenu/RemoveClothingItemExternalObtainLabelPatch.cs @@ -15,7 +15,7 @@ namespace SPT.SinglePlayer.Patches.MainMenu } [PatchPrefix] - private static void Prefix(ref ClothingItem.GClass3521 offer) + private static void Prefix(ref ClothingItem.GClass3524 offer) { offer.Offer.ExternalObtain = false; } diff --git a/project/SPT.SinglePlayer/Patches/RaidFix/FirearmControllerShowIncompatibleNotificationClass.cs b/project/SPT.SinglePlayer/Patches/RaidFix/FirearmControllerShowIncompatibleNotificationClass.cs index 45602f7..4b3df40 100644 --- a/project/SPT.SinglePlayer/Patches/RaidFix/FirearmControllerShowIncompatibleNotificationClass.cs +++ b/project/SPT.SinglePlayer/Patches/RaidFix/FirearmControllerShowIncompatibleNotificationClass.cs @@ -11,7 +11,7 @@ namespace SPT.SinglePlayer.Patches.RaidFix { protected override MethodBase GetTargetMethod() { - return typeof(Player.FirearmController.GClass1775).GetMethod(nameof(Player.FirearmController.GClass1775.ShowIncompatibleNotification)); + return typeof(Player.FirearmController.GClass1775).GetMethod(nameof(Player.FirearmController.GClass1777.ShowIncompatibleNotification)); } [PatchPrefix] diff --git a/project/SPT.SinglePlayer/Patches/ScavMode/ScavPrestigeFixPatch.cs b/project/SPT.SinglePlayer/Patches/ScavMode/ScavPrestigeFixPatch.cs index 7a05686..49b4c55 100644 --- a/project/SPT.SinglePlayer/Patches/ScavMode/ScavPrestigeFixPatch.cs +++ b/project/SPT.SinglePlayer/Patches/ScavMode/ScavPrestigeFixPatch.cs @@ -17,11 +17,11 @@ public class ScavPrestigeFixPatch : ModulePatch { protected override MethodBase GetTargetMethod() { - return AccessTools.Constructor(typeof(GClass3690), new Type[] { typeof(Profile), typeof(InventoryController), typeof(GClass3865), typeof(ISession) }, false); + return AccessTools.Constructor(typeof(GClass3693), new Type[] { typeof(Profile), typeof(InventoryController), typeof(GClass3865), typeof(ISession) }, false); } [PatchPrefix] - public static void PatchPrefix(GClass3690 __instance, ref Profile profile) + public static void PatchPrefix(GClass3693 __instance, ref Profile profile) { if (profile.Side == EPlayerSide.Savage) { diff --git a/project/SPT.SinglePlayer/Patches/ScavMode/SendPlayerScavProfileToServerAfterRaidPatch.cs b/project/SPT.SinglePlayer/Patches/ScavMode/SendPlayerScavProfileToServerAfterRaidPatch.cs index 1a5cad6..ad14c71 100644 --- a/project/SPT.SinglePlayer/Patches/ScavMode/SendPlayerScavProfileToServerAfterRaidPatch.cs +++ b/project/SPT.SinglePlayer/Patches/ScavMode/SendPlayerScavProfileToServerAfterRaidPatch.cs @@ -13,7 +13,7 @@ namespace SPT.SinglePlayer.Patches.ScavMode /// public class GetProfileAtEndOfRaidPatch : ModulePatch { - public static GClass1991 ProfileDescriptor { get; private set; } + public static GClass1993 ProfileDescriptor { get; private set; } protected override MethodBase GetTargetMethod() { @@ -23,7 +23,7 @@ namespace SPT.SinglePlayer.Patches.ScavMode [PatchPrefix] public static void PatchPrefix(LocalGame __instance) { - ProfileDescriptor = new GClass1991(__instance.Profile_0, GClass2000.Instance); + ProfileDescriptor = new GClass1993(__instance.Profile_0, GClass2002.Instance); } } /// diff --git a/project/Shared/Hollowed/hollowed.dll b/project/Shared/Hollowed/hollowed.dll index 22ab80d..0cf0135 100644 Binary files a/project/Shared/Hollowed/hollowed.dll and b/project/Shared/Hollowed/hollowed.dll differ