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

fix(core): Converts vendor sell packets (#375)

Browse source 
- [X] Converts vendor sell packets

Bumps release version
This commit is contained in:
Kamron Batman 2020-12-30 16:27:37 -08:00 • committed by GitHub
parent 540a879d63
commit 2a2af424ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 91 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Projects/Server.Tests/Tests/Network/Packets/Outgoing/VendorSellPacketTests.cs
View file

@ -12,7 +12,7 @@ namespace Server.Tests.Network
[Fact]
public void TestVendorSellList()
{
var vendor = new Mobile(0x1);
var vendor = new Mobile(0x1024u);
vendor.DefaultMobileInit();
var item1 = new Item(World.NewItem);
@ -26,57 +26,28 @@ namespace Server.Tests.Network
new(item3, 1, "Item 3")
};
var data = new VendorSellList(vendor, sellStates).Compile();
var expected = new VendorSellList(vendor, sellStates).Compile();
var length = 9 + 14 * 3 + sellStates.Sum(
state =>
(string.IsNullOrWhiteSpace(state.Item.Name) ? state.Name ?? "" : state.Item.Name.Trim()).Length
);
using var ns = PacketTestUtilities.CreateTestNetState();
ns.SendVendorSellList(vendor.Serial, sellStates);
Span<byte> expectedData = stackalloc byte[length];
var pos = 0;
expectedData.Write(ref pos, (byte)0x9E); // Packet ID
expectedData.Write(ref pos, (ushort)length);
expectedData.Write(ref pos, vendor.Serial);
expectedData.Write(ref pos, (ushort)sellStates.Count);
for (var i = 0; i < sellStates.Count; i++)
{
var state = sellStates[i];
expectedData.Write(ref pos, state.Item.Serial);
expectedData.Write(ref pos, (ushort)state.Item.ItemID);
expectedData.Write(ref pos, (ushort)state.Item.Hue);
expectedData.Write(ref pos, (ushort)state.Item.Amount);
expectedData.Write(ref pos, (ushort)state.Price);
var name = string.IsNullOrWhiteSpace(state.Item.Name) ? state.Name ?? "" : state.Item.Name.Trim();
expectedData.Write(ref pos, (ushort)name.Length);
expectedData.WriteAscii(ref pos, name);
}
AssertThat.Equal(data, expectedData);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Fact]
public void TestEndVendorSell()
{
var vendor = new Mobile(0x1);
var vendor = new Mobile(0x1024u);
vendor.DefaultMobileInit();
var data = new EndVendorBuy(vendor.Serial).Compile();
var expected = new EndVendorBuy(vendor.Serial).Compile();
Span<byte> expectedData = stackalloc byte[8];
var pos = 0;
using var ns = PacketTestUtilities.CreateTestNetState();
ns.SendEndVendorSell(vendor.Serial);
expectedData.Write(ref pos, (byte)0x3B); // Packet ID
expectedData.Write(ref pos, (ushort)0x08); // Length
expectedData.Write(ref pos, vendor.Serial);
#if NO_LOCAL_INIT
expectedData.Write(ref pos, (byte)0);
#endif
AssertThat.Equal(data, expectedData);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
}
}

0
Projects/Server/Network/Packets/VendorSellPackets.cs → Projects/Server.Tests/Tests/Network/Packets/Outgoing/VendorSellPackets.cs
View file

4
Projects/Server/Network/Packets/IncomingVendorPackets.cs
View file

@ -77,7 +77,7 @@ namespace Server.Network
if (vendor.Deleted || !Utility.RangeCheck(vendor.Location, state.Mobile.Location, 10))
{
state.Send(new EndVendorSell(vendor));
state.SendEndVendorSell(vendor.Serial);
return;
}
@ -103,7 +103,7 @@ namespace Server.Network
if (sellList.Count > 0 && vendor is IVendor v && v.OnSellItems(state.Mobile, sellList))
{
state.Send(new EndVendorSell(vendor));
state.SendEndVendorSell(vendor.Serial);
}
}
}

1
Projects/Server/Network/Packets/OutgoingPlayerPackets.cs
View file

@ -17,7 +17,6 @@ using System;
using System.Buffers;
using System.IO;
using System.Runtime.CompilerServices;
using Server.HuePickers;
namespace Server.Network
{

74
Projects/Server/Network/Packets/OutgoingVendorSellPackets.cs Normal file
View file

@ -0,0 +1,74 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: OutgoingVendorSellPackets.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
using System.Buffers;
using System.Collections.Generic;
using System.IO;
namespace Server.Network
{
public static class OutgoingVendorSellPackets
{
public static void SendVendorSellList(this NetState ns, Serial vendor, List<SellItemState> list)
{
if (ns == null || !ns.GetSendBuffer(out var buffer))
{
return;
}
var writer = new CircularBufferWriter(buffer);
writer.Write((byte)0x9E); // Packet ID
writer.Seek(2, SeekOrigin.Current);
writer.Write(vendor);
writer.Write((ushort)list.Count);
for (var i = 0; i < list.Count; i++)
{
var sis = list[i];
var item = sis.Item;
writer.Write(item.Serial);
writer.Write((ushort)item.ItemID);
writer.Write((ushort)item.Hue);
writer.Write((ushort)item.Amount);
writer.Write((ushort)sis.Price);
var name = (item.Name?.Trim()).DefaultIfNullOrEmpty(sis.Name ?? "");
writer.Write((ushort)name.Length);
writer.WriteAscii(name);
}
writer.WritePacketLength();
ns.Send(ref buffer, writer.Position);
}
public static void SendEndVendorSell(this NetState ns, Serial vendor)
{
if (ns == null || !ns.GetSendBuffer(out var buffer))
{
return;
}
var writer = new CircularBufferWriter(buffer);
writer.Write((byte)0x3B); // Packet ID
writer.Write((ushort)8);
writer.Write(vendor);
writer.Write((byte)0);
ns.Send(ref buffer, writer.Position);
}
}
}

3
Projects/Server/Utilities/StringHelpers.cs
View file

@ -23,7 +23,8 @@ namespace Server
public static class StringHelpers
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static string DefaultIfNullOrEmpty(this string value, string def) => value?.Trim().Length > 0 ? value : def;
public static string DefaultIfNullOrEmpty(this string value, string def) =>
string.IsNullOrWhiteSpace(value) ? def : value;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void Remove(

2
Projects/UOContent/Mobiles/Vendors/BaseVendor.cs
View file

@ -1042,7 +1042,7 @@ namespace Server.Mobiles
{
SendPacksTo(from);
from.Send(new VendorSellList(this, list));
from.NetState.SendVendorSellList(Serial, list);
}
else
{