Commander unit component

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

@@ -0,0 +1,83 @@
+package mindustry.entities.def;
+
+import arc.struct.*;
+import arc.util.ArcAnnotate.*;
+import arc.util.*;
+import mindustry.ai.formations.*;
+import mindustry.ai.types.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.entities.units.*;
+import mindustry.gen.*;
+
+/** A unit that can command other units. */
+@Component
+abstract class CommanderComp implements Unitc{
+    private static final Array<FormationMember> members = new Array<>();
+
+    @Import float x, y, rotation;
+
+    transient @Nullable Formation formation;
+    transient Array<Unitc> controlling = new Array<>();
+
+    @Override
+    public void update(){
+        if(formation != null){
+            formation.anchor.set(x, y, rotation);
+            formation.updateSlots();
+        }
+    }
+
+    @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 unitController){
+        clearCommand();
+    }
+
+    void command(Formation formation, Array<Unitc> units){
+        clearCommand();
+
+        controlling.addAll(units);
+        for(Unitc unit : units){
+            unit.controller(new FormationAI(this, formation));
+        }
+        this.formation = formation;
+
+        members.clear();
+        for(Unitc u : units){
+            members.add((FormationAI)u.controller());
+        }
+
+        Log.info(members);
+        Log.info(members.size);
+
+
+        //TODO doesn't handle units that don't fit a formation
+        formation.addMembers(members);
+    }
+
+    boolean isCommanding(){
+        return formation != null;
+    }
+
+    void clearCommand(){
+        //reset controlled units
+        for(Unitc unit : controlling){
+            if(unit.controller().isBeingControlled(this)){
+                unit.controller(unit.type().createController());
+            }
+        }
+
+        controlling.clear();
+        formation = null;
+    }
+}

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

@@ -59,8 +59,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
     }
 
     @Override
-    public void controller(UnitController controller){
-        this.controller = controller;
+    public void controller(UnitController next){
+        this.controller = next;
         if(controller.unit() != this) controller.unit(this);
     }
 

core/src/mindustry/entities/def/VelComp.java

@@ -20,6 +20,10 @@ abstract class VelComp implements Posc{
         vel.scl(1f - drag * Time.delta());
     }
 
+    boolean moving(){
+        return !vel.isZero(0.001f);
+    }
+
     void move(float cx, float cy){
         x += cx;
         y += cy;

core/src/mindustry/entities/units/UnitController.java

@@ -15,7 +15,7 @@ public interface UnitController{
 
     }
 
-    default boolean isFollowing(Playerc player){
+    default boolean isBeingControlled(Unitc player){
         return false;
     }
 }