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

block QuickMoveToSortingTable entirely in raid

Browse Source
This commit is contained in:
Tyfon
2024-07-16 12:38:43 -07:00
parent 5169ba01e7
commit 5460659b9e
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Patches/OpenSortingTablePatch.cs
View File

@@ -19,17 +19,24 @@ public class OpenSortingTablePatch : ModulePatch
} }
[PatchPrefix] [PatchPrefix]
public static void Prefix(ItemUiContext __instance) public static bool Prefix(ItemUiContext __instance, ref ItemOperation __result)
{ {
if (!Settings.AutoOpenSortingTable.Value || !AllowedScreens.Contains(__instance.ContextType) || Plugin.InRaid()) // BSG checks visibility, not in-raid. There's a bug where somehow that visibility can be true in raid
if (Plugin.InRaid())
{ {
return; __result = new GClass3370("SortingTable/VisibilityError");
return false;
}
if (!Settings.AutoOpenSortingTable.Value || !AllowedScreens.Contains(__instance.ContextType))
{
return true;
} }
// Temporary work-around for LootValue bug - bail out if the ALT key is down // Temporary work-around for LootValue bug - bail out if the ALT key is down
if (Input.GetKey(KeyCode.LeftAlt)) if (Input.GetKey(KeyCode.LeftAlt))
{ {
return; return true;
} }
SortingTableClass sortingTable = __instance.R().InventoryController.Inventory.SortingTable; SortingTableClass sortingTable = __instance.R().InventoryController.Inventory.SortingTable;
@@ -46,5 +53,7 @@ public class OpenSortingTablePatch : ModulePatch
Singleton<CommonUI>.Instance.ScavengerInventoryScreen.R().SimpleStashPanel.ChangeSortingTableTabState(true); Singleton<CommonUI>.Instance.ScavengerInventoryScreen.R().SimpleStashPanel.ChangeSortingTableTabState(true);
} }
} }
return true;
} }
} }