From ba13d5798d9a2cd07dc39f79a47d3ee565286e95 Mon Sep 17 00:00:00 2001 From: Tahir Akhlaq Date: Wed, 15 Jun 2016 00:08:05 +0100 Subject: [PATCH] derp --- FFXIVClassic Lobby Server/Database.cs | 4 +- .../packets/SubPacket.cs | 8 +-- FFXIVClassic Map Server/CommandProcessor.cs | 6 +- .../actors/chara/ParameterTemp.cs | 2 +- FFXIVClassic Map Server/lua/LuaEngine.cs | 58 +++++++++---------- FFXIVClassic Map Server/packets/SubPacket.cs | 8 +-- .../packets/send/Actor/ActorDoEmotePacket.cs | 12 ++-- .../send/Actor/ActorInstantiatePacket.cs | 4 +- .../send/Actor/ActorSpecialGraphicPacket.cs | 4 +- .../packets/send/Actor/BattleAction1Packet.cs | 4 +- .../send/Actor/MoveActorToPositionPacket.cs | 4 +- .../packets/send/Actor/SetActorIconPacket.cs | 4 +- .../send/Actor/SetActorIdleAnimationPacket.cs | 4 +- .../send/Actor/SetActorIsZoningPacket.cs | 4 +- .../packets/send/Actor/SetActorNamePacket.cs | 4 +- .../send/Actor/SetActorPositionPacket.cs | 4 +- .../send/Actor/SetActorPropetyPacket.cs | 4 +- .../packets/send/Actor/SetActorSpeedPacket.cs | 8 +-- .../packets/send/Actor/SetActorStatePacket.cs | 4 +- .../send/Actor/SetActorStatusAllPacket.cs | 4 +- .../send/Actor/SetActorStatusPacket.cs | 4 +- .../Actor/SetActorTargetAnimatedPacket.cs | 4 +- .../send/Actor/SetActorTargetPacket.cs | 4 +- .../packets/send/Actor/_0xFPacket.cs | 4 +- .../packets/send/Actor/battle/BattleAction.cs | 2 +- .../Actor/battle/BattleActionX00Packet.cs | 2 +- .../Actor/battle/BattleActionX01Packet.cs | 4 +- .../Actor/battle/BattleActionX10Packet.cs | 2 +- .../Actor/battle/BattleActionX18Packet.cs | 2 +- .../inventory/InventoryBeginChangePacket.cs | 4 +- .../inventory/InventoryEndChangePacket.cs | 4 +- .../Actor/inventory/InventoryListX01Packet.cs | 4 +- .../Actor/inventory/InventoryListX08Packet.cs | 4 +- .../Actor/inventory/InventoryListX16Packet.cs | 4 +- .../inventory/InventorySetBeginPacket.cs | 4 +- .../Actor/inventory/InventorySetEndPacket.cs | 4 +- .../packets/send/GameMessagePacket.cs | 32 +++++----- .../packets/send/SendMessagePacket.cs | 4 +- .../packets/send/events/KickEventPacket.cs | 4 +- .../send/list/SetListPropertyPacket.cs | 8 +-- .../send/player/InfoRequestResponsePacket.cs | 4 +- .../send/player/SetChocoboNamePacket.cs | 4 +- .../send/player/SetCurrentJobPacket.cs | 4 +- .../send/player/SetGrandCompanyPacket.cs | 4 +- .../send/player/SetPlayerTitlePacket.cs | 4 +- .../packets/send/player/_0x196Packet.cs | 4 +- .../utils/ActorPropertyPacketUtil.cs | 6 +- 47 files changed, 144 insertions(+), 144 deletions(-) diff --git a/FFXIVClassic Lobby Server/Database.cs b/FFXIVClassic Lobby Server/Database.cs index de0ff845..deb776b4 100644 --- a/FFXIVClassic Lobby Server/Database.cs +++ b/FFXIVClassic Lobby Server/Database.cs @@ -384,7 +384,7 @@ namespace FFXIVClassic_Lobby_Server serverId, name, isLegacy, - DoRename, + doRename, currentZoneId, guardian, birthMonth, @@ -441,7 +441,7 @@ namespace FFXIVClassic_Lobby_Server serverId, name, isLegacy, - DoRename, + doRename, currentZoneId, guardian, birthMonth, diff --git a/FFXIVClassic Lobby Server/packets/SubPacket.cs b/FFXIVClassic Lobby Server/packets/SubPacket.cs index fe8a99ec..43b54a2a 100644 --- a/FFXIVClassic Lobby Server/packets/SubPacket.cs +++ b/FFXIVClassic Lobby Server/packets/SubPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Lobby_Server.packets public ushort subpacketSize; public ushort type; public uint sourceId; - public uint tarGetId; + public uint targetId; public uint unknown1; } @@ -68,14 +68,14 @@ namespace FFXIVClassic_Lobby_Server.packets offset += header.subpacketSize; } - public SubPacket(ushort opcode, uint sourceId, uint tarGetId, byte[] data) + public SubPacket(ushort opcode, uint sourceId, uint targetId, byte[] data) { this.header = new SubPacketHeader(); this.gameMessage = new GameMessageHeader(); gameMessage.opcode = opcode; header.sourceId = sourceId; - header.tarGetId = tarGetId; + header.targetId = targetId; gameMessage.timestamp = Utils.UnixTimeStampUTC(); @@ -97,7 +97,7 @@ namespace FFXIVClassic_Lobby_Server.packets header.subpacketSize = original.header.subpacketSize; header.type = original.header.type; header.sourceId = original.header.sourceId; - header.tarGetId = newTarGetId; + header.targetId = newTarGetId; data = original.data; } diff --git a/FFXIVClassic Map Server/CommandProcessor.cs b/FFXIVClassic Map Server/CommandProcessor.cs index 19163650..23ea3d7c 100644 --- a/FFXIVClassic Map Server/CommandProcessor.cs +++ b/FFXIVClassic Map Server/CommandProcessor.cs @@ -54,11 +54,11 @@ namespace FFXIVClassic_Map_Server } } - public void ChangeProperty(uint id, uint value, string tarGet) + public void ChangeProperty(uint id, uint value, string target) { - SetActorPropetyPacket ChangeProperty = new SetActorPropetyPacket(tarGet); + SetActorPropetyPacket ChangeProperty = new SetActorPropetyPacket(target); - ChangeProperty.SetTarget(tarGet); + ChangeProperty.SetTarget(target); ChangeProperty.AddInt(id, value); ChangeProperty.AddTarget(); diff --git a/FFXIVClassic Map Server/actors/chara/ParameterTemp.cs b/FFXIVClassic Map Server/actors/chara/ParameterTemp.cs index 71f71767..399e7e84 100644 --- a/FFXIVClassic Map Server/actors/chara/ParameterTemp.cs +++ b/FFXIVClassic Map Server/actors/chara/ParameterTemp.cs @@ -4,7 +4,7 @@ { public short tp = 0; - public int tarGetInformation = 0; + public int targetInformation = 0; public ushort[] maxCommandRecastTime = new ushort[40]; diff --git a/FFXIVClassic Map Server/lua/LuaEngine.cs b/FFXIVClassic Map Server/lua/LuaEngine.cs index e0b898a5..fef4e299 100644 --- a/FFXIVClassic Map Server/lua/LuaEngine.cs +++ b/FFXIVClassic Map Server/lua/LuaEngine.cs @@ -28,13 +28,13 @@ namespace FFXIVClassic_Map_Server.lua UserData.RegistrationPolicy = InteropRegistrationPolicy.Automatic; } - public static List DoActorInstantiate(Player player, Actor tarGet) + public static List DoActorInstantiate(Player player, Actor target) { string luaPath; - if (tarGet is Npc) + if (target is Npc) { - luaPath = String.Format(FILEPATH_NPCS, tarGet.zoneId, tarGet.GetName()); + luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName()); if (File.Exists(luaPath)) { Script script = LoadScript(luaPath); @@ -42,13 +42,13 @@ namespace FFXIVClassic_Map_Server.lua if (script == null) return null; - DynValue result = script.Call(script.Globals["init"], tarGet); + DynValue result = script.Call(script.Globals["init"], target); List lparams = LuaUtils.CreateLuaParamList(result); return lparams; } else { - SendError(player, String.Format("ERROR: Could not find script for actor {0}.", tarGet.GetName())); + SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName())); return null; } } @@ -56,26 +56,26 @@ namespace FFXIVClassic_Map_Server.lua return null; } - public static void DoActorOnEventStarted(Player player, Actor tarGet, EventStartPacket eventStart) + public static void DoActorOnEventStarted(Player player, Actor target, EventStartPacket eventStart) { - if (tarGet is Npc) + if (target is Npc) { - ((Npc)tarGet).DoEventStart(player, eventStart); + ((Npc)target).DoEventStart(player, eventStart); return; } string luaPath; - if (tarGet is Command) + if (target is Command) { - luaPath = String.Format(FILEPATH_COMMANDS, tarGet.GetName()); + luaPath = String.Format(FILEPATH_COMMANDS, target.GetName()); } - else if (tarGet is Director) + else if (target is Director) { - luaPath = String.Format(FILEPATH_DIRECTORS, tarGet.GetName()); + luaPath = String.Format(FILEPATH_DIRECTORS, target.GetName()); } else - luaPath = String.Format(FILEPATH_NPCS, tarGet.zoneId, tarGet.GetName()); + luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName()); if (File.Exists(luaPath)) { @@ -87,7 +87,7 @@ namespace FFXIVClassic_Map_Server.lua //Have to Do this to combine LuaParams List objects = new List(); objects.Add(player); - objects.Add(tarGet); + objects.Add(target); objects.Add(eventStart.triggerName); if (eventStart.luaParams != null) @@ -99,14 +99,14 @@ namespace FFXIVClassic_Map_Server.lua } else { - SendError(player, String.Format("ERROR: Could not find script for actor {0}.", tarGet.GetName())); + SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName())); } } - public static void DoActorOnSpawn(Player player, Npc tarGet) + public static void DoActorOnSpawn(Player player, Npc target) { - string luaPath = String.Format(FILEPATH_NPCS, tarGet.zoneId, tarGet.GetName()); + string luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName()); if (File.Exists(luaPath)) { @@ -117,31 +117,31 @@ namespace FFXIVClassic_Map_Server.lua //Run Script if (!script.Globals.Get("onSpawn").IsNil()) - script.Call(script.Globals["onSpawn"], player, tarGet); + script.Call(script.Globals["onSpawn"], player, target); } else { - SendError(player, String.Format("ERROR: Could not find script for actor {0}.", tarGet.GetName())); + SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName())); } } - public static void DoActorOnEventUpdated(Player player, Actor tarGet, EventUpdatePacket eventUpdate) + public static void DoActorOnEventUpdated(Player player, Actor target, EventUpdatePacket eventUpdate) { - if (tarGet is Npc) + if (target is Npc) { - ((Npc)tarGet).DoEventUpdate(player, eventUpdate); + ((Npc)target).DoEventUpdate(player, eventUpdate); return; } string luaPath; - if (tarGet is Command) - luaPath = String.Format(FILEPATH_COMMANDS, tarGet.GetName()); - else if (tarGet is Director) - luaPath = String.Format(FILEPATH_DIRECTORS, tarGet.GetName()); + if (target is Command) + luaPath = String.Format(FILEPATH_COMMANDS, target.GetName()); + else if (target is Director) + luaPath = String.Format(FILEPATH_DIRECTORS, target.GetName()); else - luaPath = String.Format(FILEPATH_NPCS, tarGet.zoneId, tarGet.GetName()); + luaPath = String.Format(FILEPATH_NPCS, target.zoneId, target.GetName()); if (File.Exists(luaPath)) { @@ -153,7 +153,7 @@ namespace FFXIVClassic_Map_Server.lua //Have to Do this to combine LuaParams List objects = new List(); objects.Add(player); - objects.Add(tarGet); + objects.Add(target); objects.Add(eventUpdate.val2); objects.AddRange(LuaUtils.CreateLuaParamObjectList(eventUpdate.luaParams)); @@ -163,7 +163,7 @@ namespace FFXIVClassic_Map_Server.lua } else { - SendError(player, String.Format("ERROR: Could not find script for actor {0}.", tarGet.GetName())); + SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName())); } } diff --git a/FFXIVClassic Map Server/packets/SubPacket.cs b/FFXIVClassic Map Server/packets/SubPacket.cs index f6db325e..5bb0b746 100644 --- a/FFXIVClassic Map Server/packets/SubPacket.cs +++ b/FFXIVClassic Map Server/packets/SubPacket.cs @@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets public ushort subpacketSize; public ushort type; public uint sourceId; - public uint tarGetId; + public uint targetId; public uint unknown1; } @@ -68,14 +68,14 @@ namespace FFXIVClassic_Map_Server.packets offset += header.subpacketSize; } - public SubPacket(ushort opcode, uint sourceId, uint tarGetId, byte[] data) + public SubPacket(ushort opcode, uint sourceId, uint targetId, byte[] data) { this.header = new SubPacketHeader(); this.gameMessage = new GameMessageHeader(); gameMessage.opcode = opcode; header.sourceId = sourceId; - header.tarGetId = tarGetId; + header.targetId = targetId; gameMessage.timestamp = Utils.UnixTimeStampUTC(); @@ -97,7 +97,7 @@ namespace FFXIVClassic_Map_Server.packets header.subpacketSize = original.header.subpacketSize; header.type = original.header.type; header.sourceId = original.header.sourceId; - header.tarGetId = newTargetId; + header.targetId = newTargetId; data = original.data; } diff --git a/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs index fa0886e4..ee59c7d3 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs @@ -8,26 +8,26 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00E1; public const uint PACKET_SIZE = 0x30; - public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorId, uint tarGettedActorId, uint emoteID) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, uint targettedActorId, uint emoteID) { byte[] data = new byte[PACKET_SIZE - 0x20]; - if (tarGettedActorId == 0xC0000000) - tarGettedActorId = sourceActorId; + if (targettedActorId == 0xC0000000) + targettedActorId = sourceActorId; using (MemoryStream mem = new MemoryStream(data)) { using (BinaryWriter binWriter = new BinaryWriter(mem)) { uint realAnimID = 0x5000000 | ((emoteID - 100) << 12); - uint realDescID = 20000 + ((emoteID - 1) * 10) + (tarGettedActorId == sourceActorId ? (uint)2 : (uint)1); + uint realDescID = 20000 + ((emoteID - 1) * 10) + (targettedActorId == sourceActorId ? (uint)2 : (uint)1); binWriter.Write((UInt32)realAnimID); - binWriter.Write((UInt32)tarGettedActorId); + binWriter.Write((UInt32)targettedActorId); binWriter.Write((UInt32)realDescID); } } - SubPacket packet = new SubPacket(OPCODE, sourceActorId, tarGetActorId, data); + SubPacket packet = new SubPacket(OPCODE, sourceActorId, targetActorId, data); packet.DebugPrintSubPacket(); return packet; } diff --git a/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs index 1dded5f3..14a72cb8 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00CC; public const uint PACKET_SIZE = 0x128; - public static SubPacket BuildPacket(uint sourceActorID, uint tarGetActorID, string objectName, string className, List initParams) + public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, string objectName, string className, List initParams) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -31,7 +31,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, sourceActorID, tarGetActorID, data); + return new SubPacket(OPCODE, sourceActorID, targetActorID, data); } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs index e5479f82..2ba4f976 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs @@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00E3; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID, int iconCode) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, int iconCode) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -25,7 +25,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, tarGetActorID, playerActorID, data); + return new SubPacket(OPCODE, targetActorID, playerActorID, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs index 88525e92..e6d61e39 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0139; public const uint PACKET_SIZE = 0x58; - public static SubPacket BuildPacket(uint sourceId, uint tarGetId) + public static SubPacket BuildPacket(uint sourceId, uint targetId) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -18,7 +18,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, sourceId, tarGetId, data); + return new SubPacket(OPCODE, sourceId, targetId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs index e812ba4b..60e5596a 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00CF; public const uint PACKET_SIZE = 0x50; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID, float x, float y, float z, float rot, ushort moveState) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, float x, float y, float z, float rot, ushort moveState) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -25,7 +25,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - SubPacket packet = new SubPacket(OPCODE, playerActorID, tarGetActorID, data); + SubPacket packet = new SubPacket(OPCODE, playerActorID, targetActorID, data); return packet; } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs index c8390e06..662e6096 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs @@ -12,7 +12,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0145; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID, uint iconCode) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint iconCode) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -24,7 +24,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, tarGetActorID, data); + return new SubPacket(OPCODE, playerActorID, targetActorID, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs index 3bbcfffd..12341c95 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x144; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetID, uint idleAnimationId) + public static SubPacket BuildPacket(uint playerActorID, uint targetID, uint idleAnimationId) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -21,7 +21,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, tarGetID, data); + return new SubPacket(OPCODE, playerActorID, targetID, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs index f7edc364..5b46c55b 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs @@ -5,11 +5,11 @@ public const ushort OPCODE = 0x017B; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID, bool isDimmed) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, bool isDimmed) { byte[] data = new byte[PACKET_SIZE - 0x20]; data[0] = (byte)(isDimmed ? 1 : 0); - return new SubPacket(OPCODE, playerActorID, tarGetActorID, data); + return new SubPacket(OPCODE, playerActorID, targetActorID, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs index 9ec68113..6036cd4d 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x013D; public const uint PACKET_SIZE = 0x48; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID, uint displayNameID, string customName) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint displayNameID, string customName) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -27,7 +27,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - SubPacket packet = new SubPacket(OPCODE, playerActorID, tarGetActorID, data); + SubPacket packet = new SubPacket(OPCODE, playerActorID, targetActorID, data); return packet; } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs index b48966b9..7e0012ea 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs @@ -22,7 +22,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const float INNPOS_Z = 165.050003f; public const float INNPOS_ROT = -1.530000f; - public static SubPacket BuildPacket(uint sourceActorID, uint tarGetActorID, uint actorId, float x, float y, float z, float rotation, uint spawnType, bool isZoningPlayer) + public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, uint actorId, float x, float y, float z, float rotation, uint spawnType, bool isZoningPlayer) { byte[] data = new byte[PACKET_SIZE-0x20]; @@ -44,7 +44,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, sourceActorID, tarGetActorID, data); + return new SubPacket(OPCODE, sourceActorID, targetActorID, data); } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs index 3591c3e0..b059f506 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs @@ -182,9 +182,9 @@ namespace FFXIVClassic_Map_Server.packets.send.actor isMore = flag; } - public void SetTarget(string tarGet) + public void SetTarget(string target) { - currentTarget = tarGet; + currentTarget = target; } public void AddTarget() diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs index 791b2b0b..5f22942b 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs @@ -12,7 +12,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const float DEFAULT_WALK = 2.0f; public const float DEFAULT_RUN = 5.0f; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -38,10 +38,10 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, tarGetActorID, data); + return new SubPacket(OPCODE, playerActorID, targetActorID, data); } - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID, float stopSpeed, float walkSpeed, float runSpeed) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, float stopSpeed, float walkSpeed, float runSpeed) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -67,7 +67,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, tarGetActorID, data); + return new SubPacket(OPCODE, playerActorID, targetActorID, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs index 317e5214..bb3a0cc6 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs @@ -27,10 +27,10 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x134; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetID, uint mainState, uint subState) + public static SubPacket BuildPacket(uint playerActorID, uint targetID, uint mainState, uint subState) { ulong combined = (mainState & 0xFF) | ((subState & 0xFF) << 8); - return new SubPacket(OPCODE, playerActorID, tarGetID, BitConverter.GetBytes(combined)); + return new SubPacket(OPCODE, playerActorID, targetID, BitConverter.GetBytes(combined)); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs index 4f903091..277dda2b 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0179; public const uint PACKET_SIZE = 0x48; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID, ushort[] statusIds) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, ushort[] statusIds) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -25,7 +25,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - SubPacket packet = new SubPacket(OPCODE, playerActorID, tarGetActorID, data); + SubPacket packet = new SubPacket(OPCODE, playerActorID, targetActorID, data); return packet; } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs index 65811b30..bd148efb 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0177; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID, ushort index, ushort statusCode) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, ushort index, ushort statusCode) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -21,7 +21,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, tarGetActorID, data); + return new SubPacket(OPCODE, playerActorID, targetActorID, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs index 62a42bab..ebc77e0d 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs @@ -7,9 +7,9 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00D3; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID, uint tarGetID) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint targetID) { - return new SubPacket(OPCODE, playerActorID, tarGetID, BitConverter.GetBytes((ulong)tarGetID)); + return new SubPacket(OPCODE, playerActorID, targetID, BitConverter.GetBytes((ulong)targetID)); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs index 5ef0052c..645209cc 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs @@ -7,9 +7,9 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x00DB; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID, uint tarGetID) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint targetID) { - return new SubPacket(OPCODE, playerActorID, tarGetID, BitConverter.GetBytes((ulong)tarGetID)); + return new SubPacket(OPCODE, playerActorID, targetID, BitConverter.GetBytes((ulong)targetID)); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs index e9c598ee..7fe72cae 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs @@ -7,7 +7,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x000F; public const uint PACKET_SIZE = 0x38; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -19,7 +19,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, playerActorID, tarGetActorID, data); + return new SubPacket(OPCODE, playerActorID, targetActorID, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs index 77dda47b..71bf867b 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs @@ -2,7 +2,7 @@ { class BattleAction { - public uint tarGetId; + public uint targetId; public ushort amount; public ushort worldMasterTextId; public uint effectId; diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs index aa61508c..30995408 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle public const ushort OPCODE = 0x013C; public const uint PACKET_SIZE = 0x48; - public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint tarGetActorId, uint animationId, ushort commandId) + public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint targetActorId, uint animationId, ushort commandId) { byte[] data = new byte[PACKET_SIZE - 0x20]; diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs index e91efe59..0a90d960 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle public const ushort OPCODE = 0x0139; public const uint PACKET_SIZE = 0x58; - public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint tarGetActorId, uint animationId, uint effectId, ushort worldMasterTextId, ushort commandId, ushort amount, byte param) + public static SubPacket BuildPacket(uint playerActorID, uint sourceActorId, uint targetActorId, uint animationId, uint effectId, ushort worldMasterTextId, ushort commandId, ushort amount, byte param) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -26,7 +26,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle binWriter.Write((UInt16)commandId); binWriter.Write((UInt16)810); //? - binWriter.Write((UInt32)tarGetActorId); + binWriter.Write((UInt32)targetActorId); binWriter.Write((UInt16)amount); binWriter.Write((UInt16)worldMasterTextId); diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs index 8a136009..67775962 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs @@ -28,7 +28,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle binWriter.Seek(0x20, SeekOrigin.Begin); foreach (BattleAction action in actionList) - binWriter.Write((UInt32)action.tarGetId); + binWriter.Write((UInt32)action.targetId); binWriter.Seek(0x50, SeekOrigin.Begin); foreach (BattleAction action in actionList) diff --git a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs index 63e2f960..38038ab3 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs @@ -28,7 +28,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle binWriter.Seek(0x58, SeekOrigin.Begin); foreach (BattleAction action in actionList) - binWriter.Write((UInt32)action.tarGetId); + binWriter.Write((UInt32)action.targetId); binWriter.Seek(0xA0, SeekOrigin.Begin); foreach (BattleAction action in actionList) diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs index a8d450c6..4df15032 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs @@ -5,11 +5,11 @@ public const ushort OPCODE = 0x016D; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorId) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId) { byte[] data = new byte[8]; data[0] = 2; - return new SubPacket(OPCODE, sourceActorId, tarGetActorId, data); + return new SubPacket(OPCODE, sourceActorId, targetActorId, data); } public static SubPacket BuildPacket(uint playerActorID) diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs index 369e26f9..c6944676 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs @@ -5,9 +5,9 @@ public const ushort OPCODE = 0x016E; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorId) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId) { - return new SubPacket(OPCODE, sourceActorId, tarGetActorId, new byte[8]); + return new SubPacket(OPCODE, sourceActorId, targetActorId, new byte[8]); } public static SubPacket BuildPacket(uint playerActorID) diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs index 5a3c5757..5d4db4fe 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs @@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory return BuildPacket(playerActorId, playerActorId, item); } - public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorId, InventoryItem item) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, InventoryItem item) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -25,7 +25,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory } } - return new SubPacket(OPCODE, sourceActorId, tarGetActorId, data); + return new SubPacket(OPCODE, sourceActorId, targetActorId, data); } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs index 19ebd593..b136429c 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs @@ -15,7 +15,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory return BuildPacket(playerActorId, playerActorId, items, ref listOffset); } - public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorId, List items, ref int listOffset) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, List items, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -40,7 +40,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory } } - return new SubPacket(OPCODE, sourceActorId, tarGetActorId, data); + return new SubPacket(OPCODE, sourceActorId, targetActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs index 57cdb134..31cf4cc4 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs @@ -14,7 +14,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory return BuildPacket(playerActorId, playerActorId, items, ref listOffset); } - public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorId, List items, ref int listOffset) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, List items, ref int listOffset) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -36,7 +36,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory } } - return new SubPacket(OPCODE, sourceActorId, tarGetActorId, data); + return new SubPacket(OPCODE, sourceActorId, targetActorId, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs index 99d8370f..707f9ca1 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs @@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory return BuildPacket(playerActorId, playerActorId, size, code); } - public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorId, ushort size, ushort code) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, ushort size, ushort code) { byte[] data = new byte[8]; @@ -27,7 +27,7 @@ namespace FFXIVClassic_Map_Server.packets.send.Actor.inventory } } - return new SubPacket(OPCODE, sourceActorId, tarGetActorId, data); + return new SubPacket(OPCODE, sourceActorId, targetActorId, data); } } diff --git a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs index cdfc485d..29da7459 100644 --- a/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs +++ b/FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs @@ -11,9 +11,9 @@ return new SubPacket(OPCODE, playerActorId, playerActorId, new byte[8]); } - public static SubPacket BuildPacket(uint sourceActorId, uint tarGetActorID) + public static SubPacket BuildPacket(uint sourceActorId, uint targetActorID) { - return new SubPacket(OPCODE, sourceActorId, tarGetActorID, new byte[8]); + return new SubPacket(OPCODE, sourceActorId, targetActorID, new byte[8]); } } diff --git a/FFXIVClassic Map Server/packets/send/GameMessagePacket.cs b/FFXIVClassic Map Server/packets/send/GameMessagePacket.cs index cf780440..9524bae1 100644 --- a/FFXIVClassic Map Server/packets/send/GameMessagePacket.cs +++ b/FFXIVClassic Map Server/packets/send/GameMessagePacket.cs @@ -56,7 +56,7 @@ namespace FFXIVClassic_Map_Server.packets.send private const ushort SIZE_GAMEMESSAGE_WITHOUT_ACTOR4 = 0x48; private const ushort SIZE_GAMEMESSAGE_WITHOUT_ACTOR5 = 0x68; - public static SubPacket BuildPacket(uint sourceId, uint tarGetId, uint actorId, uint textOwnerActorId, ushort textId, byte log) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint actorId, uint textOwnerActorId, ushort textId, byte log) { byte[] data = new byte[SIZE_GAMEMESSAGE_WITH_ACTOR1 - 0x20]; @@ -71,10 +71,10 @@ namespace FFXIVClassic_Map_Server.packets.send } } - return new SubPacket(OPCODE_GAMEMESSAGE_WITH_ACTOR1, sourceId, tarGetId, data); + return new SubPacket(OPCODE_GAMEMESSAGE_WITH_ACTOR1, sourceId, targetId, data); } - public static SubPacket BuildPacket(uint sourceId, uint tarGetId, uint actorId, uint textOwnerActorId, ushort textId, byte log, List lParams) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint actorId, uint textOwnerActorId, ushort textId, byte log, List lParams) { int lParamsSize = findSizeOfParams(lParams); byte[] data; @@ -119,10 +119,10 @@ namespace FFXIVClassic_Map_Server.packets.send } } - return new SubPacket(opcode, sourceId, tarGetId, data); + return new SubPacket(opcode, sourceId, targetId, data); } - public static SubPacket BuildPacket(uint sourceId, uint tarGetId, uint textOwnerActorId, ushort textId, string sender, byte log) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, string sender, byte log) { byte[] data = new byte[SIZE_GAMEMESSAGE_WITH_CUSTOM_SENDER1 - 0x20]; @@ -137,10 +137,10 @@ namespace FFXIVClassic_Map_Server.packets.send } } - return new SubPacket(OPCODE_GAMEMESSAGE_WITH_CUSTOM_SENDER1, sourceId, tarGetId, data); + return new SubPacket(OPCODE_GAMEMESSAGE_WITH_CUSTOM_SENDER1, sourceId, targetId, data); } - public static SubPacket BuildPacket(uint sourceId, uint tarGetId, uint textOwnerActorId, ushort textId, string sender, byte log, List lParams) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, string sender, byte log, List lParams) { int lParamsSize = findSizeOfParams(lParams); byte[] data; @@ -185,10 +185,10 @@ namespace FFXIVClassic_Map_Server.packets.send } } - return new SubPacket(opcode, sourceId, tarGetId, data); + return new SubPacket(opcode, sourceId, targetId, data); } - public static SubPacket BuildPacket(uint sourceId, uint tarGetId, uint textOwnerActorId, ushort textId, uint senderDisplayNameId, byte log) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, uint senderDisplayNameId, byte log) { byte[] data = new byte[SIZE_GAMEMESSAGE_WITH_DISPID_SENDER1 - 0x20]; @@ -203,10 +203,10 @@ namespace FFXIVClassic_Map_Server.packets.send } } - return new SubPacket(OPCODE_GAMEMESSAGE_WITH_DISPID_SENDER1, sourceId, tarGetId, data); + return new SubPacket(OPCODE_GAMEMESSAGE_WITH_DISPID_SENDER1, sourceId, targetId, data); } - public static SubPacket BuildPacket(uint sourceId, uint tarGetId, uint textOwnerActorId, ushort textId, uint senderDisplayNameId, byte log, List lParams) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, uint senderDisplayNameId, byte log, List lParams) { int lParamsSize = findSizeOfParams(lParams); byte[] data; @@ -251,10 +251,10 @@ namespace FFXIVClassic_Map_Server.packets.send } } - return new SubPacket(opcode, sourceId, tarGetId, data); + return new SubPacket(opcode, sourceId, targetId, data); } - public static SubPacket BuildPacket(uint sourceId, uint tarGetId, uint textOwnerActorId, ushort textId, byte log) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, byte log) { byte[] data = new byte[SIZE_GAMEMESSAGE_WITHOUT_ACTOR1 - 0x20]; @@ -268,10 +268,10 @@ namespace FFXIVClassic_Map_Server.packets.send } } - return new SubPacket(OPCODE_GAMEMESSAGE_WITHOUT_ACTOR1, sourceId, tarGetId, data); + return new SubPacket(OPCODE_GAMEMESSAGE_WITHOUT_ACTOR1, sourceId, targetId, data); } - public static SubPacket BuildPacket(uint sourceId, uint tarGetId, uint textOwnerActorId, ushort textId, byte log, List lParams) + public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, byte log, List lParams) { int lParamsSize = findSizeOfParams(lParams); byte[] data; @@ -315,7 +315,7 @@ namespace FFXIVClassic_Map_Server.packets.send } } - return new SubPacket(opcode, sourceId, tarGetId, data); + return new SubPacket(opcode, sourceId, targetId, data); } private static int findSizeOfParams(List lParams) diff --git a/FFXIVClassic Map Server/packets/send/SendMessagePacket.cs b/FFXIVClassic Map Server/packets/send/SendMessagePacket.cs index 2e305057..6152f215 100644 --- a/FFXIVClassic Map Server/packets/send/SendMessagePacket.cs +++ b/FFXIVClassic Map Server/packets/send/SendMessagePacket.cs @@ -34,7 +34,7 @@ namespace FFXIVClassic_Map_Server.packets.send public const ushort OPCODE = 0x0003; public const uint PACKET_SIZE = 0x248; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetID, uint messageType, string sender, string message) + public static SubPacket BuildPacket(uint playerActorID, uint targetID, uint messageType, string sender, string message) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -49,7 +49,7 @@ namespace FFXIVClassic_Map_Server.packets.send } } - return new SubPacket(OPCODE, playerActorID, tarGetID, data); + return new SubPacket(OPCODE, playerActorID, targetID, data); } } diff --git a/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs b/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs index 3ba3455b..35571c55 100644 --- a/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs +++ b/FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs @@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events public const ushort OPCODE = 0x012F; public const uint PACKET_SIZE = 0x90; - public static SubPacket BuildPacket(uint playerActorId, uint tarGetActorId, string conditionName, List luaParams) + public static SubPacket BuildPacket(uint playerActorId, uint targetActorId, string conditionName, List luaParams) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -20,7 +20,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events using (BinaryWriter binWriter = new BinaryWriter(mem)) { binWriter.Write((UInt32)playerActorId); - binWriter.Write((UInt32)tarGetActorId); + binWriter.Write((UInt32)targetActorId); binWriter.Write((Byte)0x5); binWriter.Write((Byte)0x87); binWriter.Write((Byte)0xDC); diff --git a/FFXIVClassic Map Server/packets/send/list/SetListPropertyPacket.cs b/FFXIVClassic Map Server/packets/send/list/SetListPropertyPacket.cs index 2b76466d..781e137f 100644 --- a/FFXIVClassic Map Server/packets/send/list/SetListPropertyPacket.cs +++ b/FFXIVClassic Map Server/packets/send/list/SetListPropertyPacket.cs @@ -158,11 +158,11 @@ namespace FFXIVClassic_Map_Server.packets.send.actor isMore = flag; } - public void SetTarget(string tarGet) + public void SetTarget(string target) { - binWriter.Write((byte)(isMore ? 0x62 + tarGet.Length : 0x82 + tarGet.Length)); - binWriter.Write(Encoding.ASCII.GetBytes(tarGet)); - runningByteTotal += (ushort)(1 + Encoding.ASCII.GetByteCount(tarGet)); + binWriter.Write((byte)(isMore ? 0x62 + target.Length : 0x82 + target.Length)); + binWriter.Write(Encoding.ASCII.GetBytes(target)); + runningByteTotal += (ushort)(1 + Encoding.ASCII.GetByteCount(target)); } diff --git a/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs b/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs index a6b51c95..73780b4c 100644 --- a/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs @@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x0133; public const uint PACKET_SIZE = 0xE0; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID, List luaParams) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, List luaParams) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -21,7 +21,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player } } - return new SubPacket(OPCODE, playerActorID, tarGetActorID, data); + return new SubPacket(OPCODE, playerActorID, targetActorID, data); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs index 5b3776e0..53bbb748 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs @@ -7,11 +7,11 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x0198; public const uint PACKET_SIZE = 0x40; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID, string name) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, string name) { if (Encoding.Unicode.GetByteCount(name) >= 0x20) name = "ERR: Too Long"; - return new SubPacket(OPCODE, playerActorID, tarGetActorID, Encoding.ASCII.GetBytes(name)); + return new SubPacket(OPCODE, playerActorID, targetActorID, Encoding.ASCII.GetBytes(name)); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs index 152aa55e..43a07cd0 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs @@ -7,9 +7,9 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x01A4; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint sourceActorID, uint tarGetActorID, uint jobId) + public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, uint jobId) { - return new SubPacket(OPCODE, sourceActorID, tarGetActorID, BitConverter.GetBytes((uint)jobId)); + return new SubPacket(OPCODE, sourceActorID, targetActorID, BitConverter.GetBytes((uint)jobId)); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs b/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs index 326a4bcb..4b177966 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor public const ushort OPCODE = 0x0194; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint sourceActorID, uint tarGetActorID, ushort currentAllegiance, ushort rankLimsa, ushort rankGridania, ushort rankUldah) + public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, ushort currentAllegiance, ushort rankLimsa, ushort rankGridania, ushort rankUldah) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor } } - return new SubPacket(OPCODE, sourceActorID, tarGetActorID, data); + return new SubPacket(OPCODE, sourceActorID, targetActorID, data); } } diff --git a/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs b/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs index 7a053092..112def38 100644 --- a/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs +++ b/FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs @@ -7,9 +7,9 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x019D; public const uint PACKET_SIZE = 0x28; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID, uint titleID) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint titleID) { - return new SubPacket(OPCODE, playerActorID, tarGetActorID, BitConverter.GetBytes((UInt64)titleID)); + return new SubPacket(OPCODE, playerActorID, targetActorID, BitConverter.GetBytes((UInt64)titleID)); } } } diff --git a/FFXIVClassic Map Server/packets/send/player/_0x196Packet.cs b/FFXIVClassic Map Server/packets/send/player/_0x196Packet.cs index 6924769d..221f4d37 100644 --- a/FFXIVClassic Map Server/packets/send/player/_0x196Packet.cs +++ b/FFXIVClassic Map Server/packets/send/player/_0x196Packet.cs @@ -8,7 +8,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player public const ushort OPCODE = 0x0196; public const uint PACKET_SIZE = 0x38; - public static SubPacket BuildPacket(uint playerActorID, uint tarGetActorID) + public static SubPacket BuildPacket(uint playerActorID, uint targetActorID) { byte[] data = new byte[PACKET_SIZE - 0x20]; @@ -21,7 +21,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player } } - return new SubPacket(OPCODE, playerActorID, tarGetActorID, data); + return new SubPacket(OPCODE, playerActorID, targetActorID, data); } } } diff --git a/FFXIVClassic Map Server/utils/ActorPropertyPacketUtil.cs b/FFXIVClassic Map Server/utils/ActorPropertyPacketUtil.cs index 095cb206..e86996eb 100644 --- a/FFXIVClassic Map Server/utils/ActorPropertyPacketUtil.cs +++ b/FFXIVClassic Map Server/utils/ActorPropertyPacketUtil.cs @@ -32,11 +32,11 @@ namespace FFXIVClassic_Map_Server.utils } } - public void NewTarget(string tarGet) + public void NewTarget(string target) { currentActorPropertyPacket.AddTarget(); - currentTarget = tarGet; - currentActorPropertyPacket.SetTarget(tarGet); + currentTarget = target; + currentActorPropertyPacket.SetTarget(target); } public List Done()