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

Changes damage packets (#299)

Browse source 
- [X] Changes damage packets

Bumps release version
This commit is contained in:
Kamron Batman 2020-11-01 22:44:23 -08:00 • committed by GitHub
parent 6f5cb00cdd
commit c3289a20ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 89 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Projects/Server.Tests/Network/Packets/Old/Outgoing/CombatPacketTests.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Buffers;
using Server.Network;
using Xunit;

15
Projects/Server.Tests/Network/Packets/Old/Outgoing/CombatPackets.cs
View file

@ -1,18 +1,3 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: CombatPackets.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/>. *
*************************************************************************/
namespace Server.Network
{
public sealed class Swing : Packet

54
Projects/Server.Tests/Network/Packets/Old/Outgoing/DamagePacketTests.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Buffers;
using Server.Network;
using Xunit;
@ -8,49 +7,40 @@ namespace Server.Tests.Network
public class DamagePacketTests : IClassFixture<ServerFixture>
{
[Theory]
[InlineData(10, 10)]
[InlineData(-5, 0)]
[InlineData(1024, 0xFF)]
public void TestDamagePacketOld(int inputAmount, byte expectedAmount)
[InlineData(10)]
[InlineData(-5)]
[InlineData(1024)]
public void TestDamagePacketOld(int inputAmount)
{
var m = new Mobile(0x1);
m.DefaultMobileInit();
Serial serial = 0x1024;
var data = new DamagePacketOld(m.Serial, inputAmount).Compile();
var expected = new DamagePacketOld(serial, inputAmount).Compile();
Span<byte> expectedData = stackalloc byte[11];
var pos = 0;
using var ns = PacketTestUtilities.CreateTestNetState();
ns.SendDamage(serial, inputAmount);
expectedData.Write(ref pos, (byte)0xBF); // Packet ID
expectedData.Write(ref pos, (ushort)11); // Length
expectedData.Write(ref pos, (ushort)0x22); // Sub-packet
expectedData.Write(ref pos, (byte)0x01); // Command
expectedData.Write(ref pos, m.Serial);
expectedData.Write(ref pos, expectedAmount);
AssertThat.Equal(data, expectedData);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
[Theory]
[InlineData(10, 10)]
[InlineData(-5, 0)]
[InlineData(1024, 1024)]
[InlineData(100000, 0xFFFF)]
public void TestDamage(int inputAmount, ushort expectedAmount)
[InlineData(10)]
[InlineData(-5)]
[InlineData(1024)]
[InlineData(100000)]
public void TestDamage(int inputAmount)
{
var m = new Mobile(0x1);
m.DefaultMobileInit();
Serial serial = 0x1024;
var data = new DamagePacket(m.Serial, inputAmount).Compile();
var expected = new DamagePacket(serial, inputAmount).Compile();
Span<byte> expectedData = stackalloc byte[7];
var pos = 0;
using var ns = PacketTestUtilities.CreateTestNetState();
ns.ProtocolChanges = ProtocolChanges.DamagePacket;
expectedData.Write(ref pos, (byte)0x0B); // Packet ID
expectedData.Write(ref pos, m.Serial);
expectedData.Write(ref pos, expectedAmount);
ns.SendDamage(serial, inputAmount);
AssertThat.Equal(data, expectedData);
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
}
}

28
Projects/Server.Tests/Network/Packets/Old/Outgoing/DamagePackets.cs Normal file
View file

@ -0,0 +1,28 @@
using System;
namespace Server.Network
{
public sealed class DamagePacketOld : Packet
{
public DamagePacketOld(Serial mobile, int amount) : base(0xBF)
{
EnsureCapacity(11);
Stream.Write((short)0x22);
Stream.Write((byte)1);
Stream.Write(mobile);
Stream.Write((byte)Math.Clamp(amount, 0, 255));
}
}
public sealed class DamagePacket : Packet
{
public DamagePacket(Serial mobile, int amount) : base(0x0B, 7)
{
Stream.Write(mobile);
Stream.Write((ushort)Math.Clamp(amount, 0, 0xFFFF));
}
}
}