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

quick access panel show/hide take 2

Browse Source
This commit is contained in:
Tyfon
2024-07-10 11:43:47 -07:00
parent 51754a58e6
commit 2247b7bea6
1 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Patches/QuickAccessPanelPatches.cs
View File

@@ -16,6 +16,7 @@ namespace UIFixes
{ {
new FixWeaponBindsDisplayPatch().Enable(); new FixWeaponBindsDisplayPatch().Enable();
new FixVisibilityPatch().Enable(); new FixVisibilityPatch().Enable();
new TranslateCommandHackPatch().Enable();
} }
public class FixWeaponBindsDisplayPatch : ModulePatch public class FixWeaponBindsDisplayPatch : ModulePatch
@@ -46,24 +47,33 @@ namespace UIFixes
public class FixVisibilityPatch : ModulePatch public class FixVisibilityPatch : ModulePatch
{ {
public static bool Ignorable = false;
protected override MethodBase GetTargetMethod() protected override MethodBase GetTargetMethod()
{ {
return AccessTools.Method(typeof(InventoryScreenQuickAccessPanel), nameof(InventoryScreenQuickAccessPanel.method_4)); return AccessTools.Method(typeof(InventoryScreenQuickAccessPanel), nameof(InventoryScreenQuickAccessPanel.method_4));
} }
// BSGs implementation of this method is just straight up wrong, so reimplementing it // This method is a mess. The visibility setting has to be ignored in some cases, respected in others
// In most calls, visible=true must be followed regardless of setting preference, e.g. mag selection
// When coming from translatecommand, which is when you hit a quickbind key, visible=true can be ignored if the setting is never
// Ironically this is also the only time that autohide matters, since the other places will explicitly call hide
// visible=false can always be ignored if setting is always
[PatchPrefix] [PatchPrefix]
public static bool Prefix(InventoryScreenQuickAccessPanel __instance, bool visible) public static bool Prefix(InventoryScreenQuickAccessPanel __instance, bool visible)
{ {
GameSetting<EVisibilityMode> quickSlotsVisibility = Singleton<SharedGameSettingsClass>.Instance.Game.Settings.QuickSlotsVisibility; GameSetting<EVisibilityMode> quickSlotsVisibility = Singleton<SharedGameSettingsClass>.Instance.Game.Settings.QuickSlotsVisibility;
bool disabled = __instance.IsDisabled;
if (visible && !disabled && quickSlotsVisibility != EVisibilityMode.Never) bool shouldShow = visible && !__instance.IsDisabled;
bool blocked = Ignorable && quickSlotsVisibility == EVisibilityMode.Never;
if (shouldShow && !blocked)
{ {
__instance.AnimatedShow(quickSlotsVisibility == EVisibilityMode.Autohide); bool autohide = Ignorable && quickSlotsVisibility == EVisibilityMode.Autohide;
__instance.AnimatedShow(autohide);
} }
else else if (!shouldShow && quickSlotsVisibility != EVisibilityMode.Always)
{ {
__instance.AnimatedHide(); __instance.AnimatedHide();
} }
@@ -71,5 +81,25 @@ namespace UIFixes
return false; return false;
} }
} }
public class TranslateCommandHackPatch : ModulePatch
{
protected override MethodBase GetTargetMethod()
{
return AccessTools.Method(typeof(InventoryScreenQuickAccessPanel), nameof(InventoryScreenQuickAccessPanel.TranslateCommand));
}
[PatchPrefix]
public static void Prefix(ECommand command)
{
FixVisibilityPatch.Ignorable = GClass3032.SlotBySelectCommandDictionary.ContainsKey(command);
}
[PatchPostfix]
public static void Postfix()
{
FixVisibilityPatch.Ignorable = false;
}
}
} }
} }