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

Implemented MotD. Groups are now sent from world server to client, and also initialized. Retainers finished and are also sent.

Browse source
This commit is contained in:
Filip Maj 2016-12-18 09:50:23 -05:00
parent 31446f37fa
commit 7036ef363d
18 changed files with 309 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
FFXIVClassic World Server/DataObjects/Group/Group.cs
View file

@ -8,7 +8,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
class Group
{
public const uint PlayerPartyGroup = 10001;
public const uint CompanyGroup = 20001;
public const uint CompanyGroup = 20002;
public const uint GroupInvitationRelationGroup = 50001;
public const uint TradeRelationGroup = 50002;

28
FFXIVClassic World Server/DataObjects/Group/Linkshell.cs
View file

@ -14,7 +14,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
public ulong dbId;
public string name;
public LinkshellWork linkshellWork = new LinkshellWork();
public LinkshellWork work = new LinkshellWork();
private List<LinkshellMember> members = new List<LinkshellMember>();
@ -22,31 +22,31 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
{
this.dbId = dbId;
this.name = name;
linkshellWork._globalSave.crestIcon[0] = crestId;
linkshellWork._globalSave.master = master;
linkshellWork._globalSave.rank = rank;
work._globalSave.crestIcon[0] = crestId;
work._globalSave.master = master;
work._globalSave.rank = rank;
}
public void setMaster(uint actorId)
{
linkshellWork._globalSave.master = (ulong)((0xB36F92 << 8) | actorId);
work._globalSave.master = (ulong)((0xB36F92 << 8) | actorId);
}
public void setCrest(ushort crestId)
{
linkshellWork._globalSave.crestIcon[0] = crestId;
work._globalSave.crestIcon[0] = crestId;
}
public void setRank(byte rank = 1)
{
linkshellWork._globalSave.rank = rank;
work._globalSave.rank = rank;
}
public void setMemberRank(int index, byte rank)
{
if (members.Count >= index)
return;
linkshellWork._memberSave[index].rank = rank;
work._memberSave[index].rank = rank;
}
public void AddMember(uint charaId)
@ -87,7 +87,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
{
List<GroupMember> groupMembers = new List<GroupMember>();
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)));
groupMembers.Add(new GroupMember(member.charaId, -1, 0, false, true, Server.GetServer().GetNameForId(member.charaId)));
return groupMembers;
}
@ -95,14 +95,14 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
{
SynchGroupWorkValuesPacket groupWork = new SynchGroupWorkValuesPacket(groupIndex);
groupWork.addProperty(this, "linkshellWork._globalSave.master");
groupWork.addProperty(this, "linkshellWork._globalSave.crestIcon[0]");
groupWork.addProperty(this, "linkshellWork._globalSave.rank");
groupWork.addProperty(this, "work._globalSave.master");
groupWork.addProperty(this, "work._globalSave.crestIcon[0]");
groupWork.addProperty(this, "work._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));
work._memberSave[i].rank = members[i].rank;
groupWork.addProperty(this, String.Format("work._memberSave[{0}].rank", i));
}
groupWork.setTarget("/_init");

1
FFXIVClassic World Server/DataObjects/Group/Party.cs
View file

@ -17,6 +17,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
public Party(ulong groupId, uint leaderCharaId) : base(groupId)
{
partyGroupWork._globalTemp.owner = (ulong)((0xB36F92 << 8) | leaderCharaId);
members.Add(leaderCharaId);
}
public void SetLeader(uint actorId)

34
FFXIVClassic World Server/DataObjects/Group/RetainerGroup.cs
View file

@ -13,7 +13,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
{
public RetainerWork work = new RetainerWork();
public uint owner;
public Dictionary<uint, RetainerGroupMember> members = new Dictionary<uint, RetainerGroupMember>();
public List<RetainerGroupMember> members = new List<RetainerGroupMember>();
public RetainerGroup(ulong groupId, uint owner) : base(groupId)
{
@ -33,10 +33,20 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
public override void SendInitWorkValues(Session session)
{
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");
groupWork.addProperty(this, "work._memberSave[0].level");
for (int i = 0; i < members.Count; i++)
{
work._memberSave[i].cdIDOffset = members[i].cdIDOffset;
work._memberSave[i].placeName = members[i].placeName;
work._memberSave[i].conditions = members[i].conditions;
work._memberSave[i].level = members[i].level;
groupWork.addProperty(this, String.Format("work._memberSave[{0}].cdIDOffset", i));
groupWork.addProperty(this, String.Format("work._memberSave[{0}].placeName", i));
groupWork.addProperty(this, String.Format("work._memberSave[{0}].conditions", i));
groupWork.addProperty(this, String.Format("work._memberSave[{0}].level", i));
}
groupWork.setTarget("/_init");
SubPacket test = groupWork.buildPacket(session.sessionId, session.sessionId);
@ -45,7 +55,7 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
public override int GetMemberCount()
{
return members.Count;
return members.Count + 1;
}
public override uint GetTypeId()
@ -55,9 +65,15 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
public override List<GroupMember> BuildMemberList()
{
List<GroupMember> groupMembers = new List<GroupMember>();
foreach (RetainerGroupMember member in members.Values)
groupMembers.Add(new GroupMember(member.retainerId, -1, 0, false, true, member.name));
List<GroupMember> groupMembers = new List<GroupMember>();
//Add retainers
foreach (RetainerGroupMember member in members)
groupMembers.Add(new GroupMember(member.id, -1, 0, false, true, member.name));
//Add player
groupMembers.Add(new GroupMember(owner, -1, 0, false, true, Server.GetServer().GetNameForId(owner)));
return groupMembers;
}
}

18
FFXIVClassic World Server/DataObjects/Group/RetainerGroupMember.cs
View file

@ -8,7 +8,23 @@ namespace FFXIVClassic_World_Server.DataObjects.Group
{
class RetainerGroupMember
{
public uint retainerId;
public uint id;
public string name;
public uint classActorId;
public byte cdIDOffset;
public ushort placeName;
public byte conditions;
public byte level;
public RetainerGroupMember(uint id, string name, uint classActorId, byte cdIDOffset, ushort placeName, byte conditions, byte level)
{
this.id = id;
this.name = name;
this.classActorId = classActorId;
this.cdIDOffset = cdIDOffset;
this.placeName = placeName;
this.conditions = conditions;
this.level = level;
}
}
}