From 22bd973bb5f04278365b2a245eb27ffb598ed277 Mon Sep 17 00:00:00 2001 From: Dev Date: Thu, 31 Oct 2024 21:27:32 +0000 Subject: [PATCH] Fixed various patch issues --- .../Patches/SendFleaListingTaxAmountToServerPatch.cs | 2 +- .../Patches/ScavMode/LoadOfflineRaidScreenPatch.cs | 2 +- .../Patches/ScavMode/ScavPrefabLoadPatch.cs | 2 +- .../Patches/ScavMode/ScavProfileLoadPatch.cs | 10 ++++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/project/SPT.Custom/Patches/SendFleaListingTaxAmountToServerPatch.cs b/project/SPT.Custom/Patches/SendFleaListingTaxAmountToServerPatch.cs index 7ae862b..fb1ece5 100644 --- a/project/SPT.Custom/Patches/SendFleaListingTaxAmountToServerPatch.cs +++ b/project/SPT.Custom/Patches/SendFleaListingTaxAmountToServerPatch.cs @@ -23,7 +23,7 @@ namespace SPT.Custom.Patches protected override MethodBase GetTargetMethod() { - return AccessTools.Method(typeof(AddOfferWindow), nameof(AddOfferWindow.method_1)); + return AccessTools.Method(typeof(AddOfferWindow), nameof(AddOfferWindow.method_5)); } /// diff --git a/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs b/project/SPT.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs index 848ac09..0033b72 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(MainMenuController), nameof(MainMenuController.method_45)); + _onReadyScreenMethod = AccessTools.Method(typeof(MainMenuController), nameof(MainMenuController.method_46)); _isLocalField = AccessTools.Field(typeof(MainMenuController), "bool_0"); _menuControllerField = typeof(TarkovApplication).GetFields(PatchConstants.PrivateFlags).FirstOrDefault(x => x.FieldType == typeof(MainMenuController)); diff --git a/project/SPT.SinglePlayer/Patches/ScavMode/ScavPrefabLoadPatch.cs b/project/SPT.SinglePlayer/Patches/ScavMode/ScavPrefabLoadPatch.cs index b046f49..f4bdd5e 100644 --- a/project/SPT.SinglePlayer/Patches/ScavMode/ScavPrefabLoadPatch.cs +++ b/project/SPT.SinglePlayer/Patches/ScavMode/ScavPrefabLoadPatch.cs @@ -25,7 +25,7 @@ namespace SPT.SinglePlayer.Patches.ScavMode .GetNestedTypes(PatchConstants.PublicDeclaredFlags) .SingleCustom(x => x.GetField("timeAndWeather") != null && x.GetField("tarkovApplication_0") != null - && x.GetField("timeHasComeScreenController") == null + && x.GetField("inTransition") != null && x.Name.Contains("Struct")); var desiredMethod = desiredType.GetMethods(PatchConstants.PublicDeclaredFlags) diff --git a/project/SPT.SinglePlayer/Patches/ScavMode/ScavProfileLoadPatch.cs b/project/SPT.SinglePlayer/Patches/ScavMode/ScavProfileLoadPatch.cs index ba8bd17..2072ab0 100644 --- a/project/SPT.SinglePlayer/Patches/ScavMode/ScavProfileLoadPatch.cs +++ b/project/SPT.SinglePlayer/Patches/ScavMode/ScavProfileLoadPatch.cs @@ -16,11 +16,13 @@ namespace SPT.SinglePlayer.Patches.ScavMode protected override MethodBase GetTargetMethod() { // Struct348 - 32128 + // Struct364 - 33374 var desiredType = typeof(TarkovApplication) .GetNestedTypes(PatchConstants.PublicDeclaredFlags) .SingleCustom(x => x.GetField("timeAndWeather") != null - && x.GetField("timeHasComeScreenController") != null - && x.Name.Contains("Struct")); + && x.GetField("gameWorld") != null + && x.GetField("metricsConfig") != null + && x.Name.Contains("Struct")); var desiredMethod = AccessTools.Method(desiredType, "MoveNext"); @@ -83,8 +85,8 @@ namespace SPT.SinglePlayer.Patches.ScavMode private static bool IsTargetNestedType(Type nestedType) { - return nestedType.GetMethods(PatchConstants.PublicDeclaredFlags).Count() > 0 && - nestedType.GetFields().Length == 6 && + return nestedType.GetMethods(PatchConstants.PublicDeclaredFlags).Any() && + nestedType.GetFields().Length == 5 && nestedType.GetField("savageProfile") != null && nestedType.GetField("profile") != null; }