mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-11 18:39:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup if chains

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier 2020-03-05 10:28:10 +01:00
parent 9df875354a
commit 00249f62b6
No known key found for this signature in database
GPG Key ID: 0D6CA7326C76D8EA
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,35 +305,21 @@ public class CraterConveyor extends Block implements Autotiler{
});
}
public boolean shouldLaunch(Tile tile){
private boolean shouldLaunch(Tile tile){
CraterConveyorEntity entity = tile.ent();
// unless its a loading dock, always move
if(entity.blendbit2 != 5) return true;
// its considered full (enough, at this point in time)
if(entity.items.total() >= getMaximumAccepted(tile, entity.items.first())) return true;
return false;
// prevent(s) launch only when the crater is on a loading dock that still has room for items
return entity.blendbit2 != 5 || (entity.items.total() >= getMaximumAccepted(tile, entity.items.first()));
}
@Override
public boolean acceptItem(Item item, Tile tile, Tile source){
CraterConveyorEntity entity = tile.ent();
// is a loading dock
if(entity.blendbit2 != 5) return false;
// doesn't yet have a different item
if(entity.items.total() > 0 && !entity.items.has(item)) return false;
// is not filled to capacity
if(entity.items.total() >= getMaximumAccepted(tile, item)) return false;
// is not fed from the front
if(tile.front() == source) return false;
return true;
return!((entity.blendbit2 != 5) // not a loading dock
|| (entity.items.total() > 0 && !entity.items.has(item)) // incompatible items
|| (entity.items.total() >= getMaximumAccepted(tile, item)) // filled to capacity
|| (tile.front() == source)); // fed from the front
}
}