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

168
Projects/Scripts/Multis/Boats/BaseBoat.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Server.Items;
using Server.Network;
@ -258,7 +259,7 @@ namespace Server.Multis
}
int xOffset = 0, yOffset = 0;
Movement.Offset(m_Facing, ref xOffset, ref yOffset);
Movement.Movement.Offset(m_Facing, ref xOffset, ref yOffset);
if (TillerMan != null)
{
@ -1457,10 +1458,11 @@ namespace Server.Multis
else
{
List<IEntity> toMove = GetMovingEntities();
if (TillerMan != null) toMove.Add(TillerMan);
if (Hold != null) toMove.Add(Hold);
if (PPlank != null) toMove.Add(PPlank);
if (SPlank != null) toMove.Add(SPlank);
SafeAdd(TillerMan, toMove);
SafeAdd(Hold, toMove);
SafeAdd(PPlank, toMove);
SafeAdd(SPlank, toMove);
// Packet must be sent before actual locations are changed
foreach (NetState ns in Map.GetClientsInRange(Location, GetMaxUpdateRange()))
@ -1468,7 +1470,7 @@ namespace Server.Multis
Mobile m = ns.Mobile;
if (ns.HighSeas && m.CanSee(this) && m.InRange(Location, GetUpdateRange(m)))
BoatPackets.SendMoveBoatHS(ns, m, this, d, clientSpeed, toMove, xOffset, yOffset);
ns.Send(new MoveBoatHS(m, this, d, clientSpeed, toMove, xOffset, yOffset));
}
foreach (IEntity e in toMove)
@ -1500,6 +1502,12 @@ 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();
@ -1526,9 +1534,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 eable)
foreach (IEntity o in map.GetObjectsInBounds(new Rectangle2D(X + mcl.Min.X, Y + mcl.Min.Y, mcl.Width, mcl.Height))
)
{
if (o == this || o is TillerMan || o is Hold || o is Plank)
continue;
@ -1545,8 +1553,6 @@ namespace Server.Multis
}
}
eable.Free();
return list;
}
@ -1589,11 +1595,11 @@ namespace Server.Multis
List<IEntity> toMove = GetMovingEntities();
if (PPlank != null) toMove.Add(PPlank);
if (SPlank != null) toMove.Add(SPlank);
toMove.Add(PPlank);
toMove.Add(SPlank);
int xOffset = 0, yOffset = 0;
Movement.Offset(facing, ref xOffset, ref yOffset);
Movement.Movement.Offset(facing, ref xOffset, ref yOffset);
if (TillerMan != null)
TillerMan.Location = new Point3D(X + xOffset * TillerManDistance + (facing == Direction.North ? 1 : 0),
@ -1610,7 +1616,9 @@ 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;
@ -1726,6 +1734,8 @@ namespace Server.Multis
}
}
#region High Seas
public override bool AllowsRelativeDrop => true;
/*
@ -1743,5 +1753,137 @@ 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
}
}

2
Projects/Scripts/Multis/Boats/ConfirmDryDockGump.cs
View file

@ -29,7 +29,7 @@ namespace Server.Multis
AddButton(20, 125, 4005, 4007, 1);
}
public override void OnResponse(NetState sender, RelayInfo info)
public override void OnResponse(NetState state, RelayInfo info)
{
if (info.ButtonID == 2)
m_Boat.EndDryDock(m_From);

127
Projects/Scripts/Multis/Boats/Packets.cs
View file

@ -1,127 +0,0 @@
using System.Collections.Generic;
using Server.Buffers;
using Server.Multis;
namespace Server.Network
{
public static class BoatPackets
{
public static void SendMoveBoatHS(NetState ns, Mobile beholder, BaseBoat boat, Direction d, int speed,
IReadOnlyCollection<IEntity> ents, int xOffset,
int yOffset)
{
if (ns == null)
return;
int length = 18 + ents.Count * 10;
SpanWriter writer = new SpanWriter(stackalloc byte[length]);
writer.Write((byte)0xF6); // Packet ID
writer.Position += 2; // Dynamic Length
writer.Write(boat.Serial);
writer.Write((byte)speed);
writer.Write((byte)d);
writer.Write((byte)boat.Facing);
writer.Write((short)(boat.X + xOffset));
writer.Write((short)(boat.Y + yOffset));
writer.Write((short)boat.Z);
writer.Position += 2; // count
ushort count = 0;
foreach (IEntity ent in ents)
{
if (!beholder.CanSee(ent))
continue;
writer.Write(ent.Serial);
writer.Write((short)(ent.X + xOffset));
writer.Write((short)(ent.Y + yOffset));
writer.Write((short)ent.Z);
count++;
}
writer.Position = 16;
writer.Write(count);
writer.Position = 1;
writer.Write((ushort)writer.WrittenCount);
ns.Send(writer.Span);
}
public static void SendDisplayBoatHS(NetState ns, Mobile beholder, BaseBoat boat)
{
if (ns == null)
return;
List<IEntity> ents = boat.GetMovingEntities();
if (boat.TillerMan != null) ents.Add(boat.TillerMan);
if (boat.Hold != null) ents.Add(boat.Hold);
if (boat.PPlank != null) ents.Add(boat.PPlank);
if (boat.SPlank != null) ents.Add(boat.SPlank);
ents.Add(boat);
int length = 5 + ents.Count * 26;
SpanWriter writer = new SpanWriter(stackalloc byte[length]);
writer.Write((byte)0xF7); // Packet ID
writer.Position += 4; // Dynamic Length & Count
ushort count = 0;
foreach (IEntity ent in ents)
{
if (!beholder.CanSee(ent))
continue;
writer.Write((byte)0xF3);
writer.Write((short)0x1);
if (ent is Mobile m)
{
writer.Write((byte)0x01);
writer.Write(m.Serial);
writer.Write((short)m.Body);
writer.Position++;
writer.Write((short)1);
writer.Write((short)1);
writer.Write((short)(m.X & 0x7FFF));
writer.Write((short)(m.Y & 0x3FFF));
writer.Write((sbyte)m.Z);
writer.Write((byte)m.Direction);
writer.Write((short)m.Hue);
writer.Write((byte)m.GetPacketFlags());
}
else if (ent is Item item)
{
writer.Position++;
writer.Write(item.Serial);
writer.Write((ushort)(item.ItemID & 0xFFFF));
writer.Position++;
writer.Write((short)item.Amount);
writer.Write((short)item.Amount);
writer.Write((short)(item.X & 0x7FFF));
writer.Write((short)(item.Y & 0x3FFF));
writer.Write((sbyte)item.Z);
writer.Write((byte)item.Light);
writer.Write((short)item.Hue);
writer.Write((byte)item.GetPacketFlags());
}
writer.Position += 2;
count++;
}
writer.Position = 3;
writer.Write(count);
writer.Position = 1;
writer.Write((ushort)writer.WrittenCount);
ns.Send(writer.Span);
}
}
}

2
Projects/Scripts/Multis/Boats/RenameBoatPrompt.cs
View file

@ -1,3 +1,5 @@
using Server.Prompts;
namespace Server.Multis
{
public class RenameBoatPrompt : Prompt

4
Projects/Scripts/Multis/Boats/Strandedness.cs
View file

@ -95,7 +95,7 @@ namespace Server.Misc
if (map == null)
return false;
ITile surface = map.GetTopSurface(from.Location);
object surface = map.GetTopSurface(from.Location);
if (surface is LandTile tile)
{
@ -175,4 +175,4 @@ namespace Server.Misc
from.Location = new Point3D(x, y, z);
}
}
}
}