Skip to content

Add inventory exclude filter (keep items from being dumped to stash)#10

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
greenbrad wants to merge 1 commit into
base:master
Choose a base branch
from
Open

Add inventory exclude filter (keep items from being dumped to stash) #10

Show file tree
Hide file tree
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
169 changes: 150 additions & 19 deletions HighlightedItems.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -423,15 +423,7 @@ public override void Render()
stackSizes += item.Item?.GetComponent<Stack>()?.Size;
if (isCustomFilter)
{
var rect = item.GetClientRectCache;
var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
rect.Inflate(-deflateWidth, -deflateHeight);

var topLeft = rect.TopLeft.ToVector2Num();
var bottomRight = rect.BottomRight.ToVector2Num();
Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
DrawItemFrame(item.GetClientRectCache, Settings.CustomFilterFrameColor);
}
}

Expand DownExpand Up@@ -472,6 +464,30 @@ public override void Render()
? (customPredicate, true)
: (_ => true, false);

DrawInventoryExcludeFilterWindow(inventoryRect.TopLeft.ToVector2Num() + new Vector2(0, -80));
var excludeTerms = GetExcludeTerms();
if (excludeTerms.Length > 0 && (Settings.ShowExcludeHighlight || Settings.ShowExcludeTooltip))
{
var mousePos = Mouse.GetCursorPosition() - WindowOffset;
foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
.Where(x => IsExcluded(x.Item, excludeTerms)))
{
var rect = item.GetClientRect();
if (Settings.ShowExcludeHighlight)
{
DrawItemFrame(rect, Settings.ExcludeFilterFrameColor);
}

if (Settings.ShowExcludeTooltip && rect.Contains(mousePos))
{
ImGui.SetNextWindowPos(ImGui.GetMousePos() + Settings.ExcludeTooltipOffset.Value);
ImGui.BeginTooltip();
ImGui.TextUnformatted(item.Item?.Path ?? "");
ImGui.EndTooltip();
}
}
}

if (Settings.DumpButtonEnable && IsStashTargetOpened)
{
//Determine Inventory Pickup Button position and draw
Expand All@@ -482,17 +498,10 @@ public override void Render()

if (isCustomFilter)
{
foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems.Where(x => itemFilter(x.Item)))
foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
.Where(x => itemFilter(x.Item) && !IsExcluded(x.Item, excludeTerms)))
{
var rect = item.GetClientRect();
var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
rect.Inflate(-deflateWidth, -deflateHeight);

var topLeft = rect.TopLeft.ToVector2Num();
var bottomRight = rect.BottomRight.ToVector2Num();
Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
DrawItemFrame(item.GetClientRect(), Settings.CustomFilterFrameColor);
}
}

Expand All@@ -506,6 +515,7 @@ public override void Render()
var inventoryItems = GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
.Where(x => !IsInIgnoreCell(x))
.Where(x => itemFilter(x.Item))
.Where(x => !IsExcluded(x.Item, excludeTerms))
.OrderBy(x => x.PosX)
.ThenBy(x => x.PosY)
.ToList();
Expand DownExpand Up@@ -680,6 +690,127 @@ private async SyncTask<bool> StopMovingItems() {
return true;
}

private void DrawItemFrame(SharpDX.RectangleF rect, Color color)
{
var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
rect.Inflate(-deflateWidth, -deflateHeight);

Graphics.DrawFrame(rect.TopLeft.ToVector2Num(), rect.BottomRight.ToVector2Num(), color, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
}

private void DrawInventoryExcludeFilterWindow(Vector2 defaultPosition)
{
if (!Settings.ShowInventoryExcludeFilterWindow)
return;

Settings.SavedExcludeFilters ??= [];
ImGui.SetNextWindowPos(defaultPosition, ImGuiCond.FirstUseEver);
if (ImGui.Begin("Inventory exclude filter", ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.AlwaysAutoResize))
{
var saved = Settings.SavedExcludeFilters;
ImGui.TextUnformatted("Keep in inventory");
ImGui.SameLine();
var frameColor = Settings.ExcludeFilterFrameColor.Value;
var colorVec = new System.Numerics.Vector4(frameColor.R / 255f, frameColor.G / 255f, frameColor.B / 255f, frameColor.A / 255f);
if (ImGui.ColorEdit4("##excludecolor", ref colorVec, ImGuiColorEditFlags.NoInputs | ImGuiColorEditFlags.AlphaBar))
Settings.ExcludeFilterFrameColor.Value = new Color(colorVec.X, colorVec.Y, colorVec.Z, colorVec.W);
if (ImGui.IsItemHovered())
ImGui.SetTooltip("Highlight frame color");
var text = Settings.InventoryExcludeFilter.Value ?? "";
ImGui.SetNextItemWidth(250);
if (ImGui.InputTextWithHint("##excludefilter", "metadata or name... (Enter saves)", ref text, 1024, ImGuiInputTextFlags.EnterReturnsTrue))
{
foreach (var term in text.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
{
if (!saved.Any(x => x.Equals(term, StringComparison.OrdinalIgnoreCase)))
saved.Add(term);
}

text = "";
ImGui.SetKeyboardFocusHere(-1);
}

Settings.InventoryExcludeFilter.Value = text;
if (ImGui.IsItemHovered())
ImGui.SetTooltip("Items whose metadata path or name contains any of these terms\nget a gold border and are not moved to the stash.\nPress Enter to save the term, click a saved term to remove it.");

if (saved.Count > 0)
{
var removeIndex = -1;
if (saved.Count > 2)
{
// more than 2 saved filters: collapse them into a popout so the window stays compact
if (ImGui.SmallButton($"Filters ({saved.Count})##hiExcludeList"))
ImGui.OpenPopup("hi_exclude_popup");
ImGui.SameLine();
if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
{
saved.Clear();
Settings.InventoryExcludeFilter.Value = "";
}

if (ImGui.BeginPopup("hi_exclude_popup"))
{
// one filter per line, click to remove it
for (var i = 0; i < saved.Count; i++)
{
if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
removeIndex = i;
}

ImGui.EndPopup();
}
}
else
{
// one small button per saved filter, click to remove it
for (var i = 0; i < saved.Count; i++)
{
if (i > 0) ImGui.SameLine();
if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
removeIndex = i;
}

ImGui.SameLine();
if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
{
saved.Clear();
Settings.InventoryExcludeFilter.Value = "";
}
}

if (removeIndex >= 0 && removeIndex < saved.Count)
saved.RemoveAt(removeIndex);
}
}

ImGui.End();
}

private string[] GetExcludeTerms()
{
var inputTerms = (Settings.InventoryExcludeFilter.Value ?? "")
.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
return (Settings.SavedExcludeFilters ?? [])
.Where(x => !string.IsNullOrWhiteSpace(x))
.Select(x => x.Trim())
.Concat(inputTerms)
.ToArray();
}

private static bool IsExcluded(Entity item, string[] terms)
{
if (item == null || terms.Length == 0)
return false;

var metadata = item.Path ?? "";
var renderName = item.RenderName ?? "";
return terms.Any(t => metadata.Contains(t, StringComparison.OrdinalIgnoreCase) ||
renderName.Contains(t, StringComparison.OrdinalIgnoreCase));
}

private List<NormalInventoryItem> GetHighlightedItems(Inventory stash, Predicate<NormalInventoryItem> filter)
{
try
Expand Down
21 changes: 21 additions & 0 deletions Settings.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,27 @@ public class Settings : ISettings

[Menu("Show Inventory Custom Filter Window")]
public ToggleNode ShowInventoryCustomFilterWindow { get; set; } = new(true);

[Menu("Show Inventory Exclude Filter Window", "Text box that keeps matching inventory items from being dumped to stash")]
public ToggleNode ShowInventoryExcludeFilterWindow { get; set; } = new(true);

[IgnoreMenu]
public TextNode InventoryExcludeFilter { get; set; } = new("");

[IgnoreMenu]
public List<string> SavedExcludeFilters { get; set; } = [];

[Menu("Show Exclude Highlight", "Draw the frame around excluded inventory items (items are still skipped when dumping)")]
public ToggleNode ShowExcludeHighlight { get; set; } = new(true);

[Menu("Show Exclude Metadata Tooltip", "Show the metadata path tooltip when hovering an excluded item")]
public ToggleNode ShowExcludeTooltip { get; set; } = new(true);

[Menu("Exclude Filter Frame Color")]
public ColorNode ExcludeFilterFrameColor { get; set; } = new(new Color(255, 215, 0, 255));

[Menu("Exclude Tooltip Offset", "X/Y offset of the metadata tooltip from the cursor")]
public RangeNode<Vector2> ExcludeTooltipOffset { get; set; } = new(Vector2.Zero, Vector2.One * -1000, Vector2.One * 1000);
public ToggleNode ResetCustomFilterOnPanelClose { get; set; } = new(true);
public ToggleNode UsePopupForFilterSelector { get; set; } = new(false);
public RangeNode<int> CustomFilterFrameThickness { get; set; } = new(2, 1, 20);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add inventory exclude filter (keep items from being dumped to stash) by greenbrad · Pull Request #10 · exApiTools/HighlightedItems · GitHub
Skip to content
Add inventory exclude filter (keep items from being dumped to stash)#10

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

greenbrad
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Add inventory exclude filter (keep items from being dumped to stash)
#10
Show file tree
Hide file tree
 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


169 changes: 150 additions & 19 deletions
HighlightedItems.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,15 +423,7 @@ public override void Render()
 stackSizes += item.Item?.GetComponent<Stack>()?.Size;
 if (isCustomFilter)
 {
 var rect = item.GetClientRectCache;
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRectCache, Settings.CustomFilterFrameColor);
 }
 }

Expand DownExpand Up@@ -472,6 +464,30 @@ public override void Render()
 ? (customPredicate, true)
 : (_ => true, false);

 DrawInventoryExcludeFilterWindow(inventoryRect.TopLeft.ToVector2Num() + new Vector2(0, -80));
 var excludeTerms = GetExcludeTerms();
 if (excludeTerms.Length > 0 && (Settings.ShowExcludeHighlight || Settings.ShowExcludeTooltip))
 {
 var mousePos = Mouse.GetCursorPosition() - WindowOffset;
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 if (Settings.ShowExcludeHighlight)
 {
 DrawItemFrame(rect, Settings.ExcludeFilterFrameColor);
 }

 if (Settings.ShowExcludeTooltip && rect.Contains(mousePos))
 {
 ImGui.SetNextWindowPos(ImGui.GetMousePos() + Settings.ExcludeTooltipOffset.Value);
 ImGui.BeginTooltip();
 ImGui.TextUnformatted(item.Item?.Path ?? "");
 ImGui.EndTooltip();
 }
 }
 }

 if (Settings.DumpButtonEnable && IsStashTargetOpened)
 {
 //Determine Inventory Pickup Button position and draw
Expand All@@ -482,17 +498,10 @@ public override void Render()

 if (isCustomFilter)
 {
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems.Where(x => itemFilter(x.Item)))
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => itemFilter(x.Item) && !IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRect(), Settings.CustomFilterFrameColor);
 }
 }

Expand All@@ -506,6 +515,7 @@ public override void Render()
 var inventoryItems = GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => !IsInIgnoreCell(x))
 .Where(x => itemFilter(x.Item))
 .Where(x => !IsExcluded(x.Item, excludeTerms))
 .OrderBy(x => x.PosX)
 .ThenBy(x => x.PosY)
 .ToList();
Expand DownExpand Up@@ -680,6 +690,127 @@ private async SyncTask<bool> StopMovingItems() {
 return true;
 }

 private void DrawItemFrame(SharpDX.RectangleF rect, Color color)
 {
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 Graphics.DrawFrame(rect.TopLeft.ToVector2Num(), rect.BottomRight.ToVector2Num(), color, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 }

 private void DrawInventoryExcludeFilterWindow(Vector2 defaultPosition)
 {
 if (!Settings.ShowInventoryExcludeFilterWindow)
 return;

 Settings.SavedExcludeFilters ??= [];
 ImGui.SetNextWindowPos(defaultPosition, ImGuiCond.FirstUseEver);
 if (ImGui.Begin("Inventory exclude filter", ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.AlwaysAutoResize))
 {
 var saved = Settings.SavedExcludeFilters;
 ImGui.TextUnformatted("Keep in inventory");
 ImGui.SameLine();
 var frameColor = Settings.ExcludeFilterFrameColor.Value;
 var colorVec = new System.Numerics.Vector4(frameColor.R / 255f, frameColor.G / 255f, frameColor.B / 255f, frameColor.A / 255f);
 if (ImGui.ColorEdit4("##excludecolor", ref colorVec, ImGuiColorEditFlags.NoInputs | ImGuiColorEditFlags.AlphaBar))
 Settings.ExcludeFilterFrameColor.Value = new Color(colorVec.X, colorVec.Y, colorVec.Z, colorVec.W);
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Highlight frame color");
 var text = Settings.InventoryExcludeFilter.Value ?? "";
 ImGui.SetNextItemWidth(250);
 if (ImGui.InputTextWithHint("##excludefilter", "metadata or name... (Enter saves)", ref text, 1024, ImGuiInputTextFlags.EnterReturnsTrue))
 {
 foreach (var term in text.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
 {
 if (!saved.Any(x => x.Equals(term, StringComparison.OrdinalIgnoreCase)))
 saved.Add(term);
 }

 text = "";
 ImGui.SetKeyboardFocusHere(-1);
 }

 Settings.InventoryExcludeFilter.Value = text;
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Items whose metadata path or name contains any of these terms\nget a gold border and are not moved to the stash.\nPress Enter to save the term, click a saved term to remove it.");

 if (saved.Count > 0)
 {
 var removeIndex = -1;
 if (saved.Count > 2)
 {
 // more than 2 saved filters: collapse them into a popout so the window stays compact
 if (ImGui.SmallButton($"Filters ({saved.Count})##hiExcludeList"))
 ImGui.OpenPopup("hi_exclude_popup");
 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }

 if (ImGui.BeginPopup("hi_exclude_popup"))
 {
 // one filter per line, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.EndPopup();
 }
 }
 else
 {
 // one small button per saved filter, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (i > 0) ImGui.SameLine();
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }
 }

 if (removeIndex >= 0 && removeIndex < saved.Count)
 saved.RemoveAt(removeIndex);
 }
 }

 ImGui.End();
 }

 private string[] GetExcludeTerms()
 {
 var inputTerms = (Settings.InventoryExcludeFilter.Value ?? "")
 .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 return (Settings.SavedExcludeFilters ?? [])
 .Where(x => !string.IsNullOrWhiteSpace(x))
 .Select(x => x.Trim())
 .Concat(inputTerms)
 .ToArray();
 }

 private static bool IsExcluded(Entity item, string[] terms)
 {
 if (item == null || terms.Length == 0)
 return false;

 var metadata = item.Path ?? "";
 var renderName = item.RenderName ?? "";
 return terms.Any(t => metadata.Contains(t, StringComparison.OrdinalIgnoreCase) ||
 renderName.Contains(t, StringComparison.OrdinalIgnoreCase));
 }

 private List<NormalInventoryItem> GetHighlightedItems(Inventory stash, Predicate<NormalInventoryItem> filter)
 {
 try
Expand Down

21 changes: 21 additions & 0 deletions
Settings.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,27 @@ public class Settings : ISettings

 [Menu("Show Inventory Custom Filter Window")]
 public ToggleNode ShowInventoryCustomFilterWindow { get; set; } = new(true);

 [Menu("Show Inventory Exclude Filter Window", "Text box that keeps matching inventory items from being dumped to stash")]
 public ToggleNode ShowInventoryExcludeFilterWindow { get; set; } = new(true);

 [IgnoreMenu]
 public TextNode InventoryExcludeFilter { get; set; } = new("");

 [IgnoreMenu]
 public List<string> SavedExcludeFilters { get; set; } = [];

 [Menu("Show Exclude Highlight", "Draw the frame around excluded inventory items (items are still skipped when dumping)")]
 public ToggleNode ShowExcludeHighlight { get; set; } = new(true);

 [Menu("Show Exclude Metadata Tooltip", "Show the metadata path tooltip when hovering an excluded item")]
 public ToggleNode ShowExcludeTooltip { get; set; } = new(true);

 [Menu("Exclude Filter Frame Color")]
 public ColorNode ExcludeFilterFrameColor { get; set; } = new(new Color(255, 215, 0, 255));

 [Menu("Exclude Tooltip Offset", "X/Y offset of the metadata tooltip from the cursor")]
 public RangeNode<Vector2> ExcludeTooltipOffset { get; set; } = new(Vector2.Zero, Vector2.One * -1000, Vector2.One * 1000);
 public ToggleNode ResetCustomFilterOnPanelClose { get; set; } = new(true);
 public ToggleNode UsePopupForFilterSelector { get; set; } = new(false);
 public RangeNode<int> CustomFilterFrameThickness { get; set; } = new(2, 1, 20);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add inventory exclude filter (keep items from being dumped to stash) by greenbrad · Pull Request #10 · exApiTools/HighlightedItems · GitHub
Skip to content
Add inventory exclude filter (keep items from being dumped to stash)#10

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

greenbrad
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Add inventory exclude filter (keep items from being dumped to stash)
#10
Show file tree
Hide file tree
 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


169 changes: 150 additions & 19 deletions
HighlightedItems.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,15 +423,7 @@ public override void Render()
 stackSizes += item.Item?.GetComponent<Stack>()?.Size;
 if (isCustomFilter)
 {
 var rect = item.GetClientRectCache;
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRectCache, Settings.CustomFilterFrameColor);
 }
 }

Expand DownExpand Up@@ -472,6 +464,30 @@ public override void Render()
 ? (customPredicate, true)
 : (_ => true, false);

 DrawInventoryExcludeFilterWindow(inventoryRect.TopLeft.ToVector2Num() + new Vector2(0, -80));
 var excludeTerms = GetExcludeTerms();
 if (excludeTerms.Length > 0 && (Settings.ShowExcludeHighlight || Settings.ShowExcludeTooltip))
 {
 var mousePos = Mouse.GetCursorPosition() - WindowOffset;
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 if (Settings.ShowExcludeHighlight)
 {
 DrawItemFrame(rect, Settings.ExcludeFilterFrameColor);
 }

 if (Settings.ShowExcludeTooltip && rect.Contains(mousePos))
 {
 ImGui.SetNextWindowPos(ImGui.GetMousePos() + Settings.ExcludeTooltipOffset.Value);
 ImGui.BeginTooltip();
 ImGui.TextUnformatted(item.Item?.Path ?? "");
 ImGui.EndTooltip();
 }
 }
 }

 if (Settings.DumpButtonEnable && IsStashTargetOpened)
 {
 //Determine Inventory Pickup Button position and draw
Expand All@@ -482,17 +498,10 @@ public override void Render()

 if (isCustomFilter)
 {
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems.Where(x => itemFilter(x.Item)))
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => itemFilter(x.Item) && !IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRect(), Settings.CustomFilterFrameColor);
 }
 }

Expand All@@ -506,6 +515,7 @@ public override void Render()
 var inventoryItems = GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => !IsInIgnoreCell(x))
 .Where(x => itemFilter(x.Item))
 .Where(x => !IsExcluded(x.Item, excludeTerms))
 .OrderBy(x => x.PosX)
 .ThenBy(x => x.PosY)
 .ToList();
Expand DownExpand Up@@ -680,6 +690,127 @@ private async SyncTask<bool> StopMovingItems() {
 return true;
 }

 private void DrawItemFrame(SharpDX.RectangleF rect, Color color)
 {
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 Graphics.DrawFrame(rect.TopLeft.ToVector2Num(), rect.BottomRight.ToVector2Num(), color, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 }

 private void DrawInventoryExcludeFilterWindow(Vector2 defaultPosition)
 {
 if (!Settings.ShowInventoryExcludeFilterWindow)
 return;

 Settings.SavedExcludeFilters ??= [];
 ImGui.SetNextWindowPos(defaultPosition, ImGuiCond.FirstUseEver);
 if (ImGui.Begin("Inventory exclude filter", ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.AlwaysAutoResize))
 {
 var saved = Settings.SavedExcludeFilters;
 ImGui.TextUnformatted("Keep in inventory");
 ImGui.SameLine();
 var frameColor = Settings.ExcludeFilterFrameColor.Value;
 var colorVec = new System.Numerics.Vector4(frameColor.R / 255f, frameColor.G / 255f, frameColor.B / 255f, frameColor.A / 255f);
 if (ImGui.ColorEdit4("##excludecolor", ref colorVec, ImGuiColorEditFlags.NoInputs | ImGuiColorEditFlags.AlphaBar))
 Settings.ExcludeFilterFrameColor.Value = new Color(colorVec.X, colorVec.Y, colorVec.Z, colorVec.W);
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Highlight frame color");
 var text = Settings.InventoryExcludeFilter.Value ?? "";
 ImGui.SetNextItemWidth(250);
 if (ImGui.InputTextWithHint("##excludefilter", "metadata or name... (Enter saves)", ref text, 1024, ImGuiInputTextFlags.EnterReturnsTrue))
 {
 foreach (var term in text.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
 {
 if (!saved.Any(x => x.Equals(term, StringComparison.OrdinalIgnoreCase)))
 saved.Add(term);
 }

 text = "";
 ImGui.SetKeyboardFocusHere(-1);
 }

 Settings.InventoryExcludeFilter.Value = text;
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Items whose metadata path or name contains any of these terms\nget a gold border and are not moved to the stash.\nPress Enter to save the term, click a saved term to remove it.");

 if (saved.Count > 0)
 {
 var removeIndex = -1;
 if (saved.Count > 2)
 {
 // more than 2 saved filters: collapse them into a popout so the window stays compact
 if (ImGui.SmallButton($"Filters ({saved.Count})##hiExcludeList"))
 ImGui.OpenPopup("hi_exclude_popup");
 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }

 if (ImGui.BeginPopup("hi_exclude_popup"))
 {
 // one filter per line, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.EndPopup();
 }
 }
 else
 {
 // one small button per saved filter, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (i > 0) ImGui.SameLine();
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }
 }

 if (removeIndex >= 0 && removeIndex < saved.Count)
 saved.RemoveAt(removeIndex);
 }
 }

 ImGui.End();
 }

 private string[] GetExcludeTerms()
 {
 var inputTerms = (Settings.InventoryExcludeFilter.Value ?? "")
 .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 return (Settings.SavedExcludeFilters ?? [])
 .Where(x => !string.IsNullOrWhiteSpace(x))
 .Select(x => x.Trim())
 .Concat(inputTerms)
 .ToArray();
 }

 private static bool IsExcluded(Entity item, string[] terms)
 {
 if (item == null || terms.Length == 0)
 return false;

 var metadata = item.Path ?? "";
 var renderName = item.RenderName ?? "";
 return terms.Any(t => metadata.Contains(t, StringComparison.OrdinalIgnoreCase) ||
 renderName.Contains(t, StringComparison.OrdinalIgnoreCase));
 }

 private List<NormalInventoryItem> GetHighlightedItems(Inventory stash, Predicate<NormalInventoryItem> filter)
 {
 try
Expand Down

21 changes: 21 additions & 0 deletions
Settings.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,27 @@ public class Settings : ISettings

 [Menu("Show Inventory Custom Filter Window")]
 public ToggleNode ShowInventoryCustomFilterWindow { get; set; } = new(true);

 [Menu("Show Inventory Exclude Filter Window", "Text box that keeps matching inventory items from being dumped to stash")]
 public ToggleNode ShowInventoryExcludeFilterWindow { get; set; } = new(true);

 [IgnoreMenu]
 public TextNode InventoryExcludeFilter { get; set; } = new("");

 [IgnoreMenu]
 public List<string> SavedExcludeFilters { get; set; } = [];

 [Menu("Show Exclude Highlight", "Draw the frame around excluded inventory items (items are still skipped when dumping)")]
 public ToggleNode ShowExcludeHighlight { get; set; } = new(true);

 [Menu("Show Exclude Metadata Tooltip", "Show the metadata path tooltip when hovering an excluded item")]
 public ToggleNode ShowExcludeTooltip { get; set; } = new(true);

 [Menu("Exclude Filter Frame Color")]
 public ColorNode ExcludeFilterFrameColor { get; set; } = new(new Color(255, 215, 0, 255));

 [Menu("Exclude Tooltip Offset", "X/Y offset of the metadata tooltip from the cursor")]
 public RangeNode<Vector2> ExcludeTooltipOffset { get; set; } = new(Vector2.Zero, Vector2.One * -1000, Vector2.One * 1000);
 public ToggleNode ResetCustomFilterOnPanelClose { get; set; } = new(true);
 public ToggleNode UsePopupForFilterSelector { get; set; } = new(false);
 public RangeNode<int> CustomFilterFrameThickness { get; set; } = new(2, 1, 20);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add inventory exclude filter (keep items from being dumped to stash) by greenbrad · Pull Request #10 · exApiTools/HighlightedItems · GitHub
Skip to content
Add inventory exclude filter (keep items from being dumped to stash)#10

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

greenbrad
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Add inventory exclude filter (keep items from being dumped to stash)
#10
Show file tree
Hide file tree
 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


169 changes: 150 additions & 19 deletions
HighlightedItems.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,15 +423,7 @@ public override void Render()
 stackSizes += item.Item?.GetComponent<Stack>()?.Size;
 if (isCustomFilter)
 {
 var rect = item.GetClientRectCache;
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRectCache, Settings.CustomFilterFrameColor);
 }
 }

Expand DownExpand Up@@ -472,6 +464,30 @@ public override void Render()
 ? (customPredicate, true)
 : (_ => true, false);

 DrawInventoryExcludeFilterWindow(inventoryRect.TopLeft.ToVector2Num() + new Vector2(0, -80));
 var excludeTerms = GetExcludeTerms();
 if (excludeTerms.Length > 0 && (Settings.ShowExcludeHighlight || Settings.ShowExcludeTooltip))
 {
 var mousePos = Mouse.GetCursorPosition() - WindowOffset;
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 if (Settings.ShowExcludeHighlight)
 {
 DrawItemFrame(rect, Settings.ExcludeFilterFrameColor);
 }

 if (Settings.ShowExcludeTooltip && rect.Contains(mousePos))
 {
 ImGui.SetNextWindowPos(ImGui.GetMousePos() + Settings.ExcludeTooltipOffset.Value);
 ImGui.BeginTooltip();
 ImGui.TextUnformatted(item.Item?.Path ?? "");
 ImGui.EndTooltip();
 }
 }
 }

 if (Settings.DumpButtonEnable && IsStashTargetOpened)
 {
 //Determine Inventory Pickup Button position and draw
Expand All@@ -482,17 +498,10 @@ public override void Render()

 if (isCustomFilter)
 {
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems.Where(x => itemFilter(x.Item)))
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => itemFilter(x.Item) && !IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRect(), Settings.CustomFilterFrameColor);
 }
 }

Expand All@@ -506,6 +515,7 @@ public override void Render()
 var inventoryItems = GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => !IsInIgnoreCell(x))
 .Where(x => itemFilter(x.Item))
 .Where(x => !IsExcluded(x.Item, excludeTerms))
 .OrderBy(x => x.PosX)
 .ThenBy(x => x.PosY)
 .ToList();
Expand DownExpand Up@@ -680,6 +690,127 @@ private async SyncTask<bool> StopMovingItems() {
 return true;
 }

 private void DrawItemFrame(SharpDX.RectangleF rect, Color color)
 {
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 Graphics.DrawFrame(rect.TopLeft.ToVector2Num(), rect.BottomRight.ToVector2Num(), color, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 }

 private void DrawInventoryExcludeFilterWindow(Vector2 defaultPosition)
 {
 if (!Settings.ShowInventoryExcludeFilterWindow)
 return;

 Settings.SavedExcludeFilters ??= [];
 ImGui.SetNextWindowPos(defaultPosition, ImGuiCond.FirstUseEver);
 if (ImGui.Begin("Inventory exclude filter", ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.AlwaysAutoResize))
 {
 var saved = Settings.SavedExcludeFilters;
 ImGui.TextUnformatted("Keep in inventory");
 ImGui.SameLine();
 var frameColor = Settings.ExcludeFilterFrameColor.Value;
 var colorVec = new System.Numerics.Vector4(frameColor.R / 255f, frameColor.G / 255f, frameColor.B / 255f, frameColor.A / 255f);
 if (ImGui.ColorEdit4("##excludecolor", ref colorVec, ImGuiColorEditFlags.NoInputs | ImGuiColorEditFlags.AlphaBar))
 Settings.ExcludeFilterFrameColor.Value = new Color(colorVec.X, colorVec.Y, colorVec.Z, colorVec.W);
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Highlight frame color");
 var text = Settings.InventoryExcludeFilter.Value ?? "";
 ImGui.SetNextItemWidth(250);
 if (ImGui.InputTextWithHint("##excludefilter", "metadata or name... (Enter saves)", ref text, 1024, ImGuiInputTextFlags.EnterReturnsTrue))
 {
 foreach (var term in text.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
 {
 if (!saved.Any(x => x.Equals(term, StringComparison.OrdinalIgnoreCase)))
 saved.Add(term);
 }

 text = "";
 ImGui.SetKeyboardFocusHere(-1);
 }

 Settings.InventoryExcludeFilter.Value = text;
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Items whose metadata path or name contains any of these terms\nget a gold border and are not moved to the stash.\nPress Enter to save the term, click a saved term to remove it.");

 if (saved.Count > 0)
 {
 var removeIndex = -1;
 if (saved.Count > 2)
 {
 // more than 2 saved filters: collapse them into a popout so the window stays compact
 if (ImGui.SmallButton($"Filters ({saved.Count})##hiExcludeList"))
 ImGui.OpenPopup("hi_exclude_popup");
 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }

 if (ImGui.BeginPopup("hi_exclude_popup"))
 {
 // one filter per line, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.EndPopup();
 }
 }
 else
 {
 // one small button per saved filter, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (i > 0) ImGui.SameLine();
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }
 }

 if (removeIndex >= 0 && removeIndex < saved.Count)
 saved.RemoveAt(removeIndex);
 }
 }

 ImGui.End();
 }

 private string[] GetExcludeTerms()
 {
 var inputTerms = (Settings.InventoryExcludeFilter.Value ?? "")
 .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 return (Settings.SavedExcludeFilters ?? [])
 .Where(x => !string.IsNullOrWhiteSpace(x))
 .Select(x => x.Trim())
 .Concat(inputTerms)
 .ToArray();
 }

 private static bool IsExcluded(Entity item, string[] terms)
 {
 if (item == null || terms.Length == 0)
 return false;

 var metadata = item.Path ?? "";
 var renderName = item.RenderName ?? "";
 return terms.Any(t => metadata.Contains(t, StringComparison.OrdinalIgnoreCase) ||
 renderName.Contains(t, StringComparison.OrdinalIgnoreCase));
 }

 private List<NormalInventoryItem> GetHighlightedItems(Inventory stash, Predicate<NormalInventoryItem> filter)
 {
 try
Expand Down

21 changes: 21 additions & 0 deletions
Settings.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,27 @@ public class Settings : ISettings

 [Menu("Show Inventory Custom Filter Window")]
 public ToggleNode ShowInventoryCustomFilterWindow { get; set; } = new(true);

 [Menu("Show Inventory Exclude Filter Window", "Text box that keeps matching inventory items from being dumped to stash")]
 public ToggleNode ShowInventoryExcludeFilterWindow { get; set; } = new(true);

 [IgnoreMenu]
 public TextNode InventoryExcludeFilter { get; set; } = new("");

 [IgnoreMenu]
 public List<string> SavedExcludeFilters { get; set; } = [];

 [Menu("Show Exclude Highlight", "Draw the frame around excluded inventory items (items are still skipped when dumping)")]
 public ToggleNode ShowExcludeHighlight { get; set; } = new(true);

 [Menu("Show Exclude Metadata Tooltip", "Show the metadata path tooltip when hovering an excluded item")]
 public ToggleNode ShowExcludeTooltip { get; set; } = new(true);

 [Menu("Exclude Filter Frame Color")]
 public ColorNode ExcludeFilterFrameColor { get; set; } = new(new Color(255, 215, 0, 255));

 [Menu("Exclude Tooltip Offset", "X/Y offset of the metadata tooltip from the cursor")]
 public RangeNode<Vector2> ExcludeTooltipOffset { get; set; } = new(Vector2.Zero, Vector2.One * -1000, Vector2.One * 1000);
 public ToggleNode ResetCustomFilterOnPanelClose { get; set; } = new(true);
 public ToggleNode UsePopupForFilterSelector { get; set; } = new(false);
 public RangeNode<int> CustomFilterFrameThickness { get; set; } = new(2, 1, 20);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Add inventory exclude filter (keep items from being dumped to stash) by greenbrad · Pull Request #10 · exApiTools/HighlightedItems · GitHub
Skip to content
Add inventory exclude filter (keep items from being dumped to stash)#10

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

greenbrad
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Add inventory exclude filter (keep items from being dumped to stash)
#10
Show file tree
Hide file tree
 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


169 changes: 150 additions & 19 deletions
HighlightedItems.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,15 +423,7 @@ public override void Render()
 stackSizes += item.Item?.GetComponent<Stack>()?.Size;
 if (isCustomFilter)
 {
 var rect = item.GetClientRectCache;
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRectCache, Settings.CustomFilterFrameColor);
 }
 }

Expand DownExpand Up@@ -472,6 +464,30 @@ public override void Render()
 ? (customPredicate, true)
 : (_ => true, false);

 DrawInventoryExcludeFilterWindow(inventoryRect.TopLeft.ToVector2Num() + new Vector2(0, -80));
 var excludeTerms = GetExcludeTerms();
 if (excludeTerms.Length > 0 && (Settings.ShowExcludeHighlight || Settings.ShowExcludeTooltip))
 {
 var mousePos = Mouse.GetCursorPosition() - WindowOffset;
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 if (Settings.ShowExcludeHighlight)
 {
 DrawItemFrame(rect, Settings.ExcludeFilterFrameColor);
 }

 if (Settings.ShowExcludeTooltip && rect.Contains(mousePos))
 {
 ImGui.SetNextWindowPos(ImGui.GetMousePos() + Settings.ExcludeTooltipOffset.Value);
 ImGui.BeginTooltip();
 ImGui.TextUnformatted(item.Item?.Path ?? "");
 ImGui.EndTooltip();
 }
 }
 }

 if (Settings.DumpButtonEnable && IsStashTargetOpened)
 {
 //Determine Inventory Pickup Button position and draw
Expand All@@ -482,17 +498,10 @@ public override void Render()

 if (isCustomFilter)
 {
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems.Where(x => itemFilter(x.Item)))
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => itemFilter(x.Item) && !IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRect(), Settings.CustomFilterFrameColor);
 }
 }

Expand All@@ -506,6 +515,7 @@ public override void Render()
 var inventoryItems = GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => !IsInIgnoreCell(x))
 .Where(x => itemFilter(x.Item))
 .Where(x => !IsExcluded(x.Item, excludeTerms))
 .OrderBy(x => x.PosX)
 .ThenBy(x => x.PosY)
 .ToList();
Expand DownExpand Up@@ -680,6 +690,127 @@ private async SyncTask<bool> StopMovingItems() {
 return true;
 }

 private void DrawItemFrame(SharpDX.RectangleF rect, Color color)
 {
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 Graphics.DrawFrame(rect.TopLeft.ToVector2Num(), rect.BottomRight.ToVector2Num(), color, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 }

 private void DrawInventoryExcludeFilterWindow(Vector2 defaultPosition)
 {
 if (!Settings.ShowInventoryExcludeFilterWindow)
 return;

 Settings.SavedExcludeFilters ??= [];
 ImGui.SetNextWindowPos(defaultPosition, ImGuiCond.FirstUseEver);
 if (ImGui.Begin("Inventory exclude filter", ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.AlwaysAutoResize))
 {
 var saved = Settings.SavedExcludeFilters;
 ImGui.TextUnformatted("Keep in inventory");
 ImGui.SameLine();
 var frameColor = Settings.ExcludeFilterFrameColor.Value;
 var colorVec = new System.Numerics.Vector4(frameColor.R / 255f, frameColor.G / 255f, frameColor.B / 255f, frameColor.A / 255f);
 if (ImGui.ColorEdit4("##excludecolor", ref colorVec, ImGuiColorEditFlags.NoInputs | ImGuiColorEditFlags.AlphaBar))
 Settings.ExcludeFilterFrameColor.Value = new Color(colorVec.X, colorVec.Y, colorVec.Z, colorVec.W);
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Highlight frame color");
 var text = Settings.InventoryExcludeFilter.Value ?? "";
 ImGui.SetNextItemWidth(250);
 if (ImGui.InputTextWithHint("##excludefilter", "metadata or name... (Enter saves)", ref text, 1024, ImGuiInputTextFlags.EnterReturnsTrue))
 {
 foreach (var term in text.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
 {
 if (!saved.Any(x => x.Equals(term, StringComparison.OrdinalIgnoreCase)))
 saved.Add(term);
 }

 text = "";
 ImGui.SetKeyboardFocusHere(-1);
 }

 Settings.InventoryExcludeFilter.Value = text;
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Items whose metadata path or name contains any of these terms\nget a gold border and are not moved to the stash.\nPress Enter to save the term, click a saved term to remove it.");

 if (saved.Count > 0)
 {
 var removeIndex = -1;
 if (saved.Count > 2)
 {
 // more than 2 saved filters: collapse them into a popout so the window stays compact
 if (ImGui.SmallButton($"Filters ({saved.Count})##hiExcludeList"))
 ImGui.OpenPopup("hi_exclude_popup");
 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }

 if (ImGui.BeginPopup("hi_exclude_popup"))
 {
 // one filter per line, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.EndPopup();
 }
 }
 else
 {
 // one small button per saved filter, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (i > 0) ImGui.SameLine();
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }
 }

 if (removeIndex >= 0 && removeIndex < saved.Count)
 saved.RemoveAt(removeIndex);
 }
 }

 ImGui.End();
 }

 private string[] GetExcludeTerms()
 {
 var inputTerms = (Settings.InventoryExcludeFilter.Value ?? "")
 .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 return (Settings.SavedExcludeFilters ?? [])
 .Where(x => !string.IsNullOrWhiteSpace(x))
 .Select(x => x.Trim())
 .Concat(inputTerms)
 .ToArray();
 }

 private static bool IsExcluded(Entity item, string[] terms)
 {
 if (item == null || terms.Length == 0)
 return false;

 var metadata = item.Path ?? "";
 var renderName = item.RenderName ?? "";
 return terms.Any(t => metadata.Contains(t, StringComparison.OrdinalIgnoreCase) ||
 renderName.Contains(t, StringComparison.OrdinalIgnoreCase));
 }

 private List<NormalInventoryItem> GetHighlightedItems(Inventory stash, Predicate<NormalInventoryItem> filter)
 {
 try
Expand Down

21 changes: 21 additions & 0 deletions
Settings.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,27 @@ public class Settings : ISettings

 [Menu("Show Inventory Custom Filter Window")]
 public ToggleNode ShowInventoryCustomFilterWindow { get; set; } = new(true);

 [Menu("Show Inventory Exclude Filter Window", "Text box that keeps matching inventory items from being dumped to stash")]
 public ToggleNode ShowInventoryExcludeFilterWindow { get; set; } = new(true);

 [IgnoreMenu]
 public TextNode InventoryExcludeFilter { get; set; } = new("");

 [IgnoreMenu]
 public List<string> SavedExcludeFilters { get; set; } = [];

 [Menu("Show Exclude Highlight", "Draw the frame around excluded inventory items (items are still skipped when dumping)")]
 public ToggleNode ShowExcludeHighlight { get; set; } = new(true);

 [Menu("Show Exclude Metadata Tooltip", "Show the metadata path tooltip when hovering an excluded item")]
 public ToggleNode ShowExcludeTooltip { get; set; } = new(true);

 [Menu("Exclude Filter Frame Color")]
 public ColorNode ExcludeFilterFrameColor { get; set; } = new(new Color(255, 215, 0, 255));

 [Menu("Exclude Tooltip Offset", "X/Y offset of the metadata tooltip from the cursor")]
 public RangeNode<Vector2> ExcludeTooltipOffset { get; set; } = new(Vector2.Zero, Vector2.One * -1000, Vector2.One * 1000);
 public ToggleNode ResetCustomFilterOnPanelClose { get; set; } = new(true);
 public ToggleNode UsePopupForFilterSelector { get; set; } = new(false);
 public RangeNode<int> CustomFilterFrameThickness { get; set; } = new(2, 1, 20);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add inventory exclude filter (keep items from being dumped to stash) by greenbrad · Pull Request #10 · exApiTools/HighlightedItems · GitHub
Skip to content
Add inventory exclude filter (keep items from being dumped to stash)#10

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

greenbrad
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Add inventory exclude filter (keep items from being dumped to stash)
#10
Show file tree
Hide file tree
 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


169 changes: 150 additions & 19 deletions
HighlightedItems.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,15 +423,7 @@ public override void Render()
 stackSizes += item.Item?.GetComponent<Stack>()?.Size;
 if (isCustomFilter)
 {
 var rect = item.GetClientRectCache;
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRectCache, Settings.CustomFilterFrameColor);
 }
 }

Expand DownExpand Up@@ -472,6 +464,30 @@ public override void Render()
 ? (customPredicate, true)
 : (_ => true, false);

 DrawInventoryExcludeFilterWindow(inventoryRect.TopLeft.ToVector2Num() + new Vector2(0, -80));
 var excludeTerms = GetExcludeTerms();
 if (excludeTerms.Length > 0 && (Settings.ShowExcludeHighlight || Settings.ShowExcludeTooltip))
 {
 var mousePos = Mouse.GetCursorPosition() - WindowOffset;
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 if (Settings.ShowExcludeHighlight)
 {
 DrawItemFrame(rect, Settings.ExcludeFilterFrameColor);
 }

 if (Settings.ShowExcludeTooltip && rect.Contains(mousePos))
 {
 ImGui.SetNextWindowPos(ImGui.GetMousePos() + Settings.ExcludeTooltipOffset.Value);
 ImGui.BeginTooltip();
 ImGui.TextUnformatted(item.Item?.Path ?? "");
 ImGui.EndTooltip();
 }
 }
 }

 if (Settings.DumpButtonEnable && IsStashTargetOpened)
 {
 //Determine Inventory Pickup Button position and draw
Expand All@@ -482,17 +498,10 @@ public override void Render()

 if (isCustomFilter)
 {
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems.Where(x => itemFilter(x.Item)))
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => itemFilter(x.Item) && !IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRect(), Settings.CustomFilterFrameColor);
 }
 }

Expand All@@ -506,6 +515,7 @@ public override void Render()
 var inventoryItems = GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => !IsInIgnoreCell(x))
 .Where(x => itemFilter(x.Item))
 .Where(x => !IsExcluded(x.Item, excludeTerms))
 .OrderBy(x => x.PosX)
 .ThenBy(x => x.PosY)
 .ToList();
Expand DownExpand Up@@ -680,6 +690,127 @@ private async SyncTask<bool> StopMovingItems() {
 return true;
 }

 private void DrawItemFrame(SharpDX.RectangleF rect, Color color)
 {
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 Graphics.DrawFrame(rect.TopLeft.ToVector2Num(), rect.BottomRight.ToVector2Num(), color, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 }

 private void DrawInventoryExcludeFilterWindow(Vector2 defaultPosition)
 {
 if (!Settings.ShowInventoryExcludeFilterWindow)
 return;

 Settings.SavedExcludeFilters ??= [];
 ImGui.SetNextWindowPos(defaultPosition, ImGuiCond.FirstUseEver);
 if (ImGui.Begin("Inventory exclude filter", ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.AlwaysAutoResize))
 {
 var saved = Settings.SavedExcludeFilters;
 ImGui.TextUnformatted("Keep in inventory");
 ImGui.SameLine();
 var frameColor = Settings.ExcludeFilterFrameColor.Value;
 var colorVec = new System.Numerics.Vector4(frameColor.R / 255f, frameColor.G / 255f, frameColor.B / 255f, frameColor.A / 255f);
 if (ImGui.ColorEdit4("##excludecolor", ref colorVec, ImGuiColorEditFlags.NoInputs | ImGuiColorEditFlags.AlphaBar))
 Settings.ExcludeFilterFrameColor.Value = new Color(colorVec.X, colorVec.Y, colorVec.Z, colorVec.W);
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Highlight frame color");
 var text = Settings.InventoryExcludeFilter.Value ?? "";
 ImGui.SetNextItemWidth(250);
 if (ImGui.InputTextWithHint("##excludefilter", "metadata or name... (Enter saves)", ref text, 1024, ImGuiInputTextFlags.EnterReturnsTrue))
 {
 foreach (var term in text.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
 {
 if (!saved.Any(x => x.Equals(term, StringComparison.OrdinalIgnoreCase)))
 saved.Add(term);
 }

 text = "";
 ImGui.SetKeyboardFocusHere(-1);
 }

 Settings.InventoryExcludeFilter.Value = text;
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Items whose metadata path or name contains any of these terms\nget a gold border and are not moved to the stash.\nPress Enter to save the term, click a saved term to remove it.");

 if (saved.Count > 0)
 {
 var removeIndex = -1;
 if (saved.Count > 2)
 {
 // more than 2 saved filters: collapse them into a popout so the window stays compact
 if (ImGui.SmallButton($"Filters ({saved.Count})##hiExcludeList"))
 ImGui.OpenPopup("hi_exclude_popup");
 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }

 if (ImGui.BeginPopup("hi_exclude_popup"))
 {
 // one filter per line, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.EndPopup();
 }
 }
 else
 {
 // one small button per saved filter, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (i > 0) ImGui.SameLine();
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }
 }

 if (removeIndex >= 0 && removeIndex < saved.Count)
 saved.RemoveAt(removeIndex);
 }
 }

 ImGui.End();
 }

 private string[] GetExcludeTerms()
 {
 var inputTerms = (Settings.InventoryExcludeFilter.Value ?? "")
 .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 return (Settings.SavedExcludeFilters ?? [])
 .Where(x => !string.IsNullOrWhiteSpace(x))
 .Select(x => x.Trim())
 .Concat(inputTerms)
 .ToArray();
 }

 private static bool IsExcluded(Entity item, string[] terms)
 {
 if (item == null || terms.Length == 0)
 return false;

 var metadata = item.Path ?? "";
 var renderName = item.RenderName ?? "";
 return terms.Any(t => metadata.Contains(t, StringComparison.OrdinalIgnoreCase) ||
 renderName.Contains(t, StringComparison.OrdinalIgnoreCase));
 }

 private List<NormalInventoryItem> GetHighlightedItems(Inventory stash, Predicate<NormalInventoryItem> filter)
 {
 try
Expand Down

21 changes: 21 additions & 0 deletions
Settings.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,27 @@ public class Settings : ISettings

 [Menu("Show Inventory Custom Filter Window")]
 public ToggleNode ShowInventoryCustomFilterWindow { get; set; } = new(true);

 [Menu("Show Inventory Exclude Filter Window", "Text box that keeps matching inventory items from being dumped to stash")]
 public ToggleNode ShowInventoryExcludeFilterWindow { get; set; } = new(true);

 [IgnoreMenu]
 public TextNode InventoryExcludeFilter { get; set; } = new("");

 [IgnoreMenu]
 public List<string> SavedExcludeFilters { get; set; } = [];

 [Menu("Show Exclude Highlight", "Draw the frame around excluded inventory items (items are still skipped when dumping)")]
 public ToggleNode ShowExcludeHighlight { get; set; } = new(true);

 [Menu("Show Exclude Metadata Tooltip", "Show the metadata path tooltip when hovering an excluded item")]
 public ToggleNode ShowExcludeTooltip { get; set; } = new(true);

 [Menu("Exclude Filter Frame Color")]
 public ColorNode ExcludeFilterFrameColor { get; set; } = new(new Color(255, 215, 0, 255));

 [Menu("Exclude Tooltip Offset", "X/Y offset of the metadata tooltip from the cursor")]
 public RangeNode<Vector2> ExcludeTooltipOffset { get; set; } = new(Vector2.Zero, Vector2.One * -1000, Vector2.One * 1000);
 public ToggleNode ResetCustomFilterOnPanelClose { get; set; } = new(true);
 public ToggleNode UsePopupForFilterSelector { get; set; } = new(false);
 public RangeNode<int> CustomFilterFrameThickness { get; set; } = new(2, 1, 20);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add inventory exclude filter (keep items from being dumped to stash) by greenbrad · Pull Request #10 · exApiTools/HighlightedItems · GitHub
Skip to content
Add inventory exclude filter (keep items from being dumped to stash)#10

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

greenbrad
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Add inventory exclude filter (keep items from being dumped to stash)
#10
Show file tree
Hide file tree
 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


169 changes: 150 additions & 19 deletions
HighlightedItems.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,15 +423,7 @@ public override void Render()
 stackSizes += item.Item?.GetComponent<Stack>()?.Size;
 if (isCustomFilter)
 {
 var rect = item.GetClientRectCache;
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRectCache, Settings.CustomFilterFrameColor);
 }
 }

Expand DownExpand Up@@ -472,6 +464,30 @@ public override void Render()
 ? (customPredicate, true)
 : (_ => true, false);

 DrawInventoryExcludeFilterWindow(inventoryRect.TopLeft.ToVector2Num() + new Vector2(0, -80));
 var excludeTerms = GetExcludeTerms();
 if (excludeTerms.Length > 0 && (Settings.ShowExcludeHighlight || Settings.ShowExcludeTooltip))
 {
 var mousePos = Mouse.GetCursorPosition() - WindowOffset;
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 if (Settings.ShowExcludeHighlight)
 {
 DrawItemFrame(rect, Settings.ExcludeFilterFrameColor);
 }

 if (Settings.ShowExcludeTooltip && rect.Contains(mousePos))
 {
 ImGui.SetNextWindowPos(ImGui.GetMousePos() + Settings.ExcludeTooltipOffset.Value);
 ImGui.BeginTooltip();
 ImGui.TextUnformatted(item.Item?.Path ?? "");
 ImGui.EndTooltip();
 }
 }
 }

 if (Settings.DumpButtonEnable && IsStashTargetOpened)
 {
 //Determine Inventory Pickup Button position and draw
Expand All@@ -482,17 +498,10 @@ public override void Render()

 if (isCustomFilter)
 {
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems.Where(x => itemFilter(x.Item)))
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => itemFilter(x.Item) && !IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRect(), Settings.CustomFilterFrameColor);
 }
 }

Expand All@@ -506,6 +515,7 @@ public override void Render()
 var inventoryItems = GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => !IsInIgnoreCell(x))
 .Where(x => itemFilter(x.Item))
 .Where(x => !IsExcluded(x.Item, excludeTerms))
 .OrderBy(x => x.PosX)
 .ThenBy(x => x.PosY)
 .ToList();
Expand DownExpand Up@@ -680,6 +690,127 @@ private async SyncTask<bool> StopMovingItems() {
 return true;
 }

 private void DrawItemFrame(SharpDX.RectangleF rect, Color color)
 {
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 Graphics.DrawFrame(rect.TopLeft.ToVector2Num(), rect.BottomRight.ToVector2Num(), color, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 }

 private void DrawInventoryExcludeFilterWindow(Vector2 defaultPosition)
 {
 if (!Settings.ShowInventoryExcludeFilterWindow)
 return;

 Settings.SavedExcludeFilters ??= [];
 ImGui.SetNextWindowPos(defaultPosition, ImGuiCond.FirstUseEver);
 if (ImGui.Begin("Inventory exclude filter", ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.AlwaysAutoResize))
 {
 var saved = Settings.SavedExcludeFilters;
 ImGui.TextUnformatted("Keep in inventory");
 ImGui.SameLine();
 var frameColor = Settings.ExcludeFilterFrameColor.Value;
 var colorVec = new System.Numerics.Vector4(frameColor.R / 255f, frameColor.G / 255f, frameColor.B / 255f, frameColor.A / 255f);
 if (ImGui.ColorEdit4("##excludecolor", ref colorVec, ImGuiColorEditFlags.NoInputs | ImGuiColorEditFlags.AlphaBar))
 Settings.ExcludeFilterFrameColor.Value = new Color(colorVec.X, colorVec.Y, colorVec.Z, colorVec.W);
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Highlight frame color");
 var text = Settings.InventoryExcludeFilter.Value ?? "";
 ImGui.SetNextItemWidth(250);
 if (ImGui.InputTextWithHint("##excludefilter", "metadata or name... (Enter saves)", ref text, 1024, ImGuiInputTextFlags.EnterReturnsTrue))
 {
 foreach (var term in text.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
 {
 if (!saved.Any(x => x.Equals(term, StringComparison.OrdinalIgnoreCase)))
 saved.Add(term);
 }

 text = "";
 ImGui.SetKeyboardFocusHere(-1);
 }

 Settings.InventoryExcludeFilter.Value = text;
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Items whose metadata path or name contains any of these terms\nget a gold border and are not moved to the stash.\nPress Enter to save the term, click a saved term to remove it.");

 if (saved.Count > 0)
 {
 var removeIndex = -1;
 if (saved.Count > 2)
 {
 // more than 2 saved filters: collapse them into a popout so the window stays compact
 if (ImGui.SmallButton($"Filters ({saved.Count})##hiExcludeList"))
 ImGui.OpenPopup("hi_exclude_popup");
 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }

 if (ImGui.BeginPopup("hi_exclude_popup"))
 {
 // one filter per line, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.EndPopup();
 }
 }
 else
 {
 // one small button per saved filter, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (i > 0) ImGui.SameLine();
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }
 }

 if (removeIndex >= 0 && removeIndex < saved.Count)
 saved.RemoveAt(removeIndex);
 }
 }

 ImGui.End();
 }

 private string[] GetExcludeTerms()
 {
 var inputTerms = (Settings.InventoryExcludeFilter.Value ?? "")
 .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 return (Settings.SavedExcludeFilters ?? [])
 .Where(x => !string.IsNullOrWhiteSpace(x))
 .Select(x => x.Trim())
 .Concat(inputTerms)
 .ToArray();
 }

 private static bool IsExcluded(Entity item, string[] terms)
 {
 if (item == null || terms.Length == 0)
 return false;

 var metadata = item.Path ?? "";
 var renderName = item.RenderName ?? "";
 return terms.Any(t => metadata.Contains(t, StringComparison.OrdinalIgnoreCase) ||
 renderName.Contains(t, StringComparison.OrdinalIgnoreCase));
 }

 private List<NormalInventoryItem> GetHighlightedItems(Inventory stash, Predicate<NormalInventoryItem> filter)
 {
 try
Expand Down

21 changes: 21 additions & 0 deletions
Settings.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,27 @@ public class Settings : ISettings

 [Menu("Show Inventory Custom Filter Window")]
 public ToggleNode ShowInventoryCustomFilterWindow { get; set; } = new(true);

 [Menu("Show Inventory Exclude Filter Window", "Text box that keeps matching inventory items from being dumped to stash")]
 public ToggleNode ShowInventoryExcludeFilterWindow { get; set; } = new(true);

 [IgnoreMenu]
 public TextNode InventoryExcludeFilter { get; set; } = new("");

 [IgnoreMenu]
 public List<string> SavedExcludeFilters { get; set; } = [];

 [Menu("Show Exclude Highlight", "Draw the frame around excluded inventory items (items are still skipped when dumping)")]
 public ToggleNode ShowExcludeHighlight { get; set; } = new(true);

 [Menu("Show Exclude Metadata Tooltip", "Show the metadata path tooltip when hovering an excluded item")]
 public ToggleNode ShowExcludeTooltip { get; set; } = new(true);

 [Menu("Exclude Filter Frame Color")]
 public ColorNode ExcludeFilterFrameColor { get; set; } = new(new Color(255, 215, 0, 255));

 [Menu("Exclude Tooltip Offset", "X/Y offset of the metadata tooltip from the cursor")]
 public RangeNode<Vector2> ExcludeTooltipOffset { get; set; } = new(Vector2.Zero, Vector2.One * -1000, Vector2.One * 1000);
 public ToggleNode ResetCustomFilterOnPanelClose { get; set; } = new(true);
 public ToggleNode UsePopupForFilterSelector { get; set; } = new(false);
 public RangeNode<int> CustomFilterFrameThickness { get; set; } = new(2, 1, 20);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Add inventory exclude filter (keep items from being dumped to stash) by greenbrad · Pull Request #10 · exApiTools/HighlightedItems · GitHub
Skip to content
Add inventory exclude filter (keep items from being dumped to stash)#10

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

greenbrad
wants to merge
1
commit into

base:master
Choose a base branch

from

 Open


Add inventory exclude filter (keep items from being dumped to stash)
#10
Show file tree
Hide file tree
 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


169 changes: 150 additions & 19 deletions
HighlightedItems.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -423,15 +423,7 @@ public override void Render()
 stackSizes += item.Item?.GetComponent<Stack>()?.Size;
 if (isCustomFilter)
 {
 var rect = item.GetClientRectCache;
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRectCache, Settings.CustomFilterFrameColor);
 }
 }

Expand DownExpand Up@@ -472,6 +464,30 @@ public override void Render()
 ? (customPredicate, true)
 : (_ => true, false);

 DrawInventoryExcludeFilterWindow(inventoryRect.TopLeft.ToVector2Num() + new Vector2(0, -80));
 var excludeTerms = GetExcludeTerms();
 if (excludeTerms.Length > 0 && (Settings.ShowExcludeHighlight || Settings.ShowExcludeTooltip))
 {
 var mousePos = Mouse.GetCursorPosition() - WindowOffset;
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 if (Settings.ShowExcludeHighlight)
 {
 DrawItemFrame(rect, Settings.ExcludeFilterFrameColor);
 }

 if (Settings.ShowExcludeTooltip && rect.Contains(mousePos))
 {
 ImGui.SetNextWindowPos(ImGui.GetMousePos() + Settings.ExcludeTooltipOffset.Value);
 ImGui.BeginTooltip();
 ImGui.TextUnformatted(item.Item?.Path ?? "");
 ImGui.EndTooltip();
 }
 }
 }

 if (Settings.DumpButtonEnable && IsStashTargetOpened)
 {
 //Determine Inventory Pickup Button position and draw
Expand All@@ -482,17 +498,10 @@ public override void Render()

 if (isCustomFilter)
 {
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems.Where(x => itemFilter(x.Item)))
 foreach (var item in GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => itemFilter(x.Item) && !IsExcluded(x.Item, excludeTerms)))
 {
 var rect = item.GetClientRect();
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 var topLeft = rect.TopLeft.ToVector2Num();
 var bottomRight = rect.BottomRight.ToVector2Num();
 Graphics.DrawFrame(topLeft, bottomRight, Settings.CustomFilterFrameColor, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 DrawItemFrame(item.GetClientRect(), Settings.CustomFilterFrameColor);
 }
 }

Expand All@@ -506,6 +515,7 @@ public override void Render()
 var inventoryItems = GameController.IngameState.ServerData.PlayerInventories[0].Inventory.InventorySlotItems
 .Where(x => !IsInIgnoreCell(x))
 .Where(x => itemFilter(x.Item))
 .Where(x => !IsExcluded(x.Item, excludeTerms))
 .OrderBy(x => x.PosX)
 .ThenBy(x => x.PosY)
 .ToList();
Expand DownExpand Up@@ -680,6 +690,127 @@ private async SyncTask<bool> StopMovingItems() {
 return true;
 }

 private void DrawItemFrame(SharpDX.RectangleF rect, Color color)
 {
 var deflateFactor = Settings.CustomFilterBorderDeflation / 200.0;
 var deflateWidth = (int)(rect.Width * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 var deflateHeight = (int)(rect.Height * deflateFactor + Settings.CustomFilterFrameThickness / 2);
 rect.Inflate(-deflateWidth, -deflateHeight);

 Graphics.DrawFrame(rect.TopLeft.ToVector2Num(), rect.BottomRight.ToVector2Num(), color, Settings.CustomFilterBorderRounding, Settings.CustomFilterFrameThickness, 0);
 }

 private void DrawInventoryExcludeFilterWindow(Vector2 defaultPosition)
 {
 if (!Settings.ShowInventoryExcludeFilterWindow)
 return;

 Settings.SavedExcludeFilters ??= [];
 ImGui.SetNextWindowPos(defaultPosition, ImGuiCond.FirstUseEver);
 if (ImGui.Begin("Inventory exclude filter", ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.AlwaysAutoResize))
 {
 var saved = Settings.SavedExcludeFilters;
 ImGui.TextUnformatted("Keep in inventory");
 ImGui.SameLine();
 var frameColor = Settings.ExcludeFilterFrameColor.Value;
 var colorVec = new System.Numerics.Vector4(frameColor.R / 255f, frameColor.G / 255f, frameColor.B / 255f, frameColor.A / 255f);
 if (ImGui.ColorEdit4("##excludecolor", ref colorVec, ImGuiColorEditFlags.NoInputs | ImGuiColorEditFlags.AlphaBar))
 Settings.ExcludeFilterFrameColor.Value = new Color(colorVec.X, colorVec.Y, colorVec.Z, colorVec.W);
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Highlight frame color");
 var text = Settings.InventoryExcludeFilter.Value ?? "";
 ImGui.SetNextItemWidth(250);
 if (ImGui.InputTextWithHint("##excludefilter", "metadata or name... (Enter saves)", ref text, 1024, ImGuiInputTextFlags.EnterReturnsTrue))
 {
 foreach (var term in text.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
 {
 if (!saved.Any(x => x.Equals(term, StringComparison.OrdinalIgnoreCase)))
 saved.Add(term);
 }

 text = "";
 ImGui.SetKeyboardFocusHere(-1);
 }

 Settings.InventoryExcludeFilter.Value = text;
 if (ImGui.IsItemHovered())
 ImGui.SetTooltip("Items whose metadata path or name contains any of these terms\nget a gold border and are not moved to the stash.\nPress Enter to save the term, click a saved term to remove it.");

 if (saved.Count > 0)
 {
 var removeIndex = -1;
 if (saved.Count > 2)
 {
 // more than 2 saved filters: collapse them into a popout so the window stays compact
 if (ImGui.SmallButton($"Filters ({saved.Count})##hiExcludeList"))
 ImGui.OpenPopup("hi_exclude_popup");
 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }

 if (ImGui.BeginPopup("hi_exclude_popup"))
 {
 // one filter per line, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.EndPopup();
 }
 }
 else
 {
 // one small button per saved filter, click to remove it
 for (var i = 0; i < saved.Count; i++)
 {
 if (i > 0) ImGui.SameLine();
 if (ImGui.SmallButton($"{saved[i]} x##hiExclude{i}"))
 removeIndex = i;
 }

 ImGui.SameLine();
 if (ImGui.SmallButton("Clear All##hiExcludeClearAll"))
 {
 saved.Clear();
 Settings.InventoryExcludeFilter.Value = "";
 }
 }

 if (removeIndex >= 0 && removeIndex < saved.Count)
 saved.RemoveAt(removeIndex);
 }
 }

 ImGui.End();
 }

 private string[] GetExcludeTerms()
 {
 var inputTerms = (Settings.InventoryExcludeFilter.Value ?? "")
 .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
 return (Settings.SavedExcludeFilters ?? [])
 .Where(x => !string.IsNullOrWhiteSpace(x))
 .Select(x => x.Trim())
 .Concat(inputTerms)
 .ToArray();
 }

 private static bool IsExcluded(Entity item, string[] terms)
 {
 if (item == null || terms.Length == 0)
 return false;

 var metadata = item.Path ?? "";
 var renderName = item.RenderName ?? "";
 return terms.Any(t => metadata.Contains(t, StringComparison.OrdinalIgnoreCase) ||
 renderName.Contains(t, StringComparison.OrdinalIgnoreCase));
 }

 private List<NormalInventoryItem> GetHighlightedItems(Inventory stash, Predicate<NormalInventoryItem> filter)
 {
 try
Expand Down

21 changes: 21 additions & 0 deletions
Settings.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,27 @@ public class Settings : ISettings

 [Menu("Show Inventory Custom Filter Window")]
 public ToggleNode ShowInventoryCustomFilterWindow { get; set; } = new(true);

 [Menu("Show Inventory Exclude Filter Window", "Text box that keeps matching inventory items from being dumped to stash")]
 public ToggleNode ShowInventoryExcludeFilterWindow { get; set; } = new(true);

 [IgnoreMenu]
 public TextNode InventoryExcludeFilter { get; set; } = new("");

 [IgnoreMenu]
 public List<string> SavedExcludeFilters { get; set; } = [];

 [Menu("Show Exclude Highlight", "Draw the frame around excluded inventory items (items are still skipped when dumping)")]
 public ToggleNode ShowExcludeHighlight { get; set; } = new(true);

 [Menu("Show Exclude Metadata Tooltip", "Show the metadata path tooltip when hovering an excluded item")]
 public ToggleNode ShowExcludeTooltip { get; set; } = new(true);

 [Menu("Exclude Filter Frame Color")]
 public ColorNode ExcludeFilterFrameColor { get; set; } = new(new Color(255, 215, 0, 255));

 [Menu("Exclude Tooltip Offset", "X/Y offset of the metadata tooltip from the cursor")]
 public RangeNode<Vector2> ExcludeTooltipOffset { get; set; } = new(Vector2.Zero, Vector2.One * -1000, Vector2.One * 1000);
 public ToggleNode ResetCustomFilterOnPanelClose { get; set; } = new(true);
 public ToggleNode UsePopupForFilterSelector { get; set; } = new(false);
 public RangeNode<int> CustomFilterFrameThickness { get; set; } = new(2, 1, 20);
Expand Down