lineage2/L2Bot2.0
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add max passable height to AI config

Browse Source
This commit is contained in:
Иванов Иван
2024-08-22 09:45:11 +02:00
parent d0baa5c21a
commit 936697defc
16 changed files with 46 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Client/Infrastructure/Service/AsyncPathMover.cs
View File

@@ -21,10 +21,10 @@ namespace Client.Infrastructure.Service
{
private readonly WorldHandler worldHandler;
private readonly PathfinderInterface pathfinder;
private readonly int pathNumberOfAttempts;
private readonly double nodeWaitingTime;
private readonly int nodeDistanceTolerance;
private readonly int nextNodeDistanceTolerance;
private readonly ushort maxPassableHeight;
private CancellationTokenSource? cancellationTokenSource;
public PathfinderInterface Pathfinder => pathfinder;
@@ -43,16 +43,7 @@ namespace Client.Infrastructure.Service
}
}
public async Task MoveUntilReachedAsync(Vector3 location)
{
var remainingAttempts = pathNumberOfAttempts;
while (!await MoveAsync(location) && remainingAttempts > 0)
{
remainingAttempts--;
}
}
public async Task<bool> MoveAsync(Vector3 location)
public async Task<bool> MoveAsync(Vector3 location, ushort maxPassableHeight)
{
IsLocked = true;
@@ -69,7 +60,7 @@ namespace Client.Infrastructure.Service
return await Task.Run(async () =>
{
Debug.WriteLine("Find path started");
FindPath(location);
FindPath(location, maxPassableHeight);
Debug.WriteLine("Find path finished");
@@ -99,17 +90,22 @@ namespace Client.Infrastructure.Service
}
}
public AsyncPathMover(WorldHandler worldHandler, PathfinderInterface pathfinder, int pathNumberOfAttempts, double nodeWaitingTime, int nodeDistanceTolerance, int nextNodeDistanceTolerance)
public async Task<bool> MoveAsync(Vector3 location)
{
return await MoveAsync(location, maxPassableHeight);
}
public AsyncPathMover(WorldHandler worldHandler, PathfinderInterface pathfinder, double nodeWaitingTime, int nodeDistanceTolerance, int nextNodeDistanceTolerance, ushort maxPassableHeight)
{
this.worldHandler = worldHandler;
this.pathfinder = pathfinder;
this.pathNumberOfAttempts = pathNumberOfAttempts;
this.nodeWaitingTime = nodeWaitingTime;
this.nodeDistanceTolerance = nodeDistanceTolerance;
this.nextNodeDistanceTolerance = nextNodeDistanceTolerance;
this.maxPassableHeight = maxPassableHeight;
}
private void FindPath(Vector3 location)
private void FindPath(Vector3 location, ushort maxPassableHeight)
{
var hero = worldHandler.Hero;
@@ -119,7 +115,7 @@ namespace Client.Infrastructure.Service
return;
}
var path = pathfinder.FindPath(hero.Transform.Position, location);
var path = pathfinder.FindPath(hero.Transform.Position, location, maxPassableHeight);
foreach (var segment in path)
{
Path.Add(segment);

9
Client/Infrastructure/Service/L2jGeoDataPathfinder.cs
View File

@@ -20,13 +20,12 @@ namespace Client.Infrastructure.Service
[DllImport("L2JGeoDataPathFinder.dll", CallingConvention = CallingConvention.Cdecl)]
private static extern bool HasLineOfSight(string geoDataDirectory, float startX, float startY, float startZ, float endX, float endY, ushort maxPassableHeight);
public L2jGeoDataPathfinder(string geodataDirectory, ushort maxPassableHeight)
public L2jGeoDataPathfinder(string geodataDirectory)
{
this.geodataDirectory = geodataDirectory;
this.maxPassableHeight = maxPassableHeight;
}
public List<PathSegment> FindPath(Vector3 start, Vector3 end)
public List<PathSegment> FindPath(Vector3 start, Vector3 end, ushort maxPassableHeight)
{
var arrayPtr = IntPtr.Zero;
var size = FindPath(out arrayPtr, GetGeodataFullpath(), start.X, start.Y, start.Z, end.X, end.Y, maxPassableHeight);
@@ -53,7 +52,7 @@ namespace Client.Infrastructure.Service
public bool HasLineOfSight(Vector3 start, Vector3 end)
{
return HasLineOfSight(GetGeodataFullpath(), start.X, start.Y, start.Z, end.X, end.Y, maxPassableHeight);
return HasLineOfSight(GetGeodataFullpath(), start.X, start.Y, start.Z, end.X, end.Y, LINE_OF_SIGHT_HEIGHT_OF_OBSTACLE);
}
private List<PathSegment> BuildPath(List<PathNode> nodes)
@@ -98,6 +97,6 @@ namespace Client.Infrastructure.Service
}
private readonly string geodataDirectory;
private readonly ushort maxPassableHeight;
private const ushort LINE_OF_SIGHT_HEIGHT_OF_OBSTACLE = 999;
}
}