warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Updates Packets & Randomizer (#43)" (#61)

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

234
Projects/Scripts/Engines/Party/Packets.cs
View file

@ -1,175 +1,77 @@
using Server.Buffers;
using Server.Network;
namespace Server.Engines.PartySystem
{
public static class PartyPackets
public sealed class PartyEmptyList : Packet
{
public static void SendPartyEmptyList(NetState ns, Mobile m)
public PartyEmptyList(Mobile m) : base(0xBF)
{
if (ns == null)
return;
EnsureCapacity(7);
SpanWriter writer = new SpanWriter(stackalloc byte[11]);
writer.Write((byte)0xBF); // Packet ID
writer.Write((short)11); // Dynamic Length
writer.Write((short)0x06);
writer.Write((byte)0x02);
writer.Position++; // Writer(0); // Number of members
writer.Write(m.Serial);
ns.Send(writer.Span);
}
public static void SendPartyMemberList(NetState ns, Party p)
{
if (ns == null)
return;
ushort length = (ushort)(7 + p.Count * 4);
SpanWriter writer = new SpanWriter(stackalloc byte[length]);
writer.Write((byte)0xBF); // Packet ID
writer.Write(length); // Dynamic Length
writer.Write((short)0x06);
writer.Write((byte)0x01);
writer.Write((byte)p.Count);
for (int i = 0; i < p.Count; ++i)
writer.Write(p[i].Mobile.Serial);
ns.Send(writer.Span);
}
public static void SendPartyRemoveMember(NetState ns, Mobile removed, Party p)
{
if (ns == null)
return;
ushort length = (ushort)(11 + p.Count * 4);
SpanWriter writer = new SpanWriter(stackalloc byte[length]);
writer.Write((byte)0xBF); // Packet ID
writer.Write(length); // Dynamic Length
writer.Write((short)0x06);
writer.Write((byte)0x02);
writer.Write((byte)p.Count);
writer.Write(removed.Serial);
for (int i = 0; i < p.Count; ++i)
writer.Write(p[i].Mobile.Serial);
ns.Send(writer.Span);
}
public static void SendPartyRemoveMemberToAll(Mobile removed, Party p)
{
for (int i = 0; i < p.Members.Count; i++)
SendPartyRemoveMember(p[i].Mobile.NetState, removed, p);
}
public static void SendPartyTextMessage(NetState ns, bool toAll, Mobile from, string text)
{
if (ns == null)
return;
ushort length = (ushort)(12 + text.Length * 2);
SpanWriter writer = new SpanWriter(stackalloc byte[length]);
writer.Write((byte)0xBF); // Packet ID
writer.Write(length); // Dynamic Length
writer.Write((short)0x06);
writer.Write((byte)(toAll ? 0x04 : 0x03));
writer.Write(from.Serial);
writer.WriteBigUniNull(text);
ns.Send(writer.Span);
}
public static void SendPartyTextMessageToAll(Party p, bool toAll, Mobile from, string text)
{
for (int i = 0; i < p.Members.Count; ++i)
SendPartyTextMessage(p.Members[i].Mobile.NetState, toAll, from, text);
}
public static void SendPartyInvitation(NetState ns, Mobile leader)
{
if (ns == null)
return;
SpanWriter writer = new SpanWriter(stackalloc byte[10]);
writer.Write((byte)0xBF); // Packet ID
writer.Write((short)10); // Dynamic Length
writer.Write((short)0x06);
writer.Write((byte)0x07);
writer.Write(leader.Serial);
ns.Send(writer.Span);
}
public static void SendPartyMessageLocalizedToAll(Party p, Serial serial, int graphic, MessageType type, int hue, int font, int number, string name = "",
string args = "")
{
for (int i = 0; i < p.Members.Count; ++i)
Packets.SendMessageLocalized(p.Members[i].Mobile.NetState, serial, graphic, type, hue, font, number, name, args);
for (int i = 0; i < p.Listeners.Count; ++i)
{
Mobile mob = p.Listeners[i];
if (mob.Party != p)
Packets.SendMessageLocalized(mob.NetState, serial, graphic, type, hue, font, number, name, args);
}
}
public static void SendPartyMessageLocalizedAffixToAll(Party p, Serial serial, int graphic, MessageType type, int hue, int font, int number,
string name = "", AffixType affixType = AffixType.System, string affix = "", string args = "")
{
for (int i = 0; i < p.Members.Count; ++i)
Packets.SendMessageLocalizedAffix(p.Members[i].Mobile.NetState, serial, graphic, type, hue, font, number, name, affixType, affix, args);
for (int i = 0; i < p.Listeners.Count; ++i)
{
Mobile mob = p.Listeners[i];
if (mob.Party != p)
Packets.SendMessageLocalizedAffix(mob.NetState, serial, graphic, type, hue, font, number, name, affixType, affix, args);
}
}
public static void SendPartyUnicodeMessageToAll(Party p, Serial serial, int graphic, MessageType type, int hue, int font, string lang, string name,
string text)
{
for (int i = 0; i < p.Members.Count; ++i)
Packets.SendUnicodeMessage(p.Members[i].Mobile.NetState, serial, graphic, type, hue, font, lang, name, text);
for (int i = 0; i < p.Listeners.Count; ++i)
{
Mobile mob = p.Listeners[i];
if (mob.Party != p)
Packets.SendUnicodeMessage(p.Members[i].Mobile.NetState, serial, graphic, type, hue, font, lang, name, text);
}
}
public static void SendPartyAsciiMessageToAll(Party p, Serial serial, int graphic, MessageType type, int hue, int font, string name, string text)
{
for (int i = 0; i < p.Members.Count; ++i)
Packets.SendAsciiMessage(p.Members[i].Mobile.NetState, serial, graphic, type, hue, font, name, text);
for (int i = 0; i < p.Listeners.Count; ++i)
{
Mobile mob = p.Listeners[i];
if (mob.Party != p)
Packets.SendAsciiMessage(p.Members[i].Mobile.NetState, serial, graphic, type, hue, font, name, text);
}
m_Stream.Write((short)0x0006);
m_Stream.Write((byte)0x02);
m_Stream.Write((byte)0);
m_Stream.Write(m.Serial);
}
}
}
public sealed class PartyMemberList : Packet
{
public PartyMemberList(Party p) : base(0xBF)
{
EnsureCapacity(7 + p.Count * 4);
m_Stream.Write((short)0x0006);
m_Stream.Write((byte)0x01);
m_Stream.Write((byte)p.Count);
for (int i = 0; i < p.Count; ++i)
m_Stream.Write(p[i].Mobile.Serial);
}
}
public sealed class PartyRemoveMember : Packet
{
public PartyRemoveMember(Mobile removed, Party p) : base(0xBF)
{
EnsureCapacity(11 + p.Count * 4);
m_Stream.Write((short)0x0006);
m_Stream.Write((byte)0x02);
m_Stream.Write((byte)p.Count);
m_Stream.Write(removed.Serial);
for (int i = 0; i < p.Count; ++i)
m_Stream.Write(p[i].Mobile.Serial);
}
}
public sealed class PartyTextMessage : Packet
{
public PartyTextMessage(bool toAll, Mobile from, string text) : base(0xBF)
{
if (text == null)
text = "";
EnsureCapacity(12 + text.Length * 2);
m_Stream.Write((short)0x0006);
m_Stream.Write((byte)(toAll ? 0x04 : 0x03));
m_Stream.Write(from.Serial);
m_Stream.WriteBigUniNull(text);
}
}
public sealed class PartyInvitation : Packet
{
public PartyInvitation(Mobile leader) : base(0xBF)
{
EnsureCapacity(10);
m_Stream.Write((short)0x0006);
m_Stream.Write((byte)0x07);
m_Stream.Write(leader.Serial);
}
}
}

199
Projects/Scripts/Engines/Party/Party.cs
View file

@ -9,6 +9,7 @@ namespace Server.Engines.PartySystem
public class Party : IParty
{
public const int Capacity = 10;
private List<Mobile> m_Listeners; // staff listening
public Party(Mobile leader)
{
@ -16,7 +17,7 @@ namespace Server.Engines.PartySystem
Members = new List<PartyMemberInfo>();
Candidates = new List<Mobile>();
Listeners = new List<Mobile>();
m_Listeners = new List<Mobile>();
Members.Add(new PartyMemberInfo(leader));
}
@ -29,32 +30,58 @@ namespace Server.Engines.PartySystem
public List<Mobile> Candidates{ get; }
public List<Mobile> Listeners { get; } // staff listening
public PartyMemberInfo this[int index] => Members[index];
public PartyMemberInfo this[Mobile m] => Members.FirstOrDefault(t => t.Mobile == m);
public PartyMemberInfo this[Mobile m]
{
get
{
for (int i = 0; i < Members.Count; ++i)
if (Members[i].Mobile == m)
return Members[i];
return null;
}
}
public void OnStamChanged(Mobile m)
{
Packet p = null;
for (int i = 0; i < Members.Count; ++i)
{
Mobile c = Members[i].Mobile;
if (c != m && m.Map == c.Map && Utility.InUpdateRange(c, m) && c.CanSee(m))
Packets.SendNormalizedMobileStam(c.NetState, c);
{
if (p == null)
p = Packet.Acquire(new MobileStamN(m));
c.Send(p);
}
}
Packet.Release(p);
}
public void OnManaChanged(Mobile m)
{
Packet p = null;
for (int i = 0; i < Members.Count; ++i)
{
Mobile c = Members[i].Mobile;
if (c != m && m.Map == c.Map && Utility.InUpdateRange(c, m) && c.CanSee(m))
Packets.SendNormalizedMobileMana(c.NetState, c);
{
if (p == null)
p = Packet.Acquire(new MobileManaN(m));
c.Send(p);
}
}
Packet.Release(p);
}
public void OnStatsQuery(Mobile beholder, Mobile beheld)
@ -63,9 +90,9 @@ namespace Server.Engines.PartySystem
Utility.InUpdateRange(beholder, beheld))
{
if (!beholder.CanSee(beheld))
Packets.SendMobileStatusCompact(beholder.NetState, beheld, beheld.CanBeRenamedBy(beholder));
beholder.Send(new MobileStatusCompact(beheld.CanBeRenamedBy(beholder), beheld));
Packets.SendNormalizedMobileAttributes(beholder.NetState, beheld);
beholder.Send(new MobileAttributesN(beheld));
}
}
@ -94,14 +121,14 @@ namespace Server.Engines.PartySystem
{
from.SendMessage("They are not in a party.");
}
else if (p.Listeners.Contains(from))
else if (p.m_Listeners.Contains(from))
{
p.Listeners.Remove(from);
p.m_Listeners.Remove(from);
from.SendMessage("You are no longer listening to that party.");
}
else
{
p.Listeners.Add(from);
p.m_Listeners.Add(from);
from.SendMessage("You are now listening to that party.");
}
}
@ -157,25 +184,35 @@ namespace Server.Engines.PartySystem
Members.Add(new PartyMemberInfo(m));
m.Party = this;
Packet memberList = Packet.Acquire(new PartyMemberList(this));
Packet attrs = Packet.Acquire(new MobileAttributesN(m));
for (int i = 0; i < Members.Count; ++i)
{
Mobile f = Members[i].Mobile;
NetState ns = f.NetState;
PartyPackets.SendPartyMemberList(ns, this);
f.Send(memberList);
if (f != m)
{
Packets.SendMobileStatusCompact(ns, m, m.CanBeRenamedBy(f));
Packets.SendNormalizedMobileAttributes(ns, m);
Packets.SendMobileStatusCompact(ns, f, f.CanBeRenamedBy(m));
Packets.SendNormalizedMobileAttributes(ns, f);
f.Send(new MobileStatusCompact(m.CanBeRenamedBy(f), m));
f.Send(attrs);
m.Send(new MobileStatusCompact(f.CanBeRenamedBy(m), f));
m.Send(new MobileAttributesN(f));
}
}
Packet.Release(memberList);
Packet.Release(attrs);
}
}
public void OnAccept(Mobile from, bool force = false)
public void OnAccept(Mobile from)
{
OnAccept(from, false);
}
public void OnAccept(Mobile from, bool force)
{
Faction ourFaction = Faction.Find(Leader);
Faction theirFaction = Faction.Find(from);
@ -184,8 +221,8 @@ namespace Server.Engines.PartySystem
return;
// : joined the party.
PartyPackets.SendPartyMessageLocalizedAffixToAll(this, Serial.MinusOne, -1, MessageType.Label,
0x3B2, 3, 1008094, "",AffixType.Prepend | AffixType.System, from.Name);
SendToAll(new MessageLocalizedAffix(Serial.MinusOne, -1, MessageType.Label, 0x3B2, 3, 1008094, "",
AffixType.Prepend | AffixType.System, from.Name, ""));
from.SendLocalizedMessage(1005445); // You have been added to the party.
@ -201,15 +238,14 @@ namespace Server.Engines.PartySystem
from.SendLocalizedMessage(1008092); // You notify them that you do not wish to join the party.
Candidates.Remove(from);
PartyPackets.SendPartyEmptyList(from.NetState, from);
from.Send(new PartyEmptyList(from));
if (Candidates.Count == 0 && Members.Count <= 1)
{
for (int i = 0; i < Members.Count; ++i)
{
Mobile m = this[i].Mobile;
PartyPackets.SendPartyEmptyList(m.NetState, m);
m.Party = null;
this[i].Mobile.Send(new PartyEmptyList(this[i].Mobile));
this[i].Mobile.Party = null;
}
Members.Clear();
@ -219,7 +255,9 @@ namespace Server.Engines.PartySystem
public void Remove(Mobile m)
{
if (m == Leader)
{
Disband();
}
else
{
for (int i = 0; i < Members.Count; ++i)
@ -228,21 +266,19 @@ namespace Server.Engines.PartySystem
Members.RemoveAt(i);
m.Party = null;
PartyPackets.SendPartyEmptyList(m.NetState, m);
m.Send(new PartyEmptyList(m));
m.SendLocalizedMessage(1005451); // You have been removed from the party.
PartyPackets.SendPartyRemoveMemberToAll(m, this);
// A player has been removed from your party.
PartyPackets.SendPartyMessageLocalizedToAll(this, Serial.MinusOne, -1, MessageType.Regular, 0x3B2, 3, 1005452, "System");
SendToAll(new PartyRemoveMember(m, this));
SendToAll(1005452); // A player has been removed from your party.
break;
}
if (Members.Count == 1)
{
// The last person has left the party...
PartyPackets.SendPartyMessageLocalizedToAll(this, Serial.MinusOne, -1, MessageType.Regular, 0x3B2, 3, 1005450, "System");
SendToAll(1005450); // The last person has left the party...
Disband();
}
}
@ -252,14 +288,12 @@ namespace Server.Engines.PartySystem
public void Disband()
{
// Your party has disbanded.
PartyPackets.SendPartyMessageLocalizedToAll(this, Serial.MinusOne, -1, MessageType.Regular, 0x3B2, 3, 1005449, "System");
SendToAll(1005449); // Your party has disbanded.
for (int i = 0; i < Members.Count; ++i)
{
Mobile m = this[i].Mobile;
PartyPackets.SendPartyEmptyList(m.NetState, m);
m.Party = null;
this[i].Mobile.Send(new PartyEmptyList(this[i].Mobile));
this[i].Mobile.Party = null;
}
Members.Clear();
@ -286,57 +320,82 @@ namespace Server.Engines.PartySystem
p.Candidates.Add(target);
// : You are invited to join the party. Type /accept to join or /decline to decline the offer.
Packets.SendMessageLocalizedAffix(target.NetState, Serial.MinusOne, -1, MessageType.Label, 0x3B2, 3, 1008089, "",
AffixType.Prepend | AffixType.System, from.Name);
target.Send(new MessageLocalizedAffix(Serial.MinusOne, -1, MessageType.Label, 0x3B2, 3, 1008089, "",
AffixType.Prepend | AffixType.System, from.Name, ""));
from.SendLocalizedMessage(1008090); // You have invited them to join the party.
PartyPackets.SendPartyInvitation(target.NetState, from);
target.Send(new PartyInvitation(from));
target.Party = from;
DeclineTimer.Start(target, from);
}
public void SendToAll(int number)
{
SendToAll(number, "", 0x3B2);
}
public void SendToAll(int number, string args)
{
SendToAll(number, args, 0x3B2);
}
public void SendToAll(int number, string args, int hue)
{
SendToAll(new MessageLocalized(Serial.MinusOne, -1, MessageType.Regular, hue, 3, number, "System", args));
}
public void SendPublicMessage(Mobile from, string text)
{
PartyPackets.SendPartyTextMessageToAll(this, true, from, text);
SendToAll(new PartyTextMessage(true, from, text));
for (int i = 0; i < Listeners.Count; ++i)
for (int i = 0; i < m_Listeners.Count; ++i)
{
Mobile mob = Listeners[i];
Mobile mob = m_Listeners[i];
if (mob.Party != this)
Listeners[i].SendMessage("[{0}]: {1}", from.Name, text);
m_Listeners[i].SendMessage("[{0}]: {1}", from.Name, text);
}
SendToStaffMessage(from, $"[Party]: {text}");
SendToStaffMessage(from, "[Party]: {0}", text);
}
public void SendPrivateMessage(Mobile from, Mobile to, string text)
{
PartyPackets.SendPartyTextMessage(to.NetState, false, from, text);
to.Send(new PartyTextMessage(false, from, text));
for (int i = 0; i < Listeners.Count; ++i)
for (int i = 0; i < m_Listeners.Count; ++i)
{
Mobile mob = Listeners[i];
Mobile mob = m_Listeners[i];
if (mob.Party != this)
Listeners[i].SendMessage("[{0}]->[{1}]: {2}", from.Name, to.Name, text);
m_Listeners[i].SendMessage("[{0}]->[{1}]: {2}", from.Name, to.Name, text);
}
SendToStaffMessage(from, $"[Party]->[{to.Name}]: {text}");
SendToStaffMessage(from, "[Party]->[{0}]: {1}", to.Name, text);
}
private void SendToStaffMessage(Mobile from, string text)
{
Packet p = null;
foreach (NetState ns in from.GetClientsInRange(8))
{
Mobile mob = ns.Mobile;
if (mob?.AccessLevel >= AccessLevel.GameMaster && mob.AccessLevel > from.AccessLevel &&
mob.Party != this && !Listeners.Contains(mob))
Packets.SendUnicodeMessage(ns, from.Serial, from.Body, MessageType.Regular, from.SpeechHue, 3, from.Language, from.Name, text);
mob.Party != this && !m_Listeners.Contains(mob))
{
if (p == null)
p = Packet.Acquire(new UnicodeMessage(from.Serial, from.Body, MessageType.Regular, from.SpeechHue, 3,
from.Language, from.Name, text));
ns.Send(p);
}
}
Packet.Release(p);
}
private void SendToStaffMessage(Mobile from, string format, params object[] args)
@ -344,6 +403,25 @@ namespace Server.Engines.PartySystem
SendToStaffMessage(from, string.Format(format, args));
}
public void SendToAll(Packet p)
{
p.Acquire();
for (int i = 0; i < Members.Count; ++i)
Members[i].Mobile.Send(p);
if (p is MessageLocalized || p is MessageLocalizedAffix || p is UnicodeMessage || p is AsciiMessage)
for (int i = 0; i < m_Listeners.Count; ++i)
{
Mobile mob = m_Listeners[i];
if (mob.Party != this)
mob.Send(p);
}
p.Release();
}
private class RejoinTimer : Timer
{
private Mobile m_Mobile;
@ -358,7 +436,11 @@ namespace Server.Engines.PartySystem
return;
m_Mobile.SendLocalizedMessage(1005437); // You have rejoined the party.
PartyPackets.SendPartyMemberList(m_Mobile.NetState, p);
m_Mobile.Send(new PartyMemberList(p));
Packet message = Packet.Acquire(new MessageLocalizedAffix(Serial.MinusOne, -1, MessageType.Label, 0x3B2, 3,
1008087, "", AffixType.Prepend | AffixType.System, m_Mobile.Name, ""));
Packet attrs = Packet.Acquire(new MobileAttributesN(m_Mobile));
foreach (PartyMemberInfo mi in p.Members)
{
@ -366,15 +448,16 @@ namespace Server.Engines.PartySystem
if (m != m_Mobile)
{
NetState ns = m.NetState;
Packets.SendMessageLocalizedAffix(ns, Serial.MinusOne, -1, MessageType.Label, 0x3B2, 3,
1008087, "", AffixType.Prepend | AffixType.System, m_Mobile.Name);
Packets.SendMobileStatusCompact(ns, m_Mobile, m_Mobile.CanBeRenamedBy(m));
Packets.SendNormalizedMobileAttributes(ns, m_Mobile);
Packets.SendMobileStatusCompact(ns, m, m.CanBeRenamedBy(m_Mobile));
Packets.SendNormalizedMobileAttributes(ns, m);
m.Send(message);
m.Send(new MobileStatusCompact(m_Mobile.CanBeRenamedBy(m), m_Mobile));
m.Send(attrs);
m_Mobile.Send(new MobileStatusCompact(m.CanBeRenamedBy(m_Mobile), m));
m_Mobile.Send(new MobileAttributesN(m));
}
}
Packet.Release(message);
Packet.Release(attrs);
}
}
}