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

Refractor inputs to upstream

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-02-07 08:41:34 +01:00
parent 4147d8a512
commit 3d8e83850e
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package mindustry.world.blocks.distribution; package mindustry.world.blocks.distribution;
import arc.*; import arc.*;
import arc.func.*;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.math.*; import arc.math.*;
@@ -25,8 +26,6 @@ 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];
private Array<Tile> tmptiles = new Array<>();
public float speed = 0f; public float speed = 0f;
public CraterConveyor(String name){ public CraterConveyor(String name){
@@ -279,29 +278,34 @@ public class CraterConveyor extends Block implements Autotiler{
// ▲ | ▼ fixme: refactor // ▲ | ▼ fixme: refactor
private Array<Tile> inputs(Tile tile){ private void upstream(Tile tile, Cons<Tile> cons){
tmptiles.clear(); CraterConveyorEntity entity = tile.ent();
for(Tile input : new Tile[]{tile.back(), tile.left(), tile.right()}){
if(input != null && input.getTeam() == tile.getTeam() && input.block() instanceof CraterConveyor && input.front() == tile) tmptiles.add(input); if(entity.blendbit1 == 0 || entity.blendbit1 == 2 || entity.blendbit1 == 3) cons.get(tile.back());
}
return tmptiles; // fixme: add x/y checks for bits 1 & 2
if(entity.blendbit1 == 4) cons.get(tile.left());
if(entity.blendbit1 == 4) cons.get(tile.right());
} }
// awaken inputting conveyors // awaken inputting conveyors
private void bump(Tile tile){ private void bump(Tile tile){
for(Tile input : inputs(tile)){ upstream(tile, t -> {
if(input.entity.isSleeping() && input.entity.items.total() > 0){ Effects.effect(Fx.smeltsmoke, t.drawx(), t.drawy());
input.entity.noSleep();
bump(input); if(t.entity.isSleeping() && t.entity.items.total() > 0){
t.entity.noSleep();
bump(t);
} }
} });
} }
public boolean shouldLaunch(Tile tile){ public boolean shouldLaunch(Tile tile){
CraterConveyorEntity entity = tile.ent(); CraterConveyorEntity entity = tile.ent();
// unless its a loading dock, always move // unless its a loading dock, always move
if(entity.blendbit1 != 5) return true; if(entity.blendbit2 != 5) return true;
// its considered full (enough, at this point in time) // its considered full (enough, at this point in time)
if(entity.items.total() >= getMaximumAccepted(tile, entity.items.first())) return true; if(entity.items.total() >= getMaximumAccepted(tile, entity.items.first())) return true;
@@ -314,7 +318,7 @@ public class CraterConveyor extends Block implements Autotiler{
CraterConveyorEntity entity = tile.ent(); CraterConveyorEntity entity = tile.ent();
// is a loading dock // is a loading dock
if(entity.blendbit1 != 5) return false; if(entity.blendbit2 != 5) return false;
// doesn't yet have a different item // doesn't yet have a different item
if(entity.items.total() > 0 && !entity.items.has(item)) return false; if(entity.items.total() > 0 && !entity.items.has(item)) return false;