update: hotkeys and bags handling for DragAndDrop_HandleDrop

- 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).

Author: Arufonsu

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

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

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;

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;

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";

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);