Skip to content

Handle items in Titan expanded inventory #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0xE0D59 wants to merge 1 commit into
base: ExileCore2
Choose a base branch
from
+39 −3
Open

Handle items in Titan expanded inventory #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 39 additions & 3 deletions Compartments/FilterManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Threading;
using ExileCore2;
using ExileCore2.Shared;
using ExileCore2.Shared.Enums;
using ItemFilterLibrary;
using Stashie.Classes;
using static Stashie.StashieCore;
Expand Down Expand Up @@ -83,12 +84,13 @@ public static FilterResult CheckFilters(ItemData itemData, Vector2N clickPos)

public static async SyncTask<bool> ParseItems()
{
var _serverData = Main.GameController.Game.IngameState.Data.ServerData;
var _controller = Main.GameController;
var _serverData = _controller.Game.IngameState.Data.ServerData;
var invItems = _serverData.PlayerInventories[0].Inventory.InventorySlotItems;

await TaskUtils.CheckEveryFrameWithThrow(() => invItems != null, new CancellationTokenSource(500).Token);
Main.DropItems = [];
Main.ClickWindowOffset = Main.GameController.Window.GetWindowRectangle().TopLeft;
Main.ClickWindowOffset = _controller.Window.GetWindowRectangle().TopLeft;

foreach (var invItem in invItems)
{
Expand All @@ -98,12 +100,46 @@ public static async SyncTask<bool> ParseItems()
if (Utility.CheckIgnoreCells(invItem, (12, 5), Main.Settings.IgnoredCells))
continue;

var testItem = new ItemData(invItem.Item, Main.GameController);
var testItem = new ItemData(invItem.Item, _controller);
var result = CheckFilters(testItem, invItem.GetClientRect().Center);
if (result != null)
Main.DropItems.Add(result);
}

// Handle items in expanded inventory from the Titan ascendancy in PoE 2
HandleExpandedInventory();

void HandleExpandedInventory()
{
var expandedItems = _serverData?.PlayerInventories
?.FirstOrDefault(x => x is { Inventory: { InventSlot: InventorySlotE.ExpandedInventory1, ItemCount: > 0 } })
?.Inventory?.InventorySlotItems;

if (expandedItems is not { Count: > 0 })
return;

var expandedPanel = _controller.IngameState.IngameUi
?.OpenRightPanel
?.GetChildAtIndex(5)
?.GetChildAtIndex(37);

if (expandedPanel?.IsVisible != true)
return;

foreach (var invItem in expandedItems.Where(i => i is { Item: not null}))
{
// TODO: Implement cell ignoring for expanded inventory
// if (Utility.CheckIgnoreCells(invItem, (12, 5), Main.Settings.IgnoredCells))
// continue;

var clickPos = invItem.GetClientRect().Center;
clickPos.X -= 245;

if (CheckFilters(new ItemData(invItem.Item, _controller), clickPos) is { } result)
Main.DropItems.Add(result);
}
}

#region Ignore 1 max stack of wisdoms/portals

if (Main.Settings.KeepHighestIDStack) KeepHighestStackItem("Scroll of Wisdom");
Expand Down