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

Inflate crater properties

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-01-03 11:40:45 +01:00
parent aa64dcfe27
commit 8c7d8abddd
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,9 +92,9 @@ public class CraterConveyor extends BaseConveyor{
destination.block().update(destination); destination.block().update(destination);
if(entity.crater.dst(tile) < 1.25f){ if(entity.crater.dst(tile) < 1.25f){
entity.crater.f = tile.rotation() * 90 - 90; entity.crater.face = tile.rotation() * 90 - 90;
if(!(destination.block() instanceof CraterConveyor)){ if(!(destination.block() instanceof CraterConveyor)){
while(entity.items.total() > 0 && entity.crater.i != null && offloadDir(tile, entity.crater.i)) entity.items.remove(entity.crater.i, 1); while(entity.items.total() > 0 && entity.crater.item != null && offloadDir(tile, entity.crater.item)) entity.items.remove(entity.crater.item, 1);
} }
} }
@@ -119,7 +119,7 @@ public class CraterConveyor extends BaseConveyor{
if(entity.crater != null){ if(entity.crater != null){
entity.crater.x = Mathf.lerpDelta(entity.crater.x, tile.drawx(), 0.075f); entity.crater.x = Mathf.lerpDelta(entity.crater.x, tile.drawx(), 0.075f);
entity.crater.y = Mathf.lerpDelta(entity.crater.y, tile.drawy(), 0.075f); entity.crater.y = Mathf.lerpDelta(entity.crater.y, tile.drawy(), 0.075f);
entity.crater.r = Mathf.slerpDelta(entity.crater.r, entity.crater.f, 0.1f); entity.crater.rotation = Mathf.slerpDelta(entity.crater.rotation, entity.crater.face, 0.1f);
} }
} }
@@ -129,29 +129,29 @@ public class CraterConveyor extends BaseConveyor{
} }
protected class Crater implements Position{ protected class Crater implements Position{
float r; float rotation;
float f; float face;
float x; float x;
float y; float y;
Item i; Item item;
Crater(Tile tile){ Crater(Tile tile){
x = tile.drawx(); x = tile.drawx();
y = tile.drawy(); y = tile.drawy();
r = tile.rotation() * 90 - 90; rotation = tile.rotation() * 90 - 90;
f = r; face = rotation;
} }
public void draw(Tile tile){ public void draw(Tile tile){
Draw.rect(crater, x, y, r); Draw.rect(crater, x, y, rotation);
if(i == null){ if(item == null){
i = tile.entity.items.take(); item = tile.entity.items.take();
tile.entity.items.add(i, 1); tile.entity.items.add(item, 1);
} }
float size = itemSize / 1.5f; float size = itemSize / 1.5f;
Draw.rect(i.icon(Cicon.medium), x, y, size, size, 0); Draw.rect(item.icon(Cicon.medium), x, y, size, size, 0);
Fonts.outline.draw(tile.entity.items.total() + "", x, y - 1, Fonts.outline.draw(tile.entity.items.total() + "", x, y - 1,
Pal.accent, 0.25f * 0.5f / Scl.scl(1f), false, Align.center); Pal.accent, 0.25f * 0.5f / Scl.scl(1f), false, Align.center);
@@ -191,7 +191,7 @@ public class CraterConveyor extends BaseConveyor{
if(!Track.start.check.get(tile)) return true; if(!Track.start.check.get(tile)) return true;
// its considered full // its considered full
if(entity.items.total() >= getMaximumAccepted(tile, entity.crater.i)) return true; if(entity.items.total() >= getMaximumAccepted(tile, entity.crater.item)) return true;
// if it has no way of getting additional items // if it has no way of getting additional items
Tile[] inputs = new Tile[]{tile.back(), tile.left(), tile.right()}; Tile[] inputs = new Tile[]{tile.back(), tile.left(), tile.right()};