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

Update for SPT 3.9.0

Browse Source
This commit is contained in:
Tyfon
2024-07-06 21:50:51 -07:00
parent 531d8fce06
commit 238e28dbc3
55 changed files with 427 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Multiselect/MultiGrid.cs
View File

@@ -5,8 +5,6 @@ using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using GridItemAddress = GClass2769;
namespace UIFixes
{
public static class MultiGrid
@@ -14,7 +12,7 @@ namespace UIFixes
private static readonly Dictionary<Item, Dictionary<StashGridClass, Vector2Int>> GridOffsets = [];
private static readonly Dictionary<Item, Dictionary<int, Dictionary<int, StashGridClass>>> GridsByLocation = [];
public static LocationInGrid GetGridLocation(GridItemAddress realAddress)
public static LocationInGrid GetGridLocation(ItemAddressClass realAddress)
{
if (!IsMultiGrid(realAddress))
{
@@ -25,7 +23,7 @@ namespace UIFixes
return new LocationInGrid(realAddress.LocationInGrid.x + gridOffset.x, realAddress.LocationInGrid.y + gridOffset.y, realAddress.LocationInGrid.r);
}
public static GridItemAddress GetRealAddress(StashGridClass originGrid, LocationInGrid multigridLocation)
public static ItemAddressClass GetRealAddress(StashGridClass originGrid, LocationInGrid multigridLocation)
{
if (!IsMultiGrid(originGrid.ParentItem))
{
@@ -33,7 +31,7 @@ namespace UIFixes
multigridLocation.x = Math.Max(0, Math.Min(originGrid.GridWidth.Value, multigridLocation.x));
multigridLocation.y = Math.Max(0, Math.Min(originGrid.GridHeight.Value, multigridLocation.y));
return new GridItemAddress(originGrid, multigridLocation);
return new ItemAddressClass(originGrid, multigridLocation);
}
var gridsByLocation = GridsByLocation[originGrid.ParentItem];
@@ -54,7 +52,7 @@ namespace UIFixes
Vector2Int offsets = GridOffsets[originGrid.ParentItem][grid];
LocationInGrid location = new(x - offsets.x, y - offsets.y, multigridLocation.r);
return new GridItemAddress(grid, location);
return new ItemAddressClass(grid, location);
}
public static void Cache(GridView initialGridView)
@@ -108,25 +106,9 @@ namespace UIFixes
GridOffsets.Add(parent, gridOffsets);
GridsByLocation.Add(parent, gridsByLocation);
// Best effort attempt at cleanup
IItemOwner owner = parent.Owner;
if (owner != null)
{
void onRemoveItem(GEventArgs3 eventArgs)
{
if (GridOffsets.ContainsKey(eventArgs.Item))
{
GridOffsets.Remove(eventArgs.Item);
GridsByLocation.Remove(eventArgs.Item);
owner.RemoveItemEvent -= onRemoveItem;
}
};
owner.RemoveItemEvent += onRemoveItem;
}
}
private static bool IsMultiGrid(GridItemAddress itemAddress)
private static bool IsMultiGrid(ItemAddressClass itemAddress)
{
return IsMultiGrid(itemAddress.Container.ParentItem);
}

85
Multiselect/MultiSelect.cs
View File

@@ -7,8 +7,6 @@ using System.Threading.Tasks;
using TMPro;
using UnityEngine;
using GridItemAddress = GClass2769;
namespace UIFixes
{
public class MultiSelect
@@ -202,9 +200,9 @@ namespace UIFixes
var result = ItemContexts
.Where(ic => first == null || ic.Item != first.Item)
.OrderByDescending(ic => ic.ItemAddress is GridItemAddress)
.OrderByDescending(ic => ic.ItemAddress is ItemAddressClass)
.ThenByDescending(ic => first != null && first.ItemAddress.Container.ParentItem == ic.ItemAddress.Container.ParentItem)
.ThenBy(ic => ic.ItemAddress is GridItemAddress selectedGridAddress ? gridOrder(MultiGrid.GetGridLocation(selectedGridAddress)) : 0);
.ThenBy(ic => ic.ItemAddress is ItemAddressClass selectedGridAddress ? gridOrder(MultiGrid.GetGridLocation(selectedGridAddress)) : 0);
return first != null && prepend ? result.Prepend(first) : result;
}
@@ -238,7 +236,7 @@ namespace UIFixes
private static bool InteractionAvailable(ItemContextClass itemContext, EItemInfoButton interaction, ItemUiContext itemUiContext)
{
// Since itemContext is for "drag", no context actions are allowed. Get the underlying "inventory" context
ItemContextAbstractClass innerContext = itemContext.GClass2813_0;
ItemContextAbstractClass innerContext = itemContext.ItemContextAbstractClass;
if (innerContext == null)
{
return false;
@@ -283,7 +281,7 @@ namespace UIFixes
var taskSerializer = itemUiContext.gameObject.AddComponent<ItemContextTaskSerializer>();
taskSerializer.Initialize(
SortedItemContexts().Where(ic => InteractionAvailable(ic, EItemInfoButton.Unequip, itemUiContext)),
itemContext => itemUiContext.Uninstall(itemContext.GClass2813_0));
itemContext => itemUiContext.Uninstall(itemContext.ItemContextAbstractClass));
itemUiContext.Tooltip?.Close();
}
@@ -291,19 +289,23 @@ namespace UIFixes
public static Task LoadAmmoAll(ItemUiContext itemUiContext, string ammoTemplateId, bool allOrNothing)
{
StopLoading();
StopLoading(true);
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 = itemUiContext.gameObject.AddComponent<ItemContextTaskSerializer>();
Task result = LoadUnloadSerializer.Initialize(
SortedItemContexts()
.Where(ic => ic.Item is MagazineClass && InteractionAvailable(ic, EItemInfoButton.LoadAmmo, itemUiContext))
.SelectMany(ic => ic.RepeatUntilFull()),
itemContext =>
{
IgnoreStopLoading = true;
return itemUiContext.LoadAmmoByType(itemContext.Item as MagazineClass, ammoTemplateId, itemContext.UpdateView);
});
LoadUnloadSerializer = taskSerializer;
itemUiContext.Tooltip?.Close();
return result;
return result.ContinueWith(t => LoadUnloadSerializer = null);
}
return Task.CompletedTask;
@@ -311,12 +313,11 @@ namespace UIFixes
public static void UnloadAmmoAll(ItemUiContext itemUiContext, bool allOrNothing)
{
StopLoading();
StopLoading(true);
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
var taskSerializer = itemUiContext.gameObject.AddComponent<ItemContextTaskSerializer>();
taskSerializer.Initialize(
LoadUnloadSerializer = itemUiContext.gameObject.AddComponent<ItemContextTaskSerializer>();
LoadUnloadSerializer.Initialize(
SortedItemContexts().Where(ic => InteractionAvailable(ic, EItemInfoButton.UnloadAmmo, itemUiContext)),
itemContext =>
{
@@ -324,23 +325,33 @@ namespace UIFixes
{
Deselect(itemContext);
}
return itemUiContext.UnloadAmmo(itemContext.Item);
});
LoadUnloadSerializer = taskSerializer;
IgnoreStopLoading = true;
return itemUiContext.UnloadAmmo(itemContext.Item);
}).ContinueWith(t => LoadUnloadSerializer = null);
itemUiContext.Tooltip?.Close();
}
}
public static void StopLoading()
private static bool IgnoreStopLoading = false;
public static void StopLoading(bool force = false)
{
if (LoadUnloadSerializer == null)
{
return;
}
LoadUnloadSerializer.Cancel();
LoadUnloadSerializer = null;
if (!IgnoreStopLoading || force)
{
LoadUnloadSerializer.Cancel();
LoadUnloadSerializer = null;
}
else
{
IgnoreStopLoading = false;
}
}
public static void UnpackAll(ItemUiContext itemUiContext, bool allOrNothing)
@@ -402,21 +413,21 @@ namespace UIFixes
public MultiSelectItemContext(ItemContextAbstractClass itemContext, ItemRotation rotation) : base(itemContext, rotation)
{
// Adjust event handlers
if (GClass2813_0 != null)
if (ItemContextAbstractClass != null)
{
// Listen for underlying context being disposed, it might mean the item is gone (merged, destroyed, etc)
GClass2813_0.OnDisposed += OnParentDispose;
ItemContextAbstractClass.OnDisposed += OnParentDispose;
// This serves no purpose and causes stack overflows
GClass2813_0.OnCloseWindow -= CloseDependentWindows;
ItemContextAbstractClass.OnCloseWindow -= CloseDependentWindows;
}
}
public override void Dispose()
{
base.Dispose();
if (GClass2813_0 != null)
if (ItemContextAbstractClass != null)
{
GClass2813_0.OnDisposed -= OnParentDispose;
ItemContextAbstractClass.OnDisposed -= OnParentDispose;
}
}
@@ -433,9 +444,9 @@ namespace UIFixes
// ItemContextClass (drag) defaults to None, but we want what the underlying item allows
public override bool CanQuickMoveTo(ETargetContainer targetContainer)
{
if (GClass2813_0 != null)
if (ItemContextAbstractClass != null)
{
return GClass2813_0.CanQuickMoveTo(targetContainer);
return ItemContextAbstractClass.CanQuickMoveTo(targetContainer);
}
return base.CanQuickMoveTo(targetContainer);
@@ -481,6 +492,18 @@ namespace UIFixes
}
}
public static IEnumerable<ItemContextClass> RepeatUntilFull(this ItemContextClass itemContext)
{
if (itemContext.Item is MagazineClass magazine)
{
int ammoCount = -1;
while (magazine.Count > ammoCount && magazine.Count < magazine.MaxCount)
{
ammoCount = magazine.Count;
yield return itemContext;
}
}
}
}
}