From e7ed603e6ed83398df6f9bd8cf26ff19ba08223a Mon Sep 17 00:00:00 2001
From: Erik <erik.nihlen@gmail.com>
Date: Mon, 7 Sep 2026 12:11:56 +0200
Subject: [PATCH] =?UTF-8?q?fix(vtank):=20slice=207=20fix=20round=20B=20ite?=
 =?UTF-8?q?m=207=20=E2=80=94=20Consumables=20left-list=20click=20removes,?=
 =?UTF-8?q?=20not=20selects?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Retail ground truth (PluginCore.cs:7683-7700): a click on the Consumables
tab's left list removes that row directly — there is no select-then-press-
Remove step for that list, unlike our previous SelectConsumableRow which
only updated the selection index. SelectConsumableRow now sets the index
AND immediately calls RemoveSelectedConsumableCore, matching the "click
removes" convention the right-hand Excluded Scarab Types list already
uses; the "Remove" button (RemoveSelectedConsumable) stays as a second
path, same as Items/Buffs/Route. Retitled the list's tooltip to match
("Click a row to remove it.").

New test: ConsumablesLeftListRowClickRemovesTheRowDirectly. Mutation
check: commenting out the RemoveSelectedConsumableCore() call turned it
red ("The collection contained 2 items" instead of Assert.Single); restoring
it turns it green.

tests/AcDream.Plugins.MossTank.Tests: 666/666 (was 665/665, +1).
tests/AcDream.App.Tests --filter Markup|Plugin|UiMenu|Slider: 276/3 skipped/279 (unchanged).

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
---
 src/AcDream.Plugins.MossTank/MossTankPanel.cs |  8 +++++
 src/AcDream.Plugins.MossTank/mosstank.xml     |  5 +++-
 .../MossTankPanelTests.cs                     | 29 +++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/AcDream.Plugins.MossTank/MossTankPanel.cs b/src/AcDream.Plugins.MossTank/MossTankPanel.cs
index 46a7aa3d..17419490 100644
--- a/src/AcDream.Plugins.MossTank/MossTankPanel.cs
+++ b/src/AcDream.Plugins.MossTank/MossTankPanel.cs
@@ -515,8 +515,16 @@ internal sealed partial class MossTankPanel
     public int SelectedConsumableRowIndex => _selectedConsumableRow;
     public Action<int> SelectItemRow => index =>
         _selectedItemRow = ClampRow(index, _itemRows.Count);
+    // Fix round B item 7: VTank's own Consumables left list removes the
+    // clicked row directly (PluginCore.cs:7683-7700 — any left-list click
+    // is a delete, not a select-then-press-Remove step); the "Remove"
+    // button (RemoveSelectedConsumable) stays for parity with the
+    // Items/Buffs/Route lists that also keep both paths.
     public Action<int> SelectConsumableRow => index =>
+    {
         _selectedConsumableRow = ClampRow(index, _consumableRows.Count);
+        RemoveSelectedConsumableCore();
+    };
     public Action RemoveSelectedItem => RemoveSelectedItemCore;
     public Action RemoveSelectedConsumable => RemoveSelectedConsumableCore;
 
diff --git a/src/AcDream.Plugins.MossTank/mosstank.xml b/src/AcDream.Plugins.MossTank/mosstank.xml
index 07e286ff..36f44e5c 100644
--- a/src/AcDream.Plugins.MossTank/mosstank.xml
+++ b/src/AcDream.Plugins.MossTank/mosstank.xml
@@ -457,9 +457,12 @@
            text="Gems / Food / Kits / Potions / Charges / Grenades / Lockpicks"
            color="#FFE8DEC3" />
     <label x="438" y="8" text="Excluded Scarab Types:" color="#FFE8DEC3" />
+    <!-- Fix round B item 7: a click removes the row directly
+         (PluginCore.cs:7683-7700), matching the "click a row to remove it"
+         convention the right-hand list already uses. -->
     <list x="4" y="28" w="414" h="112" rowheight="18"
           items="{ConsumableRows}" selected="{SelectedConsumableRowIndex}"
-          onchange="{SelectConsumableRow}" tooltip="Select a profiled consumable to remove." />
+          onchange="{SelectConsumableRow}" tooltip="Click a row to remove it." />
     <list x="438" y="28" w="406" h="112" rowheight="18"
           selected="{SelectedExcludedComponentIndex}" onchange="{SelectExcludedComponentRow}"
           tooltip="Click a row to remove it from the blacklist.">
diff --git a/tests/AcDream.Plugins.MossTank.Tests/MossTankPanelTests.cs b/tests/AcDream.Plugins.MossTank.Tests/MossTankPanelTests.cs
index a971baa8..12f657fc 100644
--- a/tests/AcDream.Plugins.MossTank.Tests/MossTankPanelTests.cs
+++ b/tests/AcDream.Plugins.MossTank.Tests/MossTankPanelTests.cs
@@ -942,6 +942,35 @@ public sealed class MossTankPanelTests
         Assert.Equal(["Ice Wand"], panel.ItemNameColumn);
     }
 
+    [Fact]
+    public void ConsumablesLeftListRowClickRemovesTheRowDirectly()
+    {
+        // Fix round B item 7: VTank's own Consumables left list removes the
+        // clicked row directly (PluginCore.cs:7683-7700) — no separate
+        // select-then-press-Remove step, unlike the earlier
+        // ItemsAndConsumablesTabsAddTheSelectedOwnedItemToRealProfiles test
+        // which still exercises the "Remove" button path.
+        var automation = new FakeAutomation
+        {
+            ItemEntries =
+            [
+                Item(20, "Iron Phial of Imperil", 0x100),
+                Item(21, "Black Marrow Pea", 0x20),
+            ],
+        };
+        var host = new FakeHost(automation);
+        var panel = new MossTankPanel(host);
+        host.Selection.Select(20);
+        panel.AddSelectedConsumable();
+        host.Selection.Select(21);
+        panel.AddSelectedConsumable();
+        Assert.Equal(2, panel.ConsumableRows.Count);
+
+        panel.SelectConsumableRow(0);
+
+        Assert.Single(panel.ConsumableRows);
+    }
+
     [Fact]
     public void ExcludedComponentsGridAddsBySelectionAndDeletesByAnyCellClick()
     {