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

Pathfinder fixes / Hail resprite by Snake#2132 on Discord

Browse Source
This commit is contained in:
Anuken
2023-05-20 10:40:33 -04:00
parent 7c52444e3c
commit 94fe92d67d
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/turrets/hail.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 349 B

After

Width:  |  Height:  |  Size: 463 B

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

@@ -54,7 +54,10 @@ public class ControlPathfinder{
(PathTile.nearSolid(tile) || PathTile.solid(tile) ? 3 : 0), (PathTile.nearSolid(tile) || PathTile.solid(tile) ? 3 : 0),
costNaval = (team, tile) -> costNaval = (team, tile) ->
(PathTile.solid(tile) || !PathTile.liquid(tile) ? impassable : 1) + //impassable same-team neutral block, or non-liquid
((PathTile.solid(tile) && ((PathTile.team(tile) == team && !PathTile.teamPassable(tile)) || PathTile.team(tile) == 0)) || !PathTile.liquid(tile) ? impassable : 1) +
//impassable synthetic enemy block
((PathTile.team(tile) != team && PathTile.team(tile) != 0) && PathTile.solid(tile) ? wallImpassableCap : 0) +
(PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 6 : 0); (PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 6 : 0);
public static boolean showDebug = false; public static boolean showDebug = false;

7
core/src/mindustry/ai/Pathfinder.java
View File

@@ -58,7 +58,8 @@ public class Pathfinder implements Runnable{
//water //water
(team, tile) -> (team, tile) ->
(PathTile.solid(tile) || !PathTile.liquid(tile) ? 6000 : 1) + (!PathTile.liquid(tile) ? 6000 : 1) +
PathTile.health(tile) * 5 +
(PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 14 : 0) + (PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 14 : 0) +
(PathTile.deep(tile) ? 0 : 1) + (PathTile.deep(tile) ? 0 : 1) +
(PathTile.damages(tile) ? 35 : 0) (PathTile.damages(tile) ? 35 : 0)
@@ -527,7 +528,9 @@ public class Pathfinder implements Runnable{
} }
protected boolean passable(int pos){ protected boolean passable(int pos){
return cost.getCost(team.id, pathfinder.tiles[pos]) != impassable; int amount = cost.getCost(team.id, pathfinder.tiles[pos]);
//edge case: naval reports costs of 6000+ for non-liquids, even though they are not technically passable
return amount != impassable && !(cost == costTypes.get(costNaval) && amount >= 6000);
} }
/** Gets targets to pathfind towards. This must run on the main thread. */ /** Gets targets to pathfind towards. This must run on the main thread. */