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

allow partial transfers in multiselect

Browse Source
This commit is contained in:
Tyfon
2024-06-22 14:43:52 -07:00
parent dff100db30
commit cf6d38cc05
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Patches/MultiSelectPatches.cs
View File

@@ -483,6 +483,7 @@ namespace UIFixes
{ {
if (Settings.GreedyStackMove.Value && !isGridPlacement && selectedItemContext.Item.StackObjectsCount > 1) if (Settings.GreedyStackMove.Value && !isGridPlacement && selectedItemContext.Item.StackObjectsCount > 1)
{ {
int originalStackCount = selectedItemContext.Item.StackObjectsCount;
int stackCount = int.MaxValue; int stackCount = int.MaxValue;
bool failed = false; bool failed = false;
while (selectedItemContext.Item.StackObjectsCount > 0) while (selectedItemContext.Item.StackObjectsCount > 0)
@@ -498,6 +499,13 @@ namespace UIFixes
{ {
operations.Push(operation); operations.Push(operation);
} }
else if (stackCount < originalStackCount)
{
// Some succeeded, so stop but not a failure
__result = true;
operation = default;
break;
}
else else
{ {
if (operation.Error is GClass3292 noRoomError) if (operation.Error is GClass3292 noRoomError)
@@ -706,10 +714,6 @@ namespace UIFixes
return; return;
} }
// Multiselect always disables "Transfer", which is a partial merge
// It leaves things behind and that's not intuitive when multi-selecting
// order &= ~PartialMerge;
if (DisableMerge) if (DisableMerge)
{ {
order &= ~InteractionsHandlerClass.EMoveItemOrder.TryMerge; order &= ~InteractionsHandlerClass.EMoveItemOrder.TryMerge;
@@ -836,6 +840,7 @@ namespace UIFixes
} }
else else
{ {
int originalStackCount = itemContext.Item.StackObjectsCount;
int stackCount = int.MaxValue; int stackCount = int.MaxValue;
bool failed = false; bool failed = false;
while (itemContext.Item.StackObjectsCount > 0) while (itemContext.Item.StackObjectsCount > 0)
@@ -852,6 +857,13 @@ namespace UIFixes
{ {
operations.Push(operation); operations.Push(operation);
} }
else if (stackCount < originalStackCount)
{
// Some succeeded, stop but not failure
__result = true;
operation = default;
break;
}
else else
{ {
// Need to double-break // Need to double-break