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

Multigrid dictionarys by Id, fix rig/backpack swapping

Browse Source
This commit is contained in:
Tyfon
2024-07-08 01:04:13 -07:00
parent 3e93d55b8c
commit 6378c8424c
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Multiselect/MultiGrid.cs
View File

@@ -9,8 +9,8 @@ namespace UIFixes
{ {
public static class MultiGrid public static class MultiGrid
{ {
private static readonly Dictionary<Item, Dictionary<StashGridClass, Vector2Int>> GridOffsets = []; private static readonly Dictionary<string, Dictionary<StashGridClass, Vector2Int>> GridOffsets = [];
private static readonly Dictionary<Item, Dictionary<int, Dictionary<int, StashGridClass>>> GridsByLocation = []; private static readonly Dictionary<string, Dictionary<int, Dictionary<int, StashGridClass>>> GridsByLocation = [];
public static LocationInGrid GetGridLocation(ItemAddressClass realAddress) public static LocationInGrid GetGridLocation(ItemAddressClass realAddress)
{ {
@@ -19,7 +19,7 @@ namespace UIFixes
return realAddress.LocationInGrid; return realAddress.LocationInGrid;
} }
Vector2Int gridOffset = GridOffsets[realAddress.Container.ParentItem][realAddress.Grid]; Vector2Int gridOffset = GridOffsets[realAddress.Container.ParentItem.Id][realAddress.Grid];
return new LocationInGrid(realAddress.LocationInGrid.x + gridOffset.x, realAddress.LocationInGrid.y + gridOffset.y, realAddress.LocationInGrid.r); return new LocationInGrid(realAddress.LocationInGrid.x + gridOffset.x, realAddress.LocationInGrid.y + gridOffset.y, realAddress.LocationInGrid.r);
} }
@@ -34,7 +34,7 @@ namespace UIFixes
return new ItemAddressClass(originGrid, multigridLocation); return new ItemAddressClass(originGrid, multigridLocation);
} }
var gridsByLocation = GridsByLocation[originGrid.ParentItem]; var gridsByLocation = GridsByLocation[originGrid.ParentItem.Id];
// Clamp to known "meta" grid // Clamp to known "meta" grid
int x = Math.Max(0, Math.Min(gridsByLocation.Keys.Max(), multigridLocation.x)); int x = Math.Max(0, Math.Min(gridsByLocation.Keys.Max(), multigridLocation.x));
@@ -49,7 +49,7 @@ namespace UIFixes
} }
StashGridClass grid = gridsByLocation[x][y]; StashGridClass grid = gridsByLocation[x][y];
Vector2Int offsets = GridOffsets[originGrid.ParentItem][grid]; Vector2Int offsets = GridOffsets[originGrid.ParentItem.Id][grid];
LocationInGrid location = new(x - offsets.x, y - offsets.y, multigridLocation.r); LocationInGrid location = new(x - offsets.x, y - offsets.y, multigridLocation.r);
return new ItemAddressClass(grid, location); return new ItemAddressClass(grid, location);
@@ -63,7 +63,7 @@ namespace UIFixes
} }
Item parent = initialGridView.Grid.ParentItem; Item parent = initialGridView.Grid.ParentItem;
if (GridOffsets.ContainsKey(parent) || !IsMultiGrid(parent)) if (GridOffsets.ContainsKey(parent.Id) || !IsMultiGrid(parent))
{ {
return; return;
} }
@@ -104,8 +104,8 @@ namespace UIFixes
} }
} }
GridOffsets.Add(parent, gridOffsets); GridOffsets.Add(parent.Id, gridOffsets);
GridsByLocation.Add(parent, gridsByLocation); GridsByLocation.Add(parent.Id, gridsByLocation);
} }
private static bool IsMultiGrid(ItemAddressClass itemAddress) private static bool IsMultiGrid(ItemAddressClass itemAddress)

7
Patches/SwapPatches.cs
View File

@@ -381,9 +381,12 @@ namespace UIFixes
return; return;
} }
if (!ValidPrerequisites(__instance, targetItemContext, operation)) using (var containedContext = targetItemContext.CreateChild(slot.ContainedItem))
{ {
return; if (!ValidPrerequisites(__instance, containedContext, operation))
{
return;
}
} }
var item = __instance.Item; var item = __instance.Item;