cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-02 19:42:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

derp

Browse Source
This commit is contained in:
Tahir Akhlaq 2016-06-15 00:08:05 +01:00
parent b633126568
commit ba13d5798d
47 changed files with 144 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FFXIVClassic Lobby Server/Database.cs
View File

@ -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,

8
FFXIVClassic Lobby Server/packets/SubPacket.cs
View File

@ -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;
}

6
FFXIVClassic Map Server/CommandProcessor.cs
View File

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

2
FFXIVClassic Map Server/actors/chara/ParameterTemp.cs
View File

@ -4,7 +4,7 @@
{
public short tp = 0;
public int tarGetInformation = 0;
public int targetInformation = 0;
public ushort[] maxCommandRecastTime = new ushort[40];

58
FFXIVClassic Map Server/lua/LuaEngine.cs
View File

@ -28,13 +28,13 @@ namespace FFXIVClassic_Map_Server.lua
UserData.RegistrationPolicy = InteropRegistrationPolicy.Automatic;
}
public static List<LuaParam> DoActorInstantiate(Player player, Actor tarGet)
public static List<LuaParam> 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<LuaParam> 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<Object> objects = new List<Object>();
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<Object> objects = new List<Object>();
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()));
}
}

8
FFXIVClassic Map Server/packets/SubPacket.cs
View File

@ -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;
}

12
FFXIVClassic Map Server/packets/send/Actor/ActorDoEmotePacket.cs
View File

@ -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;
}

4
FFXIVClassic Map Server/packets/send/Actor/ActorInstantiatePacket.cs
View File

@ -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<LuaParam> initParams)
public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, string objectName, string className, List<LuaParam> 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);
}
}

4
FFXIVClassic Map Server/packets/send/Actor/ActorSpecialGraphicPacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/BattleAction1Packet.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/MoveActorToPositionPacket.cs
View File

@ -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;
}

4
FFXIVClassic Map Server/packets/send/Actor/SetActorIconPacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/SetActorIdleAnimationPacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/SetActorIsZoningPacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/SetActorNamePacket.cs
View File

@ -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;
}

4
FFXIVClassic Map Server/packets/send/Actor/SetActorPositionPacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs
View File

@ -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()

8
FFXIVClassic Map Server/packets/send/Actor/SetActorSpeedPacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs
View File

@ -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;
}
}

4
FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/SetActorTargetAnimatedPacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/SetActorTargetPacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/_0xFPacket.cs
View File

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

2
FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs
View File

@ -2,7 +2,7 @@
{
class BattleAction
{
public uint tarGetId;
public uint targetId;
public ushort amount;
public ushort worldMasterTextId;
public uint effectId;

2
FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX00Packet.cs
View File

@ -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];

4
FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX01Packet.cs
View File

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

2
FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs
View File

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

2
FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryBeginChangePacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryEndChangePacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX01Packet.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX08Packet.cs
View File

@ -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<InventoryItem> items, ref int listOffset)
public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, List<InventoryItem> 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);
}
}
}

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryListX16Packet.cs
View File

@ -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<InventoryItem> items, ref int listOffset)
public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, List<InventoryItem> 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);
}
}
}

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetBeginPacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/Actor/inventory/InventorySetEndPacket.cs
View File

@ -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]);
}
}

32
FFXIVClassic Map Server/packets/send/GameMessagePacket.cs
View File

@ -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<LuaParam> lParams)
public static SubPacket BuildPacket(uint sourceId, uint targetId, uint actorId, uint textOwnerActorId, ushort textId, byte log, List<LuaParam> 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<LuaParam> lParams)
public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, string sender, byte log, List<LuaParam> 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<LuaParam> lParams)
public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, uint senderDisplayNameId, byte log, List<LuaParam> 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<LuaParam> lParams)
public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, byte log, List<LuaParam> 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<LuaParam> lParams)

4
FFXIVClassic Map Server/packets/send/SendMessagePacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/events/KickEventPacket.cs
View File

@ -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<LuaParam> luaParams)
public static SubPacket BuildPacket(uint playerActorId, uint targetActorId, string conditionName, List<LuaParam> 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);

8
FFXIVClassic Map Server/packets/send/list/SetListPropertyPacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/player/InfoRequestResponsePacket.cs
View File

@ -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<LuaParam> luaParams)
public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, List<LuaParam> 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);
}
}
}

4
FFXIVClassic Map Server/packets/send/player/SetChocoboNamePacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/player/SetCurrentJobPacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/player/SetGrandCompanyPacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/player/SetPlayerTitlePacket.cs
View File

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

4
FFXIVClassic Map Server/packets/send/player/_0x196Packet.cs
View File

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

6
FFXIVClassic Map Server/utils/ActorPropertyPacketUtil.cs
View File

@ -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<SubPacket> Done()