dave/Tarkov-UIFixes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix add offer keybind

Browse Source
This commit is contained in:
Tyfon
2024-09-10 10:12:35 -07:00
parent 64b7e546c1
commit 983deffea5
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Patches/AddOfferContextMenuPatches.cs
View File

@@ -14,8 +14,6 @@ namespace UIFixes;
public static class AddOfferContextMenuPatches public static class AddOfferContextMenuPatches
{ {
private const EItemInfoButton AddOfferInfoButton = (EItemInfoButton)77;
private static Item AddOfferItem = null; private static Item AddOfferItem = null;
public static void Enable() public static void Enable()
@@ -44,7 +42,7 @@ public static class AddOfferContextMenuPatches
if (Settings.AddOfferContextMenu.Value) if (Settings.AddOfferContextMenu.Value)
{ {
var list = __result.ToList(); var list = __result.ToList();
list.Insert(list.IndexOf(EItemInfoButton.Tag), AddOfferInfoButton); list.Insert(list.IndexOf(EItemInfoButton.Tag), EItemInfoButtonExt.AddOffer);
__result = list; __result = list;
} }
} }
@@ -63,7 +61,7 @@ public static class AddOfferContextMenuPatches
if (Settings.AddOfferContextMenu.Value) if (Settings.AddOfferContextMenu.Value)
{ {
var list = __result.ToList(); var list = __result.ToList();
list.Insert(list.IndexOf(EItemInfoButton.Tag), AddOfferInfoButton); list.Insert(list.IndexOf(EItemInfoButton.Tag), EItemInfoButtonExt.AddOffer);
__result = list; __result = list;
} }
} }
@@ -83,13 +81,13 @@ public static class AddOfferContextMenuPatches
{ {
names ??= new Dictionary<EItemInfoButton, string>() names ??= new Dictionary<EItemInfoButton, string>()
{ {
{ AddOfferInfoButton, "ragfair/OFFER ADD" } { EItemInfoButtonExt.AddOffer, "ragfair/OFFER ADD" }
}; };
FleaSprite ??= Resources.FindObjectsOfTypeAll<Sprite>().Single(s => s.name == "icon_flea_market"); FleaSprite ??= Resources.FindObjectsOfTypeAll<Sprite>().Single(s => s.name == "icon_flea_market");
icons ??= new Dictionary<EItemInfoButton, Sprite>() icons ??= new Dictionary<EItemInfoButton, Sprite>()
{ {
{ AddOfferInfoButton, FleaSprite } { EItemInfoButtonExt.AddOffer, FleaSprite }
}; };
} }
} }
@@ -104,7 +102,7 @@ public static class AddOfferContextMenuPatches
[PatchPrefix] [PatchPrefix]
public static bool Prefix(EItemInfoButton button, ref bool __result) public static bool Prefix(EItemInfoButton button, ref bool __result)
{ {
if (button != AddOfferInfoButton) if (button != EItemInfoButtonExt.AddOffer)
{ {
return true; return true;
} }
@@ -130,7 +128,7 @@ public static class AddOfferContextMenuPatches
[PatchPostfix] [PatchPostfix]
public static void Postfix(EItemInfoButton button, ref IResult __result, Item ___item_0) public static void Postfix(EItemInfoButton button, ref IResult __result, Item ___item_0)
{ {
if (button != AddOfferInfoButton) if (button != EItemInfoButtonExt.AddOffer)
{ {
return; return;
} }
@@ -168,7 +166,7 @@ public static class AddOfferContextMenuPatches
[PatchPrefix] [PatchPrefix]
public static bool Prefix(ItemInfoInteractionsAbstractClass<EItemInfoButton> __instance, EItemInfoButton interaction, Item ___item_0) public static bool Prefix(ItemInfoInteractionsAbstractClass<EItemInfoButton> __instance, EItemInfoButton interaction, Item ___item_0)
{ {
if (interaction != AddOfferInfoButton) if (interaction != EItemInfoButtonExt.AddOffer)
{ {
return true; return true;
} }

5
Patches/ContextMenuPatches.cs
View File

@@ -13,6 +13,11 @@ using UnityEngine;
namespace UIFixes; namespace UIFixes;
public static class EItemInfoButtonExt
{
public const EItemInfoButton AddOffer = (EItemInfoButton)77;
}
public static class ContextMenuPatches public static class ContextMenuPatches
{ {
private static InsuranceInteractions CurrentInsuranceInteractions = null; private static InsuranceInteractions CurrentInsuranceInteractions = null;

5
Patches/ContextMenuShortcutPatches.cs
View File

@@ -112,6 +112,11 @@ public static class ContextMenuShortcutPatches
[EItemInfoButton.Fold, EItemInfoButton.Unfold, EItemInfoButton.TurnOn, EItemInfoButton.TurnOff, EItemInfoButton.CheckMagazine]); [EItemInfoButton.Fold, EItemInfoButton.Unfold, EItemInfoButton.TurnOn, EItemInfoButton.TurnOff, EItemInfoButton.CheckMagazine]);
} }
if (Settings.AddOfferKeyBind.Value.IsDown())
{
TryInteraction(__instance, itemContext, EItemInfoButtonExt.AddOffer);
}
Interactions = null; Interactions = null;
} }