unload ammo/mag, 1.7.0

This commit is contained in:
Tyfon
2024-06-15 17:56:12 -07:00
parent b562a8665d
commit 05a646b82f
6 changed files with 35 additions and 25 deletions

View File

@@ -31,11 +31,6 @@ namespace UIFixes
public static void Toggle(GridItemView itemView)
{
if (!itemView.IsInteractable)
{
return;
}
if (SelectedItemViews.ContainsKey(itemView))
{
Deselect(itemView);
@@ -57,9 +52,9 @@ namespace UIFixes
public static void Select(GridItemView itemView)
{
if (itemView.IsInteractable && !SelectedItemViews.ContainsKey(itemView))
if (itemView.IsSelectable() && !SelectedItemViews.ContainsKey(itemView))
{
ItemContextClass itemContext = new ItemContextClass(itemView.ItemContext, itemView.ItemRotation);
ItemContextClass itemContext = new(itemView.ItemContext, itemView.ItemRotation);
itemContext.GClass2813_0.OnDisposed += RugPull;
itemContext.OnDisposed += RugPull;
@@ -159,4 +154,12 @@ namespace UIFixes
selectedBackground?.SetActive(false);
}
}
public static class MultiSelectExtensions
{
public static bool IsSelectable(this ItemView itemView)
{
return itemView.IsInteractable && itemView.IsSearched && itemView.RemoveError.Value == null;
}
}
}