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

Merge branch 'main' into CykaFix

Browse Source
This commit is contained in:
PhatPhuckDave
2024-07-23 10:02:16 +02:00
parent bd9e54fedb 35d54c282e
commit d9dda127a7
27 changed files with 1224 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Patches/MultiSelectPatches.cs
View File

@@ -26,7 +26,7 @@ public static class MultiSelectPatches
// Used to prevent infinite recursion of CanAccept/AcceptItem
private static bool InPatch = false;
// If the CanAccept method should render highlights
// Keep track of preview images when dragging
private static readonly List<Image> Previews = [];
// Point that various QuickFindPlace overrides should start at
@@ -150,7 +150,7 @@ public static class MultiSelectPatches
}
[PatchPostfix]
public static void Postfix(ItemView __instance, PointerEventData eventData)
public static void Postfix(ItemView __instance, PointerEventData eventData, TraderControllerClass ___ItemController)
{
if (!MultiSelect.Enabled || __instance is RagfairNewOfferItemView || __instance is InsuranceItemView)
{
@@ -161,12 +161,36 @@ public static class MultiSelectPatches
bool shiftDown = Input.GetKey(KeyCode.LeftShift) && !Input.GetKey(KeyCode.RightShift);
bool altDown = Input.GetKey(KeyCode.LeftAlt) && !Input.GetKey(KeyCode.RightAlt);
if (Settings.EnableMultiClick.Value && __instance is GridItemView gridItemView && eventData.button == PointerEventData.InputButton.Left && shiftDown && !ctrlDown && !altDown)
// If sorting table is open and default shift-click behavior is enabled, don't multiselect
bool couldBeSortingTableMove = false;
if (Settings.DefaultSortingTableBind.Value &&
shiftDown &&
eventData.button == PointerEventData.InputButton.Left &&
___ItemController is InventoryControllerClass inventoryController)
{
SortingTableClass sortingTable = inventoryController.Inventory.SortingTable;
if (sortingTable != null && sortingTable.IsVisible)
{
couldBeSortingTableMove = true;
}
}
if (Settings.EnableMultiClick.Value &&
!couldBeSortingTableMove &&
__instance is GridItemView gridItemView &&
eventData.button == PointerEventData.InputButton.Left &&
shiftDown && !ctrlDown && !altDown)
{
MultiSelect.Toggle(gridItemView);
return;
}
// Mainly this tests for when selection box is rebound to another mouse button, to enable secondary selection
if (!couldBeSortingTableMove && shiftDown && Settings.SelectionBoxKey.Value.IsDownIgnoreOthers())
{
return;
}
if (__instance is not GridItemView gridItemView2 || !MultiSelect.IsSelected(gridItemView2))
{
MultiSelect.Clear();
@@ -211,9 +235,14 @@ public static class MultiSelectPatches
return false;
}
if (shiftDown)
if (shiftDown && !ctrlDown && !altDown)
{
// Nothing to do, mousedown handled it.
if (Settings.DefaultSortingTableBind.Value)
{
QuickMove(__instance, ___ItemUiContext, ___ItemController, true);
return false;
}
return true;
}
@@ -222,15 +251,17 @@ public static class MultiSelectPatches
return true;
}
private static void QuickMove(GridItemView gridItemView, ItemUiContext itemUiContext, TraderControllerClass itemController)
private static void QuickMove(GridItemView gridItemView, ItemUiContext itemUiContext, TraderControllerClass itemController, bool moveToSortingTable = false)
{
bool succeeded = true;
DisableMerge = true;
IgnoreItemParent = true;
Stack<ItemOperation> operations = new();
foreach (DragItemContext selectedItemContext in MultiSelect.SortedItemContexts())
foreach (var selectedItemContext in MultiSelect.SortedItemContexts())
{
ItemOperation operation = itemUiContext.QuickFindAppropriatePlace(selectedItemContext, itemController, false /*forceStash*/, false /*showWarnings*/, false /*simulate*/);
ItemOperation operation = moveToSortingTable ?
itemUiContext.QuickMoveToSortingTable(selectedItemContext.Item, false /*simulate*/) :
itemUiContext.QuickFindAppropriatePlace(selectedItemContext, itemController, false /*forceStash*/, false /*showWarnings*/, false /*simulate*/);
if (operation.Succeeded && itemController.CanExecute(operation.Value))
{
operations.Push(operation);
@@ -434,6 +465,13 @@ public static class MultiSelectPatches
return AccessTools.Method(typeof(ItemView), nameof(ItemView.OnBeginDrag));
}
[PatchPrefix]
public static bool Prefix()
{
// Disable drag if shift is down
return !Input.GetKey(KeyCode.LeftShift) && !Input.GetKey(KeyCode.RightShift);
}
[PatchPostfix]
public static void Postfix(ItemView __instance)
{