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

Updates Packets & Randomizer (#43)

Browse source 
* 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 2019-11-11 03:40:16 -08:00 • committed by 3HMonkey
parent 7aa8fd3df1
commit 179cb50557
588 changed files with 10843 additions and 16177 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Projects/Scripts/Items/Maps/IndecipherableMap.cs
View file

@ -3,13 +3,7 @@ namespace Server.Items
public class IndecipherableMap : MapItem
{
[Constructible]
public IndecipherableMap()
{
if (Utility.RandomDouble() < 0.2)
Hue = 0x965;
else
Hue = 0x961;
}
public IndecipherableMap() => Hue = Utility.RandomDouble() < 0.2 ? 0x965 : 0x961;
public IndecipherableMap(Serial serial) : base(serial)
{
@ -36,4 +30,4 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
}
}
}
}

105
Projects/Scripts/Items/Maps/MapItem.cs
View file

@ -10,14 +10,16 @@ namespace Server.Items
{
private const int MaxUserPins = 50;
private bool m_Editable;
private Map m_Facet;
[Constructible]
public MapItem() : base(0x14EC)
public MapItem(Map facet = null) : base(0x14EC)
{
Weight = 1.0;
Width = 200;
Height = 200;
m_Facet = facet;
}
public MapItem(Serial serial) : base(serial)
@ -38,6 +40,13 @@ namespace Server.Items
public List<Point2D> Pins{ get; } = new List<Point2D>();
[CommandProperty(AccessLevel.GameMaster)]
public virtual Map Facet
{
get => m_Facet;
set => m_Facet = value;
}
#region ICraftable Members
public int OnCraft(int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool,
@ -83,13 +92,24 @@ namespace Server.Items
public virtual void DisplayTo(Mobile from)
{
from.Send(new MapDetails(this));
from.Send(new MapDisplay(this));
NetState ns = from.NetState;
if (ns.NewCharacterList) // 7.0.13.0+ supports maps on all facets
MapItemPackets.SendMapDetailsNew(ns, this);
else if (Facet != null && Facet != Map.Felucca && Facet != Map.Trammel) // Is it Felucca and Trammel, or just Felucca?
{
from.SendMessage("You must have client 7.0.13.0 or higher to display this map.");
return;
}
else
MapItemPackets.SendMapDetailsOld(ns, this);
MapItemPackets.SendMapDisplay(from.NetState, this);
for (int i = 0; i < Pins.Count; ++i)
from.Send(new MapAddPin(this, Pins[i]));
MapItemPackets.SendMapAddPin(from.NetState, this, Pins[i]);
from.Send(new MapSetEditable(this, ValidateEdit(from)));
MapItemPackets.SendMapSetEditable(from.NetState, this, ValidateEdit(from));
}
public virtual void OnAddPin(Mobile from, int x, int y)
@ -144,7 +164,7 @@ namespace Server.Items
if (Validate(from))
m_Editable = !m_Editable;
from.Send(new MapSetEditable(this, Validate(from) && m_Editable));
MapItemPackets.SendMapSetEditable(from.NetState, this, m_Editable && ValidateEdit(from));
}
public virtual void Validate(ref int x, ref int y)
@ -226,7 +246,9 @@ namespace Server.Items
{
base.Serialize(writer);
writer.Write(0);
writer.Write(1);
writer.Write(m_Facet);
writer.Write(Bounds);
@ -248,6 +270,9 @@ namespace Server.Items
switch (version)
{
case 1:
m_Facet = reader.ReadMap();
goto case 0;
case 0:
{
Bounds = reader.ReadRect2D();
@ -306,71 +331,5 @@ namespace Server.Items
break;
}
}
private sealed class MapDetails : Packet
{
public MapDetails(MapItem map) : base(0x90, 19)
{
m_Stream.Write(map.Serial);
m_Stream.Write((short)0x139D);
m_Stream.Write((short)map.Bounds.Start.X);
m_Stream.Write((short)map.Bounds.Start.Y);
m_Stream.Write((short)map.Bounds.End.X);
m_Stream.Write((short)map.Bounds.End.Y);
m_Stream.Write((short)map.Width);
m_Stream.Write((short)map.Height);
}
}
/*
private sealed class MapDetailsNew : Packet
{
public MapDetailsNew( MapItem map ) : base ( 0xF5, 21 )
{
m_Stream.Write( (int) map.Serial );
m_Stream.Write( (short) 0x139D );
m_Stream.Write( (short) map.Bounds.Start.X );
m_Stream.Write( (short) map.Bounds.Start.Y );
m_Stream.Write( (short) map.Bounds.End.X );
m_Stream.Write( (short) map.Bounds.End.Y );
m_Stream.Write( (short) map.Width );
m_Stream.Write( (short) map.Height );
m_Stream.Write( (short) ( map.Facet == null ? 0 : map.Facet.MapID ) );
}
}
*/
private abstract class MapCommand : Packet
{
public MapCommand(MapItem map, int command, int number, int x, int y) : base(0x56, 11)
{
m_Stream.Write(map.Serial);
m_Stream.Write((byte)command);
m_Stream.Write((byte)number);
m_Stream.Write((short)x);
m_Stream.Write((short)y);
}
}
private sealed class MapDisplay : MapCommand
{
public MapDisplay(MapItem map) : base(map, 5, 0, 0, 0)
{
}
}
private sealed class MapAddPin : MapCommand
{
public MapAddPin(MapItem map, Point2D point) : base(map, 1, 0, point.X, point.Y)
{
}
}
private sealed class MapSetEditable : MapCommand
{
public MapSetEditable(MapItem map, bool editable) : base(map, 7, editable ? 1 : 0, 0, 0)
{
}
}
}
}

81
Projects/Scripts/Items/Maps/Packets.cs Normal file
View file

@ -0,0 +1,81 @@
using Server.Buffers;
using Server.Items;
namespace Server.Network
{
public static class MapItemPackets
{
public static void SendMapDetailsOld(NetState ns, MapItem map)
{
if (ns == null)
return;
SpanWriter writer = new SpanWriter(stackalloc byte[19]);
writer.Write((byte)0x90); // Packet ID
writer.Write(map.Serial);
writer.Write((short)0x139D);
writer.Write((short)map.Bounds.Start.X);
writer.Write((short)map.Bounds.Start.Y);
writer.Write((short)map.Bounds.End.X);
writer.Write((short)map.Bounds.End.Y);
writer.Write((short)map.Width);
writer.Write((short)map.Height);
ns.Send(writer.Span);
}
public static void SendMapDetailsNew(NetState ns, MapItem map)
{
if (ns == null)
return;
SpanWriter writer = new SpanWriter(stackalloc byte[21]);
writer.Write((byte)0xF5); // Packet ID
writer.Write(map.Serial);
writer.Write((short)0x139D);
writer.Write((short)map.Bounds.Start.X);
writer.Write((short)map.Bounds.Start.Y);
writer.Write((short)map.Bounds.End.X);
writer.Write((short)map.Bounds.End.Y);
writer.Write((short)map.Width);
writer.Write((short)map.Height);
writer.Write( (short)(map.Facet?.MapID ?? 0) );
ns.Send(writer.Span);
}
public static void SendMapDisplay(NetState ns, MapItem map)
{
SendMapCommand(ns, map, 5);
}
public static void SendMapAddPin(NetState ns, MapItem map, Point2D p)
{
SendMapCommand(ns, map, 1, 0, p.X, p.Y);
}
public static void SendMapSetEditable(NetState ns, MapItem map, bool editable)
{
SendMapCommand(ns, map, 7, editable ? 1 : 0);
}
public static void SendMapCommand(NetState ns, MapItem map, int command, int number = 0, int x = 0, int y = 0)
{
if (ns == null)
return;
SpanWriter writer = new SpanWriter(stackalloc byte[11]);
writer.Write((byte)0x56); // Packet ID
writer.Write(map.Serial);
writer.Write((byte)command);
writer.Write((byte)number);
writer.Write((short)x);
writer.Write((short)y);
ns.Send(writer.Span);
}
}
}

4
Projects/Scripts/Items/Maps/PresetMap.cs
View file

@ -78,7 +78,7 @@ namespace Server.Items
public Rectangle2D Bounds{ get; }
public static PresetMapEntry[] Table{ get; } =
public static readonly PresetMapEntry[] Table =
{
new PresetMapEntry(1041189, 200, 200, 1092, 1396, 1736, 1924), // map of Britain
new PresetMapEntry(1041203, 200, 200, 0256, 1792, 1736, 2560), // map of Britain to Skara Brae
@ -142,4 +142,4 @@ namespace Server.Items
Yew,
YewToBritain
}
}
}

92
Projects/Scripts/Items/Maps/TreasureMap.cs
View file

@ -17,7 +17,7 @@ namespace Server.Items
private static Point2D[] m_Locations;
private static Point2D[] m_HavenLocations;
private static Type[][] m_SpawnTypes =
private static readonly Type[][] m_SpawnTypes =
{
new[] { typeof(HeadlessOne), typeof(Skeleton) },
new[] { typeof(Mongbat), typeof(Ratman), typeof(HeadlessOne), typeof(Skeleton), typeof(Zombie) },
@ -32,18 +32,13 @@ namespace Server.Items
private Mobile m_CompletedBy;
private Mobile m_Decoder;
private int m_Level;
private Map m_Map;
[Constructible]
public TreasureMap(int level, Map map)
public TreasureMap(int level, Map facet = null) : base(facet)
{
m_Level = level;
m_Map = map;
if (level == 0)
ChestLocation = GetRandomHavenLocation();
else
ChestLocation = GetRandomLocation();
ChestLocation = level == 0 ? GetRandomHavenLocation() : GetRandomLocation();
Width = 300;
Height = 300;
@ -127,12 +122,12 @@ namespace Server.Items
}
[CommandProperty(AccessLevel.GameMaster)]
public Map ChestMap
public override Map Facet
{
get => m_Map;
get => base.Facet;
set
{
m_Map = value;
base.Facet = value;
InvalidateProperties();
}
}
@ -145,15 +140,9 @@ namespace Server.Items
get
{
if (m_Decoder != null)
{
if (m_Level == 6)
return 1063453;
return 1041516 + m_Level;
}
return m_Level == 6 ? 1063453 : 1041516 + m_Level;
if (m_Level == 6)
return 1063452;
return 1041510 + m_Level;
return m_Level == 6 ? 1063452 : 1041510 + m_Level;
}
}
@ -162,10 +151,8 @@ namespace Server.Items
if (m_Locations == null)
LoadLocations();
if (m_Locations.Length > 0)
return m_Locations[Utility.Random(m_Locations.Length)];
return Point2D.Zero;
// ReSharper disable once PossibleNullReferenceException
return m_Locations.Length > 0 ? m_Locations[Utility.Random(m_Locations.Length)] : Point2D.Zero;
}
public static Point2D GetRandomHavenLocation()
@ -173,10 +160,8 @@ namespace Server.Items
if (m_HavenLocations == null)
LoadLocations();
if (m_HavenLocations.Length > 0)
return m_HavenLocations[Utility.Random(m_HavenLocations.Length)];
return Point2D.Zero;
// ReSharper disable once PossibleNullReferenceException
return m_HavenLocations.Length > 0 ? m_HavenLocations[Utility.Random(m_HavenLocations.Length)] : Point2D.Zero;
}
private static void LoadLocations()
@ -325,7 +310,7 @@ namespace Server.Items
{
from.SendLocalizedMessage(503020); // You are already digging treasure.
}
else if (from.Map != m_Map)
else if (from.Map != Facet)
{
from.SendLocalizedMessage(1010479); // You seem to be in the right place, but may be on the wrong facet!
}
@ -473,7 +458,7 @@ namespace Server.Items
{
base.GetProperties(list);
list.Add(m_Map == Map.Felucca ? 1041502 : 1041503); // for somewhere in Felucca : for somewhere in Trammel
list.Add(Facet == Map.Felucca ? 1041502 : 1041503); // for somewhere in Felucca : for somewhere in Trammel
if (m_Completed)
list.Add(1041507, m_CompletedBy == null ? "someone" : m_CompletedBy.Name); // completed by ~1_val~
@ -483,9 +468,8 @@ namespace Server.Items
{
if (m_Completed)
{
from.Send(new MessageLocalizedAffix(Serial, ItemID, MessageType.Label, 0x3B2, 3, 1048030, "",
AffixType.Append,
$" completed by {(m_CompletedBy == null ? "someone" : m_CompletedBy.Name)}", ""));
Packets.SendMessageLocalizedAffix(from.NetState, Serial, ItemID, MessageType.Label, 0x3B2, 3, 1048030, "",
AffixType.Append, $" completed by {m_CompletedBy?.Name ?? "someone"}");
}
else if (m_Decoder != null)
{
@ -496,10 +480,10 @@ namespace Server.Items
}
else
{
if (m_Level == 6)
LabelTo(from, 1041522, $"#{1063452}\t \t#{(m_Map == Map.Felucca ? 1041502 : 1041503)}");
else
LabelTo(from, 1041522, $"#{1041510 + m_Level}\t \t#{(m_Map == Map.Felucca ? 1041502 : 1041503)}");
LabelTo(from, 1041522,
m_Level == 6
? $"#{1063452}\t \t#{(Facet == Map.Felucca ? 1041502 : 1041503)}"
: $"#{1041510 + m_Level}\t \t#{(Facet == Map.Felucca ? 1041502 : 1041503)}");
}
}
@ -507,14 +491,13 @@ namespace Server.Items
{
base.Serialize(writer);
writer.Write(1);
writer.Write(2);
writer.Write(m_CompletedBy);
writer.Write(m_Level);
writer.Write(m_Completed);
writer.Write(m_Decoder);
writer.Write(m_Map);
writer.Write(ChestLocation);
}
@ -537,7 +520,8 @@ namespace Server.Items
m_Level = reader.ReadInt();
m_Completed = reader.ReadBool();
m_Decoder = reader.ReadMobile();
m_Map = reader.ReadMap();
if (version < 2)
Facet = reader.ReadMap();
ChestLocation = reader.ReadPoint2D();
if (version == 0 && m_Completed)
@ -562,12 +546,10 @@ namespace Server.Items
if (m_Map.Deleted)
return;
Map map = m_Map.m_Map;
Map facet = m_Map.Facet;
if (m_Map.m_Completed)
{
from.SendLocalizedMessage(503028); // The treasure for this map has already been found.
}
/*
else if ( from != m_Map.m_Decoder )
{
@ -575,22 +557,14 @@ namespace Server.Items
}
*/
else if (m_Map.m_Decoder != from && !m_Map.HasRequiredSkill(from))
{
from.SendLocalizedMessage(
503031); // You did not decode this map and have no clue where to look for the treasure.
}
else if (!from.CanBeginAction<TreasureMap>())
{
from.SendLocalizedMessage(503020); // You are already digging treasure.
}
else if (!HasDiggingTool(from))
{
from.SendMessage("You must have a digging tool to dig for treasure.");
}
else if (from.Map != map)
{
from.SendLocalizedMessage(1114416); // You must have a digging tool to dig for treasure.
else if (from.Map != facet)
from.SendLocalizedMessage(1010479); // You seem to be in the right place, but may be on the wrong facet!
}
else
{
IPoint3D p = targeted as IPoint3D;
@ -617,19 +591,17 @@ namespace Server.Items
if (Utility.InRange(targ3D, chest3D0, maxRange))
{
if (from.Location.X == x && from.Location.Y == y)
{
from.SendLocalizedMessage(
503030); // The chest can't be dug up because you are standing on top of it.
}
else if (map != null)
else if (facet != null)
{
int z = map.GetAverageZ(x, y);
int z = facet.GetAverageZ(x, y);
if (!map.CanFit(x, y, z, 16, true))
if (!facet.CanFit(x, y, z, 16, true))
from.SendLocalizedMessage(
503021); // You have found the treasure chest but something is keeping it from being dug up.
else if (from.BeginAction<TreasureMap>())
new DigTimer(from, m_Map, new Point3D(x, y, z), map).Start();
new DigTimer(from, m_Map, new Point3D(x, y, z), facet).Start();
else
from.SendLocalizedMessage(503020); // You are already digging treasure.
}
@ -644,9 +616,7 @@ namespace Server.Items
else
{
if (Utility.InRange(targ3D, chest3D0, 8)) // We're close, but not quite
{
from.SendAsciiMessage(0x44, "The treasure chest is very close!");
}
from.SendLocalizedMessage(1080030, "", 0x44); // The treasure chest is very close!
else
{
Direction dir = Utility.GetDirection(targ3D, chest3D0);