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

fix(core): Converts mobile name and animation packets (#366)

Browse source 
- [X] Converts mobile name
- [X] Converts animation
- [X] Updates some old tests
This commit is contained in:
Kamron Batman 2020-12-27 19:57:38 -08:00 • committed by GitHub
parent 5b69f1d389
commit 26243a72a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 209 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,67 +57,32 @@ namespace Server.Tests.Network
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestMobileMovingOld()
[Theory]
[InlineData(null)]
[InlineData("Kamron")]
[InlineData("Some Really Long Mobile Name That Gets Cut off")]
public void TestMobileName(string name)
{
var m = new Mobile(0x1);
var m = new Mobile(0x1) { Name = name };
m.DefaultMobileInit();
var noto = 10;
var expected = new MobileName(m).Compile();
var data = new MobileMoving(m, noto, false).Compile();
using var ns = PacketTestUtilities.CreateTestNetState();
ns.SendMobileName(m);
Span<byte> expectedData = stackalloc byte[17];
var pos = 0;
expectedData.Write(ref pos, (byte)0x77); // Packet ID
expectedData.Write(ref pos, m.Serial);
expectedData.Write(ref pos, (ushort)m.Body);
expectedData.Write(ref pos, m.Location);
expectedData.Write(ref pos, (byte)m.Direction);
expectedData.Write(ref pos, (ushort)m.Hue);
expectedData.Write(ref pos, (byte)m.GetPacketFlags(false));
expectedData.Write(ref pos, (byte)noto);
AssertThat.Equal(data, expectedData);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestMobileName()
{
var m = new Mobile(0x1)
{
Name = "Some Really Long Mobile Name That Gets Cut off"
};
m.DefaultMobileInit();
var data = new MobileName(m).Compile();
Span<byte> expectedData = stackalloc byte[37];
var pos = 0;
expectedData.Write(ref pos, (byte)0x98);
expectedData.Write(ref pos, (ushort)0x25);
expectedData.Write(ref pos, m.Serial);
expectedData.WriteAsciiFixed(ref pos, m.Name ?? "", 29);
#if NO_LOCAL_INIT
expectedData.Write(ref pos, (byte)0);
#endif
AssertThat.Equal(data, expectedData);
}
[Fact]
public void TestMobileAnimation()
[Theory]
[InlineData(200, 5, 1, false, false, 5)]
[InlineData(10, 100, 25, true, false, 0)]
public void TestMobileAnimation(int action, int frameCount, int repeatCount, bool reverse, bool repeat, byte delay)
{
Serial mobile = 0x1;
var action = 200;
var frameCount = 5;
var repeatCount = 1;
var reverse = false;
var repeat = false;
byte delay = 5;
var data = new MobileAnimation(
var expected = new MobileAnimation(
mobile,
action,
frameCount,
@ -127,46 +92,45 @@ namespace Server.Tests.Network
delay
).Compile();
Span<byte> expectedData = stackalloc byte[14];
var pos = 0;
using var ns = PacketTestUtilities.CreateTestNetState();
ns.SendMobileAnimation(
mobile,
action,
frameCount,
repeatCount,
!reverse,
repeat,
delay
);
expectedData.Write(ref pos, (byte)0x6E); // Packet ID
expectedData.Write(ref pos, mobile);
expectedData.Write(ref pos, (ushort)action);
expectedData.Write(ref pos, (ushort)frameCount);
expectedData.Write(ref pos, (ushort)repeatCount);
expectedData.Write(ref pos, reverse);
expectedData.Write(ref pos, repeat);
expectedData.Write(ref pos, delay);
AssertThat.Equal(data, expectedData);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestNewMobileAnimation()
[Theory]
[InlineData(200, 5, 5)]
[InlineData(10, 100, 20)]
public void TestNewMobileAnimation(int action, int frameCount, byte delay)
{
Serial mobile = 0x1;
var action = 200;
var frameCount = 5;
byte delay = 5;
var data = new NewMobileAnimation(
var expected = new NewMobileAnimation(
mobile,
action,
frameCount,
delay
).Compile();
Span<byte> expectedData = stackalloc byte[10];
var pos = 0;
using var ns = PacketTestUtilities.CreateTestNetState();
ns.SendNewMobileAnimation(
mobile,
action,
frameCount,
delay
);
expectedData.Write(ref pos, (byte)0xE2);
expectedData.Write(ref pos, mobile);
expectedData.Write(ref pos, (ushort)action);
expectedData.Write(ref pos, (ushort)frameCount);
expectedData.Write(ref pos, delay);
AssertThat.Equal(data, expectedData);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]

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

@ -135,4 +135,43 @@ namespace Server.Tests.Network
AttributeNormalizer.Write(Stream, m.Stam, m.StamMax);
}
}
public sealed class MobileName : Packet
{
public MobileName(Mobile m) : base(0x98)
{
EnsureCapacity(37);
Stream.Write(m.Serial);
Stream.WriteAsciiFixed(m.Name ?? "", 29);
Stream.Write((byte)0); // Null terminator
}
}
public sealed class MobileAnimation : Packet
{
public MobileAnimation(
Serial mobile, int action, int frameCount, int repeatCount, bool forward, bool repeat, int delay
) : base(0x6E, 14)
{
Stream.Write(mobile);
Stream.Write((short)action);
Stream.Write((short)frameCount);
Stream.Write((short)repeatCount);
Stream.Write(!forward); // protocol has really "reverse" but I find this more intuitive
Stream.Write(repeat);
Stream.Write((byte)delay);
}
}
public sealed class NewMobileAnimation : Packet
{
public NewMobileAnimation(Serial mobile, int action, int frameCount, int delay) : base(0xE2, 10)
{
Stream.Write(mobile);
Stream.Write((short)action);
Stream.Write((short)frameCount);
Stream.Write((byte)delay);
}
}
}