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

Wrap upstream tile thingie

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-02-10 12:57:21 +01:00
parent b89078733e
commit 656c37372d
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,8 @@ import static mindustry.Vars.*;
public class CraterConveyor extends Block implements Autotiler{ public class CraterConveyor extends Block implements Autotiler{
private TextureRegion[] regions = new TextureRegion[8]; private TextureRegion[] regions = new TextureRegion[8];
protected final Array<Tile> upstreamTiles = new Array<>();
public float speed = 0f; public float speed = 0f;
public CraterConveyor(String name){ public CraterConveyor(String name){
@@ -138,14 +140,9 @@ public class CraterConveyor extends Block implements Autotiler{
CraterConveyorEntity entity = tile.ent(); CraterConveyorEntity entity = tile.ent();
int[] bits = buildBlending(tile, tile.rotation(), null, true); int[] bits = buildBlending(tile, tile.rotation(), null, true);
final boolean[] upstream = {false};
upstream(tile, t -> {
if(t.block() instanceof CraterConveyor) upstream[0] = true;
});
entity.blendbit2 = 0; entity.blendbit2 = 0;
if(bits[0] == 0 && blends(tile, tile.rotation(), 0) && !blends(tile, tile.rotation(), 2)) entity.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)) entity.blendbit2 = 5; // a 0 that faces into a crater conveyor with none behind it
if(upstream[0] && !blends(tile, tile.rotation(), 0)) entity.blendbit2 = 6; // a 0 that faces into none with a crater conveyor behind it if(!upstream(tile, upstreamTiles).isEmpty() && !blends(tile, tile.rotation(), 0)) entity.blendbit2 = 6; // a 0 that faces into none with a crater conveyor behind it
entity.blendbit1 = bits[0]; entity.blendbit1 = bits[0];
entity.blendsclx = bits[1]; entity.blendsclx = bits[1];
@@ -303,6 +300,12 @@ public class CraterConveyor extends Block implements Autotiler{
) cons.get(tile.left()); ) cons.get(tile.left());
} }
private Array<Tile> upstream(Tile tile, Array<Tile> upstreamTiles){
upstreamTiles.clear();
upstream(tile, upstreamTiles::add);
return upstreamTiles;
}
// ▲ | ▼ fixme: refactor // ▲ | ▼ fixme: refactor
// awaken inputting conveyors // awaken inputting conveyors