Updates menu packets (#320)
This commit is contained in:
Kamron Batman
GitHub
parent
ceb8d4ad49
commit
602c14fed7
6 changed files with 260 additions and 228 deletions
|
|
@ -12,20 +12,25 @@ namespace Server.Tests.Network
|
|||
{
|
||||
internal class ContextMenuItem : Item
|
||||
{
|
||||
public ContextMenuItem(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
private bool _requiresNewPacket;
|
||||
public ContextMenuItem(Serial serial, bool requiresNewPacket) : base(serial) =>
|
||||
_requiresNewPacket = requiresNewPacket;
|
||||
|
||||
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
|
||||
{
|
||||
base.GetContextMenuEntries(from, list);
|
||||
|
||||
list.Add(new ContextMenuEntry(500000));
|
||||
list.Add(new ContextMenuEntry(500001));
|
||||
list.Add(new ContextMenuEntry(500002));
|
||||
list.Add(new ContextMenuEntry(3000001));
|
||||
list.Add(new ContextMenuEntry(3000002));
|
||||
list.Add(new ContextMenuEntry(3000003));
|
||||
if (_requiresNewPacket)
|
||||
{
|
||||
list.Add(new ContextMenuEntry(500000));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[Collection("Sequential Tests")]
|
||||
public class MenuPacketTests : IClassFixture<ServerFixture>
|
||||
{
|
||||
[Fact]
|
||||
|
|
@ -41,45 +46,13 @@ namespace Server.Tests.Network
|
|||
}
|
||||
);
|
||||
|
||||
var data = new DisplayItemListMenu(menu).Compile();
|
||||
var expected = new DisplayItemListMenu(menu).Compile();
|
||||
|
||||
var question = menu.Question;
|
||||
var questionLength = Math.Min(255, question.Length);
|
||||
var entriesCount = 0;
|
||||
var length = 11 + questionLength;
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.SendDisplayItemListMenu(menu);
|
||||
|
||||
foreach (var entry in menu.Entries)
|
||||
{
|
||||
length += 5 + entry.Name.Length;
|
||||
if (entriesCount == 255)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
entriesCount++;
|
||||
}
|
||||
|
||||
Span<byte> expectedData = stackalloc byte[length];
|
||||
var pos = 0;
|
||||
|
||||
expectedData.Write(ref pos, (byte)0x7C); // Packet ID
|
||||
expectedData.Write(ref pos, (ushort)length);
|
||||
expectedData.Write(ref pos, menu.Serial);
|
||||
expectedData.Write(ref pos, (ushort)0x00);
|
||||
expectedData.Write(ref pos, (byte)questionLength);
|
||||
expectedData.WriteAscii(ref pos, question, 255);
|
||||
expectedData.Write(ref pos, (byte)entriesCount);
|
||||
for (var i = 0; i < entriesCount; i++)
|
||||
{
|
||||
var entry = menu.Entries[i];
|
||||
expectedData.Write(ref pos, (ushort)entry.ItemID);
|
||||
expectedData.Write(ref pos, (ushort)entry.Hue);
|
||||
var name = entry.Name?.Trim() ?? "";
|
||||
expectedData.Write(ref pos, (byte)Math.Min(255, name.Length));
|
||||
expectedData.WriteAscii(ref pos, name, 255);
|
||||
}
|
||||
|
||||
AssertThat.Equal(data, expectedData);
|
||||
var result = ns.SendPipe.Reader.TryRead();
|
||||
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -95,162 +68,40 @@ namespace Server.Tests.Network
|
|||
}
|
||||
);
|
||||
|
||||
var data = new DisplayQuestionMenu(menu).Compile();
|
||||
var expected = new DisplayQuestionMenu(menu).Compile();
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
ns.SendDisplayQuestionMenu(menu);
|
||||
|
||||
var question = menu.Question;
|
||||
var questionLength = Math.Min(255, question.Length);
|
||||
var answersCount = 0;
|
||||
var length = 11 + questionLength;
|
||||
|
||||
foreach (var answer in menu.Answers)
|
||||
{
|
||||
length += 5 + answer.Length;
|
||||
if (answersCount == 255)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
answersCount++;
|
||||
}
|
||||
|
||||
Span<byte> expectedData = stackalloc byte[length];
|
||||
|
||||
var pos = 0;
|
||||
|
||||
expectedData.Write(ref pos, (byte)0x7C); // Packet ID
|
||||
expectedData.Write(ref pos, (ushort)length);
|
||||
expectedData.Write(ref pos, menu.Serial);
|
||||
expectedData.Write(ref pos, (ushort)0x00);
|
||||
expectedData.Write(ref pos, (byte)question.Length);
|
||||
expectedData.WriteAscii(ref pos, question, 255);
|
||||
expectedData.Write(ref pos, (byte)answersCount);
|
||||
for (var i = 0; i < answersCount; i++)
|
||||
{
|
||||
var answer = menu.Answers[i];
|
||||
#if NO_LOCAL_INIT
|
||||
expectedData.Write(ref pos, 0);
|
||||
#else
|
||||
pos += 4;
|
||||
#endif
|
||||
expectedData.Write(ref pos, (byte)Math.Min(255, answer.Length));
|
||||
expectedData.WriteAscii(ref pos, answer, 255);
|
||||
}
|
||||
|
||||
AssertThat.Equal(data, expectedData);
|
||||
var result = ns.SendPipe.Reader.TryRead();
|
||||
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TestDisplayContextMenu()
|
||||
[Theory]
|
||||
[InlineData(false, false)]
|
||||
[InlineData(false, true)]
|
||||
[InlineData(true, false)]
|
||||
[InlineData(true, true)]
|
||||
public void TestDisplayContextMenu(bool newHaven, bool newPacket)
|
||||
{
|
||||
var m = new Mobile(0x1);
|
||||
m.DefaultMobileInit();
|
||||
|
||||
var item = new ContextMenuItem(World.NewItem);
|
||||
var item = new ContextMenuItem(World.NewItem, newPacket);
|
||||
var menu = new ContextMenu(m, item);
|
||||
|
||||
var data = new DisplayContextMenu(menu).Compile();
|
||||
var packet = newHaven && newPacket ? (Packet)new DisplayContextMenu(menu) : new DisplayContextMenuOld(menu);
|
||||
var expected = packet.Compile();
|
||||
|
||||
var length = 12 + menu.Entries.Length * 8;
|
||||
|
||||
Span<byte> expectedData = stackalloc byte[length];
|
||||
|
||||
var pos = 0;
|
||||
expectedData.Write(ref pos, (byte)0xBF); // Packet ID
|
||||
expectedData.Write(ref pos, (ushort)length); // Length
|
||||
expectedData.Write(ref pos, (ushort)0x14); // Command
|
||||
expectedData.Write(ref pos, (ushort)0x02); // Subcommand
|
||||
expectedData.Write(ref pos, menu.Target.Serial);
|
||||
var entries = menu.Entries;
|
||||
|
||||
expectedData.Write(ref pos, (byte)entries.Length);
|
||||
|
||||
for (var i = 0; i < entries.Length; i++)
|
||||
using var ns = PacketTestUtilities.CreateTestNetState();
|
||||
if (newHaven)
|
||||
{
|
||||
var entry = entries[i];
|
||||
expectedData.Write(ref pos, entry.Number);
|
||||
expectedData.Write(ref pos, (ushort)i);
|
||||
|
||||
var flags = entry.Flags;
|
||||
|
||||
var range = entry.Range;
|
||||
|
||||
if (range == -1)
|
||||
{
|
||||
range = 18;
|
||||
}
|
||||
|
||||
if (!(entry.Enabled && menu.From.InRange(item.GetWorldLocation(), range)))
|
||||
{
|
||||
flags |= CMEFlags.Disabled;
|
||||
}
|
||||
|
||||
expectedData.Write(ref pos, (ushort)flags);
|
||||
ns.ProtocolChanges |= ProtocolChanges.NewHaven;
|
||||
}
|
||||
|
||||
AssertThat.Equal(data, expectedData);
|
||||
}
|
||||
ns.SendDisplayContextMenu(menu);
|
||||
|
||||
[Fact]
|
||||
public void TestDisplayContextMenuOld()
|
||||
{
|
||||
var m = new Mobile(0x1);
|
||||
m.DefaultMobileInit();
|
||||
|
||||
var item = new ContextMenuItem(World.NewItem);
|
||||
var menu = new ContextMenu(m, item);
|
||||
|
||||
var data = new DisplayContextMenuOld(menu).Compile();
|
||||
|
||||
var length = 12 + menu.Entries.Sum(entry => 6 + ((entry.Color & 0xFFFF) != 0xFFFF ? 2 : 0));
|
||||
|
||||
Span<byte> expectedData = stackalloc byte[length];
|
||||
|
||||
var pos = 0;
|
||||
expectedData.Write(ref pos, (byte)0xBF); // Packet ID
|
||||
expectedData.Write(ref pos, (ushort)length); // Length
|
||||
expectedData.Write(ref pos, (ushort)0x14); // Command
|
||||
expectedData.Write(ref pos, (ushort)0x01); // Subcommand
|
||||
expectedData.Write(ref pos, menu.Target.Serial);
|
||||
var entries = menu.Entries;
|
||||
|
||||
expectedData.Write(ref pos, (byte)entries.Length);
|
||||
|
||||
for (var i = 0; i < entries.Length; i++)
|
||||
{
|
||||
var entry = entries[i];
|
||||
expectedData.Write(ref pos, (ushort)i);
|
||||
expectedData.Write(ref pos, (ushort)(entry.Number - 3000000));
|
||||
|
||||
var flags = entry.Flags;
|
||||
|
||||
var color = entry.Color & 0xFFFF;
|
||||
|
||||
if (color != 0xFFFF)
|
||||
{
|
||||
flags |= CMEFlags.Colored;
|
||||
}
|
||||
|
||||
var range = entry.Range;
|
||||
|
||||
if (range == -1)
|
||||
{
|
||||
range = 18;
|
||||
}
|
||||
|
||||
if (!(entry.Enabled && menu.From.InRange(item.GetWorldLocation(), range)))
|
||||
{
|
||||
flags |= CMEFlags.Disabled;
|
||||
}
|
||||
|
||||
expectedData.Write(ref pos, (ushort)flags);
|
||||
|
||||
if ((flags & CMEFlags.Colored) != 0)
|
||||
{
|
||||
expectedData.Write(ref pos, (ushort)color);
|
||||
}
|
||||
}
|
||||
|
||||
AssertThat.Equal(data, expectedData);
|
||||
var result = ns.SendPipe.Reader.TryRead();
|
||||
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,220 @@
|
|||
using Server.ContextMenus;
|
||||
using Server.Menus;
|
||||
using Server.Menus.ItemLists;
|
||||
using Server.Menus.Questions;
|
||||
|
||||
namespace Server.Network
|
||||
{
|
||||
public sealed class DisplayItemListMenu : Packet
|
||||
{
|
||||
public DisplayItemListMenu(ItemListMenu menu) : base(0x7C)
|
||||
{
|
||||
EnsureCapacity(256);
|
||||
|
||||
Stream.Write(((IMenu)menu).Serial);
|
||||
Stream.Write((short)0);
|
||||
|
||||
var question = menu.Question;
|
||||
|
||||
if (question == null)
|
||||
{
|
||||
Stream.Write((byte)0);
|
||||
}
|
||||
else
|
||||
{
|
||||
var questionLength = question.Length;
|
||||
Stream.Write((byte)questionLength);
|
||||
Stream.WriteAsciiFixed(question, questionLength);
|
||||
}
|
||||
|
||||
var entries = menu.Entries;
|
||||
|
||||
int entriesLength = (byte)entries.Length;
|
||||
|
||||
Stream.Write((byte)entriesLength);
|
||||
|
||||
for (var i = 0; i < entriesLength; ++i)
|
||||
{
|
||||
var e = entries[i];
|
||||
|
||||
Stream.Write((ushort)e.ItemID);
|
||||
Stream.Write((short)e.Hue);
|
||||
|
||||
var name = e.Name;
|
||||
|
||||
if (name == null)
|
||||
{
|
||||
Stream.Write((byte)0);
|
||||
}
|
||||
else
|
||||
{
|
||||
var nameLength = name.Length;
|
||||
Stream.Write((byte)nameLength);
|
||||
Stream.WriteAsciiFixed(name, nameLength);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class DisplayQuestionMenu : Packet
|
||||
{
|
||||
public DisplayQuestionMenu(QuestionMenu menu) : base(0x7C)
|
||||
{
|
||||
EnsureCapacity(256);
|
||||
|
||||
Stream.Write(((IMenu)menu).Serial);
|
||||
Stream.Write((short)0);
|
||||
|
||||
var question = menu.Question;
|
||||
|
||||
if (question == null)
|
||||
{
|
||||
Stream.Write((byte)0);
|
||||
}
|
||||
else
|
||||
{
|
||||
var questionLength = question.Length;
|
||||
Stream.Write((byte)questionLength);
|
||||
Stream.WriteAsciiFixed(question, questionLength);
|
||||
}
|
||||
|
||||
var answers = menu.Answers;
|
||||
|
||||
int answersLength = (byte)answers.Length;
|
||||
|
||||
Stream.Write((byte)answersLength);
|
||||
|
||||
for (var i = 0; i < answersLength; ++i)
|
||||
{
|
||||
Stream.Write(0);
|
||||
|
||||
var answer = answers[i];
|
||||
|
||||
if (answer == null)
|
||||
{
|
||||
Stream.Write((byte)0);
|
||||
}
|
||||
else
|
||||
{
|
||||
var answerLength = answer.Length;
|
||||
Stream.Write((byte)answerLength);
|
||||
Stream.WriteAsciiFixed(answer, answerLength);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class DisplayContextMenu : Packet
|
||||
{
|
||||
public DisplayContextMenu(ContextMenu menu) : base(0xBF)
|
||||
{
|
||||
var entries = menu.Entries;
|
||||
|
||||
int length = (byte)entries.Length;
|
||||
|
||||
EnsureCapacity(12 + length * 8);
|
||||
|
||||
Stream.Write((short)0x14);
|
||||
Stream.Write((short)0x02);
|
||||
|
||||
var target = menu.Target;
|
||||
|
||||
Stream.Write(target.Serial);
|
||||
|
||||
Stream.Write((byte)length);
|
||||
|
||||
var p = target switch
|
||||
{
|
||||
Mobile _ => target.Location,
|
||||
Item item => item.GetWorldLocation(),
|
||||
_ => Point3D.Zero
|
||||
};
|
||||
|
||||
for (var i = 0; i < length; ++i)
|
||||
{
|
||||
var e = entries[i];
|
||||
|
||||
Stream.Write(e.Number);
|
||||
Stream.Write((short)i);
|
||||
|
||||
var range = e.Range;
|
||||
|
||||
if (range == -1)
|
||||
{
|
||||
range = Core.GlobalUpdateRange;
|
||||
}
|
||||
|
||||
var flags = e.Flags;
|
||||
if (!(e.Enabled && menu.From.InRange(p, range)))
|
||||
{
|
||||
flags |= CMEFlags.Disabled;
|
||||
}
|
||||
|
||||
Stream.Write((short)flags);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class DisplayContextMenuOld : Packet
|
||||
{
|
||||
public DisplayContextMenuOld(ContextMenu menu) : base(0xBF)
|
||||
{
|
||||
var entries = menu.Entries;
|
||||
|
||||
int length = (byte)entries.Length;
|
||||
|
||||
EnsureCapacity(12 + length * 8);
|
||||
|
||||
Stream.Write((short)0x14);
|
||||
Stream.Write((short)0x01);
|
||||
|
||||
var target = menu.Target;
|
||||
|
||||
Stream.Write(target.Serial);
|
||||
|
||||
Stream.Write((byte)length);
|
||||
|
||||
var p = target switch
|
||||
{
|
||||
Mobile _ => target.Location,
|
||||
Item item => item.GetWorldLocation(),
|
||||
_ => Point3D.Zero
|
||||
};
|
||||
|
||||
for (var i = 0; i < length; ++i)
|
||||
{
|
||||
var e = entries[i];
|
||||
|
||||
Stream.Write((short)i);
|
||||
Stream.Write((ushort)(e.Number - 3000000));
|
||||
|
||||
var range = e.Range;
|
||||
|
||||
if (range == -1)
|
||||
{
|
||||
range = Core.GlobalUpdateRange;
|
||||
}
|
||||
|
||||
var flags = e.Flags;
|
||||
if (!(e.Enabled && menu.From.InRange(p, range)))
|
||||
{
|
||||
flags |= CMEFlags.Disabled;
|
||||
}
|
||||
|
||||
var color = e.Color & 0xFFFF;
|
||||
|
||||
if (color != 0xFFFF)
|
||||
{
|
||||
flags |= CMEFlags.Colored;
|
||||
}
|
||||
|
||||
Stream.Write((short)flags);
|
||||
|
||||
if ((flags & CMEFlags.Colored) != 0)
|
||||
{
|
||||
Stream.Write((short)color);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue