Linkshell and WorkValue work.

This commit is contained in:
Filip Maj 2016-12-16 20:06:17 -05:00
parent 1148619ca5
commit 2cc63960a7
10 changed files with 156 additions and 45 deletions

View file

@ -75,5 +75,10 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
session.clientConnection.QueuePacket(GroupMembersEndPacket.buildPacket(session.sessionId, session.currentZoneId, time, this), true, false);
}
public virtual void SendInitWorkValues(Session session)
{
}
}
}

View file

@ -5,6 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using FFXIVClassic_World_Server.Packets.Send.Subpackets.Groups;
using FFXIVClassic.Common;
namespace FFXIVClassic_World_Server.DataObjects.Group
{
@ -15,7 +16,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
public LinkshellWork linkshellWork = new LinkshellWork();
public Dictionary<ulong, LinkshellMember> members = new Dictionary<ulong, LinkshellMember>();
private List<LinkshellMember> members = new List<LinkshellMember>();
public Linkshell(ulong dbId, ulong groupIndex, string name, ushort crestId, uint master, byte rank) : base(groupIndex)
{
@ -48,6 +49,25 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
linkshellWork._memberSave[index].rank = rank;
}
public void AddMember(uint charaId)
{
members.Add(new LinkshellMember(charaId, dbId, 0xa));
members.Sort();
}
public void RemoveMember(uint charaId)
{
for (int i = 0; i < members.Count; i++)
{
if (members[i].charaId == charaId)
{
members.Remove(members[i]);
members.Sort();
break;
}
}
}
public override int GetMemberCount()
{
return members.Count;
@ -61,14 +81,39 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
public override uint GetTypeId()
{
return Group.CompanyGroup;
}
}
public override List<GroupMember> BuildMemberList()
{
List<GroupMember> groupMembers = new List<GroupMember>();
foreach (LinkshellMember member in members.Values)
groupMembers.Add(new GroupMember(member.charaId, -1, 0, false, Server.GetServer().GetSession(member.charaId) != null, Server.GetServer().GetNameForId(member.charaId)));
foreach (LinkshellMember member in members)
groupMembers.Add(new GroupMember(member.charaId, -1, 0, false, Server.GetServer().GetSession(member.charaId) != null, Server.GetServer().GetNameForId(member.charaId)));
return groupMembers;
}
public override void SendInitWorkValues(Session session)
{
SynchGroupWorkValuesPacket groupWork = new SynchGroupWorkValuesPacket(groupIndex);
groupWork.addProperty(this, "linkshellWork._globalSave.master");
groupWork.addProperty(this, "linkshellWork._globalSave.crestIcon[0]");
groupWork.addProperty(this, "linkshellWork._globalSave.rank");
for (int i = 0; i < members.Count; i++)
{
linkshellWork._memberSave[i].rank = members[i].rank;
groupWork.addProperty(this, String.Format("linkshellWork._memberSave[{0}].rank", i));
}
groupWork.setTarget("/_init");
SubPacket test = groupWork.buildPacket(session.sessionId, session.sessionId);
test.DebugPrintSubPacket();
session.clientConnection.QueuePacket(test, true, false);
}
public void LoadMembers()
{
members = Database.GetLSMembers(this);
}
}
}

View file

@ -6,19 +6,22 @@ using System.Threading.Tasks;
namespace FFXIVClassic_World_Server.DataObjects.Group
{
class LinkshellMember
class LinkshellMember : IComparable<LinkshellMember>
{
public readonly uint charaId;
public readonly ulong lsId;
public readonly ushort slot;
public readonly ushort rank;
public readonly byte rank;
public LinkshellMember(uint charaId, ulong lsId, ushort slot, ushort rank)
public LinkshellMember(uint charaId, ulong lsId, byte rank)
{
this.charaId = charaId;
this.lsId = lsId;
this.slot = slot;
this.rank = rank;
}
public int CompareTo(LinkshellMember other)
{
return Server.GetServer().GetNameForId(charaId).CompareTo(Server.GetServer().GetNameForId(other.charaId));
}
}
}

View file

@ -1,4 +1,5 @@
using FFXIVClassic_World_Server.Actor.Group.Work;
using FFXIVClassic.Common;
using FFXIVClassic_World_Server.Actor.Group.Work;
using FFXIVClassic_World_Server.Packets.Send.Subpackets.Groups;
using System;
using System.Collections.Generic;
@ -27,18 +28,16 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
{
return (uint)(partyGroupWork._globalTemp.owner & 0xFFFFFF);
}
/*
public override void sendWorkValues(Session session)
public override void SendInitWorkValues(Session session)
{
SynchGroupWorkValuesPacket groupWork = new SynchGroupWorkValuesPacket(groupId);
SynchGroupWorkValuesPacket groupWork = new SynchGroupWorkValuesPacket(groupIndex);
groupWork.addProperty(this, "partyGroupWork._globalTemp.owner");
groupWork.setTarget("/_init");
SubPacket test = groupWork.buildPacket(session.sessionId, session.sessionId);
session.clientConnection.QueuePacket(test, true, false);
}
*/
}
public override int GetMemberCount()
{

View file

@ -1,4 +1,5 @@
using FFXIVClassic_World_Server.Packets.Send.Subpackets.Groups;
using FFXIVClassic.Common;
using FFXIVClassic_World_Server.Packets.Send.Subpackets.Groups;
using System;
using System.Collections.Generic;
using System.Linq;
@ -37,5 +38,17 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
return groupMembers;
}
public override void SendInitWorkValues(Session session)
{
SynchGroupWorkValuesPacket groupWork = new SynchGroupWorkValuesPacket(groupIndex);
groupWork.addProperty(this, "work._globalTemp.host");
groupWork.addProperty(this, "work._globalTemp.variableCommand");
groupWork.setTarget("/_init");
SubPacket test = groupWork.buildPacket(session.sessionId, session.sessionId);
test.DebugPrintSubPacket();
session.clientConnection.QueuePacket(test, true, false);
}
}
}

View file

@ -1,4 +1,5 @@
using FFXIVClassic_World_Server.Actor.Group.Work;
using FFXIVClassic.Common;
using FFXIVClassic_World_Server.Actor.Group.Work;
using FFXIVClassic_World_Server.Packets.Send.Subpackets.Groups;
using System;
using System.Collections.Generic;
@ -28,11 +29,10 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
work._memberSave[index].conditions = condition;
work._memberSave[index].level = level;
}
/*
public override void sendWorkValues(Session session)
public override void SendInitWorkValues(Session session)
{
SynchGroupWorkValuesPacket groupWork = new SynchGroupWorkValuesPacket(groupId);
SynchGroupWorkValuesPacket groupWork = new SynchGroupWorkValuesPacket(groupIndex);
groupWork.addProperty(this, "work._memberSave[0].cdIDOffset");
groupWork.addProperty(this, "work._memberSave[0].placeName");
groupWork.addProperty(this, "work._memberSave[0].conditions");
@ -42,8 +42,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
SubPacket test = groupWork.buildPacket(session.sessionId, session.sessionId);
session.clientConnection.QueuePacket(test, true, false);
}
*/
public override int GetMemberCount()
{
return members.Count;