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

multiselect load ammo

Browse Source
This commit is contained in:
Tyfon
2024-07-02 02:09:00 -07:00
parent 89656fa468
commit 30ecbc333d
6 changed files with 132 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Multiselect/MultiSelect.cs
View File

@@ -3,6 +3,7 @@ using EFT.UI;
using EFT.UI.DragAndDrop;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using TMPro;
using UnityEngine;
@@ -18,7 +19,7 @@ namespace UIFixes
private static readonly Dictionary<ItemContextClass, GridItemView> SelectedItems = [];
private static readonly Dictionary<ItemContextClass, GridItemView> SecondaryItems = [];
private static ItemContextTaskSerializer UnloadSerializer = null;
private static ItemContextTaskSerializer LoadUnloadSerializer = null;
public static bool Enabled
{
@@ -288,9 +289,29 @@ namespace UIFixes
}
}
public static Task LoadAmmoAll(ItemUiContext itemUiContext, string ammoTemplateId, bool allOrNothing)
{
StopLoading();
if (!allOrNothing || InteractionCount(EItemInfoButton.LoadAmmo, itemUiContext) == Count)
{
// Call Initialize() before setting UnloadSerializer so that the initial synchronous call to StopProcesses()->StopUnloading() doesn't immediately cancel this
var taskSerializer = itemUiContext.gameObject.AddComponent<ItemContextTaskSerializer>();
Task result = taskSerializer.Initialize(
SortedItemContexts().Where(ic => ic.Item is MagazineClass && InteractionAvailable(ic, EItemInfoButton.LoadAmmo, itemUiContext)),
itemContext => itemUiContext.LoadAmmoByType(itemContext.Item as MagazineClass, ammoTemplateId, itemContext.UpdateView));
LoadUnloadSerializer = taskSerializer;
itemUiContext.Tooltip?.Close();
return result;
}
return Task.CompletedTask;
}
public static void UnloadAmmoAll(ItemUiContext itemUiContext, bool allOrNothing)
{
StopUnloading();
StopLoading();
if (!allOrNothing || InteractionCount(EItemInfoButton.UnloadAmmo, itemUiContext) == Count)
{
// Call Initialize() before setting UnloadSerializer so that the initial synchronous call to StopProcesses()->StopUnloading() doesn't immediately cancel this
@@ -299,20 +320,20 @@ namespace UIFixes
SortedItemContexts().Where(ic => InteractionAvailable(ic, EItemInfoButton.UnloadAmmo, itemUiContext)),
itemContext => itemUiContext.UnloadAmmo(itemContext.Item));
UnloadSerializer = taskSerializer;
LoadUnloadSerializer = taskSerializer;
itemUiContext.Tooltip?.Close();
}
}
public static void StopUnloading()
public static void StopLoading()
{
if (UnloadSerializer == null)
if (LoadUnloadSerializer == null)
{
return;
}
UnloadSerializer.Cancel();
UnloadSerializer = null;
LoadUnloadSerializer.Cancel();
LoadUnloadSerializer = null;
}
public static void UnpackAll(ItemUiContext itemUiContext, bool allOrNothing)