Merge branch 'inventory_refactor' into develop

# Conflicts: # FFXIVClassic Map Server/Database.cs # FFXIVClassic Map Server/FFXIVClassic Map Server.csproj # FFXIVClassic Map Server/WorldManager.cs # FFXIVClassic Map Server/actors/area/Area.cs # FFXIVClassic Map Server/actors/area/Zone.cs # FFXIVClassic Map Server/actors/chara/Character.cs # FFXIVClassic Map Server/actors/chara/npc/Npc.cs # FFXIVClassic Map Server/actors/chara/player/Inventory.cs # FFXIVClassic Map Server/actors/chara/player/Player.cs # FFXIVClassic Map Server/dataobjects/ZoneConnection.cs # FFXIVClassic Map Server/lua/LuaEngine.cs # FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs # FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs # FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs # FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs # FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs # FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs # FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs # FFXIVClassic Map Server/packets/send/Actor/battle/CommandResultX00Packet.cs # FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs # FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs # data/scripts/commands/gm/giveitem.lua
2025-05-20 08:26:59 -04:00 · 2019-05-06 15:59:09 -04:00
parent 10017b7e8c 163f240cf9
commit bcb609e4f6
202 changed files with 2713 additions and 1040 deletions
--- a/Server/packets/send/Actor/battle/BattleAction.cs
+++ b/Server/packets/send/Actor/battle/BattleAction.cs
@@ -0,0 +1,12 @@
+namespace FFXIVClassic_Map_Server.packets.send.actor.battle
+{
+    class BattleAction
+    {
+        public uint targetId;
+        public ushort amount;
+        public ushort worldMasterTextId;
+        public uint effectId;
+        public byte param;
+        public byte unknown;
+    }
+}
--- a/Server/packets/send/Actor/battle/BattleActionX10Packet.cs
+++ b/Server/packets/send/Actor/battle/BattleActionX10Packet.cs
@@ -0,0 +1,59 @@
+using FFXIVClassic.Common;
+using System;
+using System.IO;
+
+namespace FFXIVClassic_Map_Server.packets.send.actor.battle
+{
+    class BattleActionX10Packet
+    {
+        public const ushort OPCODE = 0x013A;
+        public const uint PACKET_SIZE = 0xD8;
+
+        public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint animationId, ushort commandId, BattleAction[] actionList)
+        {
+            byte[] data = new byte[PACKET_SIZE - 0x20];
+
+            using (MemoryStream mem = new MemoryStream(data))
+            {
+                using (BinaryWriter binWriter = new BinaryWriter(mem))
+                {
+                    binWriter.Write((UInt32)sourceActorId);
+                    binWriter.Write((UInt32)animationId);
+
+                    //Missing... last value is float, string in here as well?
+
+                    binWriter.Seek(0x20, SeekOrigin.Begin);
+                    binWriter.Write((UInt32) actionList.Length); //Num actions (always 1 for this)
+                    binWriter.Write((UInt16)commandId);
+                    binWriter.Write((UInt16)810); //?
+
+                    binWriter.Seek(0x20, SeekOrigin.Begin);
+                    foreach (BattleAction action in actionList)
+                        binWriter.Write((UInt32)action.targetId);
+
+                    binWriter.Seek(0x50, SeekOrigin.Begin);
+                    foreach (BattleAction action in actionList)
+                        binWriter.Write((UInt16)action.amount);
+
+                    binWriter.Seek(0x64, SeekOrigin.Begin);
+                    foreach (BattleAction action in actionList)
+                        binWriter.Write((UInt16)action.worldMasterTextId);
+
+                    binWriter.Seek(0x78, SeekOrigin.Begin);
+                    foreach (BattleAction action in actionList)
+                        binWriter.Write((UInt32)action.effectId);
+
+                    binWriter.Seek(0xA0, SeekOrigin.Begin);
+                    foreach (BattleAction action in actionList)
+                        binWriter.Write((Byte)action.param);
+
+                    binWriter.Seek(0xAA, SeekOrigin.Begin);
+                    foreach (BattleAction action in actionList)
+                        binWriter.Write((Byte)action.unknown);
+                }
+            }
+
+            return new SubPacket(OPCODE, sourceActorId, data);
+        }
+    }
+}
--- a/Server/packets/send/Actor/battle/BattleActionX18Packet.cs
+++ b/Server/packets/send/Actor/battle/BattleActionX18Packet.cs
@@ -0,0 +1,59 @@
+using FFXIVClassic.Common;
+using System;
+using System.IO;
+
+namespace FFXIVClassic_Map_Server.packets.send.actor.battle
+{
+    class BattleActionX18Packet
+    {
+        public const ushort OPCODE = 0x013B;
+        public const uint PACKET_SIZE = 0x148;
+
+        public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint animationId, ushort commandId, BattleAction[] actionList)
+        {
+            byte[] data = new byte[PACKET_SIZE - 0x20];
+
+            using (MemoryStream mem = new MemoryStream(data))
+            {
+                using (BinaryWriter binWriter = new BinaryWriter(mem))
+                {
+                    binWriter.Write((UInt32)sourceActorId);
+                    binWriter.Write((UInt32)animationId);
+
+                    //Missing... last value is float, string in here as well?
+
+                    binWriter.Seek(0x20, SeekOrigin.Begin);
+                    binWriter.Write((UInt32) actionList.Length); //Num actions (always 1 for this)
+                    binWriter.Write((UInt16)commandId);
+                    binWriter.Write((UInt16)810); //?
+
+                    binWriter.Seek(0x58, SeekOrigin.Begin);
+                    foreach (BattleAction action in actionList)
+                        binWriter.Write((UInt32)action.targetId);
+
+                    binWriter.Seek(0xA0, SeekOrigin.Begin);
+                    foreach (BattleAction action in actionList)
+                        binWriter.Write((UInt16)action.amount);
+
+                    binWriter.Seek(0xC4, SeekOrigin.Begin);
+                    foreach (BattleAction action in actionList)
+                        binWriter.Write((UInt16)action.worldMasterTextId);
+
+                    binWriter.Seek(0xE8, SeekOrigin.Begin);
+                    foreach (BattleAction action in actionList)
+                        binWriter.Write((UInt32)action.effectId);
+
+                    binWriter.Seek(0x130, SeekOrigin.Begin);
+                    foreach (BattleAction action in actionList)
+                        binWriter.Write((Byte)action.param);
+
+                    binWriter.Seek(0x142, SeekOrigin.Begin);
+                    foreach (BattleAction action in actionList)
+                        binWriter.Write((Byte)action.unknown);
+                }
+            }
+
+            return new SubPacket(OPCODE, sourceActorId, data);
+        }
+    }
+}
--- a/Server/packets/send/Actor/battle/CommandResultX00Packet.cs
+++ b/Server/packets/send/Actor/battle/CommandResultX00Packet.cs
@@ -2,7 +2,7 @@
 using System;
 using System.IO;

-namespace  FFXIVClassic_Map_Server.packets.send.actor.battle
+namespace FFXIVClassic_Map_Server.packets.send.actor.battle
 {
    class CommandResultX00Packet
    {