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

fix some multi-select context actions not working in raid

Browse Source
This commit is contained in:
Tyfon
2024-06-20 14:35:41 -07:00
parent 391533ffd2
commit 83a88e6ae6
3 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
MultiSelect.cs
View File

@@ -239,11 +239,8 @@ namespace UIFixes
{ {
if (!allOrNothing || InteractionCount(EItemInfoButton.Equip, itemUiContext) == Count) if (!allOrNothing || InteractionCount(EItemInfoButton.Equip, itemUiContext) == Count)
{ {
foreach (ItemContextClass selectedItemContext in SortedItemContexts()) var taskSerializer = itemUiContext.GetOrAddComponent<ItemContextTaskSerializer>();
{ taskSerializer.Initialize(SortedItemContexts(), itemContext => itemUiContext.QuickEquip(itemContext.Item));
itemUiContext.QuickEquip(selectedItemContext.Item).HandleExceptions();
}
itemUiContext.Tooltip?.Close(); itemUiContext.Tooltip?.Close();
} }
} }
@@ -252,11 +249,8 @@ namespace UIFixes
{ {
if (!allOrNothing || InteractionCount(EItemInfoButton.Unequip, itemUiContext) == Count) if (!allOrNothing || InteractionCount(EItemInfoButton.Unequip, itemUiContext) == Count)
{ {
foreach (ItemContextClass selectedItemContext in SortedItemContexts()) var taskSerializer = itemUiContext.GetOrAddComponent<ItemContextTaskSerializer>();
{ taskSerializer.Initialize(SortedItemContexts(), itemContext => itemUiContext.Uninstall(itemContext.GClass2813_0));
itemUiContext.Uninstall(selectedItemContext.GClass2813_0).HandleExceptions();
}
itemUiContext.Tooltip?.Close(); itemUiContext.Tooltip?.Close();
} }
} }
@@ -265,11 +259,8 @@ namespace UIFixes
{ {
if (!allOrNothing || InteractionCount(EItemInfoButton.UnloadAmmo, itemUiContext) == Count) if (!allOrNothing || InteractionCount(EItemInfoButton.UnloadAmmo, itemUiContext) == Count)
{ {
foreach (ItemContextClass selectedItemContext in SortedItemContexts()) var taskSerializer = itemUiContext.GetOrAddComponent<ItemContextTaskSerializer>();
{ taskSerializer.Initialize(SortedItemContexts(), itemContext => itemUiContext.UnloadAmmo(itemContext.Item));
itemUiContext.UnloadAmmo(selectedItemContext.Item).HandleExceptions();
}
itemUiContext.Tooltip?.Close(); itemUiContext.Tooltip?.Close();
} }
} }
@@ -328,6 +319,9 @@ namespace UIFixes
} }
} }
// Specific type of TaskSerializer because Unity can't understand generics
public class ItemContextTaskSerializer : TaskSerializer<ItemContextClass> { }
public static class MultiSelectExtensions public static class MultiSelectExtensions
{ {
public static bool IsSelectable(this ItemView itemView) public static bool IsSelectable(this ItemView itemView)

2
Patches/ContextMenuPatches.cs
View File

@@ -121,7 +121,7 @@ namespace UIFixes
____text.text += " (x" + count + ")"; ____text.text += " (x" + count + ")";
} }
} }
else if (caption == EItemInfoButton.UnloadAmmo.ToString()) else if (caption == EItemInfoButton.UnloadAmmo.ToString()))
{ {
int count = MultiSelect.InteractionCount(EItemInfoButton.UnloadAmmo, ItemUiContext.Instance); int count = MultiSelect.InteractionCount(EItemInfoButton.UnloadAmmo, ItemUiContext.Instance);
if (count > 0) if (count > 0)

3
Patches/MultiSelectPatches.cs
View File

@@ -34,9 +34,6 @@ namespace UIFixes
private static bool DisableMerge = false; private static bool DisableMerge = false;
private static bool IgnoreItemParent = false; private static bool IgnoreItemParent = false;
// Specific type of TaskSerializer because Unity can't understand generics
public class ItemContextTaskSerializer : TaskSerializer<ItemContextClass> { }
public static void Enable() public static void Enable()
{ {
// Initialization // Initialization