From f5f2951d2697fbbf0bf0f12dab97297dca2f0b55 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 30 Apr 2025 14:29:38 -0400 Subject: [PATCH] Fixed wave naval pathfinding for solid blocks --- core/src/mindustry/ai/Pathfinder.java | 2 +- core/src/mindustry/world/Tile.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index 0846418815..40d7fc5e94 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -69,7 +69,7 @@ public class Pathfinder implements Runnable{ //water (team, tile) -> - (!PathTile.liquid(tile) ? 6000 : 1) + + (!PathTile.liquid(tile) || PathTile.solid(tile) ? 6000 : 1) + PathTile.health(tile) * 5 + (PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 14 : 0) + (PathTile.deep(tile) ? 0 : 1) + diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index af6a0b105f..52e656e87d 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -156,6 +156,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{ return y * tilesize; } + //TODO: this method is misleading and buggy for non-center tiles public float drawx(){ return block().offset + worldx(); }