mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-12 19:09:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Move start & end logic into entity snek bits

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier 2020-01-29 08:03:53 +01:00
parent 88282a8c0b
commit db1a2ddc64
No known key found for this signature in database
GPG Key ID: 0D6CA7326C76D8EA
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,9 @@ import static mindustry.Vars.*;
public class CraterConveyor extends Block implements Autotiler{
private TextureRegion[] regions = new TextureRegion[8];
private static final byte head = 1;
private static final byte tail = 2;
public float speed = 0f;
public CraterConveyor(String name){
@ -76,6 +79,10 @@ public class CraterConveyor extends Block implements Autotiler{
entity.blendbits = bits[0];
entity.blendsclx = bits[1];
entity.blendscly = bits[2];
entity.snekbit = 0;
if(isStart(tile)) entity.snekbit = (byte)(entity.snekbit | head);
if(isEnd(tile)) entity.snekbit = (byte)(entity.snekbit | tail);
}
@Override
@ -97,6 +104,8 @@ public class CraterConveyor extends Block implements Autotiler{
int blendbits;
int blendsclx, blendscly;
byte snekbit;
int from = Pos.invalid;
float reload;
@ -129,9 +138,9 @@ public class CraterConveyor extends Block implements Autotiler{
Draw.rect(regions[Mathf.clamp(entity.blendbits, 0, regions.length - 1)], tile.drawx(), tile.drawy(), tilesize * entity.blendsclx, tilesize * entity.blendscly, rotation * 90);
// don't draw if its just one lone tile
if(isStart(tile) && isEnd(tile)) return;
if(isStart(tile)) Draw.rect(regions[5], tile.drawx(), tile.drawy(), tile.rotation() * 90);
if(isEnd(tile)) Draw.rect(regions[6], tile.drawx(), tile.drawy(), tile.rotation() * 90);
if((entity.snekbit & (head | tail)) == (head | tail)) return;
if((entity.snekbit & head) == head) Draw.rect(regions[5], tile.drawx(), tile.drawy(), tile.rotation() * 90);
if((entity.snekbit & tail) == tail) Draw.rect(regions[6], tile.drawx(), tile.drawy(), tile.rotation() * 90);
}
@Override
@ -204,7 +213,7 @@ public class CraterConveyor extends Block implements Autotiler{
// when near the center of the target tile...
if(entity.reload < 0.25f){
if(!(destination.block() instanceof CraterConveyor) && (entity.from != tile.pos() || !isStart(tile))){ // ...and if its not a crater conveyor, start unloading (everything)
if(!(destination.block() instanceof CraterConveyor) && (entity.from != tile.pos() || !((entity.snekbit & head) == head))){ // ...and if its not a crater conveyor, start unloading (everything)
while(entity.items.total() > 0 && entity.items.first() != null && offloadDir(tile, entity.items.first())) entity.items.remove(entity.items.first(), 1);
if(entity.items.total() == 0) Effects.effect(Fx.plasticburn, tile.drawx(), tile.drawy());
}
@ -238,7 +247,7 @@ public class CraterConveyor extends Block implements Autotiler{
public boolean acceptItem(Item item, Tile tile, Tile source){
TrackEntity entity = tile.ent();
if(!isStart(tile) && !(source.block() instanceof CraterConveyor)) return false;
if(!((entity.snekbit & head) == head) && !(source.block() instanceof CraterConveyor)) return false;
if(entity.items.total() > 0 && !entity.items.has(item)) return false;
if(entity.items.total() >= getMaximumAccepted(tile, item)) return false;
if(tile.front() == source) return false;
@ -262,7 +271,7 @@ public class CraterConveyor extends Block implements Autotiler{
TrackEntity entity = tile.ent();
// its not a start tile so it should be moving
if(!isStart(tile)) return true;
if(!((entity.snekbit & head) == head)) return true;
// its considered full
if(entity.items.total() >= getMaximumAccepted(tile, entity.items.first())) return true;