diff --git a/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs b/project/Aki.Custom/Patches/ExitWhileLootingPatch.cs index dcfa6a9..3354b62 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) { - GClass3104.Instance.CloseAllScreensForced(); + GClass3105.Instance.CloseAllScreensForced(); } return true; diff --git a/project/Aki.Custom/Patches/RagfairFeePatch.cs b/project/Aki.Custom/Patches/RagfairFeePatch.cs index 2d727d0..ef3a781 100644 --- a/project/Aki.Custom/Patches/RagfairFeePatch.cs +++ b/project/Aki.Custom/Patches/RagfairFeePatch.cs @@ -17,8 +17,8 @@ namespace Aki.Custom.Patches public RagfairFeePatch() { // Remember to update prefix parameter if below lines are broken - _ = nameof(GClass3066.IsAllSelectedItemSame); - _ = nameof(GClass3066.AutoSelectSimilar); + _ = nameof(GClass3067.IsAllSelectedItemSame); + _ = nameof(GClass3067.AutoSelectSimilar); } protected override MethodBase GetTargetMethod() @@ -30,18 +30,18 @@ namespace Aki.Custom.Patches /// Calculate tax to charge player and send to server before the offer is sent /// /// Item sold - /// OfferItemCount + /// OfferItemCount /// RequirementsPrice /// SellInOnePiece [PatchPrefix] - private static void PatchPrefix(ref Item ___item_0, ref GClass3066 ___gclass3066_0, ref double ___double_0, ref bool ___bool_0) + private static void PatchPrefix(ref Item ___item_0, ref GClass3067 ___gclass3067_0, ref double ___double_0, ref bool ___bool_0) { RequestHandler.PutJson("/client/ragfair/offerfees", new { id = ___item_0.Id, tpl = ___item_0.TemplateId, - count = ___gclass3066_0.OfferItemCount, - fee = Mathf.CeilToInt((float)GClass2083.CalculateTaxPrice(___item_0, ___gclass3066_0.OfferItemCount, ___double_0, ___bool_0)) + count = ___gclass3067_0.OfferItemCount, + fee = Mathf.CeilToInt((float)GClass2084.CalculateTaxPrice(___item_0, ___gclass3067_0.OfferItemCount, ___double_0, ___bool_0)) } .ToJson()); } diff --git a/project/Aki.SinglePlayer/Patches/MainMenu/InsuranceScreenPatch.cs b/project/Aki.SinglePlayer/Patches/MainMenu/InsuranceScreenPatch.cs index 84bb6dd..c69e0d6 100644 --- a/project/Aki.SinglePlayer/Patches/MainMenu/InsuranceScreenPatch.cs +++ b/project/Aki.SinglePlayer/Patches/MainMenu/InsuranceScreenPatch.cs @@ -32,7 +32,7 @@ namespace Aki.SinglePlayer.Patches.MainMenu //} var desiredType = typeof(MainMenuController); - var desiredMethod = desiredType.GetMethod("method_69", BindingFlags.NonPublic | BindingFlags.Instance); + var desiredMethod = desiredType.GetMethod("method_71", BindingFlags.NonPublic | BindingFlags.Instance); Logger.LogDebug($"{this.GetType().Name} Type: {desiredType?.Name}"); Logger.LogDebug($"{this.GetType().Name} Method: {desiredMethod?.Name}"); diff --git a/project/Aki.SinglePlayer/Patches/Progression/MidRaidQuestChangePatch.cs b/project/Aki.SinglePlayer/Patches/Progression/MidRaidQuestChangePatch.cs index feec21e..7f883dd 100644 --- a/project/Aki.SinglePlayer/Patches/Progression/MidRaidQuestChangePatch.cs +++ b/project/Aki.SinglePlayer/Patches/Progression/MidRaidQuestChangePatch.cs @@ -26,7 +26,7 @@ namespace Aki.SinglePlayer.Patches.Progression { var player = gameWorld.MainPlayer; - var questController = Traverse.Create(player).Field("_questController").Value; + var questController = Traverse.Create(player).Field("_questController").Value; if (questController != null) { foreach (var quest in questController.Quests.ToList()) diff --git a/project/Aki.SinglePlayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs b/project/Aki.SinglePlayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs index 81a00ab..1b81924 100644 --- a/project/Aki.SinglePlayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs +++ b/project/Aki.SinglePlayer/Patches/RaidFix/LabsKeycardRemovalPatch.cs @@ -43,7 +43,7 @@ namespace Aki.SinglePlayer.Patches.RaidFix } var inventoryController = Traverse.Create(player).Field("_inventoryController").Value; - GClass2767.Remove(accessCardItem, inventoryController, false, true); + GClass2768.Remove(accessCardItem, inventoryController, false, true); } } } \ No newline at end of file diff --git a/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs b/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs index c94fbc0..82ce2e3 100644 --- a/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs +++ b/project/Aki.SinglePlayer/Patches/ScavMode/LoadOfflineRaidScreenPatch.cs @@ -29,7 +29,7 @@ namespace Aki.SinglePlayer.Patches.ScavMode _ = nameof(TimeAndWeatherSettings.IsRandomWeather); _ = nameof(BotControllerSettings.IsScavWars); _ = nameof(WavesSettings.IsBosses); - _ = GClass3163.MAX_SCAV_COUNT; // UPDATE REFS TO THIS CLASS BELOW !!! + _ = GClass3164.MAX_SCAV_COUNT; // UPDATE REFS TO THIS CLASS BELOW !!! var menuControllerType = typeof(MainMenuController); @@ -118,14 +118,14 @@ 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($"{nameof(GClass3163).ToLowerInvariant()}_0").GetValue(); + var matchmakerPlayersController = Traverse.Create(menuController).Field($"{nameof(GClass3164).ToLowerInvariant()}_0").GetValue(); - var gclass = new MatchmakerOfflineRaidScreen.GClass3152(profile?.Info, ref raidSettings, matchmakerPlayersController); + var gclass = new MatchmakerOfflineRaidScreen.GClass3153(profile?.Info, ref raidSettings, matchmakerPlayersController); gclass.OnShowNextScreen += LoadOfflineRaidNextScreen; // `MatchmakerOfflineRaidScreen` OnShowReadyScreen - gclass.OnShowReadyScreen += (OfflineRaidAction)Delegate.CreateDelegate(typeof(OfflineRaidAction), menuController, "method_70"); + gclass.OnShowReadyScreen += (OfflineRaidAction)Delegate.CreateDelegate(typeof(OfflineRaidAction), menuController, "method_72"); gclass.ShowScreen(EScreenState.Queued); } diff --git a/project/Shared/Hollowed/hollowed.dll b/project/Shared/Hollowed/hollowed.dll index cced105..0c591d5 100644 Binary files a/project/Shared/Hollowed/hollowed.dll and b/project/Shared/Hollowed/hollowed.dll differ