Add support for equip/unequip item packets and responses. Unequip ite…

…ms from paperdoll when right-clicked in the dialog.
ethanmoffat · Mar 24, 2022 · f2bb8a6 · f2bb8a6
1 parent d93c57c
commit f2bb8a6
Show file tree

Hide file tree

Showing 13 changed files with 235 additions and 299 deletions.
diff --git a/EOBot/TrainerBot.cs b/EOBot/TrainerBot.cs
@@ -343,7 +343,7 @@ private async Task UseHealItem(IEnumerable<IInventoryItem> healItems)
 
             ConsoleHelper.WriteMessage(ConsoleHelper.Type.UseItem, $"{itemToUse.Name} - {itemToUse.HP} HP - inventory: {amount - 1} - (other heal item types: {healItems.Count() - 1})");
 
-            await TrySend(() => _characterActions.UseItem(itemToUse.ID));
+            await TrySend(() => _characterActions.UseItem((short)itemToUse.ID));
 
             await Task.Delay(ATTACK_BACKOFF_MS);
         }

diff --git a/EOLib/Domain/Character/CharacterActions.cs b/EOLib/Domain/Character/CharacterActions.cs
@@ -79,10 +79,30 @@ public void ToggleSit()
             _packetSendService.SendPacket(packet);
         }
 
-        public void UseItem(int itemId)
+        public void UseItem(short itemId)
         {
             var packet = new PacketBuilder(PacketFamily.Item, PacketAction.Use)
-                .AddShort((short)itemId)
+                .AddShort(itemId)
+                .Build();
+
+            _packetSendService.SendPacket(packet);
+        }
+
+        public void EquipItem(short itemId, bool alternateLocation)
+        {
+            var packet = new PacketBuilder(PacketFamily.PaperDoll, PacketAction.Add)
+                .AddShort(itemId)
+                .AddChar((byte)(alternateLocation ? 1 : 0))
+                .Build();
+
+            _packetSendService.SendPacket(packet);
+        }
+
+        public void UnequipItem(short itemId, bool alternateLocation)
+        {
+            var packet = new PacketBuilder(PacketFamily.PaperDoll, PacketAction.Remove)
+                .AddShort(itemId)
+                .AddChar((byte)(alternateLocation ? 1 : 0))
                 .Build();
 
             _packetSendService.SendPacket(packet);
@@ -159,7 +179,11 @@ public interface ICharacterActions
 
         void ToggleSit();
 
-        void UseItem(int itemId);
+        void UseItem(short itemId);
+
+        void EquipItem(short itemId, bool alternateLocation);
+
+        void UnequipItem(short itemId, bool alternateLocation);
 
         void PrepareCastSpell(int spellId);
 

diff --git a/EOLib/Net/API/Avatar.cs b/EOLib/Net/API/Avatar.cs
diff --git a/EOLib/Net/API/PacketAPI.cs b/EOLib/Net/API/PacketAPI.cs
@@ -28,7 +28,6 @@ public PacketAPI(EOClient client)
             _createLockerMembers();
             _createMessageMembers();
             _createMusicMembers();
-            _createPaperdollMembers();
             _createPartyMembers();
             _createNPCMembers();
             _createQuestMembers();

diff --git a/EOLib/Net/API/Paperdoll.cs b/EOLib/Net/API/Paperdoll.cs