diff --git a/core/assets/maps/navalFortress.msav b/core/assets/maps/navalFortress.msav index 28968e43f5..2d9dda6171 100644 Binary files a/core/assets/maps/navalFortress.msav and b/core/assets/maps/navalFortress.msav differ diff --git a/core/src/mindustry/ai/Astar.java b/core/src/mindustry/ai/Astar.java index 76d73d84b0..23241e65cf 100644 --- a/core/src/mindustry/ai/Astar.java +++ b/core/src/mindustry/ai/Astar.java @@ -18,15 +18,15 @@ public class Astar{ private static float[] costs; private static byte[][] rotations; - public static Seq pathfind(Tile from, Tile to, TileHueristic th, Boolf passable){ + public static Seq pathfind(Tile from, Tile to, TileHeuristic th, Boolf passable){ return pathfind(from.x, from.y, to.x, to.y, th, manhattan, passable); } - public static Seq pathfind(int startX, int startY, int endX, int endY, TileHueristic th, Boolf passable){ + public static Seq pathfind(int startX, int startY, int endX, int endY, TileHeuristic th, Boolf passable){ return pathfind(startX, startY, endX, endY, th, manhattan, passable); } - public static Seq pathfind(int startX, int startY, int endX, int endY, TileHueristic th, DistanceHeuristic dh, Boolf passable){ + public static Seq pathfind(int startX, int startY, int endX, int endY, TileHeuristic th, DistanceHeuristic dh, Boolf passable){ Tiles tiles = world.tiles; Tile start = tiles.getn(startX, startY); @@ -94,7 +94,7 @@ public class Astar{ float cost(int x1, int y1, int x2, int y2); } - public interface TileHueristic{ + public interface TileHeuristic{ float cost(Tile tile); default float cost(Tile from, Tile tile){ diff --git a/core/src/mindustry/maps/generators/BasicGenerator.java b/core/src/mindustry/maps/generators/BasicGenerator.java index 0305b1d3b0..40f5dc44f5 100644 --- a/core/src/mindustry/maps/generators/BasicGenerator.java +++ b/core/src/mindustry/maps/generators/BasicGenerator.java @@ -444,7 +444,7 @@ public abstract class BasicGenerator implements WorldGenerator{ } } - public Seq pathfind(int startX, int startY, int endX, int endY, TileHueristic th, DistanceHeuristic dh){ + public Seq pathfind(int startX, int startY, int endX, int endY, TileHeuristic th, DistanceHeuristic dh){ return Astar.pathfind(startX, startY, endX, endY, th, dh, tile -> world.getDarkness(tile.x, tile.y) <= 1f); }