update: hotkeys and bags handling for DragAndDrop_HandleDrop

Arufonsu · Arufonsu · commit c76c8e5b2c54 · 2026-01-03T14:14:26.000-03:00
- Required logic update after fixes for item's icon handling.
- (bags seriously need a big refactor): replaced direct packet store (buggy) and slider (never been coded properly) for at least, a simple and functional YesNo Prompt that stores whole item stacks from inventory.
- HotbarItem case returns false (required so items don't go invisible when placing them to hotbars).
- SpellItem to Hotbar case returns false (required so spells don't go invisible when placing them to hotbars).
- fixes quantityLabels logic
- visually functional bags and bank items when moving them around
diff --git a/Intersect.Client.Core/Entities/Player.cs b/Intersect.Client.Core/Entities/Player.cs
@@ -1121,41 +1121,32 @@ public void TryStoreItemInBag(int inventorySlotIndex, int bagSlotIndex)
         }
 
         var quantity = inventorySlot.Quantity;
-        var maxQuantity = quantity;
-
-        if (maxQuantity < 2)
-        {
-            PacketSender.SendStoreBagItem(inventorySlotIndex, 1, bagSlotIndex);
-            return;
-        }
 
         _ = new InputBox(
             title: Strings.Bags.StoreItem,
             prompt: Strings.Bags.StoreItemPrompt.ToString(itemDescriptor.Name),
-            inputType: InputType.NumericSliderInput,
+            inputType: InputType.YesNo,
             quantity: quantity,
-            maximumQuantity: maxQuantity,
-            userData: new Tuple<int, int>(inventorySlotIndex, bagSlotIndex),
+            userData: new Tuple<int, int, int>(inventorySlotIndex, bagSlotIndex, quantity),
             onSubmit: TryStoreItemInBagOnSubmit
         );
     }
 
     private static void TryStoreItemInBagOnSubmit(Base sender, InputSubmissionEventArgs args)
     {
-        if (sender is not InputBox { UserData: (int inventorySlotIndex, int bagSlotIndex) })
+        if (sender is not InputBox { UserData: (int inventorySlotIndex, int bagSlotIndex, int quantity) })
         {
             return;
         }
 
-        if (args.Value is not NumericalSubmissionValue submissionValue)
+        if (args.Value is not BooleanSubmissionValue submissionValue)
         {
             return;
         }
 
-        var value = (int)Math.Round(submissionValue.Value);
-        if (value > 0)
+        if (submissionValue.Value)
         {
-            PacketSender.SendStoreBagItem(inventorySlotIndex, value, bagSlotIndex);
+            PacketSender.SendStoreBagItem(inventorySlotIndex, quantity, bagSlotIndex);
         }
     }
 
@@ -1445,12 +1436,17 @@ public void AddToHotbar(int hotbarSlot, sbyte itemType, int itemSlot)
         PacketSender.SendHotbarUpdate(hotbarSlot, itemType, itemSlot);
     }
 
-    public void HotbarSwap(int index, int swapIndex)
+    public bool HotbarSwap(int index, int swapIndex)
     {
         var itemId = Hotbar[index].ItemOrSpellId;
         var bagId = Hotbar[index].BagId;
         var stats = Hotbar[index].PreferredStatBuffs;
 
+        if (Hotbar[swapIndex].ItemOrSpellId == itemId)
+        {
+            return false;
+        }
+
         Hotbar[index].ItemOrSpellId = Hotbar[swapIndex].ItemOrSpellId;
         Hotbar[index].BagId = Hotbar[swapIndex].BagId;
         Hotbar[index].PreferredStatBuffs = Hotbar[swapIndex].PreferredStatBuffs;
@@ -1460,6 +1456,7 @@ public void HotbarSwap(int index, int swapIndex)
         Hotbar[swapIndex].PreferredStatBuffs = stats;
 
         PacketSender.SendHotbarSwap(index, swapIndex);
+        return true;
     }
 
     // Change the dimension if the player is on a gateway
diff --git a/Intersect.Client.Core/Interface/Game/Bag/BagItem.cs b/Intersect.Client.Core/Interface/Game/Bag/BagItem.cs
@@ -19,15 +19,13 @@ public partial class BagItem : SlotItem
 {
     // Controls
     private readonly Label _quantityLabel;
-    private readonly BagWindow _bagWindow;
 
     // Context Menu Handling
     private readonly MenuItem _withdrawContextItem;
 
-    public BagItem(BagWindow bagWindow, Base parent, int index, ContextMenu contextMenu)
+    public BagItem(Base parent, int index, ContextMenu contextMenu)
         : base(parent, nameof(BagItem), index, contextMenu)
     {
-        _bagWindow = bagWindow;
         TextureFilename = "bagitem.png";
 
         Icon.HoverEnter += Icon_HoverEnter;
@@ -145,6 +143,16 @@ private void Icon_DoubleClicked(Base sender, MouseButtonState arguments)
 
     public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
     {
+        if (Globals.Me is not { } player)
+        {
+            return false;
+        }
+
+        if (Globals.BagSlots is not { Length: > 0 } bagSlots)
+        {
+            return false;
+        }
+
         var targetNode = Interface.FindComponentUnderCursor();
 
         // Find the first parent acceptable in that tree that can accept the package
@@ -154,11 +162,11 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
             {
                 case BagItem bagItem:
                     PacketSender.SendMoveBagItems(SlotIndex, bagItem.SlotIndex);
-                    return true;
+                    return bagSlots[bagItem.SlotIndex] is not { Quantity: > 0 };
 
                 case InventoryItem inventoryItem:
-                    Globals.Me?.TryRetrieveItemFromBag(SlotIndex, inventoryItem.SlotIndex);
-                    return true;
+                    player.TryRetrieveItemFromBag(SlotIndex, inventoryItem.SlotIndex);
+                    return bagSlots[inventoryItem.SlotIndex] is not { Quantity: > 0 };
 
                 default:
                     targetNode = targetNode.Parent;
@@ -194,7 +202,7 @@ public override void Update()
         var bagSlot = bagSlots[SlotIndex];
         var descriptor = bagSlot.Descriptor;
 
-        _quantityLabel.IsVisibleInParent = !Icon.IsDragging && descriptor.IsStackable && bagSlot.Quantity > 1;
+        _quantityLabel.IsVisibleInParent = !Icon.IsHidden && descriptor.IsStackable && bagSlot.Quantity > 1;
         if (_quantityLabel.IsVisibleInParent)
         {
             _quantityLabel.Text = Strings.FormatQuantityAbbreviated(bagSlot.Quantity);
diff --git a/Intersect.Client.Core/Interface/Game/Bag/BagWindow.cs b/Intersect.Client.Core/Interface/Game/Bag/BagWindow.cs
@@ -58,7 +58,7 @@ private void InitItemContainer()
 
         for (var slotIndex = 0; slotIndex < bagSlots.Length; slotIndex++)
         {
-            Items.Add(new BagItem(this, _slotContainer, slotIndex, _contextMenu));
+            Items.Add(new BagItem(_slotContainer, slotIndex, _contextMenu));
         }
 
         PopulateSlotContainer.Populate(_slotContainer, Items);
diff --git a/Intersect.Client.Core/Interface/Game/Bank/BankItem.cs b/Intersect.Client.Core/Interface/Game/Bank/BankItem.cs
@@ -22,15 +22,12 @@ public partial class BankItem : SlotItem
 {
     // Controls
     private readonly Label _quantityLabel;
-    private BankWindow _bankWindow;
 
     // Context Menu Handling
     private MenuItem _withdrawContextItem;
 
-    public BankItem(BankWindow bankWindow, Base parent, int index, ContextMenu contextMenu) :
-        base(parent, nameof(BankItem), index, contextMenu)
+    public BankItem(Base parent, int index, ContextMenu contextMenu) : base(parent, nameof(BankItem), index, contextMenu)
     {
-        _bankWindow = bankWindow;
         TextureFilename = "bankitem.png";
 
         Icon.HoverEnter += Icon_HoverEnter;
@@ -105,6 +102,7 @@ private void Icon_HoverEnter(Base? sender, EventArgs? arguments)
 
         if (bankSlots[SlotIndex] is not { Descriptor: not null } or { Quantity: <= 0 })
         {
+             _quantityLabel.IsVisibleInParent = false;
             return;
         }
 
@@ -194,29 +192,28 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
             }
         }
 
+        if (Globals.BankSlots is not { Length: > 0 } bankSlots)
+        {
+            return false;
+        }
+
         var targetNode = Interface.FindComponentUnderCursor();
 
         // Find the first parent acceptable in that tree that can accept the package
         while (targetNode != default)
         {
+            if (bankSlots[SlotIndex] is not { Quantity: > 0 } slot)
+            {
+                return false;
+            }
+
             switch (targetNode)
             {
                 case BankItem bankItem:
                     PacketSender.SendMoveBankItems(SlotIndex, bankItem.SlotIndex);
-                    return true;
+                    return bankSlots[bankItem.SlotIndex] is not { Quantity: > 0 };
 
                 case InventoryItem inventoryItem:
-
-                    if (Globals.BankSlots is not { Length: > 0 } bankSlots)
-                    {
-                        return false;
-                    }
-
-                    if (bankSlots[SlotIndex] is not { Quantity: > 0 } slot)
-                    {
-                        return false;
-                    }
-
                     player.TryRetrieveItemFromBank(
                         SlotIndex,
                         inventorySlotIndex: inventoryItem.SlotIndex,
@@ -259,7 +256,7 @@ public override void Update()
         var bankSlot = bankSlots[SlotIndex];
         var descriptor = bankSlot.Descriptor;
 
-        _quantityLabel.IsVisibleInParent = !Icon.IsDragging && descriptor.IsStackable && bankSlot.Quantity > 1;
+        _quantityLabel.IsVisibleInParent = descriptor.IsStackable && bankSlot.Quantity > 1 && !Icon.IsHidden;
         if (_quantityLabel.IsVisibleInParent)
         {
             _quantityLabel.Text = Strings.FormatQuantityAbbreviated(bankSlot.Quantity);
@@ -283,6 +280,7 @@ public override void Update()
             {
                 Icon.Texture = default;
                 Icon.IsVisibleInParent = false;
+                _quantityLabel.IsVisibleInParent = false;
             }
         }
     }
diff --git a/Intersect.Client.Core/Interface/Game/Bank/BankWindow.cs b/Intersect.Client.Core/Interface/Game/Bank/BankWindow.cs
@@ -67,7 +67,7 @@ private void InitItemContainer()
     {
         for (var slotIndex = 0; slotIndex < Globals.BankSlotCount; slotIndex++)
         {
-            Items.Add(new BankItem(this, _slotContainer, slotIndex, _contextMenu));
+            Items.Add(new BankItem(_slotContainer, slotIndex, _contextMenu));
         }
 
         PopulateSlotContainer.Populate(_slotContainer, Items);
diff --git a/Intersect.Client.Core/Interface/Game/Hotbar/HotbarItem.cs b/Intersect.Client.Core/Interface/Game/Hotbar/HotbarItem.cs
@@ -217,12 +217,9 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
             if (targetNode is HotbarItem hotbarItem)
             {
                 player.HotbarSwap(SlotIndex, hotbarItem.SlotIndex);
-                return true;
-            }
-            else
-            {
-                targetNode = targetNode.Parent;
             }
+
+            targetNode = targetNode.Parent;
         }
 
         // If we've reached the top of the tree, we can't drop here, so cancel drop
diff --git a/Intersect.Client.Core/Interface/Game/Inventory/InventoryItem.cs b/Intersect.Client.Core/Interface/Game/Inventory/InventoryItem.cs
@@ -421,7 +421,7 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
 
                 case BagItem bagItem:
                     player.TryStoreItemInBag(SlotIndex, bagItem.SlotIndex);
-                    return true;
+                    return false;
 
                 case BankItem bankItem:
                     return player.TryStoreItemInBank(
@@ -433,11 +433,11 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
 
                 case HotbarItem hotbarItem:
                     player.AddToHotbar(hotbarItem.SlotIndex, 0, SlotIndex);
-                    return true;
+                    return false;
 
                 case ShopWindow:
                     player.TrySellItem(SlotIndex);
-                    return true;
+                    return false;
 
                 default:
                     targetNode = targetNode.Parent;
@@ -500,7 +500,7 @@ public override void Update()
         _equipImageBackground.IsVisibleInParent = !isDragging && equipped;
         _equipLabel.IsVisibleInParent = !isDragging && equipped;
 
-        _quantityLabel.IsVisibleInParent = !isDragging && descriptor.IsStackable && inventorySlot.Quantity > 1;
+        _quantityLabel.IsVisibleInParent = !Icon.IsHidden && descriptor.IsStackable && inventorySlot.Quantity > 1;
         if (_quantityLabel.IsVisibleInParent)
         {
             _quantityLabel.Text = Strings.FormatQuantityAbbreviated(inventorySlot.Quantity);
diff --git a/Intersect.Client.Core/Interface/Game/Spells/SpellItem.cs b/Intersect.Client.Core/Interface/Game/Spells/SpellItem.cs
@@ -173,7 +173,7 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
 
                 case HotbarItem hotbarItem:
                     player.AddToHotbar(hotbarItem.SlotIndex, 1, SlotIndex);
-                    return true;
+                    return false;
 
                 default:
                     targetNode = targetNode.Parent;
diff --git a/Intersect.Client.Core/Localization/Strings.cs b/Intersect.Client.Core/Localization/Strings.cs
@@ -541,7 +541,10 @@ public partial struct Bags
         public static LocalizedString StoreItem = @"Store Item";
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public static LocalizedString StoreItemPrompt = @"How many/much {00} would you like to store?";
+        public static LocalizedString StoreMultipleItemPrompt = @"How many/much {00} would you like to store?";
+
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public static LocalizedString StoreItemPrompt = @"Do you wish to store the item: {00} ?";
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public static LocalizedString Title = @"Bag";
diff --git a/Intersect.Client.Framework/Entities/IPlayer.cs b/Intersect.Client.Framework/Entities/IPlayer.cs
@@ -34,7 +34,7 @@ public interface IPlayer : IEntity
     void AddToHotbar(int hotbarSlot, sbyte itemType, int itemSlot);
     int FindHotbarItem(IHotbarInstance hotbarInstance);
     int FindHotbarSpell(IHotbarInstance hotbarInstance);
-    void HotbarSwap(int index, int swapIndex);
+    bool HotbarSwap(int index, int swapIndex);
     int FindItem(Guid itemId, int itemVal = 1);
     void SwapItems(int item1, int item2);
     long GetItemCooldown(Guid id);

Original file line number	Diff line number	Diff line change
`@@ -1121,41 +1121,32 @@ public void TryStoreItemInBag(int inventorySlotIndex, int bagSlotIndex)`
`1121`	`1121`	`}`
`1122`	`1122`
`1123`	`1123`	`var quantity = inventorySlot.Quantity;`
`1124`		`- var maxQuantity = quantity;`
`1125`		`-`
`1126`		`- if (maxQuantity < 2)`
`1127`		`- {`
`1128`		`- PacketSender.SendStoreBagItem(inventorySlotIndex, 1, bagSlotIndex);`
`1129`		`- return;`
`1130`		`- }`
`1131`	`1124`
`1132`	`1125`	`_ = new InputBox(`
`1133`	`1126`	`title: Strings.Bags.StoreItem,`
`1134`	`1127`	`prompt: Strings.Bags.StoreItemPrompt.ToString(itemDescriptor.Name),`
`1135`		`- inputType: InputType.NumericSliderInput,`
	`1128`	`+ inputType: InputType.YesNo,`
`1136`	`1129`	`quantity: quantity,`
`1137`		`- maximumQuantity: maxQuantity,`
`1138`		`- userData: new Tuple<int, int>(inventorySlotIndex, bagSlotIndex),`
	`1130`	`+ userData: new Tuple<int, int, int>(inventorySlotIndex, bagSlotIndex, quantity),`
`1139`	`1131`	`onSubmit: TryStoreItemInBagOnSubmit`
`1140`	`1132`	`);`
`1141`	`1133`	`}`
`1142`	`1134`
`1143`	`1135`	`private static void TryStoreItemInBagOnSubmit(Base sender, InputSubmissionEventArgs args)`
`1144`	`1136`	`{`
`1145`		`- if (sender is not InputBox { UserData: (int inventorySlotIndex, int bagSlotIndex) })`
	`1137`	`+ if (sender is not InputBox { UserData: (int inventorySlotIndex, int bagSlotIndex, int quantity) })`
`1146`	`1138`	`{`
`1147`	`1139`	`return;`
`1148`	`1140`	`}`
`1149`	`1141`
`1150`		`- if (args.Value is not NumericalSubmissionValue submissionValue)`
	`1142`	`+ if (args.Value is not BooleanSubmissionValue submissionValue)`
`1151`	`1143`	`{`
`1152`	`1144`	`return;`
`1153`	`1145`	`}`
`1154`	`1146`
`1155`		`- var value = (int)Math.Round(submissionValue.Value);`
`1156`		`- if (value > 0)`
	`1147`	`+ if (submissionValue.Value)`
`1157`	`1148`	`{`
`1158`		`- PacketSender.SendStoreBagItem(inventorySlotIndex, value, bagSlotIndex);`
	`1149`	`+ PacketSender.SendStoreBagItem(inventorySlotIndex, quantity, bagSlotIndex);`
`1159`	`1150`	`}`
`1160`	`1151`	`}`
`1161`	`1152`
`@@ -1445,12 +1436,17 @@ public void AddToHotbar(int hotbarSlot, sbyte itemType, int itemSlot)`
`1445`	`1436`	`PacketSender.SendHotbarUpdate(hotbarSlot, itemType, itemSlot);`
`1446`	`1437`	`}`
`1447`	`1438`
`1448`		`- public void HotbarSwap(int index, int swapIndex)`
	`1439`	`+ public bool HotbarSwap(int index, int swapIndex)`
`1449`	`1440`	`{`
`1450`	`1441`	`var itemId = Hotbar[index].ItemOrSpellId;`
`1451`	`1442`	`var bagId = Hotbar[index].BagId;`
`1452`	`1443`	`var stats = Hotbar[index].PreferredStatBuffs;`
`1453`	`1444`
	`1445`	`+ if (Hotbar[swapIndex].ItemOrSpellId == itemId)`
	`1446`	`+ {`
	`1447`	`+ return false;`
	`1448`	`+ }`
	`1449`	`+`
`1454`	`1450`	`Hotbar[index].ItemOrSpellId = Hotbar[swapIndex].ItemOrSpellId;`
`1455`	`1451`	`Hotbar[index].BagId = Hotbar[swapIndex].BagId;`
`1456`	`1452`	`Hotbar[index].PreferredStatBuffs = Hotbar[swapIndex].PreferredStatBuffs;`
`@@ -1460,6 +1456,7 @@ public void HotbarSwap(int index, int swapIndex)`
`1460`	`1456`	`Hotbar[swapIndex].PreferredStatBuffs = stats;`
`1461`	`1457`
`1462`	`1458`	`PacketSender.SendHotbarSwap(index, swapIndex);`
	`1459`	`+ return true;`
`1463`	`1460`	`}`
`1464`	`1461`
`1465`	`1462`	`// Change the dimension if the player is on a gateway`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ private void InitItemContainer()`
`58`	`58`
`59`	`59`	`for (var slotIndex = 0; slotIndex < bagSlots.Length; slotIndex++)`
`60`	`60`	`{`
`61`		`- Items.Add(new BagItem(this, _slotContainer, slotIndex, _contextMenu));`
	`61`	`+ Items.Add(new BagItem(_slotContainer, slotIndex, _contextMenu));`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`PopulateSlotContainer.Populate(_slotContainer, Items);`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ private void InitItemContainer()`
`67`	`67`	`{`
`68`	`68`	`for (var slotIndex = 0; slotIndex < Globals.BankSlotCount; slotIndex++)`
`69`	`69`	`{`
`70`		`- Items.Add(new BankItem(this, _slotContainer, slotIndex, _contextMenu));`
	`70`	`+ Items.Add(new BankItem(_slotContainer, slotIndex, _contextMenu));`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`PopulateSlotContainer.Populate(_slotContainer, Items);`
Original file line number	Diff line number	Diff line change
`@@ -217,12 +217,9 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)`
`217`	`217`	`if (targetNode is HotbarItem hotbarItem)`
`218`	`218`	`{`
`219`	`219`	`player.HotbarSwap(SlotIndex, hotbarItem.SlotIndex);`
`220`		`- return true;`
`221`		`- }`
`222`		`- else`
`223`		`- {`
`224`		`- targetNode = targetNode.Parent;`
`225`	`220`	`}`
	`221`	`+`
	`222`	`+ targetNode = targetNode.Parent;`
`226`	`223`	`}`
`227`	`224`
`228`	`225`	`// If we've reached the top of the tree, we can't drop here, so cancel drop`