Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed pathfinding not being able to attack towards solid blocks

Browse Source
This commit is contained in:
Anuken
2023-06-30 22:51:14 -04:00
parent ea8d796561
commit 05874ad3e2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/ai/ControlPathfinder.java
View File

@@ -193,7 +193,7 @@ public class ControlPathfinder{
} }
//destination is impassable, can't go there. //destination is impassable, can't go there.
if(solid(team, costType, world.packArray(World.toTile(destination.x), World.toTile(destination.y)))){ if(solid(team, costType, world.packArray(World.toTile(destination.x), World.toTile(destination.y)), false)){
return false; return false;
} }
@@ -380,7 +380,7 @@ public class ControlPathfinder{
int err = dx - dy; int err = dx - dy;
while(x >= 0 && y >= 0 && x < ww && y < wh){ while(x >= 0 && y >= 0 && x < ww && y < wh){
if(solid(team, type, x + y * wwidth)) return true; if(solid(team, type, x + y * wwidth, true)) return true;
if(x == x2 && y == y2) return false; if(x == x2 && y == y2) return false;
//no diagonals //no diagonals
@@ -429,9 +429,9 @@ public class ControlPathfinder{
return cost == impassable || cost >= 2; return cost == impassable || cost >= 2;
} }
private static boolean solid(int team, PathCost type, int tilePos){ private static boolean solid(int team, PathCost type, int tilePos, boolean checkWall){
int cost = cost(team, type, tilePos); int cost = cost(team, type, tilePos);
return cost == impassable || cost >= 6000; return cost == impassable || (checkWall && cost >= 6000);
} }
private static float tileCost(int team, PathCost type, int a, int b){ private static float tileCost(int team, PathCost type, int a, int b){