mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-23 21:27:46 +00:00
Code Activity

Added event conditions to the database. This is a JSON object that stores all types of conditions. The server also sends the correct packets to enable these conditions (minus the push packets... those aren't implemented).

Browse source
This commit is contained in:
Filip Maj 2016-01-23 22:11:45 -05:00
parent 3b48ed1f74
commit 7bc3c8c2dd
13 changed files with 192 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
View file

@ -69,6 +69,7 @@
<Compile Include="actors\chara\Work.cs" />
<Compile Include="actors\debug\Debug.cs" />
<Compile Include="actors\director\WeatherDirector.cs" />
<Compile Include="actors\EventList.cs" />
<Compile Include="actors\judge\Judge.cs" />
<Compile Include="actors\StaticActors.cs" />
<Compile Include="actors\world\WorldMaster.cs" />
@ -122,7 +123,13 @@
<Compile Include="packets\send\actor\ActorDoEmotePacket.cs" />
<Compile Include="packets\send\actor\ActorInstantiatePacket.cs" />
<Compile Include="packets\send\actor\DeleteAllActorsPacket.cs" />
<Compile Include="packets\send\actor\SetPushEventConditionWithCircle.cs" />
<Compile Include="packets\send\actor\events\SetEventStatus.cs" />
<Compile Include="packets\send\actor\events\SetNoticeEventCondition.cs" />
<Compile Include="packets\send\actor\events\SetPushEventConditionWithTriggerBox.cs" />
<Compile Include="packets\send\actor\events\SetPushEventConditionWithFan.cs" />
<Compile Include="packets\send\actor\events\SetEmoteEventCondition.cs" />
<Compile Include="packets\send\actor\events\SetTalkEventCondition.cs" />
<Compile Include="packets\send\actor\events\SetPushEventConditionWithCircle.cs" />
<Compile Include="packets\send\actor\_0x132Packet.cs" />
<Compile Include="packets\send\actor\SetActorIsZoningPacket.cs" />
<Compile Include="packets\send\actor\DoBattleActionPacket.cs" />

11
FFXIVClassic Map Server/WorldManager.cs
View file

@ -143,7 +143,8 @@ namespace FFXIVClassic_Map_Server
rotation,
actorState,
animationId,
actorClassName
actorClassName,
eventConditions
FROM server_npclist
";
@ -155,6 +156,14 @@ namespace FFXIVClassic_Map_Server
{
Npc npc = new Npc(reader.GetUInt32(0), reader.GetString(1), reader.GetUInt32(2), reader.GetUInt32(3), reader.GetFloat(4), reader.GetFloat(5), reader.GetFloat(6), reader.GetFloat(7), reader.GetUInt16(8), reader.GetUInt32(9), reader.GetString(10));
if (!reader.IsDBNull(11))
{
string eventConditions = reader.GetString(11);
npc.loadEventConditions(eventConditions);
}
if (!zoneList.ContainsKey(npc.zoneId))
continue;
Zone zone = zoneList[npc.zoneId];
if (zone == null)
continue;

65
FFXIVClassic Map Server/actors/Actor.cs
View file

@ -1,9 +1,11 @@
using FFXIVClassic_Lobby_Server;
using FFXIVClassic_Lobby_Server.common;
using FFXIVClassic_Lobby_Server.packets;
using FFXIVClassic_Map_Server.actors;
using FFXIVClassic_Map_Server.dataobjects.chara;
using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor;
using FFXIVClassic_Map_Server.packets.send.actor.events;
using System;
using System.Collections;
using System.Collections.Generic;
@ -37,6 +39,8 @@ namespace FFXIVClassic_Map_Server.Actors
public string className;
public List<LuaParam> classParams;
public EventList eventConditions;
public Actor(uint actorId)
{
this.actorId = actorId;
@ -90,6 +94,64 @@ namespace FFXIVClassic_Map_Server.Actors
return SetActorStatePacket.buildPacket(actorId, playerActorID, currentMainState, currentSubState);
}
public List<SubPacket> getEventConditionPackets(uint playerActorId)
{
List<SubPacket> subpackets = new List<SubPacket>();
//Return empty list
if (eventConditions == null)
return subpackets;
if (eventConditions.talkEventConditions != null)
{
foreach (EventList.TalkEventCondition condition in eventConditions.talkEventConditions)
subpackets.Add(SetTalkEventCondition.buildPacket(playerActorId, actorId, condition.unknown1, condition.unknown2, condition.conditionName));
}
if (eventConditions.noticeEventConditions != null)
{
foreach (EventList.NoticeEventCondition condition in eventConditions.noticeEventConditions)
subpackets.Add(SetNoticeEventCondition.buildPacket(playerActorId, actorId, condition.unknown1, condition.unknown2, condition.conditionName));
}
if (eventConditions.emoteEventConditions != null)
{
foreach (EventList.EmoteEventCondition condition in eventConditions.emoteEventConditions)
subpackets.Add(SetEmoteEventCondition.buildPacket(playerActorId, actorId, condition.unknown1, condition.unknown2, condition.emoteId, condition.conditionName));
}
return subpackets;
}
public BasePacket getSetEventStatusPackets(uint playerActorId)
{
List<SubPacket> subpackets = new List<SubPacket>();
//Return empty list
if (eventConditions == null)
return BasePacket.createPacket(subpackets, true, false);
if (eventConditions.talkEventConditions != null)
{
foreach (EventList.TalkEventCondition condition in eventConditions.talkEventConditions)
subpackets.Add(SetEventStatus.buildPacket(playerActorId, actorId, 1, 1, condition.conditionName));
}
if (eventConditions.noticeEventConditions != null)
{
foreach (EventList.NoticeEventCondition condition in eventConditions.noticeEventConditions)
subpackets.Add(SetEventStatus.buildPacket(playerActorId, actorId, 1, 1, condition.conditionName));
}
if (eventConditions.emoteEventConditions != null)
{
foreach (EventList.EmoteEventCondition condition in eventConditions.emoteEventConditions)
subpackets.Add(SetEventStatus.buildPacket(playerActorId, actorId, 1, 1, condition.conditionName));
}
return BasePacket.createPacket(subpackets, true, false);
}
public SubPacket createIsZoneingPacket(uint playerActorId)
{
return SetActorIsZoningPacket.buildPacket(actorId, playerActorId, false);
@ -109,6 +171,7 @@ namespace FFXIVClassic_Map_Server.Actors
{
List<SubPacket> subpackets = new List<SubPacket>();
subpackets.Add(createAddActorPacket(playerActorId));
subpackets.AddRange(getEventConditionPackets(playerActorId));
subpackets.Add(createSpeedPacket(playerActorId));
subpackets.Add(createSpawnPositonPacket(playerActorId, spawnType));
subpackets.Add(createNamePacket(playerActorId));
@ -116,7 +179,7 @@ namespace FFXIVClassic_Map_Server.Actors
subpackets.Add(createIsZoneingPacket(playerActorId));
subpackets.Add(createScriptBindPacket(playerActorId));
return BasePacket.createPacket(subpackets, true, false);
}
}
public virtual BasePacket getInitPackets(uint playerActorId)
{

68
FFXIVClassic Map Server/actors/EventList.cs Normal file
View file

@ -0,0 +1,68 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace FFXIVClassic_Map_Server.actors
{
class EventList
{
public List<TalkEventCondition> talkEventConditions;
public List<NoticeEventCondition> noticeEventConditions;
public List<EmoteEventCondition> emoteEventConditions;
public List<PushCircleEventCondition> pushWithCircleEventConditions;
public List<PushFanEventCondition> pushWithFanEventConditions;
public List<PushBoxEventCondition> pushWithBoxEventConditions;
public class TalkEventCondition
{
public byte unknown1;
public byte unknown2;
public string conditionName;
}
public class NoticeEventCondition
{
public byte unknown1;
public byte unknown2;
public string conditionName;
}
public class EmoteEventCondition
{
public byte unknown1;
public byte unknown2;
public byte emoteId;
public string conditionName;
}
public class PushCircleEventCondition
{
public byte unknown1;
public byte unknown2;
public byte unknown4;
public byte emoteId;
public float radius;
public int unknown5;
public float unknown6;
public string conditionName;
}
public class PushFanEventCondition
{
byte unknown1;
byte unknown2;
byte emoteId;
string conditionName;
}
public class PushBoxEventCondition
{
byte unknown1;
byte unknown2;
byte emoteId;
string conditionName;
}
}
}

10
FFXIVClassic Map Server/actors/chara/npc/Npc.cs
View file

@ -1,10 +1,12 @@
using FFXIVClassic_Lobby_Server;
using FFXIVClassic_Lobby_Server.common;
using FFXIVClassic_Lobby_Server.packets;
using FFXIVClassic_Map_Server.actors;
using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets.send.actor;
using FFXIVClassic_Map_Server.utils;
using MySql.Data.MySqlClient;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@ -49,6 +51,7 @@ namespace FFXIVClassic_Map_Server.Actors
{
List<SubPacket> subpackets = new List<SubPacket>();
subpackets.Add(createAddActorPacket(playerActorId));
subpackets.AddRange(getEventConditionPackets(playerActorId));
subpackets.Add(createSpeedPacket(playerActorId));
subpackets.Add(createSpawnPositonPacket(playerActorId, 0x0));
subpackets.Add(createAppearancePacket(playerActorId));
@ -168,7 +171,12 @@ namespace FFXIVClassic_Map_Server.Actors
conn.Dispose();
}
}
}
}
public void loadEventConditions(string eventConditions)
{
EventList conditions = JsonConvert.DeserializeObject<EventList>(eventConditions);
this.eventConditions = conditions;
}
}
}

1
FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
View file

@ -112,6 +112,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
{
basePackets.Add(actor.getSpawnPackets(playerActor.actorId, 1));
basePackets.Add(actor.getInitPackets(playerActor.actorId));
basePackets.Add(actor.getSetEventStatusPackets(playerActor.actorId));
actorInstanceList.Add(actor);
}
}

17
FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs
View file

@ -13,24 +13,23 @@ 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 targetActorID)
public static SubPacket buildPacket(uint playerActorID, uint sourceActorID, byte unknown1, byte unknown2, ushort emoteId, string conditionName)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
string eventName = "";
using (MemoryStream mem = new MemoryStream(data))
{
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
binWriter.Write((Byte)0);
binWriter.Write((Byte)0);
binWriter.Write((UInt16)0);
binWriter.Write(Encoding.ASCII.GetBytes(eventName), 0, Encoding.ASCII.GetByteCount(eventName) >= 0x24 ? 0x24 : Encoding.ASCII.GetByteCount(eventName));
{
binWriter.Write((Byte)unknown1);
binWriter.Write((Byte)unknown2);
binWriter.Write((UInt16)emoteId);
binWriter.Write(Encoding.ASCII.GetBytes(conditionName), 0, Encoding.ASCII.GetByteCount(conditionName) >= 0x24 ? 0x24 : Encoding.ASCII.GetByteCount(conditionName));
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
}
}
}

11
FFXIVClassic Map Server/packets/send/Actor/events/SetEventStatus.cs
View file

@ -13,22 +13,21 @@ 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 targetActorID)
public static SubPacket buildPacket(uint playerActorID, uint sourceActorID, uint unknown1, byte unknown2, string conditionName)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
string eventName = "";
using (MemoryStream mem = new MemoryStream(data))
{
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
binWriter.Write((UInt32)0);
binWriter.Write(Encoding.ASCII.GetBytes(eventName), 0, Encoding.ASCII.GetByteCount(eventName) >= 0x24 ? 0x24 : Encoding.ASCII.GetByteCount(eventName));
binWriter.Write((UInt32)unknown1);
binWriter.Write((Byte)unknown2);
binWriter.Write(Encoding.ASCII.GetBytes(conditionName), 0, Encoding.ASCII.GetByteCount(conditionName) >= 0x24 ? 0x24 : Encoding.ASCII.GetByteCount(conditionName));
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
}
}
}

15
FFXIVClassic Map Server/packets/send/Actor/events/SetNoticeEventCondition.cs
View file

@ -13,23 +13,22 @@ 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 targetActorID)
public static SubPacket buildPacket(uint playerActorID, uint sourceActorID, byte unknown1, byte unknown2, string conditionName)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
string eventName = "";
using (MemoryStream mem = new MemoryStream(data))
{
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
binWriter.Write((Byte)0);
binWriter.Write((Byte)0);
binWriter.Write(Encoding.ASCII.GetBytes(eventName), 0, Encoding.ASCII.GetByteCount(eventName) >= 0x24 ? 0x24 : Encoding.ASCII.GetByteCount(eventName));
{
binWriter.Write((Byte)unknown1);
binWriter.Write((Byte)unknown2);
binWriter.Write(Encoding.ASCII.GetBytes(conditionName), 0, Encoding.ASCII.GetByteCount(conditionName) >= 0x24 ? 0x24 : Encoding.ASCII.GetByteCount(conditionName));
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
}
}
}

4
FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithCircle.cs
View file

@ -13,7 +13,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 targetActorID)
public static SubPacket buildPacket(uint playerActorID, uint sourceActorID)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -34,7 +34,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
}
}
}

4
FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithFan.cs
View file

@ -13,7 +13,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 targetActorID)
public static SubPacket buildPacket(uint playerActorID, uint sourceActorID)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -34,7 +34,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
}
}
}

4
FFXIVClassic Map Server/packets/send/Actor/events/SetPushEventConditionWithTriggerBox.cs
View file

@ -13,7 +13,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
public const ushort OPCODE = 0x0175;
public const uint PACKET_SIZE = 0x58;
public static SubPacket buildPacket(uint playerActorID, uint targetActorID)
public static SubPacket buildPacket(uint playerActorID, uint sourceActorID)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
@ -34,7 +34,7 @@ namespace FFXIVClassic_Map_Server.packets.send.actor.events
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
}
}
}

14
FFXIVClassic Map Server/packets/send/Actor/events/SetTalkEventCondition.cs
View file

@ -13,23 +13,21 @@ 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 targetActorID)
public static SubPacket buildPacket(uint playerActorID, uint sourceActorID, byte unknown1, byte unknown2, string conditionName)
{
byte[] data = new byte[PACKET_SIZE - 0x20];
string eventName = "";
using (MemoryStream mem = new MemoryStream(data))
{
using (BinaryWriter binWriter = new BinaryWriter(mem))
{
binWriter.Write((Byte)0);
binWriter.Write((Byte)0);
binWriter.Write(Encoding.ASCII.GetBytes(eventName), 0, Encoding.ASCII.GetByteCount(eventName) >= 0x24 ? 0x24 : Encoding.ASCII.GetByteCount(eventName));
{
binWriter.Write((Byte)unknown1);
binWriter.Write((Byte)unknown2);
binWriter.Write(Encoding.ASCII.GetBytes(conditionName), 0, Encoding.ASCII.GetByteCount(conditionName) >= 0x24 ? 0x24 : Encoding.ASCII.GetByteCount(conditionName));
}
}
return new SubPacket(OPCODE, playerActorID, playerActorID, data);
return new SubPacket(OPCODE, sourceActorID, playerActorID, data);
}
}
}