Updates Packets & Randomizer (#43)
* Fixes a bug with the main loop. Removes unnecessary optimizations for RDRand. * WIP - Rewriting packets. * Cleanup and updates README * Converts more packets * Fixes header * Converts Effects packets. * Forgot the send command * Adds the start of containers packets. * Adds message packets with caching * Extends the send methods * Starts to add Acquire methods * Converted the packets * Cleanup * Cleanup * Adds more packets * Adds more packets * Fixes clearing arrays from pool. Adds Mobile Incoming * Converts more packets. * Moves more packets * Moves more packets * Test compression * Merges * Migrating to an idiomatic syntax that also supports compression, and proxying. * Optimize the stack alloc. Changes attributes * Converted container packets * Visual Studio doesn't auto save files. I am still getting used to subpar IDEs. * Adds static packet caching. Will profile later. Converts more packets * Fixes packets and changes how compression is configured * WIP - Adds basics for Gumps. Not finished though. * Fix file * Fixes formatting * Changed SpanWriter to be more idiomatic. * Fixes Span vs RawSpan and missing stackallocs * Converts over some more gumps * WIP - Deletes 32bit support. * Drops RDRand32 support. * Fixes gump compilation * Converting gump components * Removes old huffman compression function * Revert signature for backwards compatibility * WIP - Converting more gump components * Creates ArraySet for the strings. Updates AppendTo to reference that. * Converts the maining gump components * Cleans up gump components * Cleans up directives * Cleans up ArraySet and moves it. Adds null-coalescing-assignment * Cleanup, Target Packets, and C# 8 changes. * Removed OPL Packet * World packets * Fixing packet uses * Cleans up code. Fixes packet uses in various places. * More cleanup for packets * Code cleanup * Converts more packet uses and cleans up more code * More code cleanup * Finishes fixing the packets in Item * Updates secure trade packets * Updates core and gets it to compile. * Moved packets to scripts. Fixed account handler use of packets * Code cleanup * Updates chat packets * Code cleanuo * Adds party packets, but need to implement them. * Party packets WIP * Finishes party packets * Rearrange movement namespaces and classes * Finishes plant packets * Code Formatting * Fixes moving effects * Code cleanup, eliminates equipinfo * Adds more packets. Fixes bugs with various packets. * Finishes mahjon packets * Fixes mahjong packet * Code cleanup * Finishes mahjong packets * Adds Map packets * Add multifacet maps and charts * Cleans up some packets with UTF8 * Optimizes packets * Cleans up more packets. Moves the MessageHelper * Removes assistant support. Removes extended protocol. Incorporates MapUO packets as normal packets. * Updates protocol extensions packet receiver * Fixes a few bugs. Fixes a few more packets. * Code cleanup and fixing more packets * Fixes packet effects * Cleaned up more code * Buff Icon cleanup * Removed unused constructors * Code Cleanup. Adds BoatHS Packets * Moves house files. Updates house foundation packets. * Deployment cleanup * Fixes: * Code cleanup * More code cleanup * More code cleanup * Cleaned up BaseHouse * Enforces styling * Converts foreach to linq where possible. * Dont need that * Goals/Readme updates * Removes 32bit support at the highest level. Turns on HRT by default. * Code cleanup. Fixes extended features packet. * Fixes various bugs * Code cleanup * Code cleanup * Code cleanup. Fixes gump X/Y assignment. * Code cleanup using |= operator * More code cleanup * Cleanup * Fixes spacing issues. Thanks Visual Studio. You suck. * Compiler error * Fixes NPE from RunUO 2.7 * Renames ScriptCompiler to AssemblyHandler. Fixes packets. Updates README * Fixes more packets. Stupid trailing nulls. * Fixes various bugs. * Fixes for gumps * Fixes more gump stuff. Going to split it out later since it is getting insane * Recoded the gump writing * WIP * *Added output path of scripts project to dev branch *Activated debugging in code
This commit is contained in:
Kamron Batman
3HMonkey
parent
7aa8fd3df1
commit
179cb50557
588 changed files with 10843 additions and 16177 deletions
|
|
@ -1,6 +1,5 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using Server.Items;
|
||||
using Server.Network;
|
||||
|
|
@ -259,7 +258,7 @@ namespace Server.Multis
|
|||
}
|
||||
|
||||
int xOffset = 0, yOffset = 0;
|
||||
Movement.Movement.Offset(m_Facing, ref xOffset, ref yOffset);
|
||||
Movement.Offset(m_Facing, ref xOffset, ref yOffset);
|
||||
|
||||
if (TillerMan != null)
|
||||
{
|
||||
|
|
@ -1458,11 +1457,10 @@ namespace Server.Multis
|
|||
else
|
||||
{
|
||||
List<IEntity> toMove = GetMovingEntities();
|
||||
|
||||
SafeAdd(TillerMan, toMove);
|
||||
SafeAdd(Hold, toMove);
|
||||
SafeAdd(PPlank, toMove);
|
||||
SafeAdd(SPlank, toMove);
|
||||
if (TillerMan != null) toMove.Add(TillerMan);
|
||||
if (Hold != null) toMove.Add(Hold);
|
||||
if (PPlank != null) toMove.Add(PPlank);
|
||||
if (SPlank != null) toMove.Add(SPlank);
|
||||
|
||||
// Packet must be sent before actual locations are changed
|
||||
foreach (NetState ns in Map.GetClientsInRange(Location, GetMaxUpdateRange()))
|
||||
|
|
@ -1470,7 +1468,7 @@ namespace Server.Multis
|
|||
Mobile m = ns.Mobile;
|
||||
|
||||
if (ns.HighSeas && m.CanSee(this) && m.InRange(Location, GetUpdateRange(m)))
|
||||
ns.Send(new MoveBoatHS(m, this, d, clientSpeed, toMove, xOffset, yOffset));
|
||||
BoatPackets.SendMoveBoatHS(ns, m, this, d, clientSpeed, toMove, xOffset, yOffset);
|
||||
}
|
||||
|
||||
foreach (IEntity e in toMove)
|
||||
|
|
@ -1502,12 +1500,6 @@ namespace Server.Multis
|
|||
return true;
|
||||
}
|
||||
|
||||
private static void SafeAdd(Item item, List<IEntity> toMove)
|
||||
{
|
||||
if (item != null)
|
||||
toMove.Add(item);
|
||||
}
|
||||
|
||||
public void Teleport(int xOffset, int yOffset, int zOffset)
|
||||
{
|
||||
List<IEntity> toMove = GetMovingEntities();
|
||||
|
|
@ -1534,9 +1526,9 @@ namespace Server.Multis
|
|||
return list;
|
||||
|
||||
MultiComponentList mcl = Components;
|
||||
IPooledEnumerable eable = map.GetObjectsInBounds(new Rectangle2D(X + mcl.Min.X, Y + mcl.Min.Y, mcl.Width, mcl.Height));
|
||||
|
||||
foreach (IEntity o in map.GetObjectsInBounds(new Rectangle2D(X + mcl.Min.X, Y + mcl.Min.Y, mcl.Width, mcl.Height))
|
||||
)
|
||||
foreach (IEntity o in eable)
|
||||
{
|
||||
if (o == this || o is TillerMan || o is Hold || o is Plank)
|
||||
continue;
|
||||
|
|
@ -1553,6 +1545,8 @@ namespace Server.Multis
|
|||
}
|
||||
}
|
||||
|
||||
eable.Free();
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
|
|
@ -1595,11 +1589,11 @@ namespace Server.Multis
|
|||
|
||||
List<IEntity> toMove = GetMovingEntities();
|
||||
|
||||
toMove.Add(PPlank);
|
||||
toMove.Add(SPlank);
|
||||
if (PPlank != null) toMove.Add(PPlank);
|
||||
if (SPlank != null) toMove.Add(SPlank);
|
||||
|
||||
int xOffset = 0, yOffset = 0;
|
||||
Movement.Movement.Offset(facing, ref xOffset, ref yOffset);
|
||||
Movement.Offset(facing, ref xOffset, ref yOffset);
|
||||
|
||||
if (TillerMan != null)
|
||||
TillerMan.Location = new Point3D(X + xOffset * TillerManDistance + (facing == Direction.North ? 1 : 0),
|
||||
|
|
@ -1616,9 +1610,7 @@ namespace Server.Multis
|
|||
IEntity e = toMove[i];
|
||||
|
||||
if (e is Item item)
|
||||
{
|
||||
item.Location = Rotate(item.Location, count);
|
||||
}
|
||||
else if (e is Mobile m)
|
||||
{
|
||||
m.Direction = m.Direction - old + facing & Direction.Mask;
|
||||
|
|
@ -1734,8 +1726,6 @@ namespace Server.Multis
|
|||
}
|
||||
}
|
||||
|
||||
#region High Seas
|
||||
|
||||
public override bool AllowsRelativeDrop => true;
|
||||
|
||||
/*
|
||||
|
|
@ -1753,137 +1743,5 @@ namespace Server.Multis
|
|||
return base.GetWorldPacketFor( state );
|
||||
}
|
||||
*/
|
||||
|
||||
public sealed class MoveBoatHS : Packet
|
||||
{
|
||||
public MoveBoatHS(Mobile beholder, BaseBoat boat, Direction d, int speed, List<IEntity> ents, int xOffset,
|
||||
int yOffset)
|
||||
: base(0xF6)
|
||||
{
|
||||
EnsureCapacity(3 + 15 + ents.Count * 10);
|
||||
|
||||
m_Stream.Write(boat.Serial);
|
||||
m_Stream.Write((byte)speed);
|
||||
m_Stream.Write((byte)d);
|
||||
m_Stream.Write((byte)boat.Facing);
|
||||
m_Stream.Write((short)(boat.X + xOffset));
|
||||
m_Stream.Write((short)(boat.Y + yOffset));
|
||||
m_Stream.Write((short)boat.Z);
|
||||
m_Stream.Write((short)0); // count placeholder
|
||||
|
||||
int count = 0;
|
||||
|
||||
foreach (IEntity ent in ents)
|
||||
{
|
||||
if (!beholder.CanSee(ent))
|
||||
continue;
|
||||
|
||||
m_Stream.Write(ent.Serial);
|
||||
m_Stream.Write((short)(ent.X + xOffset));
|
||||
m_Stream.Write((short)(ent.Y + yOffset));
|
||||
m_Stream.Write((short)ent.Z);
|
||||
++count;
|
||||
}
|
||||
|
||||
m_Stream.Seek(16, SeekOrigin.Begin);
|
||||
m_Stream.Write((short)count);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class DisplayBoatHS : Packet
|
||||
{
|
||||
public DisplayBoatHS(Mobile beholder, BaseBoat boat)
|
||||
: base(0xF7)
|
||||
{
|
||||
List<IEntity> ents = boat.GetMovingEntities();
|
||||
|
||||
SafeAdd(boat.TillerMan, ents);
|
||||
SafeAdd(boat.Hold, ents);
|
||||
SafeAdd(boat.PPlank, ents);
|
||||
SafeAdd(boat.SPlank, ents);
|
||||
|
||||
ents.Add(boat);
|
||||
|
||||
EnsureCapacity(3 + 2 + ents.Count * 26);
|
||||
|
||||
m_Stream.Write((short)0); // count placeholder
|
||||
|
||||
int count = 0;
|
||||
|
||||
foreach (IEntity ent in ents)
|
||||
{
|
||||
if (!beholder.CanSee(ent))
|
||||
continue;
|
||||
|
||||
// Embedded WorldItemHS packets
|
||||
m_Stream.Write((byte)0xF3);
|
||||
m_Stream.Write((short)0x1);
|
||||
|
||||
if (ent is BaseMulti bm)
|
||||
{
|
||||
m_Stream.Write((byte)0x02);
|
||||
m_Stream.Write(bm.Serial);
|
||||
// TODO: Mask no longer needed, merge with Item case?
|
||||
m_Stream.Write((ushort)(bm.ItemID & 0x3FFF));
|
||||
m_Stream.Write((byte)0);
|
||||
|
||||
m_Stream.Write((short)bm.Amount);
|
||||
m_Stream.Write((short)bm.Amount);
|
||||
|
||||
m_Stream.Write((short)(bm.X & 0x7FFF));
|
||||
m_Stream.Write((short)(bm.Y & 0x3FFF));
|
||||
m_Stream.Write((sbyte)bm.Z);
|
||||
|
||||
m_Stream.Write((byte)bm.Light);
|
||||
m_Stream.Write((short)bm.Hue);
|
||||
m_Stream.Write((byte)bm.GetPacketFlags());
|
||||
}
|
||||
else if (ent is Mobile m)
|
||||
{
|
||||
m_Stream.Write((byte)0x01);
|
||||
m_Stream.Write(m.Serial);
|
||||
m_Stream.Write((short)m.Body);
|
||||
m_Stream.Write((byte)0);
|
||||
|
||||
m_Stream.Write((short)1);
|
||||
m_Stream.Write((short)1);
|
||||
|
||||
m_Stream.Write((short)(m.X & 0x7FFF));
|
||||
m_Stream.Write((short)(m.Y & 0x3FFF));
|
||||
m_Stream.Write((sbyte)m.Z);
|
||||
|
||||
m_Stream.Write((byte)m.Direction);
|
||||
m_Stream.Write((short)m.Hue);
|
||||
m_Stream.Write((byte)m.GetPacketFlags());
|
||||
}
|
||||
else if (ent is Item item)
|
||||
{
|
||||
m_Stream.Write((byte)0x00);
|
||||
m_Stream.Write(item.Serial);
|
||||
m_Stream.Write((ushort)(item.ItemID & 0xFFFF));
|
||||
m_Stream.Write((byte)0);
|
||||
|
||||
m_Stream.Write((short)item.Amount);
|
||||
m_Stream.Write((short)item.Amount);
|
||||
|
||||
m_Stream.Write((short)(item.X & 0x7FFF));
|
||||
m_Stream.Write((short)(item.Y & 0x3FFF));
|
||||
m_Stream.Write((sbyte)item.Z);
|
||||
|
||||
m_Stream.Write((byte)item.Light);
|
||||
m_Stream.Write((short)item.Hue);
|
||||
m_Stream.Write((byte)item.GetPacketFlags());
|
||||
}
|
||||
|
||||
m_Stream.Write((short)0x00);
|
||||
++count;
|
||||
}
|
||||
|
||||
m_Stream.Seek(3, SeekOrigin.Begin);
|
||||
m_Stream.Write((short)count);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue