Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blend tripod dumper with conveyors

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-03-05 14:21:41 +01:00
parent fd61add2e4
commit 9c75133fc8
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -17,6 +17,7 @@ import mindustry.type.*;
import mindustry.ui.*;
import mindustry.world.*;
import mindustry.world.blocks.*;
import mindustry.world.blocks.distribution.CraterConveyor.*;
import mindustry.world.meta.*;
import java.io.*;
@@ -115,7 +116,7 @@ public class Conveyor extends Block implements Autotiler{
@Override
public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
return otherblock.outputsItems() && lookingAt(tile, rotation, otherx, othery, otherrot, otherblock);
return otherblock.outputsItems() && (lookingAt(tile, rotation, otherx, othery, otherrot, otherblock) || (otherblock instanceof CraterConveyor && world.tile(otherx, othery).<CraterConveyorEntity>ent().blendbit2 == 6));
}
@Override

2
core/src/mindustry/world/blocks/distribution/CraterConveyor.java
View File

@@ -138,6 +138,8 @@ public class CraterConveyor extends Block implements Autotiler{
entity.blendbit1 = bits[0];
entity.blendsclx = bits[1];
entity.blendscly = bits[2];
entity.proximity().each(t -> t.block() instanceof Conveyor, t -> t.block().onProximityUpdate(t));
}
@Override