Select command from reconstructor / Units save command when controlled

core/src/mindustry/world/blocks/units/Reconstructor.java

@@ -1,13 +1,18 @@
 package mindustry.world.blocks.units;
 
 import arc.*;
+import arc.Graphics.*;
+import arc.Graphics.Cursor.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
+import arc.scene.ui.*;
+import arc.scene.ui.layout.*;
 import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
 import mindustry.*;
+import mindustry.ai.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.entities.units.*;
@@ -35,6 +40,7 @@ public class Reconstructor extends UnitBlock{
         regionRotated2 = 2;
         commandable = true;
         ambientSound = Sounds.respawning;
+        configurable = true;
     }
 
     @Override
@@ -132,6 +138,7 @@ public class Reconstructor extends UnitBlock{
 
     public class ReconstructorBuild extends UnitBuild{
         public @Nullable Vec2 commandPos;
+        public @Nullable UnitCommand command;
 
         public float fraction(){
             return progress / constructTime;
@@ -157,6 +164,51 @@ public class Reconstructor extends UnitBlock{
             return hasUpgrade(unit.type) && !upgrade(unit.type).isBanned();
         }
 
+        public boolean canSetCommand(){
+            var output = unit();
+            return output != null && output.commands.length > 1;
+        }
+
+        @Override
+        public Cursor getCursor(){
+            return canSetCommand() ? super.getCursor() : SystemCursor.arrow;
+        }
+
+        @Override
+        public boolean shouldShowConfigure(Player player){
+            return canSetCommand();
+        }
+
+        @Override
+        public void buildConfiguration(Table table){
+            var unit = unit();
+
+            if(unit == null){
+                deselect();
+                return;
+            }
+
+            var group = new ButtonGroup<ImageButton>();
+            group.setMinCheckCount(0);
+            int i = 0, columns = 4;
+
+            table.background(Styles.black6);
+
+            var list = unit().commands;
+            for(var item : list){
+                ImageButton button = table.button(item.getIcon(), Styles.clearNoneTogglei, 40f, () -> {
+                    command = (command == item ? null : item);
+                    deselect();
+                }).tooltip(item.localized()).group(group).get();
+
+                button.update(() -> button.setChecked(command == item));
+
+                if(++i % columns == 0){
+                    table.row();
+                }
+            }
+        }
+
         @Override
         public boolean acceptPayload(Building source, Payload payload){
             if(!(this.payload == null
@@ -252,9 +304,17 @@ public class Reconstructor extends UnitBlock{
                         //upgrade the unit
                         if(progress >= constructTime){
                             payload.unit = upgrade(payload.unit.type).create(payload.unit.team());
-                            if(commandPos != null && payload.unit.isCommandable()){
-                                payload.unit.command().commandPosition(commandPos);
+
+                            if(payload.unit.isCommandable()){
+                                if(commandPos != null){
+                                    payload.unit.command().commandPosition(commandPos);
+                                }
+                                if(command != null){
+                                    //this already checks if it is a valid command for the unit type
+                                    payload.unit.command().command(command);
+                                }
                             }
+
                             progress %= 1f;
                             Effect.shake(2f, 3f, this);
                             Fx.producesmoke.at(this);
@@ -303,7 +363,7 @@ public class Reconstructor extends UnitBlock{
 
         @Override
         public byte version(){
-            return 2;
+            return 3;
         }
 
         @Override
@@ -312,6 +372,7 @@ public class Reconstructor extends UnitBlock{
 
             write.f(progress);
             TypeIO.writeVecNullable(write, commandPos);
+            TypeIO.writeCommand(write, command);
         }
 
         @Override
@@ -325,6 +386,10 @@ public class Reconstructor extends UnitBlock{
             if(revision >= 2){
                 commandPos = TypeIO.readVecNullable(read);
             }
+
+            if(revision >= 3){
+                command = TypeIO.readCommand(read);
+            }
         }
 
     }