fix(core): Converts mobile incoming packet (#370)
- [X] Converts mobile incoming packet Bumps release version
This commit is contained in:
Kamron Batman
GitHub
parent
9d4161b3e4
commit
7ef1d41c6f
9 changed files with 300 additions and 339 deletions
|
|
@ -1,37 +0,0 @@
|
|||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -323,7 +323,7 @@ namespace Server.Network
|
|||
|
||||
state.SendMobileUpdate(m);
|
||||
|
||||
state.Send(new MobileIncoming(state, m, m));
|
||||
state.SendMobileIncoming(m, m);
|
||||
|
||||
state.SendMobileStatus(m);
|
||||
state.SendSetWarMode(m.Warmode);
|
||||
|
|
@ -335,7 +335,7 @@ namespace Server.Network
|
|||
|
||||
state.SendMobileStatus(m);
|
||||
state.SendSetWarMode(m.Warmode);
|
||||
state.Send(new MobileIncoming(state, m, m));
|
||||
state.SendMobileIncoming(m, m);
|
||||
|
||||
state.SendLoginComplete();
|
||||
state.Send(new CurrentTime());
|
||||
|
|
|
|||
|
|
@ -474,7 +474,7 @@ namespace Server.Network
|
|||
}
|
||||
|
||||
state.SendMobileUpdate(from);
|
||||
state.Send(new MobileIncoming(state, from, from));
|
||||
state.SendMobileIncoming(from, from);
|
||||
|
||||
from.SendEverything();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,167 +0,0 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: MobilePackets.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.Threading;
|
||||
|
||||
namespace Server.Network
|
||||
{
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -536,5 +536,121 @@ namespace Server.Network
|
|||
|
||||
ns.Send(ref buffer, writer.Position);
|
||||
}
|
||||
|
||||
public static void SendMobileIncoming(this NetState ns, Mobile beholder, Mobile beheld)
|
||||
{
|
||||
if (ns == null || !ns.GetSendBuffer(out var buffer))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Span<bool> layers = stackalloc bool[256];
|
||||
#if NO_LOCAL_INIT
|
||||
layers.Clear();
|
||||
#endif
|
||||
|
||||
var writer = new CircularBufferWriter(buffer);
|
||||
writer.Write((byte)0x78); // Packet ID
|
||||
writer.Seek(2, SeekOrigin.Current);
|
||||
|
||||
var sa = ns.StygianAbyss;
|
||||
var newPacket = ns.NewMobileIncoming;
|
||||
var itemIdMask = newPacket ? 0xFFFF : 0x7FFF;
|
||||
|
||||
var hue = beheld.SolidHueOverride >= 0 ? beheld.SolidHueOverride : beheld.Hue;
|
||||
|
||||
writer.Write(beheld.Serial);
|
||||
writer.Write((short)beheld.Body);
|
||||
writer.Write((short)beheld.X);
|
||||
writer.Write((short)beheld.Y);
|
||||
writer.Write((sbyte)beheld.Z);
|
||||
writer.Write((byte)beheld.Direction);
|
||||
writer.Write((short)hue);
|
||||
writer.Write((byte)beheld.GetPacketFlags(sa));
|
||||
writer.Write((byte)Notoriety.Compute(beholder, beheld));
|
||||
|
||||
var eq = beheld.Items;
|
||||
for (var i = 0; i < eq.Count; ++i)
|
||||
{
|
||||
var item = eq[i];
|
||||
var layer = (byte)item.Layer;
|
||||
|
||||
if (item.Deleted || !beholder.CanSee(item) || layers[layer])
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
layers[layer] = true;
|
||||
hue = beheld.SolidHueOverride >= 0 ? beheld.SolidHueOverride : item.Hue;
|
||||
|
||||
var itemID = item.ItemID & itemIdMask;
|
||||
var writeHue = newPacket || hue != 0;
|
||||
|
||||
if (!newPacket)
|
||||
{
|
||||
itemID |= 0x8000;
|
||||
}
|
||||
|
||||
writer.Write(item.Serial);
|
||||
writer.Write((ushort)itemID);
|
||||
writer.Write(layer);
|
||||
|
||||
if (writeHue)
|
||||
{
|
||||
writer.Write((short)hue);
|
||||
}
|
||||
}
|
||||
|
||||
if (beheld.HairItemID > 0 && !layers[(int)Layer.Hair])
|
||||
{
|
||||
layers[(int)Layer.Hair] = true;
|
||||
hue = beheld.SolidHueOverride >= 0 ? beheld.SolidHueOverride : beheld.HairHue;
|
||||
|
||||
var itemID = beheld.HairItemID & itemIdMask;
|
||||
var writeHue = newPacket || hue != 0;
|
||||
|
||||
if (!newPacket)
|
||||
{
|
||||
itemID |= 0x8000;
|
||||
}
|
||||
|
||||
writer.Write(HairInfo.FakeSerial(beheld));
|
||||
writer.Write((ushort)itemID);
|
||||
writer.Write((byte)Layer.Hair);
|
||||
|
||||
if (writeHue)
|
||||
{
|
||||
writer.Write((short)hue);
|
||||
}
|
||||
}
|
||||
|
||||
if (beheld.FacialHairItemID > 0 && !layers[(int)Layer.FacialHair])
|
||||
{
|
||||
layers[(int)Layer.FacialHair] = true;
|
||||
hue = beheld.SolidHueOverride >= 0 ? beheld.SolidHueOverride : beheld.FacialHairHue;
|
||||
|
||||
var itemID = beheld.FacialHairItemID & itemIdMask;
|
||||
var writeHue = newPacket || hue != 0;
|
||||
|
||||
if (!newPacket)
|
||||
{
|
||||
itemID |= 0x8000;
|
||||
}
|
||||
|
||||
writer.Write(FacialHairInfo.FakeSerial(beheld));
|
||||
writer.Write((ushort)itemID);
|
||||
writer.Write((byte)Layer.FacialHair);
|
||||
|
||||
if (writeHue)
|
||||
{
|
||||
writer.Write((short)hue);
|
||||
}
|
||||
}
|
||||
|
||||
writer.Write(0); // terminate
|
||||
|
||||
writer.WritePacketLength();
|
||||
ns.Send(ref buffer, writer.Position);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue