Unified command

core/src/mindustry/entities/comp/BuilderComp.java

@@ -208,7 +208,7 @@ abstract class BuilderComp implements Unitc{
         BuildPlan plan = buildPlan();
         Tile tile = world.tile(plan.x, plan.y);
 
-        if(!within(tile, buildingRange) && !state.isEditor()){
+        if((!within(tile, buildingRange) && !state.isEditor()) || tile == null){
             return;
         }
 

core/src/mindustry/entities/comp/BuildingComp.java

@@ -215,9 +215,12 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return true;
     }
 
-    public void applyBoost(float intensity, float  duration){
+    public void applyBoost(float intensity, float duration){
+        //do not refresh time scale when getting a weaker intensity
+        if(intensity >= this.timeScale){
+            timeScaleDuration = Math.max(timeScaleDuration, duration);
+        }
         timeScale = Math.max(timeScale, intensity);
-        timeScaleDuration = Math.max(timeScaleDuration, duration);
     }
 
     public Building nearby(int dx, int dy){

core/src/mindustry/entities/comp/CommanderComp.java

@@ -9,22 +9,25 @@ import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
+import mindustry.game.*;
 import mindustry.gen.*;
+import mindustry.type.*;
 
 /** A unit that can command other units. */
 @Component
-abstract class CommanderComp implements Unitc{
+abstract class CommanderComp implements Entityc, Posc{
     private static final Seq<FormationMember> members = new Seq<>();
     private static final Seq<Unit> units = new Seq<>();
 
-    @Import float x, y, rotation;
+    @Import float x, y, rotation, hitSize;
+    @Import Team team;
+    @Import UnitType type;
 
     transient @Nullable Formation formation;
-    transient Seq<Unit> controlling = new Seq<>();
+    transient Seq<Unit> controlling = new Seq<>(10);
     /** minimum speed of any unit in the formation. */
     transient float minFormationSpeed;
 
-    @Override
     public void update(){
         if(formation != null){
             formation.anchor.set(x, y, /*rotation*/ 0); //TODO rotation set to 0 because rotating is pointless
@@ -32,18 +35,15 @@ abstract class CommanderComp implements Unitc{
         }
     }
 
-    @Override
     public void remove(){
         clearCommand();
     }
 
-    @Override
     public void killed(){
         clearCommand();
     }
 
     //make sure to reset command state when the controller is switched
-    @Override
     public void controller(UnitController next){
         clearCommand();
     }
@@ -58,14 +58,15 @@ abstract class CommanderComp implements Unitc{
 
         units.clear();
 
-        Units.nearby(team(), x, y, 200f, u -> {
-            if(u.isAI() && include.get(u) && u != self()){
+        Units.nearby(team, x, y, 150f, u -> {
+            if(u.isAI() && include.get(u) && u != self() && u.type().flying == type.flying && u.hitSize <= hitSize * 1.1f){
                 units.add(u);
             }
         });
 
-        units.sort(u -> u.dst2(this));
-        units.truncate(type().commandLimit);
+        //sort by hitbox size, then by distance
+        units.sort(Structs.comps(Structs.comparingFloat(u -> -u.hitSize), Structs.comparingFloat(u -> u.dst2(this))));
+        units.truncate(type.commandLimit);
 
         command(formation, units);
     }
@@ -73,8 +74,8 @@ abstract class CommanderComp implements Unitc{
     void command(Formation formation, Seq<Unit> units){
         clearCommand();
 
-        float spacing = hitSize() * 0.65f;
-        minFormationSpeed = type().speed;
+        float spacing = hitSize * 0.65f;
+        minFormationSpeed = type.speed;
 
         controlling.addAll(units);
         for(Unit unit : units){

core/src/mindustry/entities/comp/UnitComp.java

@@ -28,7 +28,7 @@ import mindustry.world.blocks.payloads.*;
 import static mindustry.Vars.*;
 
 @Component(base = true)
-abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Displayable, Senseable, Ranged{
+abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Commanderc, Displayable, Senseable, Ranged{
 
     @Import boolean hovering, dead;
     @Import float x, y, rotation, elevation, maxHealth, drag, armor, hitSize, health, ammo;