Merged Unit & Builder components / Cleanup

2020-11-17 19:40:18 -05:00
parent 8280166485
commit 527be41e32
38 changed files with 152 additions and 125 deletions
@@ -32,7 +32,7 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{
    }

    boolean mining(){
-        return mineTile != null && !(((Object)this) instanceof Builderc b && b.activelyBuilding());
+        return mineTile != null && !this.<Unit>self().activelyBuilding();
    }

    public boolean validMine(Tile tile, boolean checkDst){
@@ -44,6 +44,10 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{
        return validMine(tile, true);
    }

+    public boolean canMine(){
+        return type.mineSpeed > 0;
+    }
+
    @Override
    public void update(){
        Building core = closestCore();