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

Revert "Updates Packets & Randomizer (#43)" (#61)

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,16 +10,14 @@ namespace Server.Items
{
private const int MaxUserPins = 50;
private bool m_Editable;
private Map m_Facet;
[Constructible]
public MapItem(Map facet = null) : base(0x14EC)
public MapItem() : base(0x14EC)
{
Weight = 1.0;
Width = 200;
Height = 200;
m_Facet = facet;
}
public MapItem(Serial serial) : base(serial)
@ -40,13 +38,6 @@ 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,
@ -92,24 +83,13 @@ namespace Server.Items
public virtual void DisplayTo(Mobile from)
{
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);
from.Send(new MapDetails(this));
from.Send(new MapDisplay(this));
for (int i = 0; i < Pins.Count; ++i)
MapItemPackets.SendMapAddPin(from.NetState, this, Pins[i]);
from.Send(new MapAddPin(this, Pins[i]));
MapItemPackets.SendMapSetEditable(from.NetState, this, ValidateEdit(from));
from.Send(new MapSetEditable(this, ValidateEdit(from)));
}
public virtual void OnAddPin(Mobile from, int x, int y)
@ -164,7 +144,7 @@ namespace Server.Items
if (Validate(from))
m_Editable = !m_Editable;
MapItemPackets.SendMapSetEditable(from.NetState, this, m_Editable && ValidateEdit(from));
from.Send(new MapSetEditable(this, Validate(from) && m_Editable));
}
public virtual void Validate(ref int x, ref int y)
@ -246,9 +226,7 @@ namespace Server.Items
{
base.Serialize(writer);
writer.Write(1);
writer.Write(m_Facet);
writer.Write(0);
writer.Write(Bounds);
@ -270,9 +248,6 @@ namespace Server.Items
switch (version)
{
case 1:
m_Facet = reader.ReadMap();
goto case 0;
case 0:
{
Bounds = reader.ReadRect2D();
@ -331,5 +306,71 @@ 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)
{
}
}
}
}