Cleanup/Housekeeping (#242)
This commit is contained in:
Kamron Batman
GitHub
parent
90ede0659f
commit
741e8d8300
228 changed files with 6292 additions and 2690 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: AccountPackets.cs *
|
||||
* *
|
||||
|
|
@ -56,21 +56,30 @@ namespace Server.Network
|
|||
var count = 0;
|
||||
|
||||
for (var i = 0; i < a.Length; ++i)
|
||||
{
|
||||
if (a[i] != null)
|
||||
{
|
||||
++count;
|
||||
}
|
||||
}
|
||||
|
||||
Stream.Write((byte)count);
|
||||
Stream.Write((byte)0);
|
||||
|
||||
for (var i = 0; i < a.Length; ++i)
|
||||
{
|
||||
if (a[i] != null)
|
||||
{
|
||||
var name = a[i].Name;
|
||||
|
||||
if (name == null)
|
||||
{
|
||||
name = "-null-";
|
||||
}
|
||||
else if ((name = name.Trim()).Length == 0)
|
||||
{
|
||||
name = "-empty-";
|
||||
}
|
||||
|
||||
Stream.WriteAsciiFixed(name, 30);
|
||||
Stream.Fill(30); // password
|
||||
|
|
@ -79,6 +88,7 @@ namespace Server.Network
|
|||
{
|
||||
Stream.Fill(60);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -123,15 +133,23 @@ namespace Server.Network
|
|||
flags &= ~FeatureFlags.UOTD;
|
||||
|
||||
if (ns.Account.Limit > 6)
|
||||
{
|
||||
flags |= FeatureFlags.SeventhCharacterSlot;
|
||||
}
|
||||
else
|
||||
{
|
||||
flags |= FeatureFlags.SixthCharacterSlot;
|
||||
}
|
||||
}
|
||||
|
||||
if (ns.ExtendedSupportedFeatures)
|
||||
{
|
||||
Stream.Write((uint)flags);
|
||||
}
|
||||
else
|
||||
{
|
||||
Stream.Write((ushort)flags);
|
||||
}
|
||||
}
|
||||
|
||||
public static FeatureFlags Value { get; set; }
|
||||
|
|
@ -156,7 +174,9 @@ namespace Server.Network
|
|||
var map = m.Map;
|
||||
|
||||
if (map == null || map == Map.Internal)
|
||||
{
|
||||
map = m.LogoutMap;
|
||||
}
|
||||
|
||||
Stream.Write((short)0);
|
||||
Stream.Write((short)0);
|
||||
|
|
@ -185,8 +205,12 @@ namespace Server.Network
|
|||
var highSlot = -1;
|
||||
|
||||
for (var i = 0; i < a.Length; ++i)
|
||||
{
|
||||
if (a[i] != null)
|
||||
{
|
||||
highSlot = i;
|
||||
}
|
||||
}
|
||||
|
||||
var count = Math.Max(Math.Max(highSlot + 1, a.Limit), 5);
|
||||
|
||||
|
|
@ -218,14 +242,19 @@ namespace Server.Network
|
|||
var highSlot = -1;
|
||||
|
||||
for (var i = 0; i < a.Length; ++i)
|
||||
{
|
||||
if (a[i] != null)
|
||||
{
|
||||
highSlot = i;
|
||||
}
|
||||
}
|
||||
|
||||
var count = Math.Max(Math.Max(highSlot + 1, a.Limit), 5);
|
||||
|
||||
Stream.Write((byte)count);
|
||||
|
||||
for (var i = 0; i < count; ++i)
|
||||
{
|
||||
if (a[i] != null)
|
||||
{
|
||||
Stream.WriteAsciiFixed(a[i].Name, 30);
|
||||
|
|
@ -235,6 +264,7 @@ namespace Server.Network
|
|||
{
|
||||
Stream.Fill(60);
|
||||
}
|
||||
}
|
||||
|
||||
Stream.Write((byte)info.Length);
|
||||
|
||||
|
|
@ -256,13 +286,19 @@ namespace Server.Network
|
|||
var flags = ExpansionInfo.CoreExpansion.CharacterListFlags;
|
||||
|
||||
if (count > 6)
|
||||
{
|
||||
flags |= CharacterListFlags.SeventhCharacterSlot |
|
||||
CharacterListFlags.SixthCharacterSlot; // 7th Character Slot - TODO: Is SixthCharacterSlot Required?
|
||||
}
|
||||
else if (count == 6)
|
||||
{
|
||||
flags |= CharacterListFlags.SixthCharacterSlot; // 6th Character Slot
|
||||
}
|
||||
else if (a.Limit == 1)
|
||||
{
|
||||
flags |= CharacterListFlags.SlotLimit &
|
||||
CharacterListFlags.OneCharacterSlot; // Limit Characters & One Character
|
||||
}
|
||||
|
||||
Stream.Write((int)(flags | AdditionalFlags)); // Additional Flags
|
||||
|
||||
|
|
@ -281,14 +317,19 @@ namespace Server.Network
|
|||
var highSlot = -1;
|
||||
|
||||
for (var i = 0; i < a.Length; ++i)
|
||||
{
|
||||
if (a[i] != null)
|
||||
{
|
||||
highSlot = i;
|
||||
}
|
||||
}
|
||||
|
||||
var count = Math.Max(Math.Max(highSlot + 1, a.Limit), 5);
|
||||
|
||||
Stream.Write((byte)count);
|
||||
|
||||
for (var i = 0; i < count; ++i)
|
||||
{
|
||||
if (a[i] != null)
|
||||
{
|
||||
Stream.WriteAsciiFixed(a[i].Name, 30);
|
||||
|
|
@ -298,6 +339,7 @@ namespace Server.Network
|
|||
{
|
||||
Stream.Fill(60);
|
||||
}
|
||||
}
|
||||
|
||||
Stream.Write((byte)info.Length);
|
||||
|
||||
|
|
@ -313,13 +355,19 @@ namespace Server.Network
|
|||
var flags = ExpansionInfo.CoreExpansion.CharacterListFlags;
|
||||
|
||||
if (count > 6)
|
||||
{
|
||||
flags |= CharacterListFlags.SeventhCharacterSlot |
|
||||
CharacterListFlags.SixthCharacterSlot; // 7th Character Slot - TODO: Is SixthCharacterSlot Required?
|
||||
}
|
||||
else if (count == 6)
|
||||
{
|
||||
flags |= CharacterListFlags.SixthCharacterSlot; // 6th Character Slot
|
||||
}
|
||||
else if (a.Limit == 1)
|
||||
{
|
||||
flags |= CharacterListFlags.SlotLimit &
|
||||
CharacterListFlags.OneCharacterSlot; // Limit Characters & One Character
|
||||
}
|
||||
|
||||
Stream.Write((int)(flags | CharacterList.AdditionalFlags)); // Additional Flags
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: ArrowPackets.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: AttributeNormalizer.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: CombatPackets.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: DamagePackets.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: DisplayHuePicker.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: EffectPackets.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: EquipmentPackets.cs *
|
||||
* *
|
||||
|
|
@ -83,7 +83,10 @@ namespace Server.Network
|
|||
}
|
||||
}
|
||||
|
||||
if (info.Unidentified) Stream.Write(-4);
|
||||
if (info.Unidentified)
|
||||
{
|
||||
Stream.Write(-4);
|
||||
}
|
||||
|
||||
for (var i = 0; i < attrs.Length; ++i)
|
||||
{
|
||||
|
|
@ -109,7 +112,9 @@ namespace Server.Network
|
|||
parentSerial = parent.Serial;
|
||||
|
||||
if (parent.SolidHueOverride >= 0)
|
||||
{
|
||||
hue = parent.SolidHueOverride;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: GumpPackets.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: ItemPackets.cs *
|
||||
* *
|
||||
|
|
@ -41,43 +41,69 @@ namespace Server.Network
|
|||
var direction = (int)item.Direction;
|
||||
|
||||
if (amount != 0)
|
||||
{
|
||||
serial |= 0x80000000;
|
||||
}
|
||||
else
|
||||
{
|
||||
serial &= 0x7FFFFFFF;
|
||||
}
|
||||
|
||||
Stream.Write(serial);
|
||||
|
||||
if (item is BaseMulti)
|
||||
{
|
||||
Stream.Write((short)(itemID | 0x4000));
|
||||
}
|
||||
else
|
||||
{
|
||||
Stream.Write((short)itemID);
|
||||
}
|
||||
|
||||
if (amount != 0) Stream.Write((short)amount);
|
||||
if (amount != 0)
|
||||
{
|
||||
Stream.Write((short)amount);
|
||||
}
|
||||
|
||||
x &= 0x7FFF;
|
||||
|
||||
if (direction != 0) x |= 0x8000;
|
||||
if (direction != 0)
|
||||
{
|
||||
x |= 0x8000;
|
||||
}
|
||||
|
||||
Stream.Write((short)x);
|
||||
|
||||
y &= 0x3FFF;
|
||||
|
||||
if (hue != 0) y |= 0x8000;
|
||||
if (hue != 0)
|
||||
{
|
||||
y |= 0x8000;
|
||||
}
|
||||
|
||||
if (flags != 0) y |= 0x4000;
|
||||
if (flags != 0)
|
||||
{
|
||||
y |= 0x4000;
|
||||
}
|
||||
|
||||
Stream.Write((short)y);
|
||||
|
||||
if (direction != 0)
|
||||
{
|
||||
Stream.Write((byte)direction);
|
||||
}
|
||||
|
||||
Stream.Write((sbyte)loc.m_Z);
|
||||
|
||||
if (hue != 0)
|
||||
{
|
||||
Stream.Write((ushort)hue);
|
||||
}
|
||||
|
||||
if (flags != 0)
|
||||
{
|
||||
Stream.Write((byte)flags);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -212,7 +238,9 @@ namespace Server.Network
|
|||
Stream.Write((short)offset);
|
||||
|
||||
for (var i = 0; i < 8; ++i)
|
||||
{
|
||||
Stream.Write((byte)(content >> (i * 8)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -229,6 +257,7 @@ namespace Server.Network
|
|||
ulong mask = 1;
|
||||
|
||||
for (var i = 0; i < 64; ++i, mask <<= 1)
|
||||
{
|
||||
if ((content & mask) != 0)
|
||||
{
|
||||
Stream.Write(0x7FFFFFFF - i);
|
||||
|
|
@ -242,6 +271,7 @@ namespace Server.Network
|
|||
|
||||
++written;
|
||||
}
|
||||
}
|
||||
|
||||
Stream.Seek(3, SeekOrigin.Begin);
|
||||
Stream.Write((ushort)written);
|
||||
|
|
@ -261,6 +291,7 @@ namespace Server.Network
|
|||
ulong mask = 1;
|
||||
|
||||
for (var i = 0; i < 64; ++i, mask <<= 1)
|
||||
{
|
||||
if ((content & mask) != 0)
|
||||
{
|
||||
Stream.Write(0x7FFFFFFF - i);
|
||||
|
|
@ -275,6 +306,7 @@ namespace Server.Network
|
|||
|
||||
++written;
|
||||
}
|
||||
}
|
||||
|
||||
Stream.Seek(3, SeekOrigin.Begin);
|
||||
Stream.Write((ushort)written);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: LightPackets.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: MapPackets.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: MenuPackets.cs *
|
||||
* *
|
||||
|
|
@ -166,11 +166,15 @@ namespace Server.Network
|
|||
var range = e.Range;
|
||||
|
||||
if (range == -1)
|
||||
{
|
||||
range = 18;
|
||||
}
|
||||
|
||||
var flags = e.Flags;
|
||||
if (!(e.Enabled && menu.From.InRange(p, range)))
|
||||
{
|
||||
flags |= CMEFlags.Disabled;
|
||||
}
|
||||
|
||||
Stream.Write((short)flags);
|
||||
}
|
||||
|
|
@ -213,21 +217,29 @@ namespace Server.Network
|
|||
var range = e.Range;
|
||||
|
||||
if (range == -1)
|
||||
{
|
||||
range = 18;
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: MessagePackets.cs *
|
||||
* *
|
||||
|
|
@ -40,7 +40,9 @@ namespace Server.Network
|
|||
args ??= "";
|
||||
|
||||
if (hue == 0)
|
||||
{
|
||||
hue = 0x3B2;
|
||||
}
|
||||
|
||||
EnsureCapacity(50 + args.Length * 2);
|
||||
|
||||
|
|
@ -117,7 +119,9 @@ namespace Server.Network
|
|||
args ??= "";
|
||||
|
||||
if (hue == 0)
|
||||
{
|
||||
hue = 0x3B2;
|
||||
}
|
||||
|
||||
EnsureCapacity(52 + affix.Length + args.Length * 2);
|
||||
|
||||
|
|
@ -144,7 +148,9 @@ namespace Server.Network
|
|||
text ??= "";
|
||||
|
||||
if (hue == 0)
|
||||
{
|
||||
hue = 0x3B2;
|
||||
}
|
||||
|
||||
EnsureCapacity(45 + text.Length);
|
||||
|
||||
|
|
@ -165,12 +171,18 @@ namespace Server.Network
|
|||
string text
|
||||
) : base(0xAE)
|
||||
{
|
||||
if (string.IsNullOrEmpty(lang)) lang = "ENU";
|
||||
if (string.IsNullOrEmpty(lang))
|
||||
{
|
||||
lang = "ENU";
|
||||
}
|
||||
|
||||
name ??= "";
|
||||
text ??= "";
|
||||
|
||||
if (hue == 0)
|
||||
{
|
||||
hue = 0x3B2;
|
||||
}
|
||||
|
||||
EnsureCapacity(50 + text.Length * 2);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: MobilePackets.cs *
|
||||
* *
|
||||
|
|
@ -49,7 +49,9 @@ namespace Server.Network
|
|||
var hue = m.Hue;
|
||||
|
||||
if (m.SolidHueOverride >= 0)
|
||||
{
|
||||
hue = m.SolidHueOverride;
|
||||
}
|
||||
|
||||
Stream.Write(m.Serial);
|
||||
Stream.Write((short)m.Body);
|
||||
|
|
@ -72,7 +74,9 @@ namespace Server.Network
|
|||
var hue = m.Hue;
|
||||
|
||||
if (m.SolidHueOverride >= 0)
|
||||
{
|
||||
hue = m.SolidHueOverride;
|
||||
}
|
||||
|
||||
Stream.Write(m.Serial);
|
||||
Stream.Write((short)m.Body);
|
||||
|
|
@ -319,8 +323,12 @@ namespace Server.Network
|
|||
}
|
||||
|
||||
if (type >= 6)
|
||||
{
|
||||
for (var i = 0; i < 15; ++i)
|
||||
{
|
||||
Stream.Write((short)m.GetAOSStatus(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -362,16 +370,22 @@ namespace Server.Network
|
|||
Stream.WriteAsciiFixed(name, 30);
|
||||
|
||||
if (beholder == beheld)
|
||||
{
|
||||
WriteAttr(beheld.Hits, beheld.HitsMax);
|
||||
}
|
||||
else
|
||||
{
|
||||
WriteAttrNorm(beheld.Hits, beheld.HitsMax);
|
||||
}
|
||||
|
||||
Stream.Write(beheld.CanBeRenamedBy(beholder));
|
||||
|
||||
Stream.Write((byte)type);
|
||||
|
||||
if (type <= 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Stream.Write(beheld.Female);
|
||||
|
||||
|
|
@ -423,8 +437,12 @@ namespace Server.Network
|
|||
}
|
||||
|
||||
if (type >= 6)
|
||||
{
|
||||
for (var i = 0; i < 15; ++i)
|
||||
{
|
||||
Stream.Write((short)beheld.GetAOSStatus(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void WriteAttr(int current, int maximum)
|
||||
|
|
@ -453,9 +471,13 @@ namespace Server.Network
|
|||
var p = m.Poison;
|
||||
|
||||
if (p != null)
|
||||
{
|
||||
Stream.Write((byte)(p.Level + 1));
|
||||
}
|
||||
else
|
||||
{
|
||||
Stream.Write((byte)0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -471,9 +493,13 @@ namespace Server.Network
|
|||
Stream.Write((short)2);
|
||||
|
||||
if (m.Blessed || m.YellowHealthbar)
|
||||
{
|
||||
Stream.Write((byte)1);
|
||||
}
|
||||
else
|
||||
{
|
||||
Stream.Write((byte)0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -484,7 +510,9 @@ namespace Server.Network
|
|||
var hue = m.Hue;
|
||||
|
||||
if (m.SolidHueOverride >= 0)
|
||||
{
|
||||
hue = m.SolidHueOverride;
|
||||
}
|
||||
|
||||
Stream.Write(m.Serial);
|
||||
Stream.Write((short)m.Body);
|
||||
|
|
@ -507,7 +535,9 @@ namespace Server.Network
|
|||
var hue = m.Hue;
|
||||
|
||||
if (m.SolidHueOverride >= 0)
|
||||
{
|
||||
hue = m.SolidHueOverride;
|
||||
}
|
||||
|
||||
Stream.Write(m.Serial);
|
||||
Stream.Write((short)m.Body);
|
||||
|
|
@ -536,16 +566,23 @@ namespace Server.Network
|
|||
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);
|
||||
|
|
@ -570,7 +607,9 @@ namespace Server.Network
|
|||
hue = item.Hue;
|
||||
|
||||
if (beheld.SolidHueOverride >= 0)
|
||||
{
|
||||
hue = beheld.SolidHueOverride;
|
||||
}
|
||||
|
||||
var itemID = item.ItemID & 0xFFFF;
|
||||
|
||||
|
|
@ -583,13 +622,16 @@ namespace Server.Network
|
|||
}
|
||||
|
||||
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 & 0xFFFF;
|
||||
|
||||
|
|
@ -599,15 +641,19 @@ namespace Server.Network
|
|||
|
||||
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 & 0xFFFF;
|
||||
|
||||
|
|
@ -617,6 +663,7 @@ namespace Server.Network
|
|||
|
||||
Stream.Write((short)hue);
|
||||
}
|
||||
}
|
||||
|
||||
Stream.Write(0); // terminate
|
||||
}
|
||||
|
|
@ -624,9 +671,15 @@ namespace Server.Network
|
|||
public static Packet Create(NetState ns, Mobile beholder, Mobile beheld)
|
||||
{
|
||||
if (ns.NewMobileIncoming)
|
||||
{
|
||||
return new MobileIncoming(beholder, beheld);
|
||||
}
|
||||
|
||||
if (ns.StygianAbyss)
|
||||
{
|
||||
return new MobileIncomingSA(beholder, beheld);
|
||||
}
|
||||
|
||||
return new MobileIncomingOld(beholder, beheld);
|
||||
}
|
||||
}
|
||||
|
|
@ -645,16 +698,23 @@ namespace Server.Network
|
|||
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);
|
||||
|
|
@ -679,70 +739,92 @@ namespace Server.Network
|
|||
hue = item.Hue;
|
||||
|
||||
if (beheld.SolidHueOverride >= 0)
|
||||
{
|
||||
hue = beheld.SolidHueOverride;
|
||||
}
|
||||
|
||||
var itemID = item.ItemID & 0x7FFF;
|
||||
var writeHue = hue != 0;
|
||||
|
||||
if (writeHue)
|
||||
{
|
||||
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 & 0x7FFF;
|
||||
|
||||
var writeHue = hue != 0;
|
||||
|
||||
if (writeHue)
|
||||
{
|
||||
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 & 0x7FFF;
|
||||
|
||||
var writeHue = hue != 0;
|
||||
|
||||
if (writeHue)
|
||||
{
|
||||
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
|
||||
}
|
||||
|
|
@ -763,16 +845,23 @@ namespace Server.Network
|
|||
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);
|
||||
|
|
@ -797,70 +886,92 @@ namespace Server.Network
|
|||
hue = item.Hue;
|
||||
|
||||
if (beheld.SolidHueOverride >= 0)
|
||||
{
|
||||
hue = beheld.SolidHueOverride;
|
||||
}
|
||||
|
||||
var itemID = item.ItemID & 0x7FFF;
|
||||
var writeHue = hue != 0;
|
||||
|
||||
if (writeHue)
|
||||
{
|
||||
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 & 0x7FFF;
|
||||
|
||||
var writeHue = hue != 0;
|
||||
|
||||
if (writeHue)
|
||||
{
|
||||
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 & 0x7FFF;
|
||||
|
||||
var writeHue = hue != 0;
|
||||
|
||||
if (writeHue)
|
||||
{
|
||||
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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: MovementPackets.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: ObjectHelpResponsePackets.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: PlayerPackets.cs *
|
||||
* *
|
||||
|
|
@ -290,10 +290,14 @@ namespace Server.Network
|
|||
byte flags = 0x00;
|
||||
|
||||
if (warmode)
|
||||
{
|
||||
flags |= 0x01;
|
||||
}
|
||||
|
||||
if (canLift)
|
||||
{
|
||||
flags |= 0x02;
|
||||
}
|
||||
|
||||
Stream.Write(m);
|
||||
Stream.WriteAsciiFixed(title, 60);
|
||||
|
|
@ -328,7 +332,9 @@ namespace Server.Network
|
|||
public static Packet GetInstance(MusicName name)
|
||||
{
|
||||
if (name == MusicName.Invalid)
|
||||
{
|
||||
return InvalidInstance;
|
||||
}
|
||||
|
||||
var v = (int)name;
|
||||
Packet p;
|
||||
|
|
@ -338,7 +344,9 @@ namespace Server.Network
|
|||
p = m_Instances[v];
|
||||
|
||||
if (p == null)
|
||||
{
|
||||
m_Instances[v] = p = SetStatic(new PlayMusic(name));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: SecureTradePackets.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: TargetPackets.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: UnicodePromptPackets.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: VendorBuyPackets.cs *
|
||||
* *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*************************************************************************
|
||||
* ModernUO *
|
||||
* Copyright (C) 2019-2020 - ModernUO Development Team *
|
||||
* Copyright 2019-2020 - ModernUO Development Team *
|
||||
* Email: hi@modernuo.com *
|
||||
* File: VendorSellPackets.cs *
|
||||
* *
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue