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

fix(core): Converts mobile incoming packet (#370)

Browse source 
- [X] Converts mobile incoming packet

Bumps release version
This commit is contained in:
Kamron Batman 2020-12-28 02:30:47 -08:00 • committed by GitHub
parent 9d4161b3e4
commit 7ef1d41c6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 300 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Projects/Server.Tests/Tests/Network/Packets/Outgoing/AttributeNormalizer.cs Normal file
View file

@ -0,0 +1,37 @@
namespace Server.Network
{
public static class AttributeNormalizer
{
public static int Maximum { get; set; } = 100;
public static bool Enabled { get; set; } = true;
public static void Write(PacketWriter stream, int cur, int max)
{
if (Enabled && max != 0)
{
stream.Write((short)Maximum);
stream.Write((short)(cur * Maximum / max));
}
else
{
stream.Write((short)max);
stream.Write((short)cur);
}
}
public static void WriteReverse(PacketWriter stream, int cur, int max)
{
if (Enabled && max != 0)
{
stream.Write((short)(cur * Maximum / max));
stream.Write((short)Maximum);
}
else
{
stream.Write((short)cur);
stream.Write((short)max);
}
}
}
}

143
Projects/Server.Tests/Tests/Network/Packets/Outgoing/MobilePacketTests.cs
View file

@ -286,7 +286,7 @@ namespace Server.Tests.Network
[InlineData(ProtocolChanges.Version7000, 10, 1024, 0, 0)]
[InlineData(ProtocolChanges.Version7000, 10, 1024, 11, 2048)]
public void TestMobileIncoming(
ProtocolChanges protocolChanges, int hairItemId, int hairHue, int facialHairItemId, int facialHairHue
ProtocolChanges changes, int hairItemId, int hairHue, int facialHairItemId, int facialHairHue
)
{
var beholder = new Mobile(0x1)
@ -320,143 +320,14 @@ namespace Server.Tests.Network
beheld.FacialHairItemID = facialHairItemId;
beheld.FacialHairHue = facialHairHue;
var ns = new NetState(null)
{
ProtocolChanges = protocolChanges
};
using var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges = changes;
var data = new MobileIncoming(ns, beholder, beheld).Compile();
var expected = new MobileIncoming(ns, beholder, beheld).Compile();
ns.SendMobileIncoming(beholder, beheld);
var sa = ns.StygianAbyss;
var newPacket = ns.NewMobileIncoming;
var itemIdMask = newPacket ? 0xFFFF : 0x7FFF;
Span<bool> layers = stackalloc bool[256];
#if NO_LOCAL_INIT
layers.Clear();
#endif
var items = beheld.Items;
var count = items.Count;
if (beheld.HairItemID > 0)
{
count++;
}
if (beheld.FacialHairItemID > 0)
{
count++;
}
var length = 23 + count * 9; // Max Size
Span<byte> expectedData = stackalloc byte[length];
var pos = 0;
expectedData.Write(ref pos, (byte)0x78);
pos += 2; // Length
var isSolidHue = beheld.SolidHueOverride >= 0;
expectedData.Write(ref pos, beheld.Serial);
expectedData.Write(ref pos, (ushort)beheld.Body);
expectedData.Write(ref pos, (ushort)beheld.X);
expectedData.Write(ref pos, (ushort)beheld.Y);
expectedData.Write(ref pos, (byte)beheld.Z);
expectedData.Write(ref pos, (byte)beheld.Direction);
expectedData.Write(ref pos, (ushort)(isSolidHue ? beheld.SolidHueOverride : beheld.Hue));
expectedData.Write(ref pos, (byte)beheld.GetPacketFlags(sa));
expectedData.Write(ref pos, (byte)Notoriety.Compute(beholder, beheld));
byte layer;
for (var i = 0; i < items.Count; i++)
{
var item = items[i];
layer = (byte)item.Layer;
if (!item.Deleted && !layers[layer] && beholder.CanSee(item))
{
layers[layer] = true;
expectedData.Write(ref pos, item.Serial);
var hue = isSolidHue ? beheld.SolidHueOverride : item.Hue;
var itemID = item.ItemID & itemIdMask;
var writeHue = newPacket || hue != 0;
if (!newPacket)
{
itemID |= 0x8000;
}
expectedData.Write(ref pos, (ushort)itemID);
expectedData.Write(ref pos, layer);
if (writeHue)
{
expectedData.Write(ref pos, (ushort)hue);
}
}
}
layer = (byte)Layer.Hair;
var itemId = beheld.HairItemID;
if (itemId > 0 && !layers[layer])
{
expectedData.Write(ref pos, HairInfo.FakeSerial(beheld));
var hue = isSolidHue ? beheld.SolidHueOverride : beheld.HairHue;
itemId &= itemIdMask;
var writeHue = newPacket || hue != 0;
if (!newPacket)
{
itemId |= 0x8000;
}
expectedData.Write(ref pos, (ushort)itemId);
expectedData.Write(ref pos, layer);
if (writeHue)
{
expectedData.Write(ref pos, (ushort)hue);
}
}
layer = (byte)Layer.FacialHair;
itemId = beheld.FacialHairItemID;
if (itemId > 0 && !layers[layer])
{
expectedData.Write(ref pos, FacialHairInfo.FakeSerial(beheld));
var hue = isSolidHue ? beheld.SolidHueOverride : beheld.FacialHairHue;
itemId &= itemIdMask;
var writeHue = newPacket || hue != 0;
if (!newPacket)
{
itemId |= 0x8000;
}
expectedData.Write(ref pos, (ushort)itemId);
expectedData.Write(ref pos, layer);
if (writeHue)
{
expectedData.Write(ref pos, (ushort)hue);
}
}
#if NO_LOCAL_INIT
expectedData.Write(ref pos, 0); // Zero serial, terminate list
#else
pos += 4;
#endif
expectedData.Slice(1, 2).Write((ushort)pos); // Length
expectedData = expectedData.Slice(0, pos);
AssertThat.Equal(data, expectedData);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
}

149
Projects/Server.Tests/Tests/Network/Packets/Outgoing/MobilePackets.cs
View file

@ -1,3 +1,4 @@
using System.Threading;
using Server.Network;
namespace Server.Tests.Network
@ -486,4 +487,152 @@ namespace Server.Tests.Network
Stream.Write((sbyte)m.Z);
}
}
public sealed class MobileIncoming : Packet
{
private static readonly ThreadLocal<int[]> m_DupedLayersTL = new(() => new int[256]);
private static readonly ThreadLocal<int> m_VersionTL = new();
public MobileIncoming(NetState ns, Mobile beholder, Mobile beheld) : base(0x78)
{
var sa = ns.StygianAbyss;
var newPacket = ns.NewMobileIncoming;
var itemIdMask = newPacket ? 0xFFFF : 0x7FFF;
var m_Version = ++m_VersionTL.Value;
var m_DupedLayers = m_DupedLayersTL.Value;
var eq = beheld.Items;
var count = eq.Count;
if (beheld.HairItemID > 0)
{
count++;
}
if (beheld.FacialHairItemID > 0)
{
count++;
}
EnsureCapacity(23 + count * 9);
var hue = beheld.Hue;
if (beheld.SolidHueOverride >= 0)
{
hue = beheld.SolidHueOverride;
}
Stream.Write(beheld.Serial);
Stream.Write((short)beheld.Body);
Stream.Write((short)beheld.X);
Stream.Write((short)beheld.Y);
Stream.Write((sbyte)beheld.Z);
Stream.Write((byte)beheld.Direction);
Stream.Write((short)hue);
Stream.Write((byte)beheld.GetPacketFlags(sa));
Stream.Write((byte)Notoriety.Compute(beholder, beheld));
for (var i = 0; i < eq.Count; ++i)
{
var item = eq[i];
var layer = (byte)item.Layer;
if (!item.Deleted && beholder.CanSee(item) && m_DupedLayers[layer] != m_Version)
{
m_DupedLayers[layer] = m_Version;
hue = item.Hue;
if (beheld.SolidHueOverride >= 0)
{
hue = beheld.SolidHueOverride;
}
var itemID = item.ItemID & itemIdMask;
var writeHue = newPacket || hue != 0;
if (!newPacket)
{
itemID |= 0x8000;
}
Stream.Write(item.Serial);
Stream.Write((ushort)itemID);
Stream.Write(layer);
if (writeHue)
{
Stream.Write((short)hue);
}
}
}
if (beheld.HairItemID > 0)
{
if (m_DupedLayers[(int)Layer.Hair] != m_Version)
{
m_DupedLayers[(int)Layer.Hair] = m_Version;
hue = beheld.HairHue;
if (beheld.SolidHueOverride >= 0)
{
hue = beheld.SolidHueOverride;
}
var itemID = beheld.HairItemID & itemIdMask;
var writeHue = newPacket || hue != 0;
if (!newPacket)
{
itemID |= 0x8000;
}
Stream.Write(HairInfo.FakeSerial(beheld));
Stream.Write((ushort)itemID);
Stream.Write((byte)Layer.Hair);
if (writeHue)
{
Stream.Write((short)hue);
}
}
}
if (beheld.FacialHairItemID > 0)
{
if (m_DupedLayers[(int)Layer.FacialHair] != m_Version)
{
m_DupedLayers[(int)Layer.FacialHair] = m_Version;
hue = beheld.FacialHairHue;
if (beheld.SolidHueOverride >= 0)
{
hue = beheld.SolidHueOverride;
}
var itemID = beheld.FacialHairItemID & itemIdMask;
var writeHue = newPacket || hue != 0;
if (!newPacket)
{
itemID |= 0x8000;
}
Stream.Write(FacialHairInfo.FakeSerial(beheld));
Stream.Write((ushort)itemID);
Stream.Write((byte)Layer.FacialHair);
if (writeHue)
{
Stream.Write((short)hue);
}
}
}
Stream.Write(0); // terminate
}
}
}