Fixed armageddon / Removed idle command / Balancing

This commit is contained in:
Anuken
2018-08-06 19:04:07 -04:00
parent aaec04d04a
commit a5fd0aebe6
9 changed files with 12 additions and 34 deletions

View File

@@ -24,7 +24,6 @@ import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.type.Weapon;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.units.CommandCenter.CommandCenterEntity;
import io.anuke.mindustry.world.blocks.units.UnitPad.UnitFactoryEntity;
import io.anuke.mindustry.world.meta.BlockFlag;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Timers;
@@ -369,13 +368,6 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
@Override
public void removed(){
Tile tile = world.tile(spawner);
if(tile != null && tile.entity instanceof UnitFactoryEntity){
UnitFactoryEntity factory = (UnitFactoryEntity) tile.entity;
factory.hasSpawned = false;
}
spawner = -1;
}

View File

@@ -130,8 +130,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{
public void onCommand(UnitCommand command){
state.set(command == UnitCommand.retreat ? retreat :
(command == UnitCommand.attack ? attack :
(command == UnitCommand.idle ? idle :
(null))));
(null)));
}
@Override

View File

@@ -115,8 +115,7 @@ public abstract class GroundUnit extends BaseUnit{
public void onCommand(UnitCommand command){
state.set(command == UnitCommand.retreat ? retreat :
(command == UnitCommand.attack ? attack :
(command == UnitCommand.idle ? resupply :
(null))));
(null)));
}
@Override

View File

@@ -1,5 +1,5 @@
package io.anuke.mindustry.entities.units;
public enum UnitCommand{
attack, retreat, idle
attack, retreat
}