Plastanium conveyor + bugfixes

core/assets/bundles/bundle.properties

@@ -1194,7 +1194,7 @@ block.force-projector.description = Creates a hexagonal force field around itsel
 block.shock-mine.description = Damages enemies stepping on the mine. Nearly invisible to the enemy.
 block.conveyor.description = Basic item transport block. Moves items forward and automatically deposits them into blocks. Rotatable.
 block.titanium-conveyor.description = Advanced item transport block. Moves items faster than standard conveyors.
-block.plastanium-conveyor.description = The \uf818 moves items in batches.\nOnly accepts items at the back.\nLoads & unloads on all 3 sides.
+block.plastanium-conveyor.description = Moves items in batches.\nAccepts items at the back, and unloads them in three directions at the front.
 block.junction.description = Acts as a bridge for two crossing conveyor belts. Useful in situations with two different conveyors carrying different materials to different locations.
 block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
 block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.

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

@@ -12,7 +12,9 @@ public class FlyingAI extends AIController{
 
     @Override
     public void update(){
-        unit.rotation(unit.vel().angle());
+        if(!unit.vel().isZero(0.01f)){
+            unit.rotation(unit.vel().angle());
+        }
 
         if(unit.isFlying()){
             unit.wobble();

core/src/mindustry/content/Blocks.java

@@ -910,7 +910,7 @@ public class Blocks implements ContentList{
             displayedSpeed = 10f;
         }};
 
-        plastaniumConveyor = new CraterConveyor("plastanium-conveyor"){{
+        plastaniumConveyor = new StackConveyor("plastanium-conveyor"){{
             requirements(Category.distribution, ItemStack.with(Items.plastanium, 1, Items.silicon, 1, Items.graphite, 1));
             health = 75;
             speed = 0.04f;
@@ -1743,14 +1743,14 @@ public class Blocks implements ContentList{
         //region experimental
 
         blockForge = new BlockForge("block-forge"){{
-            requirements(Category.production, ItemStack.with(Items.thorium, 100));
+            requirements(Category.production, BuildVisibility.debugOnly, ItemStack.with(Items.thorium, 100));
             hasPower = true;
             consumes.power(2f);
             size = 3;
         }};
 
         blockLauncher = new BlockLauncher("block-launcher"){{
-            requirements(Category.production, ItemStack.with(Items.thorium, 100));
+            requirements(Category.production, BuildVisibility.debugOnly, ItemStack.with(Items.thorium, 100));
             size = 3;
             hasPower = true;
             consumes.power(2f);

core/src/mindustry/entities/def/DecalComp.java

@@ -5,6 +5,7 @@ import arc.graphics.g2d.*;
 import arc.math.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 
 @EntityDef(value = {Decalc.class}, pooled = true)
 @Component
@@ -16,6 +17,8 @@ abstract class DecalComp implements Drawc, Timedc, Rotc, Posc{
 
     @Override
     public void draw(){
+        Draw.z(Layer.scorch);
+
         Draw.color(color);
         Draw.alpha(1f - Mathf.curve(fin(), 0.98f));
         Draw.rect(region, x, y, rotation);

core/src/mindustry/entities/def/TileComp.java

@@ -86,6 +86,18 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
         return this;
     }
 
+    @Override
+    @Replace
+    public int tileX(){
+        return tile.x;
+    }
+
+    @Override
+    @Replace
+    public int tileY(){
+        return tile.y;
+    }
+
     //endregion
     //region io
 
@@ -963,6 +975,10 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
             proximity.add(tile);
         }
 
+        for(Tilec other : tmpTiles){
+            other.onProximityUpdate();
+        }
+
         onProximityAdded();
         onProximityUpdate();
 

core/src/mindustry/entities/def/WeaponsComp.java

@@ -93,7 +93,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
                 //shoot if applicable
                 if(mount.reload <= 0.0001f && Angles.within(mount.rotation, mount.targetRotation, 1.5f)){
                     for(int i : (weapon.mirror && !weapon.alternate ? Mathf.signs : Mathf.one)){
-                        i *= Mathf.sign(weapon.flipped) * Mathf.sign(mount.side);
+                        i *= Mathf.sign(weapon.flipped) * (mount.weapon.mirror ? Mathf.sign(mount.side) : 1);
 
                         //m a t h
                         float weaponRotation = rotation + (weapon.rotate ? mount.rotation : 0);
@@ -106,7 +106,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
                         shoot(weapon, shootX, shootY, shootAngle, -i);
                     }
 
-                    mount.side = !mount.side;
+                    if(mount.weapon.mirror) mount.side = !mount.side;
                     mount.reload = weapon.reload;
                 }
             }

core/src/mindustry/graphics/BlockRenderer.java

@@ -232,14 +232,17 @@ public class BlockRenderer implements Disposable{
 
             if(block != Blocks.air){
                 block.drawBase(tile);
+                Draw.z(Layer.block);
 
                 if(entity != null){
                     if(entity.damaged()){
                         entity.drawCracks();
+                        Draw.z(Layer.block);
                     }
 
                     if(entity.team() != player.team()){
                         entity.drawTeam();
+                        Draw.z(Layer.block);
                     }
 
                     entity.drawLight();

core/src/mindustry/type/UnitType.java

@@ -209,16 +209,18 @@ public class UnitType extends UnlockableContent{
             for(int i : (weapon.mirror ? Mathf.signs : Mathf.one)){
                 i *= Mathf.sign(weapon.flipped);
 
-                float rotation = unit.rotation() - 90 + (weapon.rotate ? mount.rotation : 0);
+                float rotation = unit.rotation() - 90;
-                float trY = weapon.y - (mount.reload / weapon.reload * weapon.recoil) * (weapon.alternate ? Mathf.num(i == Mathf.sign(mount.side)) : 1);
+                float weaponRotation  = rotation + (weapon.rotate ? mount.rotation : 0);
+                float trY = weapon.y;
                 float width = i > 0 ? -weapon.region.getWidth() : weapon.region.getWidth();
+                float recoil = -(mount.reload / weapon.reload * weapon.recoil) * (weapon.alternate ? Mathf.num(i == Mathf.sign(mount.side)) : 1);
 
                 Draw.rect(weapon.region,
-                unit.x() + Angles.trnsx(rotation, weapon.x * i, trY),
+                unit.x() + Angles.trnsx(rotation, weapon.x * i, trY) + Angles.trnsx(weaponRotation, 0, recoil),
-                unit.y() + Angles.trnsy(rotation, weapon.x * i, trY),
+                unit.y() + Angles.trnsy(rotation, weapon.x * i, trY) + Angles.trnsy(weaponRotation, 0, recoil),
                 width * Draw.scl,
                 weapon.region.getHeight() * Draw.scl,
-                rotation);
+                weaponRotation);
             }
         }
 

core/src/mindustry/world/Block.java

@@ -271,6 +271,10 @@ public class Block extends UnlockableContent{
         return true;
     }
 
+    public boolean rotatedOutput(int x, int y){
+        return rotate;
+    }
+
     /** Adds a region by name to be loaded, with the final name "{name}-suffix". Returns an ID to looks this region up by in {@link #reg(int)}. */
     protected int reg(String suffix){
         cacheRegionStrings.add(name + suffix);

core/src/mindustry/world/blocks/Autotiler.java

@@ -12,7 +12,7 @@ import java.util.*;
 
 public interface Autotiler{
     class AutotilerHolder{
-        static final int[] blendresult = new int[3];
+        static final int[] blendresult = new int[4];
         static final BuildRequest[] directionals = new BuildRequest[4];
     }
 
@@ -50,6 +50,15 @@ public interface Autotiler{
         blends(tile, rotation, directional, 3, world) ? 5 :
         -1;
         transformCase(num, blendresult);
+
+        blendresult[3] = 0;
+
+        for(int i = 0; i < 4; i++){
+            if(blends(tile, rotation, directional, i, world)){
+                blendresult[3] |= (1 << i);
+            }
+        }
+
         return blendresult;
     }
 
@@ -88,14 +97,21 @@ public interface Autotiler{
     }
 
     default boolean blendsArmored(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
-        return (Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, otherx, othery)
+        return Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, otherx, othery)
-                || ((!otherblock.rotate && Edges.getFacingEdge(otherblock, otherx, othery, tile) != null &&
+                || ((!otherblock.rotatedOutput(otherx, othery) && Edges.getFacingEdge(otherblock, otherx, othery, tile) != null &&
-                Edges.getFacingEdge(otherblock, otherx, othery, tile).relativeTo(tile) == rotation) || (otherblock.rotate && Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y))));
+                Edges.getFacingEdge(otherblock, otherx, othery, tile).relativeTo(tile) == rotation) || (otherblock.rotatedOutput(otherx, othery) && Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
     }
 
+    /** @return whether this other block is *not* looking at this one. */
+    default boolean notLookingAt(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
+        return !(otherblock.rotatedOutput(otherx, othery) && Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y));
+    }
+
+    /** @return whether this tile is looking at the other tile, or the other tile is looking at this one.
+     * If the other tile does not rotate, it is always considered to be facing this one. */
     default boolean lookingAt(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
         return (Point2.equals(tile.x + Geometry.d4(rotation).x, tile.y + Geometry.d4(rotation).y, otherx, othery)
-        || (!otherblock.rotate || Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
+        || (!otherblock.rotatedOutput(otherx, othery) || Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y)));
     }
 
     boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock);

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

@@ -1,7 +1,6 @@
 package mindustry.world.blocks.distribution;
 
 import arc.*;
-import arc.func.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.util.*;
@@ -18,13 +17,17 @@ import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
-public class CraterConveyor extends Block implements Autotiler{
+public class StackConveyor extends Block implements Autotiler{
-    private TextureRegion[] regions = new TextureRegion[8];
+    protected static final int stateMove = 0, stateLoad = 1, stateUnload = 2;
+
+    protected TextureRegion[] regions = new TextureRegion[3];
+    protected TextureRegion edgeRegion, stackRegion;
 
     public float speed = 0f;
     public float recharge = 4f;
+    public boolean splitOut = true;
 
-    public CraterConveyor(String name){
+    public StackConveyor(String name){
         super(name);
 
         rotate = true;
@@ -33,7 +36,6 @@ public class CraterConveyor extends Block implements Autotiler{
         hasItems = true;
         itemCapacity = 8;
         conveyorPlacement = true;
-        entityType = CraterConveyorEntity::new;
 
         idleSound = Sounds.conveyor;
         idleSoundVolume = 0.004f;
@@ -44,8 +46,11 @@ public class CraterConveyor extends Block implements Autotiler{
     @Override
     public void load(){
         for(int i = 0; i < regions.length; i++){
-            regions[i] = Core.atlas.find(name + "-" + i + "-" + 0);
+            regions[i] = Core.atlas.find(name + "-" + i);
         }
+        
+        edgeRegion = Core.atlas.find(name + "-edge");
+        stackRegion = Core.atlas.find(name + "-stack");
     }
 
     @Override
@@ -62,8 +67,17 @@ public class CraterConveyor extends Block implements Autotiler{
     }
 
     @Override
-    public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock) {
+    public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
-        return otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock) && otherblock instanceof CraterConveyor; // blend with nothing but crater conveyors
+        if(tile.entity instanceof StackConveyorEntity){
+            int state = ((StackConveyorEntity)tile.entity).state;
+            if(state == stateLoad){ //standard conveyor mode
+                return otherblock.outputsItems() && lookingAt(tile, rotation, otherx, othery, otherrot, otherblock);
+            }else if(state == stateUnload){ //router mode
+                return (otherblock.hasItems || otherblock.outputsItems()) &&
+                    (notLookingAt(tile, rotation, otherx, othery, otherrot, otherblock) || otherblock instanceof StackConveyor);
+            }
+        }
+        return otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock) && otherblock instanceof StackConveyor;
     }
 
     @Override
@@ -72,43 +86,62 @@ public class CraterConveyor extends Block implements Autotiler{
 
         if(bits == null) return;
 
-        TextureRegion region = regions[bits[0]];
+        TextureRegion region = regions[0];
-        Draw.rect(region, req.drawx(), req.drawy(), region.getWidth() * bits[1] * Draw.scl * req.animScale, region.getHeight() * bits[2] * Draw.scl * req.animScale, req.rotation * 90);
+        Draw.rect(region, req.drawx(), req.drawy(), region.getWidth() * Draw.scl * req.animScale, region.getHeight() * Draw.scl * req.animScale, req.rotation * 90);
+
+        for(int i = 0; i < 4; i++){
+            if((bits[3] & (1 << i)) == 0){
+                Draw.rect(edgeRegion, req.drawx(), req.drawy(), (req.rotation - i) * 90);
+            }
+        }
     }
 
-    class CraterConveyorEntity extends TileEntity{
+    @Override
+    public boolean rotatedOutput(int x, int y){
+        Tilec tile = world.ent(x, y);
+        if(tile instanceof StackConveyorEntity){
+            return ((StackConveyorEntity)tile).state != stateUnload;
+        }
+        return super.rotatedOutput(x, y);
+    }
 
-        int blendbit1, blendbit2;
+    public class StackConveyorEntity extends TileEntity{
-        int blendsclx, blendscly;
+        public int state, blendprox;
 
-        int link = -1;
+        public int link = -1;
-        float cooldown;
+        public float cooldown;
+        public Item lastItem;
 
         @Override
         public void draw(){
-                               Draw.rect(regions[Mathf.clamp(blendbit1, 0, regions.length - 1)], x, y, tilesize * blendsclx, tilesize * blendscly, rotation() * 90);
+            Draw.rect(regions[state], x, y, rotation() * 90);
-            if(blendbit2 != 0) Draw.rect(regions[Mathf.clamp(blendbit2, 0, regions.length - 1)], x, y, tilesize * blendsclx, tilesize * blendscly, rotation() * 90);;
+
+            for(int i = 0; i < 4; i++){
+                if((blendprox & (1 << i)) == 0){
+                    Draw.rect(edgeRegion, x, y, (rotation() - i) * 90);
+                }
+            }
 
             Draw.z(Layer.blockOver);
 
             if(link == -1) return;
 
-            // offset
+            //offset
             Tile from = world.tile(link);
             Tmp.v1.set(from);
             Tmp.v2.set(tile);
             Tmp.v1.interpolate(Tmp.v2, 1f - cooldown, Interpolation.linear);
 
-            // fixme
+            //fixme
             float a = (from.rotation()%4) * 90;
             float b = (tile.rotation()%4) * 90;
             if((from.rotation()%4) == 3 && (tile.rotation()%4) == 0) a = -1 * 90;
             if((from.rotation()%4) == 0 && (tile.rotation()%4) == 3) a = 4 * 90;
 
-            // crater
+            //stack
-            Draw.rect(regions[7], Tmp.v1.x, Tmp.v1.y, Mathf.lerp(a, b, Interpolation.smooth.apply(1f - Mathf.clamp(cooldown * 2, 0f, 1f))));
+            Draw.rect(stackRegion, Tmp.v1.x, Tmp.v1.y, Mathf.lerp(a, b, Interpolation.smooth.apply(1f - Mathf.clamp(cooldown * 2, 0f, 1f))));
 
-            // item
+            //item
             float size = itemSize * Mathf.lerp(Math.min((float)items.total() / itemCapacity, 1), 1f, 0.4f);
             Drawf.shadow(Tmp.v1.x, Tmp.v1.y, size * 1.2f);
             Draw.rect(items.first().icon(Cicon.medium), Tmp.v1.x, Tmp.v1.y, size, size, 0);
@@ -118,49 +151,60 @@ public class CraterConveyor extends Block implements Autotiler{
         public void onProximityUpdate(){
             super.onProximityUpdate();
 
+            Fx.healBlockFull.at(tile, 1);
+
+            state = stateMove;
+
             int[] bits = buildBlending(tile, tile.rotation(), null, true);
-
+            if(bits[0] == 0 && blends(tile, tile.rotation(), 0) && !blends(tile, tile.rotation(), 2)) state = stateLoad; // a 0 that faces into a conveyor with none behind it
-            blendbit2 = 0;
+            if(bits[0] == 0 && !blends(tile, tile.rotation(), 0) && blends(tile, tile.rotation(), 2)) state = stateUnload; // a 0 that faces into none with a conveyor behind it
-            if(bits[0] == 0 && blends(tile, tile.rotation(), 0) && !blends(tile, tile.rotation(), 2)) blendbit2 = 5; // a 0 that faces into a crater conveyor with none behind it
+            
-            if(bits[0] == 0 && !blends(tile, tile.rotation(), 0) && blends(tile, tile.rotation(), 2)) blendbit2 = 6; // a 0 that faces into none with a crater conveyor behind it
+            blendprox = 0;
-
+            for(int i = 0; i < 4; i++){
-            blendbit1 = bits[0];
+                if(blends(tile, rotation(), i)){
-            blendsclx = bits[1];
+                    blendprox |= (1 << i);
-            blendscly = bits[2];
+                }
+            }
         }
 
-
         @Override
         public void updateTile(){
             // reel in crater
             if(cooldown > 0f) cooldown = Mathf.clamp(cooldown - speed, 0f, recharge);
 
-            // sleep when idle
+            //no items -> sleep
+            if(items.empty()){
+                sleep();
+                return;
+            }
+
             if(link == -1){
-                if(cooldown == 0f) sleep();
                 return;
             }
 
             // crater needs to be centered
             if(cooldown > 0f) return;
 
-            if(blendbit2 == 6){
+            // get current item
-                while(dump()) if(items.total() == 0) poofOut();
+            if(lastItem == null){
+                lastItem = items.first();
             }
 
-            /* unload */ else /* transfer */
+            if(state == stateUnload){ //unload
-
+                while(lastItem != null && (!splitOut ? moveForward(lastItem) : dump(lastItem))){
-                if(blendbit2 != 5 || (items.total() >= getMaximumAccepted(items.first()))){
+                    if(items.empty()) poofOut();
+                }
+            }else{ //transfer
+                if(state != stateLoad || (items.total() >= getMaximumAccepted(items.first()))){
                     if(front() != null
                     && front().team() == team()
-                    && front().block() instanceof CraterConveyor){
+                    && front().block() instanceof StackConveyor){
-                        CraterConveyorEntity e = (CraterConveyorEntity)tile.front();
+                        StackConveyorEntity e = (StackConveyorEntity)front();
 
                         // sleep if its occupied
-                        if(e.link != -1){
+                        if(e.link == -1){
-                            sleep();
-                        }else{
                             e.items.addAll(items);
+                            e.noSleep();
                             e.link = tile.pos();
                             // ▲ new | old ▼
                             link = -1;
@@ -168,11 +212,10 @@ public class CraterConveyor extends Block implements Autotiler{
 
                             cooldown = recharge;
                             e.cooldown = 1;
-                            e.noSleep();
-                            bump();
                         }
                     }
                 }
+            }
         }
 
         @Override
@@ -188,25 +231,28 @@ public class CraterConveyor extends Block implements Autotiler{
         private void poofIn(){
             link = tile.pos();
             Fx.plasticburn.at(this);
-            tile.entity.noSleep();
+            noSleep();
         }
 
         private void poofOut(){
             Fx.plasticburn.at(this);
             link = -1;
-            bump();
         }
 
         @Override
         public void handleItem(Tilec source, Item item){
-            if(items.total() == 0) poofIn();
+            if(items.empty()) poofIn();
             super.handleItem(source, item);
+            lastItem = item;
+            noSleep();
         }
 
         @Override
         public void handleStack(Item item, int amount, Teamc source){
-            if(items.total() == 0) poofIn();
+            if(items.empty()) poofIn();
             super.handleStack(item, amount, source);
+            lastItem = item;
+            noSleep();
         }
 
         @Override
@@ -214,47 +260,15 @@ public class CraterConveyor extends Block implements Autotiler{
             try{
                 return super.removeStack(item, amount);
             }finally{
-                if(items.total() == 0) poofOut();
+                if(items.empty()) poofOut();
             }
         }
 
-        // crater conveyor tiles that input into this one
-        private void upstream(Cons<CraterConveyorEntity> cons){
-
-            if(blendbit1 == 0 && !(back() instanceof CraterConveyorEntity)) return;
-
-            if(    blendbit1 == 0 // 1 input from the back, 0 from the sides
-                || blendbit1 == 2 // 1 input from the back, 1 from the sides
-                || blendbit1 == 3 // 1 input from the back, 2 from the sides
-            ) cons.get((CraterConveyorEntity)back());
-
-            if(    blendbit1 == 3 // 1 input from the back, 2 from the sides
-                || blendbit1 == 4 // 0 input from the back, 2 from the sides
-                ||(blendbit1 == 1 &&   blendscly == -1) // side is open
-                ||(blendbit1 == 2 &&   blendscly == +1) // side is open
-            ) cons.get((CraterConveyorEntity)right());
-
-            if(    blendbit1 == 3 // 1 input from the back, 2 from the sides
-                || blendbit1 == 4 // 0 input from the back, 2 from the sides
-                ||(blendbit1 == 1 &&   blendscly == +1) // side is open
-                ||(blendbit1 == 2 &&   blendscly == -1) // side is open
-            ) cons.get((CraterConveyorEntity)left());
-        }
-
-        // awaken inputting conveyors
-        private void bump(){
-            upstream(t -> {
-                if(t == null || !t.sleeping || t.items().total() <= 0) return;
-                t.noSleep();
-                t.bump();
-            });
-        }
-
         @Override
         public boolean acceptItem(Tilec source, Item item){
-            if (this == source) return true;                // player threw items
+            if(this == source) return true;                 // player threw items
-            if (cooldown > recharge - 1f) return false;     // still cooling down
+            if(cooldown > recharge - 1f) return false;      // still cooling down
-            return!((blendbit2 != 5)                        // not a loading dock
+            return !((state != stateLoad)                   // not a loading dock
             ||  (items.total() > 0 && !items.has(item))     // incompatible items
             ||  (items.total() >= getMaximumAccepted(item)) // filled to capacity
             ||  (tile.front() == source));

core/src/mindustry/world/modules/ItemModule.java

@@ -97,6 +97,10 @@ public class ItemModule extends BlockModule{
         return true;
     }
 
+    public boolean empty(){
+        return total == 0;
+    }
+
     public int total(){
         return total;
     }