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

Modernization Fixes & Updates to Default Values (#3)

Browse source
This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions
Download patch file Download diff file Expand all files Collapse all files

87
Server/Network/Packets.cs
View file

@ -298,7 +298,7 @@ namespace Server.Network
m_Stream.Write((short)list.Count);
//The client sorts these by their X/Y value.
//OSI sends these in wierd order. X/Y highest to lowest and serial loest to highest
//OSI sends these in weird order. X/Y highest to lowest and serial lowest to highest
//These are already sorted by serial (done by the vendor class) but we have to send them by x/y
//(the x74 packet is sent in 'correct' order.)
for (int i = list.Count - 1; i >= 0; --i)
@ -326,7 +326,7 @@ namespace Server.Network
m_Stream.Write((short)list.Count);
//The client sorts these by their X/Y value.
//OSI sends these in wierd order. X/Y highest to lowest and serial loest to highest
//OSI sends these in weird order. X/Y highest to lowest and serial loewst to highest
//These are already sorted by serial (done by the vendor class) but we have to send them by x/y
//(the x74 packet is sent in 'correct' order.)
for (int i = list.Count - 1; i >= 0; --i)
@ -1142,11 +1142,11 @@ namespace Server.Network
m_Stream.Write((byte)0);
/*} else if ( ) {
m_Stream.Write( (byte) 0x01 );
m_Stream.Write( (int) item.Serial );
m_Stream.Write( (short) itemID );
m_Stream.Write( (byte) item.Direction );*/
}
else
@ -1200,11 +1200,11 @@ namespace Server.Network
m_Stream.Write((byte)0);
/*} else if ( ) {
m_Stream.Write( (byte) 0x01 );
m_Stream.Write( (int) item.Serial );
m_Stream.Write( (ushort) itemID );
m_Stream.Write( (byte) item.Direction );*/
}
else
@ -2346,6 +2346,7 @@ namespace Server.Network
void AppendLayout(bool val);
void AppendLayout(int val);
void AppendLayout(uint val);
void AppendLayoutNS(int val);
void AppendLayout(string text);
void AppendLayout(byte[] buffer);
@ -2404,6 +2405,14 @@ namespace Server.Network
m_Layout.Write(m_Buffer, 0, bytes);
}
public void AppendLayout(uint val)
{
string toString = val.ToString();
int bytes = Encoding.ASCII.GetBytes(toString, 0, toString.Length, m_Buffer, 1) + 1;
m_Layout.Write(m_Buffer, 0, bytes);
}
public void AppendLayoutNS(int val)
{
string toString = val.ToString();
@ -2548,6 +2557,15 @@ namespace Server.Network
m_LayoutLength += bytes;
}
public void AppendLayout(uint val)
{
string toString = val.ToString();
int bytes = Encoding.ASCII.GetBytes(toString, 0, toString.Length, m_Buffer, 1) + 1;
m_Stream.Write(m_Buffer, 0, bytes);
m_LayoutLength += bytes;
}
public void AppendLayoutNS(int val)
{
string toString = val.ToString();
@ -3094,12 +3112,17 @@ namespace Server.Network
IWeapon weapon = m.Weapon;
int min = 0, max = 0;
weapon?.GetStatusDamage(m, out min, out max);
m_Stream.Write((short)min); // Damage min
m_Stream.Write((short)max); // Damage max
if (weapon != null)
{
weapon.GetStatusDamage(m, out int min, out int max);
m_Stream.Write((short)min); // Damage min
m_Stream.Write((short)max); // Damage max
}
else
{
m_Stream.Write((short)0); // Damage min
m_Stream.Write((short)0); // Damage max
}
m_Stream.Write(m.TithingPoints);
}
@ -3193,12 +3216,17 @@ namespace Server.Network
IWeapon weapon = beheld.Weapon;
int min = 0, max = 0;
weapon?.GetStatusDamage(beheld, out min, out max);
m_Stream.Write((short)min); // Damage min
m_Stream.Write((short)max); // Damage max
if (weapon != null)
{
weapon.GetStatusDamage(beheld, out int min, out int max);
m_Stream.Write((short)min); // Damage min
m_Stream.Write((short)max); // Damage max
}
else
{
m_Stream.Write((short)0); // Damage min
m_Stream.Write((short)0); // Damage max
}
m_Stream.Write(beheld.TithingPoints);
}
@ -3748,17 +3776,7 @@ namespace Server.Network
public sealed class MovementAck : Packet
{
private static MovementAck[][] m_Cache = new MovementAck[8][]
{
new MovementAck[256],
new MovementAck[256],
new MovementAck[256],
new MovementAck[256],
new MovementAck[256],
new MovementAck[256],
new MovementAck[256],
new MovementAck[256]
};
private static MovementAck[] m_Cache = new MovementAck[8 * 256];
private MovementAck(int seq, int noto) : base(0x22, 3)
{
@ -3770,11 +3788,11 @@ namespace Server.Network
{
int noto = Notoriety.Compute(m, m);
MovementAck p = m_Cache[noto][seq];
MovementAck p = m_Cache[noto * seq];
if (p == null)
{
m_Cache[noto][seq] = p = new MovementAck(seq, noto);
m_Cache[noto * seq] = p = new MovementAck(seq, noto);
p.SetStatic();
}
@ -4183,6 +4201,7 @@ namespace Server.Network
}
}
[Flags]
public enum AffixType : byte
{
Append = 0x00,
@ -4606,4 +4625,4 @@ namespace Server.Network
Warned = 0x10
}
}
}
}