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

158
Projects/Scripts/Misc/MapUO.cs
View file

@ -1,5 +1,4 @@
using System;
using Server.Buffers;
using Server.Engines.PartySystem;
using Server.Guilds;
using Server.Network;
@ -19,12 +18,35 @@ namespace Server.Misc
private static void OnPartyTrack(NetState state, PacketReader pvSrc)
{
MapUOPackets.SendPartyTrack(state, Party.Get(state.Mobile));
Mobile from = state.Mobile;
Party party = Party.Get(from);
if (party != null)
{
Packets.PartyTrack packet = new Packets.PartyTrack(from, party);
if (packet.UnderlyingStream.Length > 8)
state.Send(packet);
}
}
private static void OnGuildTrack(NetState state, PacketReader pvSrc)
{
MapUOPackets.SendGuildTrack(state, state.Mobile.Guild as Guild, pvSrc.ReadBoolean());
Mobile from = state.Mobile;
if (from.Guild is Guild guild)
{
bool locations = pvSrc.ReadByte() != 0;
Packets.GuildTrack packet = new Packets.GuildTrack(from, guild, locations);
if (packet.UnderlyingStream.Length > (locations ? 9 : 5))
state.Send(packet);
}
else
{
state.Send(new Packets.GuildTrack());
}
}
private static class Settings
@ -34,97 +56,75 @@ namespace Server.Misc
public const bool GuildHitsPercent = true;
}
private static class MapUOPackets
private static class Packets
{
public static void SendPartyTrack(NetState ns, Party party)
public sealed class PartyTrack : ProtocolExtension
{
Mobile from = ns.Mobile;
int count = party?.Members.Count ?? 0;
if (count < 2)
return;
SpanWriter writer = new SpanWriter(stackalloc byte[Math.Max(count - 1, 0) * 9 + 8]);
writer.Write((byte)0xF0); // Packet ID
writer.Position += 2; // Dynamic Length
writer.Write((byte)0x01); // Command
count = 0;
for (int i = 0; i < count; ++i)
public PartyTrack(Mobile from, Party party) : base(0x01, (party.Members.Count - 1) * 9 + 4)
{
Mobile mob = party.Members[i]?.Mobile; // if count is greater than 0, then party is not null
for (int i = 0; i < party.Members.Count; ++i)
{
PartyMemberInfo pmi = party.Members[i];
if (mob == from || mob?.NetState == null || Utility.InUpdateRange(from, mob) && from.CanSee(mob))
continue;
if (pmi == null || pmi.Mobile == from)
continue;
count++;
writer.Write(mob.Serial);
writer.Write((short)mob.X);
writer.Write((short)mob.Y);
writer.Write((byte)(mob.Map?.MapID ?? 0));
Mobile mob = pmi.Mobile;
if (Utility.InUpdateRange(from, mob) && from.CanSee(mob))
continue;
m_Stream.Write(mob.Serial);
m_Stream.Write((short)mob.X);
m_Stream.Write((short)mob.Y);
m_Stream.Write((byte)(mob.Map?.MapID ?? 0));
}
m_Stream.Write(0);
}
if (count == 0)
return;
writer.Position += 4; // Empty Serial
writer.Position = 1;
writer.Write((ushort)writer.WrittenCount);
ns.Send(writer.Span);
}
public static void SendGuildTrack(NetState ns, Guild guild = null, bool locations = false)
public sealed class GuildTrack : ProtocolExtension
{
Mobile from = ns.Mobile;
int count = guild?.Members.Count ?? 0;
if (count < 2)
return;
SpanWriter writer = new SpanWriter(stackalloc byte[Math.Max(count - 1, 0) * (locations ? 10 : 4) + 9]);
writer.Write((byte)0xF0); // Packet ID
writer.Position += 2; // Dynamic Length
writer.Write((byte)0x02); // Command
writer.Write(locations);
count = 0;
for (int i = 0; i < count; ++i)
public GuildTrack() : base(0x02, 5)
{
Mobile mob = guild.Members[i]; // If guild count is above 0, then guild is not null.
if (mob == from || mob?.NetState == null || locations && Utility.InUpdateRange(from, mob) && from.CanSee(mob))
continue;
count++;
writer.Write(mob.Serial);
if (locations)
{
writer.Write((short)mob.X);
writer.Write((short)mob.Y);
writer.Write((byte)(mob.Map?.MapID ?? 0));
if (Settings.GuildHitsPercent && mob.Alive)
writer.Write((byte)(mob.Hits / Math.Max(mob.HitsMax, 1.0) * 100));
else
writer.Position++; // writer.Write((byte)0);
}
m_Stream.Write((byte)0);
m_Stream.Write(0);
}
if (count == 0)
return;
public GuildTrack(Mobile from, Guild guild, bool locations) : base(0x02,
(guild.Members.Count - 1) * (locations ? 10 : 4) + 5)
{
m_Stream.Write((byte)(locations ? 1 : 0));
writer.Position += 4; // Empty Serial
for (int i = 0; i < guild.Members.Count; ++i)
{
Mobile mob = guild.Members[i];
writer.Position = 1;
writer.Write((ushort)writer.WrittenCount);
if (mob == null || mob == from || mob.NetState == null)
continue;
ns.Send(writer.Span);
if (locations && Utility.InUpdateRange(from, mob) && from.CanSee(mob))
continue;
m_Stream.Write(mob.Serial);
if (locations)
{
m_Stream.Write((short)mob.X);
m_Stream.Write((short)mob.Y);
m_Stream.Write((byte)(mob.Map?.MapID ?? 0));
if (Settings.GuildHitsPercent && mob.Alive)
m_Stream.Write((byte)(mob.Hits / Math.Max(mob.HitsMax, 1.0) * 100));
else
m_Stream.Write((byte)0);
}
}
m_Stream.Write(0);
}
}
}
}
}
}