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

Refractor for readability

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-01-03 16:42:28 +01:00
parent edbe50d8c4
commit 68dca82ab8
1 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
package mindustry.world.blocks.distribution; package mindustry.world.blocks.distribution;
import arc.*; import arc.*;
import arc.func.*;
import arc.math.*; import arc.math.*;
import arc.util.*; import arc.util.*;
import mindustry.ui.*; import mindustry.ui.*;
@@ -92,56 +91,65 @@ public class CraterConveyor extends BaseConveyor{
if(entity.lastFrameUpdated == Core.graphics.getFrameId()) return; if(entity.lastFrameUpdated == Core.graphics.getFrameId()) return;
entity.lastFrameUpdated = Core.graphics.getFrameId(); entity.lastFrameUpdated = Core.graphics.getFrameId();
// ensure a crater exists below this block
if(entity.crater == null){ if(entity.crater == null){
if(entity.items.total() > 0 && Core.graphics.getFrameId() > entity.lastFrameSpawned){ // poof in crater
entity.crater = new Crater(tile); if(entity.items.total() <= 0 || !(Core.graphics.getFrameId() > entity.lastFrameSpawned)) return;
Effects.effect(Fx.plasticburn, tile.drawx(), tile.drawy()); entity.crater = new Crater(tile);
} Effects.effect(Fx.plasticburn, tile.drawx(), tile.drawy());
}else{ }else{
// poof out crater
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.crater = null; entity.crater = null;
}else{ return;
}
}
if(shouldLaunch(tile)){ // handle crater movement
Tile destination = tile.front(); entity.crater.x = Mathf.lerpDelta(entity.crater.x, tile.drawx(), speed);
destination.block().update(destination); entity.crater.y = Mathf.lerpDelta(entity.crater.y, tile.drawy(), speed);
entity.crater.rotation = Mathf.slerpDelta(entity.crater.rotation, entity.crater.face, speed * 2);
if(entity.crater.dst(tile) < 1.25f){ if(shouldLaunch(tile)){
entity.crater.face = tile.rotation() * 90 - 90; Tile destination = tile.front();
if(!(destination.block() instanceof CraterConveyor)){
while(entity.items.total() > 0 && entity.crater.item != null && offloadDir(tile, entity.crater.item)) entity.items.remove(entity.crater.item, 1);
} // update the target first to potentially make room
} destination.block().update(destination);
if(entity.crater.dst(tile) < 0.1f){ // when near the center of the target tile...
if(destination.block() instanceof CraterConveyor){ if(entity.crater.dst(tile) < 1.25f){
CraterConveyorEntity e = destination.ent(); entity.crater.face = tile.rotation() * 90 - 90; // ...set the new direction it should face
if(!(destination.block() instanceof CraterConveyor)){ // ...and if its not a crater conveyor, start unloading (everything)
while(entity.items.total() > 0 && entity.crater.item != null && offloadDir(tile, entity.crater.item)) entity.items.remove(entity.crater.item, 1);
}
}
if(e.crater == null){ // when basically exactly on the center:
e.crater = entity.crater; if(entity.crater.dst(tile) < 0.1f){
entity.crater = null; if(destination.block() instanceof CraterConveyor){
CraterConveyorEntity e = destination.ent();
entity.lastFrameSpawned = Core.graphics.getFrameId() + 10; // check if next crater conveyor is not occupied
if(e.crater == null){
// transfer ownership of crater
e.crater = entity.crater;
entity.crater = null;
e.items.addAll(entity.items); // prevent this tile from spawning a new crater to avoid collisions
entity.items.clear(); entity.lastFrameSpawned = Core.graphics.getFrameId() + 10;
}
} // transfer inventory of conveyor
e.items.addAll(entity.items);
entity.items.clear();
} }
} }
} }
} }
if(entity.crater != null){
entity.crater.x = Mathf.lerpDelta(entity.crater.x, tile.drawx(), speed);
entity.crater.y = Mathf.lerpDelta(entity.crater.y, tile.drawy(), speed);
entity.crater.rotation = Mathf.slerpDelta(entity.crater.rotation, entity.crater.face, speed * 2);
}
} }
public class CraterConveyorEntity extends BaseConveyorEntity{ class CraterConveyorEntity extends BaseConveyorEntity{
float lastFrameUpdated = -1; float lastFrameUpdated = -1;
float lastFrameSpawned = -1; float lastFrameSpawned = -1;
float lastFrameChanged = -1; float lastFrameChanged = -1;
@@ -210,7 +218,7 @@ public class CraterConveyor extends BaseConveyor{
// its considered full // its considered full
if(entity.items.total() >= getMaximumAccepted(tile, entity.crater.item)) return true; if(entity.items.total() >= getMaximumAccepted(tile, entity.crater.item)) return true;
// inactivity tracker // has been inactive
if(Core.graphics.getFrameId() > entity.lastFrameChanged + 120) return true; if(Core.graphics.getFrameId() > entity.lastFrameChanged + 120) return true;
return false; return false;
@@ -221,10 +229,7 @@ public class CraterConveyor extends BaseConveyor{
return otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock) && otherblock.compressable; return otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock) && otherblock.compressable;
} }
/** // has no crater conveyors facing into it
* Check if there is no crater conveyor blending with this block
* (should probably use blendbits, if only i understood those)
*/
private boolean isStart(Tile tile){ private boolean isStart(Tile tile){
Tile[] inputs = new Tile[]{tile.back(), tile.left(), tile.right()}; Tile[] inputs = new Tile[]{tile.back(), tile.left(), tile.right()};
for(Tile input : inputs){ for(Tile input : inputs){
@@ -234,13 +239,13 @@ public class CraterConveyor extends BaseConveyor{
return true; return true;
} }
/** // has no crater conveyor in front of it
* Check if this tile is considered the end of the line
*/
private boolean isEnd(Tile tile){ private boolean isEnd(Tile tile){
if(tile.front() == null) return true; if(tile.front() == null) return true;
if(tile.getTeam() != tile.front().getTeam()) return true; if(tile.getTeam() != tile.front().getTeam()) return true;
return !tile.front().block().compressable; if(!tile.front().block().compressable) return true;
return false;
} }
} }