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

Remove crater inactivity

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-01-03 18:43:06 +01:00
parent a629aeef75
commit 57cd03c0c2
1 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,8 +92,7 @@ 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();
if(entity.cooldown > 0) entity.cooldown--; if(entity.cooldown > 0) entity.cooldown--;
if(entity.inactivity > 0) entity.inactivity--;
// ensure a crater exists below this block // ensure a crater exists below this block
if(entity.crater == null){ if(entity.crater == null){
@@ -157,7 +156,6 @@ public class CraterConveyor extends BaseConveyor{
Crater crater; Crater crater;
int cooldown; int cooldown;
int inactivity;
@Override @Override
public void write(DataOutput stream) throws IOException{ public void write(DataOutput stream) throws IOException{
@@ -167,7 +165,6 @@ public class CraterConveyor extends BaseConveyor{
if(crater != null) crater.write(stream); if(crater != null) crater.write(stream);
stream.writeInt(cooldown); stream.writeInt(cooldown);
stream.writeInt(inactivity);
} }
@Override @Override
@@ -177,7 +174,6 @@ public class CraterConveyor extends BaseConveyor{
if(stream.readBoolean()) crater = new Crater(stream); if(stream.readBoolean()) crater = new Crater(stream);
cooldown = stream.readInt(); cooldown = stream.readInt();
inactivity = stream.readInt();
} }
} }
@@ -231,18 +227,6 @@ public class CraterConveyor extends BaseConveyor{
return true; return true;
} }
@Override
public void handleItem(Item item, Tile tile, Tile source){
super.handleItem(item, tile, source);
((CraterConveyorEntity)tile.entity).inactivity = 120;
}
@Override
public void handleStack(Item item, int amount, Tile tile, Unit source){
super.handleStack(item, amount, tile, source);
((CraterConveyorEntity)tile.entity).inactivity = 60;
}
@Override @Override
public int getMaximumAccepted(Tile tile, Item item){ public int getMaximumAccepted(Tile tile, Item item){
return Mathf.round(super.getMaximumAccepted(tile, item) * tile.entity.timeScale); return Mathf.round(super.getMaximumAccepted(tile, item) * tile.entity.timeScale);
@@ -257,9 +241,6 @@ 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;
// has been inactive
if(entity.inactivity == 0) return true;
return false; return false;
} }