zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-06-10 06:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'database_work' into scripting

Browse source 
# Conflicts:
#	FFXIVClassic Map Server/actors/chara/Character.cs
#	FFXIVClassic Map Server/actors/chara/npc/Npc.cs
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
This commit is contained in:
Filip Maj 2016-01-17 11:53:52 -05:00
commit db62b05fdc
40 changed files with 1838 additions and 849 deletions
Download patch file Download diff file Expand all files Collapse all files

14
FFXIVClassic Map Server/actors/chara/Character.cs
View file

@ -1,4 +1,5 @@
using FFXIVClassic_Lobby_Server.packets;
using FFXIVClassic_Map_Server.actors.chara;
using FFXIVClassic_Map_Server.packets.send.actor;
using System;
using System.Collections.Generic;
@ -45,12 +46,15 @@ namespace FFXIVClassic_Map_Server.dataobjects.chara
public uint currentLockedTarget = 0xC0000000;
public uint currentActorIcon = 0;
public CharaWork charaWork = new CharaWork();
public PlayerWork playerWork = new PlayerWork();
public Character(uint actorId) : base(actorId)
{
public Work work = new Work();
public CharaWork charaWork = new CharaWork();
public Character(uint actorID) : base(actorID)
{
//Init timer array to "notimer"
for (int i = 0; i < charaWork.statusShownTime.Length; i++)
charaWork.statusShownTime[i] = 0xFFFFFFFF;
}
public SubPacket createAppearancePacket(uint playerActorId)