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

Swap working, but with specific GClass references

Browse Source
This commit is contained in:
Tyfon
2024-04-24 11:57:40 -07:00
parent 4e0f3f9139
commit 59c2428595
4 changed files with 230 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
Patches/SwapPatch.cs Normal file
View File

@@ -0,0 +1,226 @@
using Aki.Reflection.Patching;
using Aki.Reflection.Utils;
using Diz.LanguageExtensions;
using EFT.InventoryLogic;
using EFT.UI.DragAndDrop;
using HarmonyLib;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using UnityEngine;
namespace UIFixes
{
public class SwapPatch
{
public static void Enable()
{
new GridViewCanAcceptPatch().Enable();
new GetHightLightColorPatch().Enable();
new SlotViewCanAcceptPatch().Enable();
}
private static bool InHighlight = false;
public class GridViewCanAcceptPatch : ModulePatch
{
protected override MethodBase GetTargetMethod()
{
Type type = typeof(GridView);
return type.GetMethod("CanAccept");
}
// Essentially doing what happens in StashGridClass.method_6, which checks if any of the squares are already taken
// This looks at the squares taken by the two items and sees if any are the same
private static bool ItemsOverlap(Item itemA, ItemAddress itemAddressA, Item itemB, ItemAddress itemAddressB)
{
if (itemAddressA.Container != itemAddressB.Container)
{
return false;
}
if (itemAddressA is GClass2769 && itemAddressB is GClass2769)
{
LocationInGrid locationA = (itemAddressA as GClass2769).LocationInGrid;
LocationInGrid locationB = (itemAddressB as GClass2769).LocationInGrid;
StashGridClass grid = (itemAddressA as GClass2769).Grid;
GStruct24 itemASize = itemA.CalculateRotatedSize(locationA.r);
var itemASlots = new List<int>();
for (int y = 0; y < itemASize.Y; y++)
{
for (int x = 0; x < itemASize.X; x++)
{
itemASlots.Add((locationA.y + y) * grid.GridWidth.Value + locationA.x + x);
}
}
GStruct24 itemBSize = itemB.CalculateRotatedSize(locationB.r);
for (int y = 0; y < itemBSize.Y; y++)
{
for (int x = 0; x < itemBSize.X; x++)
{
int num = (locationB.y + y) * grid.GridWidth.Value + locationB.x + x;
if (itemASlots.Contains(num))
{
return true;
}
}
}
}
return false;
}
[PatchPostfix]
private static void Postfix(GridView __instance, ItemContextClass itemContext, ItemContextAbstractClass targetItemContext, ref GStruct413 operation, ref bool __result, TraderControllerClass ___gclass2758_0)
{
if (!Settings.SwapItems.Value)
{
return;
}
if (InHighlight || itemContext == null || targetItemContext == null)
{
return;
}
Item item = itemContext.Item;
Item targetItem = targetItemContext.Item;
// 3300 cannot apply a to b
// 3293 no possible actions
if (item != targetItem && (operation.Error is GClass3300 || operation.Error is GClass3293))
{
ItemAddress itemAddress = item.Parent;
GClass2769 targetAddress = targetItem.Parent as GClass2769;
if (targetAddress == null)
{
return;
}
LocationInGrid itemToLocation = __instance.CalculateItemLocation(itemContext); // This is the location you're dragging it over, including rotation
var itemToAddress = new GClass2769(targetAddress.Grid, itemToLocation); // This is a grid because we're in the GridView patch, i.e. you're dragging it over a grid
ItemAddress targetToAddress;
if (itemAddress is GClass2769) // The item source is a grid
{
var itemGridAddress = itemAddress as GClass2769;
LocationInGrid targetToLocation = itemGridAddress.LocationInGrid.Clone();
targetToLocation.r = targetAddress.LocationInGrid.r;
targetToAddress = new GClass2769(itemGridAddress.Grid, targetToLocation);
}
else if (itemAddress is GClass2767) // The item source is a slot
{
var itemSlotAddress = itemAddress as GClass2767;
targetToAddress = new GClass2767(itemSlotAddress.Slot);
} else
{
return;
}
// Check that the destinations won't overlap (Swap won't check this)
if (!ItemsOverlap(item, itemToAddress, targetItem, targetToAddress))
{
// Try original rotations
var result = InteractionsHandlerClass.Swap(item, itemToAddress, targetItem, targetToAddress, ___gclass2758_0, true);
if (result.Succeeded)
{
operation = result;
__result = operation.Succeeded;
return;
}
}
// If we're coming from a grid, try rotating the target object
if (targetToAddress is GClass2769)
{
var targetToLocation = (targetToAddress as GClass2769).LocationInGrid;
targetToLocation.r = targetToLocation.r == ItemRotation.Horizontal ? ItemRotation.Vertical : ItemRotation.Horizontal;
if (!ItemsOverlap(item, itemToAddress, targetItem, targetToAddress))
{
var result = InteractionsHandlerClass.Swap(item, itemToAddress, targetItem, targetToAddress, ___gclass2758_0, true);
if (result.Succeeded)
{
operation = result;
__result = operation.Succeeded;
return;
}
}
}
}
}
}
// Called when dragging an item onto an equipment slot
// Handles any kind of ItemAddress as the target destination (aka where the dragged item came from)
public class SlotViewCanAcceptPatch : ModulePatch
{
protected override MethodBase GetTargetMethod()
{
Type type = typeof(SlotView);
return type.GetMethod("CanAccept");
}
[PatchPostfix]
private static void Postfix(SlotView __instance, ItemContextClass itemContext, ItemContextAbstractClass targetItemContext, ref GStruct413 operation, InventoryControllerClass ___InventoryController, ref bool __result)
{
if (!@Settings.SwapItems.Value)
{
return;
}
if (InHighlight || itemContext == null || targetItemContext == null)
{
return;
}
// 3300 cannot apply a to b
// 3293 no possible actions
if (operation.Error is GClass3300 || operation.Error is GClass3293)
{
var item = itemContext.Item;
var targetItem = targetItemContext.Item;
var itemToAddress = new GClass2767(__instance.Slot);
var targetToAddress = item.Parent;
var result = InteractionsHandlerClass.Swap(item, itemToAddress, targetItem, targetToAddress, ___InventoryController, true);
if (result.Succeeded)
{
operation = result;
__result = operation.Succeeded;
}
}
}
}
// The patched method here is called when iterating over all slots to highlight ones that the dragged item can interact with
// Since swap has no special highlight, I just skip the patch here (minor perf, plus makes debugging a million times easier)
public class GetHightLightColorPatch : ModulePatch
{
protected override MethodBase GetTargetMethod()
{
Type type = typeof(GridItemView);
return type.GetMethod("method_12");
}
[PatchPrefix]
private static void Prefix()
{
InHighlight = true;
}
[PatchPostfix]
private static void Postfix()
{
InHighlight = false;
}
}
}
}

1
Plugin.cs
View File

@@ -16,6 +16,7 @@ namespace UIFixes
WeaponZoomPatch.Enable();
new WeaponBindingPatch().Enable();
new DisabledActionsPatch().Enable();
SwapPatch.Enable();
}
}
}

2
Settings.cs
View File

@@ -10,6 +10,7 @@ namespace UIFixes
public static ConfigEntry<bool> UseHomeEnd { get; set; }
public static ConfigEntry<bool> RebindPageUpDown { get; set; }
public static ConfigEntry<bool> RemoveDisabledActions { get; set; }
public static ConfigEntry<bool> SwapItems { get; set; }
public static void Init(ConfigFile config)
{
@@ -19,6 +20,7 @@ namespace UIFixes
UseHomeEnd = config.Bind<bool>("Keybinds", "Add support for Home and End", true, "Home and End will scroll to the top and bottom of lists");
RebindPageUpDown = config.Bind<bool>("Keybinds", "Use normal PageUp and PageDown (requires restart)", true, "Changes PageUp and PageDown to simply page up and down, not scroll all the way to top and bottom");
RemoveDisabledActions = config.Bind<bool>("In Raid", "Hide unimplemented actions", false, "Hides actions you can't actually do, like \"Bang and Clear\", etc from locked doors and other interactable objects");
SwapItems = config.Bind<bool>("Enhancements", "Enable item swapping", true);
}
}
}

2
UIFixes.csproj
View File

@@ -4,7 +4,7 @@
<TargetFramework>net471</TargetFramework>
<AssemblyName>Tyfon.UIFixes</AssemblyName>
<Description>SPT UI Fixes</Description>
<Version>1.1.0</Version>
<Version>1.1.1</Version>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>latest</LangVersion>
</PropertyGroup>