Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -3,191 +3,191 @@ using CalcMoves = Server.Movement.Movement;
|
|||
|
||||
namespace Server
|
||||
{
|
||||
public class PathFollower
|
||||
{
|
||||
// Should we use pathfinding? 'false' for not
|
||||
private static bool Enabled = true;
|
||||
public class PathFollower
|
||||
{
|
||||
// Should we use pathfinding? 'false' for not
|
||||
private static bool Enabled = true;
|
||||
|
||||
private Mobile m_From;
|
||||
private MovementPath m_Path;
|
||||
private int m_Index;
|
||||
private Point3D m_Next, m_LastGoalLoc;
|
||||
private DateTime m_LastPathTime;
|
||||
private static TimeSpan RepathDelay = TimeSpan.FromSeconds(2.0);
|
||||
|
||||
public MoveMethod Mover { get; set; }
|
||||
private Mobile m_From;
|
||||
private int m_Index;
|
||||
private DateTime m_LastPathTime;
|
||||
private Point3D m_Next, m_LastGoalLoc;
|
||||
private MovementPath m_Path;
|
||||
|
||||
public IPoint3D Goal { get; }
|
||||
public PathFollower(Mobile from, IPoint3D goal)
|
||||
{
|
||||
m_From = from;
|
||||
Goal = goal;
|
||||
}
|
||||
|
||||
public PathFollower( Mobile from, IPoint3D goal )
|
||||
{
|
||||
m_From = from;
|
||||
Goal = goal;
|
||||
}
|
||||
public MoveMethod Mover{ get; set; }
|
||||
|
||||
public MoveResult Move( Direction d )
|
||||
{
|
||||
if ( Mover == null )
|
||||
return ( m_From.Move( d ) ? MoveResult.Success : MoveResult.Blocked );
|
||||
public IPoint3D Goal{ get; }
|
||||
|
||||
return Mover( d );
|
||||
}
|
||||
public MoveResult Move(Direction d)
|
||||
{
|
||||
if (Mover == null)
|
||||
return m_From.Move(d) ? MoveResult.Success : MoveResult.Blocked;
|
||||
|
||||
public Point3D GetGoalLocation()
|
||||
{
|
||||
if ( Goal is Item item )
|
||||
return item.GetWorldLocation();
|
||||
return Mover(d);
|
||||
}
|
||||
|
||||
return new Point3D( Goal );
|
||||
}
|
||||
public Point3D GetGoalLocation()
|
||||
{
|
||||
if (Goal is Item item)
|
||||
return item.GetWorldLocation();
|
||||
|
||||
private static TimeSpan RepathDelay = TimeSpan.FromSeconds( 2.0 );
|
||||
return new Point3D(Goal);
|
||||
}
|
||||
|
||||
public void Advance( ref Point3D p, int index )
|
||||
{
|
||||
if ( m_Path != null && m_Path.Success )
|
||||
{
|
||||
Direction[] dirs = m_Path.Directions;
|
||||
public void Advance(ref Point3D p, int index)
|
||||
{
|
||||
if (m_Path != null && m_Path.Success)
|
||||
{
|
||||
Direction[] dirs = m_Path.Directions;
|
||||
|
||||
if ( index >= 0 && index < dirs.Length )
|
||||
{
|
||||
int x = p.X, y = p.Y;
|
||||
if (index >= 0 && index < dirs.Length)
|
||||
{
|
||||
int x = p.X, y = p.Y;
|
||||
|
||||
CalcMoves.Offset( dirs[index], ref x, ref y );
|
||||
CalcMoves.Offset(dirs[index], ref x, ref y);
|
||||
|
||||
p.X = x;
|
||||
p.Y = y;
|
||||
}
|
||||
}
|
||||
}
|
||||
p.X = x;
|
||||
p.Y = y;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void ForceRepath()
|
||||
{
|
||||
m_Path = null;
|
||||
}
|
||||
public void ForceRepath()
|
||||
{
|
||||
m_Path = null;
|
||||
}
|
||||
|
||||
public bool CheckPath()
|
||||
{
|
||||
if ( !Enabled )
|
||||
return false;
|
||||
public bool CheckPath()
|
||||
{
|
||||
if (!Enabled)
|
||||
return false;
|
||||
|
||||
bool repath = false;
|
||||
bool repath = false;
|
||||
|
||||
Point3D goal = GetGoalLocation();
|
||||
Point3D goal = GetGoalLocation();
|
||||
|
||||
if ( m_Path == null )
|
||||
repath = true;
|
||||
else if ( (!m_Path.Success || goal != m_LastGoalLoc) && (m_LastPathTime + RepathDelay) <= DateTime.UtcNow )
|
||||
repath = true;
|
||||
else if ( m_Path.Success && Check( m_From.Location, m_LastGoalLoc, 0 ) )
|
||||
repath = true;
|
||||
if (m_Path == null)
|
||||
repath = true;
|
||||
else if ((!m_Path.Success || goal != m_LastGoalLoc) && m_LastPathTime + RepathDelay <= DateTime.UtcNow)
|
||||
repath = true;
|
||||
else if (m_Path.Success && Check(m_From.Location, m_LastGoalLoc, 0))
|
||||
repath = true;
|
||||
|
||||
if ( !repath )
|
||||
return false;
|
||||
if (!repath)
|
||||
return false;
|
||||
|
||||
m_LastPathTime = DateTime.UtcNow;
|
||||
m_LastGoalLoc = goal;
|
||||
m_LastPathTime = DateTime.UtcNow;
|
||||
m_LastGoalLoc = goal;
|
||||
|
||||
m_Path = new MovementPath( m_From, goal );
|
||||
m_Path = new MovementPath(m_From, goal);
|
||||
|
||||
m_Index = 0;
|
||||
m_Next = m_From.Location;
|
||||
m_Index = 0;
|
||||
m_Next = m_From.Location;
|
||||
|
||||
Advance( ref m_Next, m_Index );
|
||||
Advance(ref m_Next, m_Index);
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool Check( Point3D loc, Point3D goal, int range )
|
||||
{
|
||||
if ( !Utility.InRange( loc, goal, range ) )
|
||||
return false;
|
||||
public bool Check(Point3D loc, Point3D goal, int range)
|
||||
{
|
||||
if (!Utility.InRange(loc, goal, range))
|
||||
return false;
|
||||
|
||||
if ( range <= 1 && Math.Abs( loc.Z - goal.Z ) >= 16 )
|
||||
return false;
|
||||
if (range <= 1 && Math.Abs(loc.Z - goal.Z) >= 16)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool Follow( bool run, int range )
|
||||
{
|
||||
Point3D goal = GetGoalLocation();
|
||||
Direction d;
|
||||
public bool Follow(bool run, int range)
|
||||
{
|
||||
Point3D goal = GetGoalLocation();
|
||||
Direction d;
|
||||
|
||||
if ( Check( m_From.Location, goal, range ) )
|
||||
return true;
|
||||
if (Check(m_From.Location, goal, range))
|
||||
return true;
|
||||
|
||||
bool repathed = CheckPath();
|
||||
bool repathed = CheckPath();
|
||||
|
||||
if ( !Enabled || !m_Path.Success )
|
||||
{
|
||||
d = m_From.GetDirectionTo( goal );
|
||||
if (!Enabled || !m_Path.Success)
|
||||
{
|
||||
d = m_From.GetDirectionTo(goal);
|
||||
|
||||
if ( run )
|
||||
d |= Direction.Running;
|
||||
if (run)
|
||||
d |= Direction.Running;
|
||||
|
||||
m_From.SetDirection( d );
|
||||
Move( d );
|
||||
m_From.SetDirection(d);
|
||||
Move(d);
|
||||
|
||||
return Check( m_From.Location, goal, range );
|
||||
}
|
||||
return Check(m_From.Location, goal, range);
|
||||
}
|
||||
|
||||
d = m_From.GetDirectionTo( m_Next );
|
||||
d = m_From.GetDirectionTo(m_Next);
|
||||
|
||||
if ( run )
|
||||
d |= Direction.Running;
|
||||
if (run)
|
||||
d |= Direction.Running;
|
||||
|
||||
m_From.SetDirection( d );
|
||||
m_From.SetDirection(d);
|
||||
|
||||
MoveResult res = Move( d );
|
||||
MoveResult res = Move(d);
|
||||
|
||||
if ( res == MoveResult.Blocked )
|
||||
{
|
||||
if ( repathed )
|
||||
return false;
|
||||
if (res == MoveResult.Blocked)
|
||||
{
|
||||
if (repathed)
|
||||
return false;
|
||||
|
||||
m_Path = null;
|
||||
CheckPath();
|
||||
m_Path = null;
|
||||
CheckPath();
|
||||
|
||||
if ( !m_Path.Success )
|
||||
{
|
||||
d = m_From.GetDirectionTo( goal );
|
||||
if (!m_Path.Success)
|
||||
{
|
||||
d = m_From.GetDirectionTo(goal);
|
||||
|
||||
if ( run )
|
||||
d |= Direction.Running;
|
||||
if (run)
|
||||
d |= Direction.Running;
|
||||
|
||||
m_From.SetDirection( d );
|
||||
Move( d );
|
||||
m_From.SetDirection(d);
|
||||
Move(d);
|
||||
|
||||
return Check( m_From.Location, goal, range );
|
||||
}
|
||||
return Check(m_From.Location, goal, range);
|
||||
}
|
||||
|
||||
d = m_From.GetDirectionTo( m_Next );
|
||||
d = m_From.GetDirectionTo(m_Next);
|
||||
|
||||
if ( run )
|
||||
d |= Direction.Running;
|
||||
if (run)
|
||||
d |= Direction.Running;
|
||||
|
||||
m_From.SetDirection( d );
|
||||
m_From.SetDirection(d);
|
||||
|
||||
res = Move( d );
|
||||
res = Move(d);
|
||||
|
||||
if ( res == MoveResult.Blocked )
|
||||
return false;
|
||||
}
|
||||
if (res == MoveResult.Blocked)
|
||||
return false;
|
||||
}
|
||||
|
||||
if ( m_From.X == m_Next.X && m_From.Y == m_Next.Y )
|
||||
{
|
||||
if ( m_From.Z == m_Next.Z )
|
||||
{
|
||||
++m_Index;
|
||||
Advance( ref m_Next, m_Index );
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Path = null;
|
||||
}
|
||||
}
|
||||
if (m_From.X == m_Next.X && m_From.Y == m_Next.Y)
|
||||
{
|
||||
if (m_From.Z == m_Next.Z)
|
||||
{
|
||||
++m_Index;
|
||||
Advance(ref m_Next, m_Index);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Path = null;
|
||||
}
|
||||
}
|
||||
|
||||
return Check( m_From.Location, goal, range );
|
||||
}
|
||||
}
|
||||
}
|
||||
return Check(m_From.Location, goal, range);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue