# Conflicts:
#	FFXIVClassic Map Server/actors/Actor.cs
#	FFXIVClassic Map Server/dataobjects/Session.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs
This commit is contained in:
Tahir Akhlaq 2017-07-08 04:10:36 +01:00
commit 4695193aa0
235 changed files with 2840 additions and 1024 deletions

View file

@ -10,7 +10,7 @@ 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 animationId, uint descriptionId)
public static SubPacket BuildPacket(uint sourceActorId, uint targettedActorId, uint animationId, uint descriptionId)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -32,7 +32,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
}
}
SubPacket packet = new SubPacket(OPCODE, sourceActorId, targetActorId, data);
SubPacket packet = new SubPacket(OPCODE, sourceActorId, data);
packet.DebugPrintSubPacket();
return packet;
}

View file

@ -13,7 +13,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, string objectName, string className, List<LuaParam> initParams)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -33,7 +33,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
}
}
return new SubPacket(OPCODE, sourceActorID, targetActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}

View file

@ -15,7 +15,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 sourceActorId, int iconCode)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -27,7 +27,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
}
}
return new SubPacket(OPCODE, targetActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -9,12 +9,12 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
public const ushort OPCODE = 0x00CA;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID, uint actorID, byte val)
public static SubPacket BuildPacket(uint sourceActorId, byte val)
{
byte[] data = new byte[PACKET_SIZE-0x20];
data[0] = val; //Why?
return new SubPacket(OPCODE, playerActorID, actorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}

View file

@ -1,27 +0,0 @@
using FFXIVClassic.Common;
using System.IO;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor
{
class BattleAction1Packet
{
public const ushort OPCODE = 0x0139;
public const uint PACKET_SIZE = 0x58;
public static SubPacket BuildPacket(uint sourceId, uint targetId)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
using (MemoryStream mem = new MemoryStream(data))
{
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
}
}
return new SubPacket(OPCODE, sourceId, targetId, data);
}
}
}

View file

@ -9,9 +9,9 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
public const ushort OPCODE = 0x0007;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID)
public static SubPacket BuildPacket(uint sourceActorId)
{
return new SubPacket(OPCODE, playerActorID, playerActorID, new byte[8]);
return new SubPacket(OPCODE, sourceActorId, new byte[8]);
}
}
}

View file

@ -10,7 +10,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 sourceActorId, float x, float y, float z, float rot, ushort moveState)
{
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, sourceActorId, data);
return packet;
}

View file

@ -12,9 +12,9 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
public const ushort OPCODE = 0x00DA;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint animationID)
public static SubPacket BuildPacket(uint sourceActorId, uint animationID)
{
return new SubPacket(OPCODE, playerActorID, targetActorID, BitConverter.GetBytes((ulong)animationID));
return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((ulong)animationID));
}
}
}

View file

@ -12,7 +12,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
public const ushort OPCODE = 0x00D9;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, string animName)
public static SubPacket BuildPacket(uint sourceActorId, string animName)
{
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, sourceActorId, data);
}
}

View file

@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
public const ushort OPCODE = 0x00CB;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID, uint actorId)
public static SubPacket BuildPacket(uint sourceActorId)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -18,11 +18,11 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
{
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
binWriter.Write((UInt32)actorId);
binWriter.Write((UInt32)sourceActorId);
}
}
return new SubPacket(OPCODE, actorId, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}

View file

@ -53,7 +53,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
appearanceIDs = appearanceTable;
}
public SubPacket BuildPacket(uint playerActorID, uint actorID)
public SubPacket BuildPacket(uint sourceActorId)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -74,7 +74,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
}
SubPacket packet = new SubPacket(OPCODE, playerActorID, actorID, data);
SubPacket packet = new SubPacket(OPCODE, sourceActorId, data);
return packet;
}

View file

@ -5,12 +5,12 @@ using System;
namespace FFXIVClassic_Map_Server.packets.send.actor
{
class _0xD8Packet
class SetActorBGPropertiesPacket
{
public const ushort OPCODE = 0x00D8;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, uint val1, uint val2)
public static SubPacket BuildPacket(uint sourceActorId, uint val1, uint val2)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
}
}
return new SubPacket(OPCODE, playerActorID, targetActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -14,7 +14,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 sourceActorId, uint iconCode)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -26,7 +26,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
}
}
return new SubPacket(OPCODE, playerActorID, targetActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -7,11 +7,11 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
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 sourceActorId, 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, sourceActorId, data);
}
}
}

View file

@ -11,7 +11,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 sourceActorId, uint displayNameID, string customName)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -29,7 +29,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
}
}
SubPacket packet = new SubPacket(OPCODE, playerActorID, targetActorID, data);
SubPacket packet = new SubPacket(OPCODE, sourceActorId, data);
return packet;
}

View file

@ -19,7 +19,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
public const ushort SPAWNTYPE_WARP_DUTY2 = 6;
public const ushort SPAWNTYPE_WARP_LIGHT = 7;
public static SubPacket BuildPacket(uint sourceActorID, uint targetActorID, uint actorId, float x, float y, float z, float rotation, ushort spawnType, bool isZoningPlayer)
public static SubPacket BuildPacket(uint sourceActorId, uint actorId, float x, float y, float z, float rotation, ushort spawnType, bool isZoningPlayer)
{
byte[] data = new byte[PACKET_SIZE-0x20];
@ -41,7 +41,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
}
}
return new SubPacket(OPCODE, sourceActorID, targetActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}

View file

@ -113,7 +113,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
string[] split = name.Split('.');
int arrayIndex = 0;
if (!(split[0].Equals("work") || split[0].Equals("charaWork") || split[0].Equals("playerWork") || split[0].Equals("npcWork")))
if (!(split[0].Equals("work") || split[0].Equals("charaWork") || split[0].Equals("playerWork") || split[0].Equals("npcWork") || split[0].Equals("guildleveWork")))
return false;
Object curObj = actor;
@ -159,6 +159,8 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
return AddByte(id, (byte)(((bool)curObj) ? 1 : 0));
else if (curObj is byte)
return AddByte(id, (byte)curObj);
else if (curObj is sbyte)
return AddByte(id, (byte)(sbyte)curObj);
else if (curObj is ushort)
return AddShort(id, (ushort)curObj);
else if (curObj is short)
@ -207,14 +209,14 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
currentTarget = newTarget;
}
public SubPacket BuildPacket(uint playerActorID, uint actorID)
public SubPacket BuildPacket(uint sourceActorId)
{
binWriter.Seek(0, SeekOrigin.Begin);
binWriter.Write((byte)runningByteTotal);
CloseStreams();
SubPacket packet = new SubPacket(OPCODE, actorID, playerActorID, data);
SubPacket packet = new SubPacket(OPCODE, sourceActorId, data);
return packet;
}

View file

@ -14,7 +14,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
public const float DEFAULT_RUN = 5.0f;
public const float DEFAULT_ACTIVE = 5.0f;
public static SubPacket BuildPacket(uint playerActorID, uint targetActorID)
public static SubPacket BuildPacket(uint sourceActorId)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -40,10 +40,10 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
}
}
return new SubPacket(OPCODE, playerActorID, targetActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, float stopSpeed, float walkSpeed, float runSpeed, float activeSpeed)
public static SubPacket BuildPacket(uint sourceActorId, float stopSpeed, float walkSpeed, float runSpeed, float activeSpeed)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -69,7 +69,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
}
}
return new SubPacket(OPCODE, playerActorID, targetActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -30,10 +30,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 sourceActorId, uint mainState, uint subState)
{
ulong combined = (mainState & 0xFF) | ((subState & 0xFF) << 8);
return new SubPacket(OPCODE, playerActorID, targetID, BitConverter.GetBytes(combined));
return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes(combined));
}
}
}

View file

@ -11,7 +11,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 sourceActorId, ushort[] statusIds)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -28,7 +28,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
}
}
SubPacket packet = new SubPacket(OPCODE, playerActorID, targetActorID, data);
SubPacket packet = new SubPacket(OPCODE, sourceActorId, data);
return packet;
}
}

View file

@ -11,7 +11,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 sourceActorId, ushort index, ushort statusCode)
{
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, sourceActorId, data);
}
}
}

View file

@ -10,7 +10,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, byte breakage, int leftChant, int rightChant, int guard, int wasteStat, int statMode, uint idleAnimationId)
public static SubPacket BuildPacket(uint sourceActorId, byte breakage, int leftChant, int rightChant, int guard, int wasteStat, int statMode, uint idleAnimationId)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -28,7 +28,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
}
}
return new SubPacket(OPCODE, playerActorID, targetID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -9,9 +9,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 sourceActorId, uint targetID)
{
return new SubPacket(OPCODE, playerActorID, targetID, BitConverter.GetBytes((ulong)targetID));
return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((ulong)targetID));
}
}
}

View file

@ -8,9 +8,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 sourceActorId, uint targetID)
{
return new SubPacket(OPCODE, playerActorID, targetID, BitConverter.GetBytes((ulong)targetID));
return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((ulong)targetID));
}
}
}

View file

@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
public const ushort OPCODE = 0x132;
public const uint PACKET_SIZE = 0x48;
public static SubPacket BuildPacket(uint playerActorID, ushort number, string function)
public static SubPacket BuildPacket(uint sourceActorId, ushort number, string function)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -24,7 +24,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -1,29 +0,0 @@
using System.IO;
using FFXIVClassic.Common;
using System;
using System.Text;
namespace FFXIVClassic_Map_Server.packets.send.actor
{
class _0xD9Packet
{
public const ushort OPCODE = 0x00D9;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID, uint targetActorID, string anim)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
using (MemoryStream mem = new MemoryStream(data))
{
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
binWriter.Write(Encoding.ASCII.GetBytes(anim), 0, Encoding.ASCII.GetByteCount(anim) >= 4 ? 4 : Encoding.ASCII.GetByteCount(anim));
}
}
return new SubPacket(OPCODE, playerActorID, targetActorID, data);
}
}
}

View file

@ -9,7 +9,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 sourceActor)
{
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, sourceActor, data);
}
}
}

View file

@ -32,7 +32,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
}
}
return new SubPacket(OPCODE, sourceActorId, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -2,8 +2,6 @@
using System;
using System.IO;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.actor.battle
{
// see xtx_command
@ -47,7 +45,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
}
}
return new SubPacket(OPCODE, sourceActorId, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -55,7 +55,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
}
}
return new SubPacket(OPCODE, sourceActorId, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -55,7 +55,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.battle
}
}
return new SubPacket(OPCODE, sourceActorId, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
public const ushort OPCODE = 0x016C;
public const uint PACKET_SIZE = 0x48;
public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, EventList.EmoteEventCondition condition)
public static SubPacket BuildPacket(uint sourceActorId, EventList.EmoteEventCondition condition)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -27,7 +27,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
}
}
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}

View file

@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
public const ushort OPCODE = 0x0136;
public const uint PACKET_SIZE = 0x48;
public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, bool enabled, byte unknown2, string conditionName)
public static SubPacket BuildPacket(uint sourceActorId, bool enabled, byte unknown2, string conditionName)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -25,7 +25,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
}
}
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -12,7 +12,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
public const ushort OPCODE = 0x016B;
public const uint PACKET_SIZE = 0x48;
public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, EventList.NoticeEventCondition condition)
public static SubPacket BuildPacket(uint sourceActorId, EventList.NoticeEventCondition condition)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -26,7 +26,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
}
}
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}

View file

@ -12,7 +12,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
public const ushort OPCODE = 0x016F;
public const uint PACKET_SIZE = 0x58;
public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, EventList.PushCircleEventCondition condition)
public static SubPacket BuildPacket(uint sourceActorId, EventList.PushCircleEventCondition condition)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -31,7 +31,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
}
}
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -12,7 +12,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
public const ushort OPCODE = 0x0170;
public const uint PACKET_SIZE = 0x60;
public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, EventList.PushFanEventCondition condition)
public static SubPacket BuildPacket(uint sourceActorId, EventList.PushFanEventCondition condition)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
binWriter.Write((Single)condition.radius);
binWriter.Write((UInt32)0xbfc90fdb);
binWriter.Write((UInt32)0x3f860a92);
binWriter.Write((UInt32)sourceActorID); //Actor Id
binWriter.Write((UInt32)sourceActorId); //Actor Id
binWriter.Write((Single)10.0f);
binWriter.Seek(4, SeekOrigin.Current);
binWriter.Write((Byte)(condition.outwards ? 0x11 : 0x1)); //If == 0x10, Inverted Bounding Box
@ -32,8 +32,8 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
binWriter.Write(Encoding.ASCII.GetBytes(condition.conditionName), 0, Encoding.ASCII.GetByteCount(condition.conditionName) >= 0x24 ? 0x24 : Encoding.ASCII.GetByteCount(condition.conditionName));
}
}
new SubPacket(OPCODE, sourceActorID, playerActorID, data).DebugPrintSubPacket();
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
new SubPacket(OPCODE, sourceActorId, data).DebugPrintSubPacket();
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -12,7 +12,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
public const ushort OPCODE = 0x0175;
public const uint PACKET_SIZE = 0x60;
public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, EventList.PushBoxEventCondition condition)
public static SubPacket BuildPacket(uint sourceActorId, EventList.PushBoxEventCondition condition)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -31,7 +31,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
}
}
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -12,7 +12,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
public const ushort OPCODE = 0x012E;
public const uint PACKET_SIZE = 0x48;
public static SubPacket BuildPacket(uint playerActorID, uint sourceActorID, EventList.TalkEventCondition condition)
public static SubPacket BuildPacket(uint sourceActorId, EventList.TalkEventCondition condition)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -27,7 +27,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
}
}
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -38,7 +38,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, playerActorId, playerActorId, data);
return new SubPacket(OPCODE, playerActorId, data);
}
}

View file

@ -36,7 +36,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, playerActorId, playerActorId, data);
return new SubPacket(OPCODE, playerActorId, data);
}
}

View file

@ -36,7 +36,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, playerActorId, playerActorId, data);
return new SubPacket(OPCODE, playerActorId, data);
}
}

View file

@ -36,7 +36,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, playerActorId, playerActorId, data);
return new SubPacket(OPCODE, playerActorId, data);
}
}

View file

@ -11,13 +11,13 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
byte[] data = new byte[8];
data[0] = 2;
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
public static SubPacket BuildPacket(uint playerActorID)
{
byte[] data = new byte[8];
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -7,14 +7,10 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
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)
{
return new SubPacket(OPCODE, sourceActorId, targetActorId, new byte[8]);
}
public static SubPacket BuildPacket(uint playerActorID)
{
return new SubPacket(OPCODE, playerActorID, playerActorID, new byte[8]);
return new SubPacket(OPCODE, sourceActorId, new byte[8]);
}
}
}

View file

@ -30,7 +30,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
data = mem.GetBuffer();
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}

View file

@ -30,7 +30,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
data = mem.GetBuffer();
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}

View file

@ -9,13 +9,8 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
public const ushort OPCODE = 0x0148;
public const uint PACKET_SIZE = 0x90;
public static SubPacket BuildPacket(uint playerActorId, InventoryItem item)
{
return BuildPacket(playerActorId, playerActorId, item);
}
public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, InventoryItem item)
public static SubPacket BuildPacket(uint sourceActorId, InventoryItem item)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -27,7 +22,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}

View file

@ -11,13 +11,8 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
public const ushort OPCODE = 0x0149;
public const uint PACKET_SIZE = 0x3A8;
public static SubPacket BuildPacket(uint playerActorId, List<InventoryItem> items, ref int listOffset)
{
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, List<InventoryItem> items, ref int listOffset)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -42,7 +37,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -11,12 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
public const ushort OPCODE = 0x014A;
public const uint PACKET_SIZE = 0x720;
public static SubPacket BuildPacket(uint playerActorId, List<InventoryItem> items, ref int listOffset)
{
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, List<InventoryItem> items, ref int listOffset)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -38,7 +33,8 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
public const ushort OPCODE = 0x014B;
public const uint PACKET_SIZE = 0xE20;
public static SubPacket BuildPacket(uint playerActorID, List<InventoryItem> items, ref int listOffset)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -33,7 +33,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -33,7 +33,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -9,7 +9,6 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
public const ushort OPCODE = 0x0152;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID, ushort slot)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -21,8 +20,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
binWriter.Write((UInt16)slot);
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -11,7 +11,6 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
public const ushort OPCODE = 0x0153;
public const uint PACKET_SIZE = 0x38;
public static SubPacket BuildPacket(uint playerActorID, List<ushort> slots, ref int listOffset)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -36,8 +35,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
binWriter.Write((Byte)max);
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -33,7 +33,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -33,7 +33,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -33,7 +33,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -10,12 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
public const ushort OPCODE = 0x0146;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorId, ushort size, ushort code)
{
return BuildPacket(playerActorId, playerActorId, size, code);
}
public static SubPacket BuildPacket(uint sourceActorId, uint targetActorId, ushort size, ushort code)
public static SubPacket BuildPacket(uint sourceActorId, ushort size, ushort code)
{
byte[] data = new byte[8];
@ -29,7 +24,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
}
}
return new SubPacket(OPCODE, sourceActorId, targetActorId, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}

View file

@ -4,19 +4,13 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.inventory
{
class InventorySetEndPacket
{
public const ushort OPCODE = 0x0147;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorId)
{
return new SubPacket(OPCODE, playerActorId, playerActorId, new byte[8]);
return new SubPacket(OPCODE, playerActorId, new byte[8]);
}
public static SubPacket BuildPacket(uint sourceActorId, uint targetActorID)
{
return new SubPacket(OPCODE, sourceActorId, targetActorID, new byte[8]);
}
}
}

View file

@ -58,7 +58,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 sourceActorId, uint actorId, uint textOwnerActorId, ushort textId, byte log)
{
byte[] data = new byte[SIZE_GAMEMESSAGE_WITH_ACTOR1 - 0x20];
@ -73,10 +73,10 @@ namespace FFXIVClassic_Map_Server.packets.send
}
}
return new SubPacket(OPCODE_GAMEMESSAGE_WITH_ACTOR1, sourceId, targetId, data);
return new SubPacket(OPCODE_GAMEMESSAGE_WITH_ACTOR1, sourceActorId, 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 sourceActorId, uint actorId, uint textOwnerActorId, ushort textId, byte log, List<LuaParam> lParams)
{
int lParamsSize = findSizeOfParams(lParams);
byte[] data;
@ -121,10 +121,10 @@ namespace FFXIVClassic_Map_Server.packets.send
}
}
return new SubPacket(opcode, sourceId, targetId, data);
return new SubPacket(opcode, sourceActorId, data);
}
public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, string sender, byte log)
public static SubPacket BuildPacket(uint sourceActorId, uint textOwnerActorId, ushort textId, string sender, byte log)
{
byte[] data = new byte[SIZE_GAMEMESSAGE_WITH_CUSTOM_SENDER1 - 0x20];
@ -139,10 +139,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, sourceActorId, 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 sourceActorId, uint textOwnerActorId, ushort textId, string sender, byte log, List<LuaParam> lParams)
{
int lParamsSize = findSizeOfParams(lParams);
byte[] data;
@ -187,10 +187,10 @@ namespace FFXIVClassic_Map_Server.packets.send
}
}
return new SubPacket(opcode, sourceId, targetId, data);
return new SubPacket(opcode, sourceActorId, data);
}
public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, uint senderDisplayNameId, byte log)
public static SubPacket BuildPacket(uint sourceActorId, uint textOwnerActorId, ushort textId, uint senderDisplayNameId, byte log)
{
byte[] data = new byte[SIZE_GAMEMESSAGE_WITH_DISPID_SENDER1 - 0x20];
@ -205,10 +205,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, sourceActorId, 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 sourceActorId, uint textOwnerActorId, ushort textId, uint senderDisplayNameId, byte log, List<LuaParam> lParams)
{
int lParamsSize = findSizeOfParams(lParams);
byte[] data;
@ -253,10 +253,10 @@ namespace FFXIVClassic_Map_Server.packets.send
}
}
return new SubPacket(opcode, sourceId, targetId, data);
return new SubPacket(opcode, sourceActorId, data);
}
public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, byte log)
public static SubPacket BuildPacket(uint sourceActorId, uint textOwnerActorId, ushort textId, byte log)
{
byte[] data = new byte[SIZE_GAMEMESSAGE_WITHOUT_ACTOR1 - 0x20];
@ -270,10 +270,10 @@ namespace FFXIVClassic_Map_Server.packets.send
}
}
return new SubPacket(OPCODE_GAMEMESSAGE_WITHOUT_ACTOR1, sourceId, targetId, data);
return new SubPacket(OPCODE_GAMEMESSAGE_WITHOUT_ACTOR1, sourceActorId, data);
}
public static SubPacket BuildPacket(uint sourceId, uint targetId, uint textOwnerActorId, ushort textId, byte log, List<LuaParam> lParams)
public static SubPacket BuildPacket(uint sourceActorId, uint textOwnerActorId, ushort textId, byte log, List<LuaParam> lParams)
{
int lParamsSize = findSizeOfParams(lParams);
byte[] data;
@ -317,7 +317,7 @@ namespace FFXIVClassic_Map_Server.packets.send
}
}
return new SubPacket(opcode, sourceId, targetId, data);
return new SubPacket(opcode, sourceActorId, data);
}
private static int findSizeOfParams(List<LuaParam> lParams)

View file

@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send
public static SubPacket BuildPacket(uint playerActorID)
{
return new SubPacket(OPCODE, playerActorID, playerActorID, new byte[8]);
return new SubPacket(OPCODE, playerActorID, new byte[8]);
}
}
}

View file

@ -22,7 +22,7 @@ namespace FFXIVClassic_Map_Server.packets.receive
}
}
SubPacket subpacket = new SubPacket(OPCODE, playerActorID, playerActorID, data);
SubPacket subpacket = new SubPacket(OPCODE, playerActorID, data);
return subpacket;
}

View file

@ -7,9 +7,9 @@ namespace FFXIVClassic_Map_Server.packets.send
public const ushort OPCODE = 0x0011;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID)
public static SubPacket BuildPacket(uint sourceActorId)
{
return new SubPacket(OPCODE, playerActorID, playerActorID, new byte[8]);
return new SubPacket(OPCODE, sourceActorId, new byte[8]);
}
}
}

View file

@ -36,7 +36,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 sourceActorId, uint messageType, string sender, string message)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -51,7 +51,7 @@ namespace FFXIVClassic_Map_Server.packets.send
}
}
return new SubPacket(OPCODE, playerActorID, targetID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}

View file

@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -16,10 +16,10 @@ namespace FFXIVClassic_Map_Server.packets.send
public const ushort EFFECT_PLAY_NORMAL_CHANNEL = 0x5; //Only works for multi channeled music
public const ushort EFFECT_PLAY_BATTLE_CHANNEL = 0x6;
public static SubPacket BuildPacket(uint playerActorID, ushort musicID, ushort musicTrackMode)
public static SubPacket BuildPacket(uint sourceActorId, ushort musicID, ushort musicTrackMode)
{
ulong combined = (ulong)(musicID | (musicTrackMode << 16));
return new SubPacket(OPCODE, 0, playerActorID, BitConverter.GetBytes(combined));
return new SubPacket(OPCODE, 0, BitConverter.GetBytes(combined));
}
}
}

View file

@ -37,10 +37,10 @@ namespace FFXIVClassic_Map_Server.packets.send
public const ushort OPCODE = 0x000D;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID, ushort weatherId, ushort transitionTime)
public static SubPacket BuildPacket(uint sourceActorId, ushort weatherId, ushort transitionTime)
{
ulong combined = (ulong)(weatherId | (transitionTime << 16));
return new SubPacket(OPCODE, 0, playerActorID, BitConverter.GetBytes(combined));
return new SubPacket(OPCODE, 0, BitConverter.GetBytes(combined));
}
}
}

View file

@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send
}
}
return new SubPacket(OPCODE, playerActorId, playerActorId, data);
return new SubPacket(OPCODE, playerActorId, data);
}
}
}

View file

@ -22,7 +22,7 @@ namespace FFXIVClassic_Map_Server.packets.send
}
}
return new SubPacket(OPCODE, playerActorId, playerActorId, data);
return new SubPacket(OPCODE, playerActorId, data);
}
}
}

View file

@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send
{
byte[] data = new byte[PACKET_SIZE - 0x20];
data[0] = (Byte) (val & 0xFF);
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -11,7 +11,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events
public const ushort OPCODE = 0x0131;
public const uint PACKET_SIZE = 0x50;
public static SubPacket BuildPacket(uint playerActorID, uint eventOwnerActorID, string eventStarter)
public static SubPacket BuildPacket(uint sourcePlayerActorId, uint eventOwnerActorID, string eventStarter)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
int maxBodySize = data.Length - 0x80;
@ -20,14 +20,14 @@ namespace FFXIVClassic_Map_Server.packets.send.events
{
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
binWriter.Write((UInt32)playerActorID);
binWriter.Write((UInt32)sourcePlayerActorId);
binWriter.Write((UInt32)0);
binWriter.Write((Byte)1);
binWriter.Write(Encoding.ASCII.GetBytes(eventStarter), 0, Encoding.ASCII.GetByteCount(eventStarter) >= 0x20 ? 0x20 : Encoding.ASCII.GetByteCount(eventStarter));
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourcePlayerActorId, data);
}
}
}

View file

@ -13,7 +13,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 sourcePlayerActorId, uint targetEventActorId, string conditionName, List<LuaParam> luaParams)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -21,8 +21,8 @@ namespace FFXIVClassic_Map_Server.packets.send.events
{
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
binWriter.Write((UInt32)playerActorId);
binWriter.Write((UInt32)targetActorId);
binWriter.Write((UInt32)sourcePlayerActorId);
binWriter.Write((UInt32)targetEventActorId);
int test = 0x75dc1705; //This will crash if set to 0 on pushCommand but not for mining which has to be 0????
@ -36,7 +36,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events
}
}
return new SubPacket(OPCODE, playerActorId, playerActorId, data);
return new SubPacket(OPCODE, sourcePlayerActorId, data);
}
}

View file

@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events
public const ushort OPCODE = 0x0130;
public const uint PACKET_SIZE = 0x2B8;
public static SubPacket BuildPacket(uint playerActorID, uint eventOwnerActorID, string eventStarter, string callFunction, List<LuaParam> luaParams)
public static SubPacket BuildPacket(uint sourcePlayerActorId, uint eventOwnerActorID, string eventStarter, string callFunction, List<LuaParam> luaParams)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
int maxBodySize = data.Length - 0x80;
@ -22,7 +22,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events
{
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
binWriter.Write((UInt32)playerActorID);
binWriter.Write((UInt32)sourcePlayerActorId);
binWriter.Write((UInt32)eventOwnerActorID);
binWriter.Write((Byte)5);
binWriter.Write(Encoding.ASCII.GetBytes(eventStarter), 0, Encoding.ASCII.GetByteCount(eventStarter) >= 0x20 ? 0x20 : Encoding.ASCII.GetByteCount(eventStarter));
@ -34,7 +34,7 @@ namespace FFXIVClassic_Map_Server.packets.send.events
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourcePlayerActorId, data);
}
}
}

View file

@ -45,7 +45,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -42,7 +42,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -42,7 +42,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -42,7 +42,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -35,7 +35,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -49,7 +49,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -37,7 +37,7 @@ namespace FFXIVClassic_Map_Server.packets.send.groups
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -56,7 +56,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -32,7 +32,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -31,7 +31,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}

View file

@ -49,7 +49,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -45,7 +45,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -45,7 +45,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -45,7 +45,7 @@ namespace FFXIVClassic_Map_Server.packets.send.group
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, playerActorID, data);
}
}
}

View file

@ -201,7 +201,7 @@ namespace FFXIVClassic_Map_Server.packets.send.groups
closeStreams();
SubPacket packet = new SubPacket(OPCODE, playerActorID, actorID, data);
SubPacket packet = new SubPacket(OPCODE, actorID, data);
return packet;
}

View file

@ -9,7 +9,7 @@ namespace FFXIVClassic_Map_Server.packets.send.login
public const ushort OPCODE = 0x0002;
public const uint PACKET_SIZE = 0x30;
public static SubPacket BuildPacket(uint playerActorID)
public static SubPacket BuildPacket(uint sourceActorId)
{
byte[] data = new byte[PACKET_SIZE-0x20];
@ -18,11 +18,11 @@ namespace FFXIVClassic_Map_Server.packets.send.login
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
binWriter.BaseStream.Seek(0x8, SeekOrigin.Begin);
binWriter.Write((uint)playerActorID);
binWriter.Write((uint)sourceActorId);
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -1,39 +0,0 @@
using FFXIVClassic.Common;
using System;
using System.IO;
using FFXIVClassic.Common;
namespace FFXIVClassic_Map_Server.packets.send.login
{
class Login0x7ResponsePacket
{
public static BasePacket BuildPacket(uint actorID, uint time, uint type)
{
byte[] data = new byte[0x18];
using (MemoryStream mem = new MemoryStream(data))
{
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
try
{
binWriter.Write((short)0x18);
binWriter.Write((short)type);
binWriter.Write((uint)0);
binWriter.Write((uint)0);
binWriter.Write((uint)0xFFFFFD7F);
binWriter.Write((uint)actorID);
binWriter.Write((uint)time);
}
catch (Exception)
{
}
}
}
return BasePacket.CreatePacket(data, false, false);
}
}
}

View file

@ -9,9 +9,9 @@ namespace FFXIVClassic_Map_Server.packets.send.player
public const ushort OPCODE = 0x019E;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID, uint achievementID)
public static SubPacket BuildPacket(uint sourceActorId, uint achievementID)
{
return new SubPacket(OPCODE, playerActorID, playerActorID, BitConverter.GetBytes((UInt64)achievementID));
return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((UInt64)achievementID));
}
}
}

View file

@ -11,7 +11,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 sourceActorId, List<LuaParam> luaParams)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -23,7 +23,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player
}
}
return new SubPacket(OPCODE, playerActorID, targetActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -10,7 +10,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player
public const ushort OPCODE = 0x019F;
public const uint PACKET_SIZE = 0x30;
public static SubPacket BuildPacket(uint playerActorID, uint achievementId, uint progressCount, uint progressFlags)
public static SubPacket BuildPacket(uint sourceActorId, uint achievementId, uint progressCount, uint progressFlags)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -24,7 +24,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -9,9 +9,9 @@ namespace FFXIVClassic_Map_Server.packets.send.player
public const ushort OPCODE = 0x019C;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID, uint numAchievementPoints)
public static SubPacket BuildPacket(uint sourceActorId, uint numAchievementPoints)
{
return new SubPacket(OPCODE, playerActorID, playerActorID, BitConverter.GetBytes((UInt64) numAchievementPoints));
return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((UInt64) numAchievementPoints));
}
}
}

View file

@ -9,11 +9,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 sourceActorId, 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, sourceActorId, Encoding.ASCII.GetBytes(name));
}
}
}

View file

@ -26,7 +26,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player
public bool[] achievementFlags = new bool[1024];
public SubPacket BuildPacket(uint playerActorID)
public SubPacket BuildPacket(uint sourceActorId)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -42,7 +42,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}

View file

@ -9,9 +9,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 jobId)
{
return new SubPacket(OPCODE, sourceActorID, targetActorID, BitConverter.GetBytes((uint)jobId));
return new SubPacket(OPCODE, sourceActorId, BitConverter.GetBytes((uint)jobId));
}
}
}

View file

@ -24,11 +24,11 @@ namespace FFXIVClassic_Map_Server.packets.send.player
public const ushort OPCODE = 0x0197;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID, int appearanceId)
public static SubPacket BuildPacket(uint sourceActorId, int appearanceId)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
data[5] = (byte)(appearanceId & 0xFF);
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -8,11 +8,11 @@ namespace FFXIVClassic_Map_Server.packets.send.player
public const ushort OPCODE = 0x01a0;
public const uint PACKET_SIZE = 0x28;
public static SubPacket BuildPacket(uint playerActorID, int appearanceId)
public static SubPacket BuildPacket(uint sourceActorId, int appearanceId)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
data[0] = (byte)(appearanceId & 0xFF);
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}
}

View file

@ -62,7 +62,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player
public bool[] cutsceneFlags = new bool[2048];
public SubPacket BuildPacket(uint playerActorID, string sNpcName, short sNpcActorIdOffset, byte sNpcSkin, byte sNpcPersonality)
public SubPacket BuildPacket(uint sourceActorId, string sNpcName, short sNpcActorIdOffset, byte sNpcSkin, byte sNpcPersonality)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -91,7 +91,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorId, data);
}
}

Some files were not shown because too many files have changed in this diff Show more