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

Fix refactoring mistake

Browse Source
This commit is contained in:
Tyfon
2024-05-20 18:20:43 -07:00
parent 661ecb10a2
commit a16f908028
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Patches/SwapPatches.cs
View File

@@ -186,8 +186,8 @@ namespace UIFixes
var gridItemAddressA = new R.GridItemAddress(itemAddressA);
var gridItemAddressB = new R.GridItemAddress(itemAddressB);
LocationInGrid locationA = gridItemAddressA.Location;
LocationInGrid locationB = gridItemAddressB.Location;
LocationInGrid locationA = gridItemAddressA.LocationInGrid;
LocationInGrid locationB = gridItemAddressB.LocationInGrid;
StashGridClass grid = gridItemAddressA.Grid;
var itemASize = itemA.CalculateRotatedSize(locationA.r);
@@ -256,8 +256,8 @@ namespace UIFixes
{
var gridItemAddress = new R.GridItemAddress(itemAddress);
LocationInGrid targetToLocation = gridItemAddress.Location.Clone();
targetToLocation.r = targetGridItemAddress.Location.r;
LocationInGrid targetToLocation = gridItemAddress.LocationInGrid.Clone();
targetToLocation.r = targetGridItemAddress.LocationInGrid.r;
targetToAddress = R.GridItemAddress.Create(gridItemAddress.Grid, targetToLocation);
}
@@ -289,8 +289,7 @@ namespace UIFixes
// If we're coming from a grid, try rotating the target object
if (R.GridItemAddress.Type.IsInstanceOfType(itemAddress))
{
var gridItemAddress = new R.GridItemAddress(itemAddress);
var targetToLocation = gridItemAddress.Location;
var targetToLocation = new R.GridItemAddress(targetToAddress).LocationInGrid;
targetToLocation.r = targetToLocation.r == ItemRotation.Horizontal ? ItemRotation.Vertical : ItemRotation.Horizontal;
if (!ItemsOverlap(item, itemToAddress, targetItem, targetToAddress))
{

2
R.cs
View File

@@ -200,7 +200,7 @@ namespace UIFixes
return (ItemAddress)Activator.CreateInstance(Type, [grid, location]);
}
public LocationInGrid Location { get { return (LocationInGrid)LocationInGridField.GetValue(Value); } }
public LocationInGrid LocationInGrid { get { return (LocationInGrid)LocationInGridField.GetValue(Value); } }
public StashGridClass Grid { get { return (StashGridClass)GridProperty.GetValue(Value); } }
}