Fixed #3987

* conveyor/conduit upgrading system

* style

core/src/mindustry/ai/types/FlyingAI.java

@@ -12,7 +12,7 @@ public class FlyingAI extends AIController{
     @Override
     public void updateMovement(){
         if(target != null && unit.hasWeapons() && command() == UnitCommand.attack){
-            if(unit.type.circleTarget){
+            if(!unit.type.circleTarget){
                 moveTo(target, unit.range() * 0.8f);
                 unit.lookAt(target);
             }else{

core/src/mindustry/entities/Puddles.java

@@ -14,12 +14,12 @@ public class Puddles{
 
     public static final float maxLiquid = 70f;
 
-    /** Deposists a Puddle between tile and source. */
+    /** Deposits a Puddle between tile and source. */
     public static void deposit(Tile tile, Tile source, Liquid liquid, float amount){
         deposit(tile, source, liquid, amount, 0);
     }
 
-    /** Deposists a Puddle at a tile. */
+    /** Deposits a Puddle at a tile. */
     public static void deposit(Tile tile, Liquid liquid, float amount){
         deposit(tile, tile, liquid, amount, 0);
     }
@@ -38,9 +38,9 @@ public class Puddles{
 
             Puddle p = map.get(tile.pos());
 
-            if(generation == 0 && p != null && p.lastRipple() <= Time.time - 40f){
+            if(generation == 0 && p != null && p.lastRipple <= Time.time - 40f){
                 Fx.ripple.at((tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f, 1f, tile.floor().liquidDrop.color);
-                p.lastRipple(Time.time);
+                p.lastRipple = Time.time;
             }
             return;
         }
@@ -62,9 +62,9 @@ public class Puddles{
         }else if(p.liquid() == liquid){
             p.accepting(Math.max(amount, p.accepting()));
 
-            if(generation == 0 && p.lastRipple() <= Time.time - 40f && p.amount() >= maxLiquid / 2f){
+            if(generation == 0 && p.lastRipple <= Time.time - 40f && p.amount() >= maxLiquid / 2f){
                 Fx.ripple.at((tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f, 1f, p.liquid().color);
-                p.lastRipple(Time.time);
+                p.lastRipple = Time.time;
             }
         }else{
             p.amount(p.amount() + reactPuddle(p.liquid(), liquid, amount, p.tile(), (p.x() + source.worldx())/2f, (p.y() + source.worldy())/2f));

core/src/mindustry/entities/comp/PuddleComp.java

@@ -22,8 +22,7 @@ import static mindustry.entities.Puddles.*;
 abstract class PuddleComp implements Posc, Puddlec, Drawc{
     private static final int maxGeneration = 2;
     private static final Color tmp = new Color();
-    private static final Rect rect = new Rect();
+    private static final Rect rect = new Rect(), rect2 = new Rect();
-    private static final Rect rect2 = new Rect();
     private static int seeds;
 
     @Import float x, y;
@@ -53,7 +52,7 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{
                 Tile other = world.tile(tile.x + point.x, tile.y + point.y);
                 if(other != null && other.block() == Blocks.air){
                     Puddles.deposit(other, tile, liquid, deposited, generation + 1);
-                    amount -= deposited / 2f; //tweak to speed up/slow down Puddlec propagation
+                    amount -= deposited / 2f; //tweak to speed up/slow down Puddle propagation
                 }
             }
         }

core/src/mindustry/input/InputHandler.java

@@ -32,6 +32,7 @@ import mindustry.ui.fragments.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 import mindustry.world.blocks.ConstructBlock.*;
+import mindustry.world.blocks.distribution.*;
 import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.power.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
@@ -1161,7 +1162,14 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         }
 
         if(diagonal){
-            points = Placement.pathfindLine(block != null && block.conveyorPlacement, startX, startY, endX, endY);
+            var start = world.build(startX, startY);
+            var end = world.build(endX, endY);
+            if(block != null && start instanceof ChainedBuilding && end instanceof ChainedBuilding
+                    && block.canReplace(end.block) && block.canReplace(start.block)){
+                points = Placement.upgradeLine(startX, startY, endX, endY);
+            }else{
+                points = Placement.pathfindLine(block != null && block.conveyorPlacement, startX, startY, endX, endY);
+            }
         }else{
             points = Placement.normalizeLine(startX, startY, endX, endY);
         }

core/src/mindustry/input/Placement.java

@@ -6,6 +6,7 @@ import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.pooling.*;
 import mindustry.world.*;
+import mindustry.world.blocks.distribution.*;
 
 import static mindustry.Vars.*;
 
@@ -23,7 +24,6 @@ public class Placement{
     /** Normalize a diagonal line into points. */
     public static Seq<Point2> pathfindLine(boolean conveyors, int startX, int startY, int endX, int endY){
         Pools.freeAll(points);
-
         points.clear();
         if(conveyors && Core.settings.getBool("conveyorpathfinding")){
             if(astar(startX, startY, endX, endY)){
@@ -54,6 +54,19 @@ public class Placement{
         return points;
     }
 
+    public static Seq<Point2> upgradeLine(int startX, int startY, int endX, int endY){
+        Pools.freeAll(points);
+        points.clear();
+        var build = world.build(startX, startY);
+        points.add(Pools.obtain(Point2.class, Point2::new).set(startX, startY));
+        while(build instanceof ChainedBuilding chain && (build.tile.x != endX || build.tile.y != endY)){
+            if(chain.next() == null) return pathfindLine(true, startX, startY, endX, endY);
+            build = chain.next();
+            points.add(Pools.obtain(Point2.class, Point2::new).set(build.tile.x, build.tile.y));
+        }
+        return points;
+    }
+
     private static float tileHeuristic(Tile tile, Tile other){
         Block block = control.input.block;
 

core/src/mindustry/type/UnitType.java

@@ -46,7 +46,7 @@ public class UnitType extends UnlockableContent{
     public float health = 200f, range = -1, armor = 0f, maxRange = -1f;
     public float crashDamageMultiplier = 1f;
     public boolean targetAir = true, targetGround = true;
-    public boolean faceTarget = true, rotateShooting = true, isCounted = true, lowAltitude = false, circleTarget = true;
+    public boolean faceTarget = true, rotateShooting = true, isCounted = true, lowAltitude = false, circleTarget = false;
     public boolean canBoost = false;
     public boolean destructibleWreck = true;
     public float groundLayer = Layer.groundUnit;

core/src/mindustry/world/blocks/distribution/ChainedBuilding.java

@@ -0,0 +1,7 @@
+package mindustry.world.blocks.distribution;
+
+import mindustry.gen.*;
+
+public interface ChainedBuilding{
+    Building next();
+}

core/src/mindustry/world/blocks/distribution/Conveyor.java

@@ -91,7 +91,7 @@ public class Conveyor extends Block implements Autotiler{
             Mathf.mod(req.tile().build.rotation - req.rotation, 2) == 1 ? Blocks.junction : this;
     }
 
-    public class ConveyorBuild extends Building{
+    public class ConveyorBuild extends Building implements ChainedBuilding{
         //parallel array data
         public Item[] ids = new Item[capacity];
         public float[] xs = new float[capacity];
@@ -391,5 +391,11 @@ public class Conveyor extends Block implements Autotiler{
 
             len--;
         }
+
+        @Nullable
+        @Override
+        public Building next(){
+            return nextc;
+        }
     }
 }

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

@@ -16,6 +16,7 @@ import mindustry.graphics.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
+import mindustry.world.blocks.distribution.*;
 
 import static mindustry.Vars.*;
 
@@ -73,7 +74,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
         return new TextureRegion[]{Core.atlas.find("conduit-bottom"), topRegions[0]};
     }
 
-    public class ConduitBuild extends LiquidBuild{
+    public class ConduitBuild extends LiquidBuild implements ChainedBuilding{
         public float smoothLiquid;
         public int blendbits, xscl, yscl, blending;
 
@@ -137,5 +138,15 @@ public class Conduit extends LiquidBlock implements Autotiler{
                 sleep();
             }
         }
+
+        @Nullable
+        @Override
+        public Building next(){
+            Tile next = tile.nearby(rotation);
+            if(next != null && next.build instanceof ConduitBuild){
+                return next.build;
+            }
+            return null;
+        }
     }
 }

fastlane/metadata/android/en-US/changelogs/29788.txt

@@ -0,0 +1,3 @@
+[This is a truncated changelog, see Github for full notes]
+- Decreased junction item capacity - this may cause slight desync on servers running previous 121 versions, servers are advised to update
+- Many various small bugfixes

servers_v6.json

@@ -1,7 +1,7 @@
 [
   {
     "name": "mindustry.pl",
-    "address": ["mindustry.pl:6000", "mindustry.pl:6666", "91.134.217.10:6006"]
+    "address": ["mindustry.pl:6000", "mindustry.pl:6666", "mindustry.pl"]
   },
   {
     "name": "{AA}",