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

fix(AI): Fixes direction issue with NPCs (#371)

Browse source 
- [X] Fixes a bug with RunUO where direction is set multiple times and the run flag is not set properly.

TODO: Fix other direction/movement issues and duplicate packets.

Bumps release version
This commit is contained in:
Kamron Batman 2020-12-29 22:32:10 -08:00 • committed by GitHub
parent 7ef1d41c6f
commit 67c23bf9ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 207 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Server/Main.cs
View file

@ -480,8 +480,6 @@ namespace Server
while (!Closing)
{
// m_Signal.WaitOne();
Mobile.ProcessDeltaQueue();
Item.ProcessDeltaQueue();

36
Projects/Server/Mobiles/Mobile.cs
View file

@ -294,7 +294,8 @@ namespace Server
Locked
}
[CustomEnum(new[] { "North", "Right", "East", "Down", "South", "Left", "West", "Up" }), Flags]
[Flags]
[CustomEnum(new[] { "North", "Right", "East", "Down", "South", "Left", "West", "Up" })]
public enum Direction : byte
{
North = 0x0,
@ -1348,9 +1349,7 @@ namespace Server
if (m_Direction != value)
{
m_Direction = value;
Delta(MobileDelta.Direction);
// ProcessDelta();
}
}
}
@ -9144,7 +9143,7 @@ namespace Server
public void BoltEffect(int hue) => Effects.SendBoltEffect(this, true, hue);
public Direction GetDirectionTo(int x, int y)
public Direction GetDirectionTo(int x, int y, bool run = false)
{
var dx = m_Location.m_X - x;
var dy = m_Location.m_Y - y;
@ -9165,30 +9164,25 @@ namespace Server
{
ret = rx > 0 ? Direction.Left : Direction.Right;
}
else if (rx >= 0 && ry >= 0)
{
ret = Direction.West;
}
else if (rx >= 0 && ry < 0)
{
ret = Direction.South;
}
else if (rx < 0 && ry < 0)
{
ret = Direction.East;
}
else
{
ret = Direction.North;
ret = rx switch
{
>= 0 when ry >= 0 => Direction.West,
>= 0 => Direction.South,
< 0 when ry < 0 => Direction.East,
_ => Direction.North
};
}
return ret;
return ret | (run ? Direction.Running : 0);
}
public Direction GetDirectionTo(Point2D p) => GetDirectionTo(p.m_X, p.m_Y);
public Direction GetDirectionTo(Point3D p) => GetDirectionTo(p.m_X, p.m_Y);
public Direction GetDirectionTo(Point2D p, bool run = false) => GetDirectionTo(p.m_X, p.m_Y, run);
public Direction GetDirectionTo(Point3D p, bool run = false) => GetDirectionTo(p.m_X, p.m_Y, run);
public Direction GetDirectionTo(IPoint2D p) => p == null ? Direction.North : GetDirectionTo(p.X, p.Y);
public Direction GetDirectionTo(IPoint2D p, bool run = false) =>
p == null ? Direction.North | (run ? Direction.Running : 0) : GetDirectionTo(p.X, p.Y, run);
public void PublicOverheadMessage(MessageType type, int hue, bool ascii, string text, bool noLineOfSight = true)
{