mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-22 04:37:47 +00:00
Code Activity

Merge branch 'develop'

Browse source
This commit is contained in:
Filip Maj 2016-04-01 23:50:29 -04:00
commit e501d5b796
2 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
FFXIVClassic Map Server/actors/chara/player/Player.cs
View file

@ -315,19 +315,6 @@ namespace FFXIVClassic_Map_Server.Actors
subpackets.Add(SetAchievementPointsPacket.buildPacket(playerActorId, achievementPoints)); subpackets.Add(SetAchievementPointsPacket.buildPacket(playerActorId, achievementPoints));
subpackets.Add(Database.getLatestAchievements(this)); subpackets.Add(Database.getLatestAchievements(this));
subpackets.Add(Database.getAchievementsPacket(this)); subpackets.Add(Database.getAchievementsPacket(this));
/*
if (isInn)
{
SetCutsceneBookPacket book = new SetCutsceneBookPacket();
for (int i = 0; i < book.cutsceneFlags.Length; i++)
book.cutsceneFlags[i] = true;
client.queuePacket(book.buildPacket(player.actorID), true, false);
//
//subpackets.Add(SetPlayerDreamPacket.buildPacket(playerActorId, );
}
*/
} }
return subpackets; return subpackets;
@ -547,10 +534,10 @@ namespace FFXIVClassic_Map_Server.Actors
if (zone.isInn) if (zone.isInn)
{ {
SetCutsceneBookPacket cutsceneBookPacket = new SetCutsceneBookPacket(); SetCutsceneBookPacket cutsceneBookPacket = new SetCutsceneBookPacket();
for (int i = 64; i < 1200; i++) for (int i = 0; i < 2048; i++)
cutsceneBookPacket.cutsceneFlags[i] = true; cutsceneBookPacket.cutsceneFlags[i] = true;
SubPacket packet = cutsceneBookPacket.buildPacket(actorId, "Test PathCompanion", 11, 1, 1); SubPacket packet = cutsceneBookPacket.buildPacket(actorId, "<Path Companion>", 11, 1, 1);
packet.debugPrintSubPacket(); packet.debugPrintSubPacket();
queuePacket(packet); queuePacket(packet);

12
FFXIVClassic Map Server/packets/send/player/SetCutsceneBookPacket.cs
View file

@ -62,7 +62,7 @@ namespace FFXIVClassic_Map_Server.packets.send.player
public const ushort OPCODE = 0x01A3; public const ushort OPCODE = 0x01A3;
public const uint PACKET_SIZE = 0x150; public const uint PACKET_SIZE = 0x150;
public bool[] cutsceneFlags = new bool[2432]; public bool[] cutsceneFlags = new bool[2048];
public SubPacket buildPacket(uint playerActorID, string sNpcName, short sNpcActorIdOffset, byte sNpcSkin, byte sNpcPersonality) public SubPacket buildPacket(uint playerActorID, string sNpcName, short sNpcActorIdOffset, byte sNpcSkin, byte sNpcPersonality)
{ {
@ -73,10 +73,6 @@ namespace FFXIVClassic_Map_Server.packets.send.player
using (BinaryWriter binWriter = new BinaryWriter(mem)) using (BinaryWriter binWriter = new BinaryWriter(mem))
{ {
byte[] binStream = Utils.ConvertBoolArrayToBinaryStream(cutsceneFlags); byte[] binStream = Utils.ConvertBoolArrayToBinaryStream(cutsceneFlags);
if (binStream.Length <= PACKET_SIZE - 0x20)
binWriter.Write(binStream);
else
Log.error("Failed making SetCutsceneBook packet. Bin Stream was too big!");
//Temp Path Companion SNPC Stuff //Temp Path Companion SNPC Stuff
binWriter.Seek(0x01 ,SeekOrigin.Begin); binWriter.Seek(0x01 ,SeekOrigin.Begin);
@ -86,8 +82,14 @@ namespace FFXIVClassic_Map_Server.packets.send.player
binWriter.Write((Byte)sNpcSkin); binWriter.Write((Byte)sNpcSkin);
binWriter.Write((Byte)sNpcPersonality); binWriter.Write((Byte)sNpcPersonality);
if (binStream.Length <= PACKET_SIZE - 0x20)
binWriter.Write(binStream);
else
Log.error("Failed making SetCutsceneBook packet. Bin Stream was too big!");
binWriter.Seek(0x109, SeekOrigin.Begin); binWriter.Seek(0x109, SeekOrigin.Begin);
binWriter.Write(Encoding.ASCII.GetBytes(sNpcName), 0, Encoding.ASCII.GetByteCount(sNpcName) >= 0x20 ? 0x20 : Encoding.ASCII.GetByteCount(sNpcName)); binWriter.Write(Encoding.ASCII.GetBytes(sNpcName), 0, Encoding.ASCII.GetByteCount(sNpcName) >= 0x20 ? 0x20 : Encoding.ASCII.GetByteCount(sNpcName));
} }
} }