Pathfinding improvements

core/assets/bundles/bundle_tr.properties

@@ -1662,7 +1662,7 @@ block.electric-heater.name = Elektrikli Isıtıcı
 block.slag-heater.name = Cürüflü Isıtıcı
 block.phase-heater.name = Faz Isıtıcı
 block.heat-redirector.name = Isı Aktarıcı
-block.heat-router.name = Isı Yönelndirici
+block.heat-router.name = Isı Yönlendirici
 block.slag-incinerator.name = Cürüf Yakıcı
 block.carbide-crucible.name = Karbür Kazanı
 block.slag-centrifuge.name = Cürüf Sentrifüjü
@@ -1698,7 +1698,7 @@ block.reinforced-pump.name = Güçlendirilmiş Pompa
 block.reinforced-conduit.name = Güçlendirilmiş Boru
 block.reinforced-liquid-junction.name = Güçlendirilmiş Sıvı Kavşağı
 block.reinforced-bridge-conduit.name = Güçlendirilmiş Köprü Borusu
-block.reinforced-liquid-router.name = Güçlendirilmiş Sıvı Yönelndirici
+block.reinforced-liquid-router.name = Güçlendirilmiş Sıvı Yönlendirici
 block.reinforced-liquid-container.name = Güçlendirilmiş Sıvı Konteyneri
 block.reinforced-liquid-tank.name = Güçlendirilmiş Sıvı Tankı
 block.beam-node.name = Işın Noktası

core/src/mindustry/ai/ControlPathfinder.java

@@ -7,6 +7,7 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
@@ -50,7 +51,8 @@ public class ControlPathfinder{
 
     costLegs = (team, tile) ->
     PathTile.legSolid(tile) ? impassable : 1 +
-    (PathTile.deep(tile) ? 6000 : 0),
+    (PathTile.deep(tile) ? 6000 : 0) +
+    (PathTile.nearLegSolid(tile) ? 3 : 0),
 
     costNaval = (team, tile) ->
     //impassable same-team neutral block, or non-liquid
@@ -231,11 +233,11 @@ public class ControlPathfinder{
             req.curId = pathId;
 
             //check for the unit getting stuck every N seconds
-            if((req.stuckTimer += Time.delta) >= 60f * 2.5f){
+            if((req.stuckTimer += Time.delta) >= 60f * 1.5f){
                 req.stuckTimer = 0f;
                 //force recalculate
                 if(req.lastPos.within(unit, 1.5f)){
-                    req.lastWorldUpdate = -1;
+                    req.forceRecalculate();
                 }
                 req.lastPos.set(unit);
             }
@@ -279,6 +281,18 @@ public class ControlPathfinder{
                     Tile tile = tile(items[req.rayPathIndex]);
                     out.set(tile);
 
+                    if(req.rayPathIndex > 0){
+                        float angleToNext = tile(items[req.rayPathIndex - 1]).angleTo(tile);
+                        float angleToDest = unit.angleTo(tile);
+                        //force recalculate when the unit moves backwards
+                        if(Angles.angleDist(angleToNext, angleToDest) > 80f && !unit.within(tile, 1f)){
+                            if(showDebug){
+                                Fx.placeBlock.at(unit, 1f);
+                            }
+                            req.forceRecalculate();
+                        }
+                    }
+
                     if(unit.within(tile, range)){
                         req.pathIndex = req.rayPathIndex = Math.max(req.pathIndex, req.rayPathIndex + 1);
                     }
@@ -481,6 +495,7 @@ public class ControlPathfinder{
         volatile PathCost cost;
         volatile int team;
         volatile int lastWorldUpdate;
+        volatile boolean forcedRecalc;
 
         final Vec2 lastPos = new Vec2();
         float stuckTimer = 0f;
@@ -505,6 +520,7 @@ public class ControlPathfinder{
 
         long lastUpdateId;
         long lastTime;
+        long forceRecalcTime;
 
         volatile int lastId, curId;
 
@@ -512,6 +528,13 @@ public class ControlPathfinder{
             this.thread = thread;
         }
 
+        public void forceRecalculate(){
+            //keep it at 3 times/sec
+            if(Time.timeSinceMillis(forceRecalcTime) < 1000 / 3) return;
+            forcedRecalc = true;
+            forceRecalcTime = Time.millis();
+        }
+
         void update(long maxUpdateNs){
             if(curId != lastId){
                 clear(true);
@@ -519,9 +542,10 @@ public class ControlPathfinder{
             lastId = curId;
 
             //re-do everything when world updates, but keep the old path around
-            if(Time.timeSinceMillis(lastTime) > 1000 * 3 && (worldUpdateId != lastWorldUpdate || !destination.epsilonEquals(lastDestination, 2f))){
+            if(forcedRecalc || (Time.timeSinceMillis(lastTime) > 1000 * 3 && (worldUpdateId != lastWorldUpdate || !destination.epsilonEquals(lastDestination, 2f)))){
                 lastTime = Time.millis();
                 lastWorldUpdate = worldUpdateId;
+                forcedRecalc = false;
                 clear(false);
             }
 

core/src/mindustry/ai/Pathfinder.java

@@ -6,7 +6,6 @@ import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
-import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
@@ -153,7 +152,7 @@ public class Pathfinder implements Runnable{
 
     /** Packs a tile into its internal representation. */
     public int packTile(Tile tile){
-        boolean nearLiquid = false, nearSolid = false, nearGround = false, solid = tile.solid(), allDeep = tile.floor().isDeep();
+        boolean nearLiquid = false, nearSolid = false, nearLegSolid = false, nearGround = false, solid = tile.solid(), allDeep = tile.floor().isDeep();
 
         for(int i = 0; i < 4; i++){
             Tile other = tile.nearby(i);
@@ -165,6 +164,7 @@ public class Pathfinder implements Runnable{
                 if(osolid && !other.block().teamPassable) nearSolid = true;
                 if(!floor.isLiquid) nearGround = true;
                 if(!floor.isDeep()) allDeep = false;
+                if(other.legSolid()) nearLegSolid = true;
 
                 //other tile is now near solid
                 if(solid && !tile.block().teamPassable){
@@ -180,10 +180,11 @@ public class Pathfinder implements Runnable{
             tid == 0 && tile.build != null && state.rules.coreCapture ? 255 : tid, //use teamid = 255 when core capture is enabled to mark out derelict structures
             solid,
             tile.floor().isLiquid,
-            tile.staticDarkness() >= 2 || (tile.floor().solid && tile.block() == Blocks.air),
+            tile.legSolid(),
             nearLiquid,
             nearGround,
             nearSolid,
+            nearLegSolid,
             tile.floor().isDeep(),
             tile.floor().damageTaken > 0.00001f,
             allDeep,
@@ -564,6 +565,8 @@ public class Pathfinder implements Runnable{
         boolean nearGround;
         //whether this block is near a solid object
         boolean nearSolid;
+        //whether this block is near a block that is solid for legged units
+        boolean nearLegSolid;
         //whether this block is deep / drownable
         boolean deep;
         //whether the floor damages

core/src/mindustry/editor/EditorTool.java

@@ -106,7 +106,7 @@ public enum EditorTool{
 
             if(tile == null) return;
 
-            if(editor.drawBlock.isMultiblock()){
+            if(editor.drawBlock.isMultiblock() && (mode == 0 || mode == -1)){
                 //don't fill multiblocks, thanks
                 pencil.touched(x, y);
                 return;

core/src/mindustry/entities/EntityCollisions.java

@@ -5,7 +5,6 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
-import mindustry.content.*;
 import mindustry.gen.*;
 import mindustry.world.*;
 
@@ -129,7 +128,7 @@ public class EntityCollisions{
 
     public static boolean legsSolid(int x, int y){
         Tile tile = world.tile(x, y);
-        return tile == null || tile.staticDarkness() >= 2 || (tile.floor().solid && tile.block() == Blocks.air);
+        return tile == null || tile.legSolid();
     }
 
     public static boolean waterSolid(int x, int y){

core/src/mindustry/entities/units/BuildPlan.java

@@ -37,7 +37,7 @@ public class BuildPlan implements Position, QuadTreeObject{
     public BuildPlan(int x, int y, int rotation, Block block){
         this.x = x;
         this.y = y;
-        this.rotation = block.planRotation(rotation);
+        if(block != null) this.rotation = block.planRotation(rotation);
         this.block = block;
         this.breaking = false;
     }
@@ -46,7 +46,7 @@ public class BuildPlan implements Position, QuadTreeObject{
     public BuildPlan(int x, int y, int rotation, Block block, Object config){
         this.x = x;
         this.y = y;
-        this.rotation = block.planRotation(rotation);
+        if(block != null) this.rotation = block.planRotation(rotation);
         this.block = block;
         this.breaking = false;
         this.config = config;
@@ -138,7 +138,7 @@ public class BuildPlan implements Position, QuadTreeObject{
     public BuildPlan set(int x, int y, int rotation, Block block){
         this.x = x;
         this.y = y;
-        this.rotation = block.planRotation(rotation);
+        if(block != null) this.rotation = block.planRotation(rotation);
         this.block = block;
         this.breaking = false;
         return this;

core/src/mindustry/input/DesktopInput.java

@@ -178,7 +178,7 @@ public class DesktopInput extends InputHandler{
                 }
                 linePlans.each(this::drawOverPlan);
             }else if(isPlacing()){
-                int rot = block.planRotation(rotation);
+                int rot = block == null ? rotation : block.planRotation(rotation);
                 if(block.rotate && block.drawArrow){
                     drawArrow(block, cursorX, cursorY, rot);
                 }

core/src/mindustry/input/MobileInput.java

@@ -415,7 +415,7 @@ public class MobileInput extends InputHandler implements GestureListener{
 
             //draw last placed plan
             if(!plan.breaking && plan == lastPlaced && plan.block != null){
-                int rot = block.planRotation(rotation);
+                int rot = plan.block.planRotation(rotation);
                 boolean valid = validPlace(tile.x, tile.y, plan.block, rot);
                 Draw.mixcol();
                 plan.block.drawPlace(tile.x, tile.y, rot, valid);
@@ -1036,7 +1036,7 @@ public class MobileInput extends InputHandler implements GestureListener{
                     }
 
                     if(allowHealing && target == null){
-                        target = Geometry.findClosest(unit.x, unit.y, indexer.getDamaged(Team.sharded));
+                        target = Geometry.findClosest(unit.x, unit.y, indexer.getDamaged(player.team()));
                         if(target != null && !unit.within(target, range)){
                             target = null;
                         }

core/src/mindustry/io/JsonIO.java

@@ -195,6 +195,9 @@ public class JsonIO{
 
             @Override
             public Planet read(Json json, JsonValue jsonData, Class type){
+                if(jsonData.asString() == null){
+                    return null;
+                }
                 Planet block = Vars.content.getByName(ContentType.planet, jsonData.asString());
                 return block == null ? Planets.serpulo : block;
             }

core/src/mindustry/ui/dialogs/SchematicsDialog.java

@@ -422,7 +422,7 @@ public class SchematicsDialog extends BaseDialog{
                     }
 
                     for(ContentType ctype : defaultContentIcons){
-                        var all = content.getBy(ctype).<UnlockableContent>as().filter(u -> !u.isHidden() && u.unlockedNow() && u.hasEmoji());
+                        var all = content.getBy(ctype).<UnlockableContent>as().select(u -> !u.isHidden() && u.unlockedNow() && u.hasEmoji());
 
                         t.row();
                         if(all.count(u -> !tags.contains(u.emoji())) > 0) t.image().colspan(cols).growX().width(Float.NEGATIVE_INFINITY).height(3f).color(Pal.accent);

core/src/mindustry/world/Tile.java

@@ -547,6 +547,11 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         return block.solid && block.fillsTile && !block.synthetic() ? data : 0;
     }
 
+    /** @return whether this tile is solid for legged units */
+    public boolean legSolid(){
+        return staticDarkness() >= 2 || (floor.solid && block == Blocks.air);
+    }
+
     /** @return true if these tiles are right next to each other. */
     public boolean adjacentTo(Tile tile){
         return relativeTo(tile) != -1;

core/src/mindustry/world/blocks/liquid/Conduit.java

@@ -38,6 +38,8 @@ public class Conduit extends LiquidBlock implements Autotiler{
     /** indices: [rotation] [fluid type] [frame] */
     public TextureRegion[][][] rotateRegions;
 
+    /** If true, the liquid region is padded at corners, so it doesn't stick out. */
+    public boolean padCorners = true;
     public boolean leaks = true;
     public @Nullable Block junctionReplacement, bridgeReplacement, rotBridgeReplacement;
 
@@ -186,9 +188,9 @@ public class Conduit extends LiquidBlock implements Autotiler{
             int gas = liquids.current().gas ? 1 : 0;
             float ox = 0f, oy = 0f;
             int wrapRot = (rotation + offset) % 4;
-            TextureRegion liquidr = bits == 1 ? rotateRegions[wrapRot][gas][frame] : renderer.fluidFrames[gas][frame];
+            TextureRegion liquidr = bits == 1 && padCorners ? rotateRegions[wrapRot][gas][frame] : renderer.fluidFrames[gas][frame];
 
-            if(bits == 1){
+            if(bits == 1 && padCorners){
                 ox = rotateOffsets[wrapRot][0];
                 oy = rotateOffsets[wrapRot][1];
             }