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

Messy cleanup

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-03-05 13:40:44 +01:00
parent 5036506547
commit acd695a469
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/world/blocks/distribution/CraterConveyor.java
+14 -12
View File
@@ -84,30 +84,28 @@ public class CraterConveyor extends Block implements Autotiler{
public void drawLayer(Tile tile){ public void drawLayer(Tile tile){
CraterConveyorEntity entity = tile.ent(); CraterConveyorEntity entity = tile.ent();
// no from == no crater
if(entity.from == Pos.invalid) return; if(entity.from == Pos.invalid) return;
// position
Tile from = world.tile(entity.from); Tile from = world.tile(entity.from);
Tmp.v1.set(from.getX(), from.getY()); Tmp.v1.set(from.getX(), from.getY());
Tmp.v2.set(tile.drawx(), tile.drawy()); Tmp.v2.set(tile.drawx(), tile.drawy());
Tmp.v1.interpolate(Tmp.v2, 1f - entity.reload, Interpolation.linear); Tmp.v1.interpolate(Tmp.v2, 1f - entity.reload, Interpolation.linear);
// rotating smoothly // fixme
float a = from.rotation() * 90; float a = from.rotation() * 90;
float b = tile.rotation() * 90; float b = tile.rotation() * 90;
if(from.rotation() == 3 && tile.rotation() == 0) a = -1 * 90; if(from.rotation() == 3 && tile.rotation() == 0) a = -1 * 90;
if(from.rotation() == 0 && tile.rotation() == 3) a = 4 * 90; if(from.rotation() == 0 && tile.rotation() == 3) a = 4 * 90;
// rotation
float rotation = Mathf.lerp(a, b, Interpolation.smooth.apply(1f - Mathf.clamp(entity.reload * 2, 0f, 1f))); float rotation = Mathf.lerp(a, b, Interpolation.smooth.apply(1f - Mathf.clamp(entity.reload * 2, 0f, 1f)));
// draw crater // crater
Draw.rect(regions[7], Tmp.v1.x, Tmp.v1.y, rotation); Draw.rect(regions[7], Tmp.v1.x, Tmp.v1.y, rotation);
// failsafe // item
if(entity.items.first() == null) return; float size = (itemSize / 2f) + entity.items.total() * 0.1f / (itemCapacity / 8f);
// draw resource
float size = itemSize / 2f;
size += entity.items.total() * 0.1f / (itemCapacity / 8f);
Draw.rect(entity.items.first().icon(Cicon.medium), Tmp.v1.x, Tmp.v1.y, size, size, 0); Draw.rect(entity.items.first().icon(Cicon.medium), Tmp.v1.x, Tmp.v1.y, size, size, 0);
} }
@@ -159,8 +157,8 @@ public class CraterConveyor extends Block implements Autotiler{
entity.sleep(); entity.sleep();
return; return;
} }
Effects.effect(Fx.plasticburn, tile.drawx(), tile.drawy());
entity.from = tile.pos(); entity.from = tile.pos();
Effects.effect(Fx.plasticburn, tile.drawx(), tile.drawy());
}else{ }else{
// poof out crater // poof out crater
if(entity.items.total() == 0){ if(entity.items.total() == 0){
@@ -177,6 +175,7 @@ public class CraterConveyor extends Block implements Autotiler{
while(true) if(!tryDump(tile)) break; // unload as much as possible while(true) if(!tryDump(tile)) break; // unload as much as possible
if(entity.items.total() == 0){ if(entity.items.total() == 0){
Effects.effect(Fx.plasticburn, tile.drawx(), tile.drawy()); Effects.effect(Fx.plasticburn, tile.drawx(), tile.drawy());
entity.from = Pos.invalid;
bump(tile); bump(tile);
} }
} }
@@ -231,8 +230,11 @@ public class CraterConveyor extends Block implements Autotiler{
@Override @Override
public int removeStack(Tile tile, Item item, int amount){ public int removeStack(Tile tile, Item item, int amount){
int i = super.removeStack(tile, item, amount); int i = super.removeStack(tile, item, amount);
if(tile.entity.items.total() == 0) Effects.effect(Fx.plasticburn, tile.drawx(), tile.drawy()); if(tile.entity.items.total() == 0){
if(tile.entity.items.total() == 0) bump(tile); Effects.effect(Fx.plasticburn, tile.drawx(), tile.drawy());
tile.<CraterConveyorEntity>ent().from = Pos.invalid;
bump(tile);
}
return i; return i;
} }