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
|
|
@ -1,154 +1,150 @@
|
|||
using System;
|
||||
using Server.Targeting;
|
||||
using Server.PathAlgorithms;
|
||||
using Server.PathAlgorithms.SlowAStar;
|
||||
using Server.PathAlgorithms.FastAStar;
|
||||
using Server.Commands;
|
||||
using Server.Items;
|
||||
using Server.PathAlgorithms;
|
||||
using Server.PathAlgorithms.FastAStar;
|
||||
using Server.PathAlgorithms.SlowAStar;
|
||||
using Server.Spells;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server
|
||||
{
|
||||
public sealed class MovementPath
|
||||
{
|
||||
public Map Map { get; }
|
||||
public sealed class MovementPath
|
||||
{
|
||||
public MovementPath(Mobile m, Point3D goal)
|
||||
{
|
||||
Point3D start = m.Location;
|
||||
Map map = m.Map;
|
||||
|
||||
public Point3D Start { get; }
|
||||
Map = map;
|
||||
Start = start;
|
||||
Goal = goal;
|
||||
|
||||
public Point3D Goal { get; }
|
||||
if (map == null || map == Map.Internal)
|
||||
return;
|
||||
|
||||
public Direction[] Directions { get; }
|
||||
if (Utility.InRange(start, goal, 1))
|
||||
return;
|
||||
|
||||
public bool Success => ( Directions != null && Directions.Length > 0 );
|
||||
try
|
||||
{
|
||||
PathAlgorithm alg = OverrideAlgorithm;
|
||||
|
||||
public static void Initialize()
|
||||
{
|
||||
CommandSystem.Register( "Path", AccessLevel.GameMaster, Path_OnCommand );
|
||||
}
|
||||
if (alg == null) alg = FastAStarAlgorithm.Instance;
|
||||
|
||||
public static void Path_OnCommand( CommandEventArgs e )
|
||||
{
|
||||
e.Mobile.BeginTarget( -1, true, TargetFlags.None, Path_OnTarget );
|
||||
e.Mobile.SendMessage( "Target a location and a path will be drawn there." );
|
||||
}
|
||||
if (alg != null && alg.CheckCondition(m, map, start, goal))
|
||||
Directions = alg.Find(m, map, start, goal);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Console.WriteLine("Warning: {0}: Pathing error from {1} to {2}", e.GetType().Name, start, goal);
|
||||
}
|
||||
}
|
||||
|
||||
private static void Path( Mobile from, IPoint3D p, PathAlgorithm alg, string name, int zOffset )
|
||||
{
|
||||
OverrideAlgorithm = alg;
|
||||
public Map Map{ get; }
|
||||
|
||||
long start = DateTime.UtcNow.Ticks;
|
||||
MovementPath path = new MovementPath( from, new Point3D( p ) );
|
||||
long end = DateTime.UtcNow.Ticks;
|
||||
double len = Math.Round( (end-start) / 10000.0, 2 );
|
||||
public Point3D Start{ get; }
|
||||
|
||||
if ( !path.Success )
|
||||
{
|
||||
from.SendMessage( "{0} path failed: {1}ms", name, len );
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendMessage( "{0} path success: {1}ms", name, len );
|
||||
public Point3D Goal{ get; }
|
||||
|
||||
int x = from.X;
|
||||
int y = from.Y;
|
||||
int z = from.Z;
|
||||
public Direction[] Directions{ get; }
|
||||
|
||||
for ( int i = 0; i < path.Directions.Length; ++i )
|
||||
{
|
||||
Movement.Movement.Offset( path.Directions[i], ref x, ref y );
|
||||
public bool Success => Directions != null && Directions.Length > 0;
|
||||
|
||||
new Items.RecallRune().MoveToWorld( new Point3D( x, y, z+zOffset ), from.Map );
|
||||
}
|
||||
}
|
||||
}
|
||||
public static PathAlgorithm OverrideAlgorithm{ get; set; }
|
||||
|
||||
public static void Path_OnTarget( Mobile from, object obj )
|
||||
{
|
||||
if ( !(obj is IPoint3D p) )
|
||||
return;
|
||||
public static void Initialize()
|
||||
{
|
||||
CommandSystem.Register("Path", AccessLevel.GameMaster, Path_OnCommand);
|
||||
}
|
||||
|
||||
Spells.SpellHelper.GetSurfaceTop( ref p );
|
||||
public static void Path_OnCommand(CommandEventArgs e)
|
||||
{
|
||||
e.Mobile.BeginTarget(-1, true, TargetFlags.None, Path_OnTarget);
|
||||
e.Mobile.SendMessage("Target a location and a path will be drawn there.");
|
||||
}
|
||||
|
||||
Path( from, p, FastAStarAlgorithm.Instance, "Fast", 0 );
|
||||
Path( from, p, SlowAStarAlgorithm.Instance, "Slow", 2 );
|
||||
OverrideAlgorithm = null;
|
||||
private static void Path(Mobile from, IPoint3D p, PathAlgorithm alg, string name, int zOffset)
|
||||
{
|
||||
OverrideAlgorithm = alg;
|
||||
|
||||
/*MovementPath path = new MovementPath( from, new Point3D( p ) );
|
||||
long start = DateTime.UtcNow.Ticks;
|
||||
MovementPath path = new MovementPath(from, new Point3D(p));
|
||||
long end = DateTime.UtcNow.Ticks;
|
||||
double len = Math.Round((end - start) / 10000.0, 2);
|
||||
|
||||
if ( !path.Success )
|
||||
{
|
||||
from.SendMessage( "No path to there could be found." );
|
||||
}
|
||||
else
|
||||
{
|
||||
//for ( int i = 0; i < path.Directions.Length; ++i )
|
||||
// Timer.DelayCall( TimeSpan.FromSeconds( 0.1 + (i * 0.3) ), new TimerStateCallback( Pathfind ), new object[]{ from, path.Directions[i] } );
|
||||
int x = from.X;
|
||||
int y = from.Y;
|
||||
int z = from.Z;
|
||||
if (!path.Success)
|
||||
{
|
||||
from.SendMessage("{0} path failed: {1}ms", name, len);
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendMessage("{0} path success: {1}ms", name, len);
|
||||
|
||||
for ( int i = 0; i < path.Directions.Length; ++i )
|
||||
{
|
||||
Movement.Movement.Offset( path.Directions[i], ref x, ref y );
|
||||
int x = from.X;
|
||||
int y = from.Y;
|
||||
int z = from.Z;
|
||||
|
||||
new Items.RecallRune().MoveToWorld( new Point3D( x, y, z ), from.Map );
|
||||
}
|
||||
}*/
|
||||
}
|
||||
for (int i = 0; i < path.Directions.Length; ++i)
|
||||
{
|
||||
Movement.Movement.Offset(path.Directions[i], ref x, ref y);
|
||||
|
||||
public static void Pathfind( object state )
|
||||
{
|
||||
object[] states = (object[])state;
|
||||
Mobile from = (Mobile) states[0];
|
||||
Direction d = (Direction) states[1];
|
||||
new RecallRune().MoveToWorld(new Point3D(x, y, z + zOffset), from.Map);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
from.Direction = d;
|
||||
from.NetState.BlockAllPackets=true;
|
||||
from.Move( d );
|
||||
from.NetState.BlockAllPackets=false;
|
||||
from.ProcessDelta();
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
}
|
||||
public static void Path_OnTarget(Mobile from, object obj)
|
||||
{
|
||||
if (!(obj is IPoint3D p))
|
||||
return;
|
||||
|
||||
public static PathAlgorithm OverrideAlgorithm { get; set; }
|
||||
SpellHelper.GetSurfaceTop(ref p);
|
||||
|
||||
public MovementPath( Mobile m, Point3D goal )
|
||||
{
|
||||
Point3D start = m.Location;
|
||||
Map map = m.Map;
|
||||
Path(from, p, FastAStarAlgorithm.Instance, "Fast", 0);
|
||||
Path(from, p, SlowAStarAlgorithm.Instance, "Slow", 2);
|
||||
OverrideAlgorithm = null;
|
||||
|
||||
Map = map;
|
||||
Start = start;
|
||||
Goal = goal;
|
||||
/*MovementPath path = new MovementPath( from, new Point3D( p ) );
|
||||
|
||||
if ( map == null || map == Map.Internal )
|
||||
return;
|
||||
if ( !path.Success )
|
||||
{
|
||||
from.SendMessage( "No path to there could be found." );
|
||||
}
|
||||
else
|
||||
{
|
||||
//for ( int i = 0; i < path.Directions.Length; ++i )
|
||||
// Timer.DelayCall( TimeSpan.FromSeconds( 0.1 + (i * 0.3) ), new TimerStateCallback( Pathfind ), new object[]{ from, path.Directions[i] } );
|
||||
int x = from.X;
|
||||
int y = from.Y;
|
||||
int z = from.Z;
|
||||
|
||||
if ( Utility.InRange( start, goal, 1 ) )
|
||||
return;
|
||||
for ( int i = 0; i < path.Directions.Length; ++i )
|
||||
{
|
||||
Movement.Movement.Offset( path.Directions[i], ref x, ref y );
|
||||
|
||||
try
|
||||
{
|
||||
PathAlgorithm alg = OverrideAlgorithm;
|
||||
new Items.RecallRune().MoveToWorld( new Point3D( x, y, z ), from.Map );
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
if ( alg == null )
|
||||
{
|
||||
alg = FastAStarAlgorithm.Instance;
|
||||
public static void Pathfind(object state)
|
||||
{
|
||||
object[] states = (object[])state;
|
||||
Mobile from = (Mobile)states[0];
|
||||
Direction d = (Direction)states[1];
|
||||
|
||||
//if ( !alg.CheckCondition( m, map, start, goal ) ) // SlowAstar is still broken
|
||||
// alg = SlowAStarAlgorithm.Instance; // TODO: Fix SlowAstar
|
||||
}
|
||||
|
||||
if ( alg != null && alg.CheckCondition( m, map, start, goal ) )
|
||||
Directions = alg.Find( m, map, start, goal );
|
||||
}
|
||||
catch ( Exception e )
|
||||
{
|
||||
Console.WriteLine( "Warning: {0}: Pathing error from {1} to {2}", e.GetType().Name, start, goal );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
try
|
||||
{
|
||||
from.Direction = d;
|
||||
from.NetState.BlockAllPackets = true;
|
||||
from.Move(d);
|
||||
from.NetState.BlockAllPackets = false;
|
||||
from.ProcessDelta();
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue