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

Fix binding persisting into unbindable places, fix hoverstate not updating

Browse Source
This commit is contained in:
Tyfon
2024-05-04 12:58:12 -07:00
parent 4c8af4857f
commit 761d29a5c7
2 changed files with 74 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
Patches/SwapPatch.cs
View File

@@ -9,6 +9,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using UnityEngine.EventSystems;
namespace UIFixes namespace UIFixes
{ {
@@ -26,7 +27,7 @@ namespace UIFixes
private static PropertyInfo CanAcceptOperationSucceededProperty; private static PropertyInfo CanAcceptOperationSucceededProperty;
private static PropertyInfo CanAcceptOperationErrorProperty; private static PropertyInfo CanAcceptOperationErrorProperty;
private static Type SwapOperationType; // GStruct414 private static Type SwapOperationType; // GStruct414<GClass2797>
private static MethodInfo SwapOperationToCanAcceptOperationOperator; private static MethodInfo SwapOperationToCanAcceptOperationOperator;
// Source container for the drag - we have to grab this early to check it // Source container for the drag - we have to grab this early to check it
@@ -36,10 +37,13 @@ namespace UIFixes
// Whether we're being called from the "check every slot" loop // Whether we're being called from the "check every slot" loop
private static bool InHighlight = false; private static bool InHighlight = false;
// The most recent CheckItemFilter result // The most recent CheckItemFilter result - needed to differentiate "No room" from incompatible
private static string LastCheckItemFilterId; private static string LastCheckItemFilterId;
private static bool LastCheckItemFilterResult; private static bool LastCheckItemFilterResult;
// The most recent GridItemView that was hovered - needed to forcibly update hover state after swap
private static GridItemView LastHoveredGridItemView;
public static void Enable() public static void Enable()
{ {
GridItemAddressType = PatchConstants.EftTypes.First(t => typeof(ItemAddress).IsAssignableFrom(t) && t.GetProperty("Grid") != null); // GClass2769 GridItemAddressType = PatchConstants.EftTypes.First(t => typeof(ItemAddress).IsAssignableFrom(t) && t.GetProperty("Grid") != null); // GClass2769
@@ -63,6 +67,8 @@ namespace UIFixes
new GetHightLightColorPatch().Enable(); new GetHightLightColorPatch().Enable();
new SlotViewCanAcceptPatch().Enable(); new SlotViewCanAcceptPatch().Enable();
new CheckItemFilterPatch().Enable(); new CheckItemFilterPatch().Enable();
new SwapOperationRaiseEventsPatch().Enable();
new GridItemViewOnPointerEnterPatch().Enable();
} }
private static bool InRaid() private static bool InRaid()
{ {
@@ -297,6 +303,71 @@ namespace UIFixes
} }
} }
// Operations signal their completion status by raising events when they are disposed.
// The Move operation, for example, builds a list of moved items that are no longer valid for binding, and raises unbind events when it completes successfully
// Swap does not do that, because spaghetti, so do it here.
public class SwapOperationRaiseEventsPatch : ModulePatch
{
private static MethodInfo RaiseUnbindItemEvent;
private static Type RaiseUnbindItemEventArgs; // GEventArgs13
protected override MethodBase GetTargetMethod()
{
RaiseUnbindItemEvent = AccessTools.Method(typeof(InventoryControllerClass), "RaiseUnbindItemEvent");
RaiseUnbindItemEventArgs = RaiseUnbindItemEvent.GetParameters()[0].ParameterType;
return AccessTools.Method(SwapOperationType.GenericTypeArguments[0], "RaiseEvents"); // GClass2787
}
[PatchPostfix]
private static void Postfix(TraderControllerClass controller, CommandStatus status, Item ___Item, Item ___Item1)
{
InventoryControllerClass inventoryController = controller as InventoryControllerClass;
if (status != CommandStatus.Succeed || inventoryController == null || ___Item == null || ___Item1 == null)
{
return;
}
if (!inventoryController.IsAtBindablePlace(___Item))
{
var result = inventoryController.UnbindItemDirect(___Item, false);
if (result.Succeeded)
{
result.Value.RaiseEvents(controller, CommandStatus.Begin);
result.Value.RaiseEvents(controller, CommandStatus.Succeed);
}
}
if (!inventoryController.IsAtBindablePlace(___Item1))
{
var result = inventoryController.UnbindItemDirect(___Item1, false);
if (result.Succeeded)
{
result.Value.RaiseEvents(controller, CommandStatus.Begin);
result.Value.RaiseEvents(controller, CommandStatus.Succeed);
}
}
if (LastHoveredGridItemView != null)
{
LastHoveredGridItemView.OnPointerEnter(new PointerEventData(EventSystem.current));
}
}
}
public class GridItemViewOnPointerEnterPatch : ModulePatch
{
protected override MethodBase GetTargetMethod()
{
return AccessTools.Method(typeof(GridItemView), "OnPointerEnter");
}
[PatchPostfix]
private static void Postfix(GridItemView __instance)
{
LastHoveredGridItemView = __instance;
}
}
// Called when dragging an item onto an equipment slot // 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) // Handles any kind of ItemAddress as the target destination (aka where the dragged item came from)
public class SlotViewCanAcceptPatch : ModulePatch public class SlotViewCanAcceptPatch : ModulePatch

2
UIFixes.csproj
View File

@@ -61,6 +61,6 @@
</ItemGroup> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent"> <Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="if $(ConfigurationName) == Debug (&#xD;&#xA; copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)\$(PathToSPT)\BepInEx\plugins\$(TargetName).dll&quot;&#xD;&#xA; copy &quot;$(ProjectDir)$(OutDir)$(TargetName).pdb&quot; &quot;$(ProjectDir)\$(PathToSPT)\BepInEx\plugins\$(TargetName).pdb&quot;&#xD;&#xA;) &#xD;&#xA;if $(ConfigurationName) == Release (&#xD;&#xA; copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)\$(PathToSPT)\BepInEx\plugins\$(TargetName).dll&quot;&#xD;&#xA;)&#xD;&#xA;if $(Configurationname) == Dist (&#xD;&#xA; mkdir &quot;$(ProjectDir)\dist\BepInDex\plugins&quot;&#xD;&#xA; copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)\dist\BepInEx\plugins\$(TargetName).dll&quot;&#xD;&#xA; 7z a -t7z Tyfon-UIFixes-$(Version).7z $(ProjectDir)\dist\BepInEx&#xD;&#xA; move /Y Tyfon-UIFixes-$(Version).7z dist\&#xD;&#xA;)" /> <Exec Command="if $(ConfigurationName) == Debug (&#xD;&#xA; xcopy /F /Y &quot;$(TargetPath)&quot; &quot;$(ProjectDir)\$(PathToSPT)\BepInEx\plugins\$(TargetName).dll&quot;&#xD;&#xA; xcopy /F /Y &quot;$(ProjectDir)$(OutDir)$(TargetName).pdb&quot; &quot;$(ProjectDir)\$(PathToSPT)\BepInEx\plugins\$(TargetName).pdb&quot;&#xD;&#xA;) &#xD;&#xA;if $(ConfigurationName) == Release (&#xD;&#xA; xcopy /F /Y &quot;$(TargetPath)&quot; &quot;$(ProjectDir)\$(PathToSPT)\BepInEx\plugins\$(TargetName).dll&quot;&#xD;&#xA;)&#xD;&#xA;if $(Configurationname) == Dist (&#xD;&#xA; mkdir &quot;$(ProjectDir)\dist\BepInDex\plugins&quot;&#xD;&#xA; xcopy /F /Y &quot;$(TargetPath)&quot; &quot;$(ProjectDir)\dist\BepInEx\plugins\$(TargetName).dll&quot;&#xD;&#xA; 7z a -t7z Tyfon-UIFixes-$(Version).7z $(ProjectDir)\dist\BepInEx&#xD;&#xA; move /Y Tyfon-UIFixes-$(Version).7z dist\&#xD;&#xA;)" />
</Target> </Target>
</Project> </Project>