diff --git a/Patches/AddOfferContextMenuPatches.cs b/Patches/AddOfferContextMenuPatches.cs index 09e3c0a..d7c6e62 100644 --- a/Patches/AddOfferContextMenuPatches.cs +++ b/Patches/AddOfferContextMenuPatches.cs @@ -14,8 +14,6 @@ namespace UIFixes; public static class AddOfferContextMenuPatches { - private const EItemInfoButton AddOfferInfoButton = (EItemInfoButton)77; - private static Item AddOfferItem = null; public static void Enable() @@ -44,7 +42,7 @@ public static class AddOfferContextMenuPatches if (Settings.AddOfferContextMenu.Value) { var list = __result.ToList(); - list.Insert(list.IndexOf(EItemInfoButton.Tag), AddOfferInfoButton); + list.Insert(list.IndexOf(EItemInfoButton.Tag), EItemInfoButtonExt.AddOffer); __result = list; } } @@ -63,7 +61,7 @@ public static class AddOfferContextMenuPatches if (Settings.AddOfferContextMenu.Value) { var list = __result.ToList(); - list.Insert(list.IndexOf(EItemInfoButton.Tag), AddOfferInfoButton); + list.Insert(list.IndexOf(EItemInfoButton.Tag), EItemInfoButtonExt.AddOffer); __result = list; } } @@ -83,13 +81,13 @@ public static class AddOfferContextMenuPatches { names ??= new Dictionary() { - { AddOfferInfoButton, "ragfair/OFFER ADD" } + { EItemInfoButtonExt.AddOffer, "ragfair/OFFER ADD" } }; FleaSprite ??= Resources.FindObjectsOfTypeAll().Single(s => s.name == "icon_flea_market"); icons ??= new Dictionary() { - { AddOfferInfoButton, FleaSprite } + { EItemInfoButtonExt.AddOffer, FleaSprite } }; } } @@ -104,7 +102,7 @@ public static class AddOfferContextMenuPatches [PatchPrefix] public static bool Prefix(EItemInfoButton button, ref bool __result) { - if (button != AddOfferInfoButton) + if (button != EItemInfoButtonExt.AddOffer) { return true; } @@ -130,7 +128,7 @@ public static class AddOfferContextMenuPatches [PatchPostfix] public static void Postfix(EItemInfoButton button, ref IResult __result, Item ___item_0) { - if (button != AddOfferInfoButton) + if (button != EItemInfoButtonExt.AddOffer) { return; } @@ -168,7 +166,7 @@ public static class AddOfferContextMenuPatches [PatchPrefix] public static bool Prefix(ItemInfoInteractionsAbstractClass __instance, EItemInfoButton interaction, Item ___item_0) { - if (interaction != AddOfferInfoButton) + if (interaction != EItemInfoButtonExt.AddOffer) { return true; } diff --git a/Patches/ContextMenuPatches.cs b/Patches/ContextMenuPatches.cs index 2347dfc..0a4efad 100644 --- a/Patches/ContextMenuPatches.cs +++ b/Patches/ContextMenuPatches.cs @@ -13,6 +13,11 @@ using UnityEngine; namespace UIFixes; +public static class EItemInfoButtonExt +{ + public const EItemInfoButton AddOffer = (EItemInfoButton)77; +} + public static class ContextMenuPatches { private static InsuranceInteractions CurrentInsuranceInteractions = null; diff --git a/Patches/ContextMenuShortcutPatches.cs b/Patches/ContextMenuShortcutPatches.cs index a926e84..825d508 100644 --- a/Patches/ContextMenuShortcutPatches.cs +++ b/Patches/ContextMenuShortcutPatches.cs @@ -112,6 +112,11 @@ public static class ContextMenuShortcutPatches [EItemInfoButton.Fold, EItemInfoButton.Unfold, EItemInfoButton.TurnOn, EItemInfoButton.TurnOff, EItemInfoButton.CheckMagazine]); } + if (Settings.AddOfferKeyBind.Value.IsDown()) + { + TryInteraction(__instance, itemContext, EItemInfoButtonExt.AddOffer); + } + Interactions = null; }