Restore typed combat command surface

ober

2d0201b5e042ade874a3b334fd4fcda625f70fc8

diff --git a/templates/original-tactics-parts/MainActivity.kt.ss b/templates/original-tactics-parts/MainActivity.kt.ss
index 1c11422..7b9fcad 100644
--- a/templates/original-tactics-parts/MainActivity.kt.ss
+++ b/templates/original-tactics-parts/MainActivity.kt.ss
@@ -406,6 +406,8 @@
         (extern (maMapSetDashboard (view : TacticalMapView)
                                    (dashboard : (Nullable JSONObject))) : Unit
           (kotlin-member-call setTacticalDashboard))
+        (extern (maMapReset (view : TacticalMapView)) : Unit
+          (kotlin-member-call resetView))
         (extern (maBridgeSetData (view : BridgeHudView) (game : (Nullable JSONObject))
                                  (dashboard : (Nullable JSONObject))
                                  (events : JSONArray)) : Unit
@@ -1000,6 +1002,12 @@
                       (lambda () (startAndroFleetScenario "fed-tcc")))
                     (button "Andro Fleet"
                       (lambda () (startAndroFleetScenario "fed-tcc")))))
+                (maAddButtonRow this content
+                  (list-of Button
+                    (button "Kzinti/Fed"
+                      (lambda () (startPreset "kzinti-tcc" "fed-tcc")))
+                    (button "Rom/Fed"
+                      (lambda () (startPreset "romulan-tfh" "fed-tcc")))))
                 (maLayoutAddView content
                   (maLinearAsView
                     (stationPanel "ORDERS"
@@ -1028,6 +1036,7 @@
                 (maAddButtonRow this content
                   (list-of Button
                     (button "Actions" (lambda () (openActionConsolePanel)))
+                    (button "Cmd" (lambda () (openCommandPanel)))
                     (button "Verify Log" (lambda () (submitBattleLogNow "manual")))
                     (button "To Fire" (lambda () (runToFire)))
                     (button "A Disp"
@@ -1037,12 +1046,35 @@
                 (maAddButtonRow this content
                   (list-of Button
                     (button "Submit Orders" (lambda () (maSelfSubmitOrders this)))
-                    (button "Commit + Fire" (lambda () (maSelfCommitFire this)))
+                    (button "Commit" (lambda () (maSelfCommitFire this)))
                     (button "Fire" (lambda () (maSelfFire this)))
-                    (button "Advance" (lambda () (maSelfAdvance this)))
+                    (button "Impulse" (lambda () (maSelfAdvance this)))
                     (button "Run" (lambda () (maSelfRunCombat this)))))
                 (maAddButtonRow this content
                   (list-of Button
+                    (button "Reset Map" (lambda () (maMapReset tacticalMap)))
+                    (button "A All"
+                      (lambda ()
+                        (setFireGroup "alpha" alphaFireSelectionInput FIRE_GROUP_ALL)))
+                    (button "A Heavy"
+                      (lambda ()
+                        (setFireGroup "alpha" alphaFireSelectionInput FIRE_GROUP_HEAVY)))
+                    (button "A Phaser"
+                      (lambda ()
+                        (setFireGroup "alpha" alphaFireSelectionInput FIRE_GROUP_PHASER)))))
+                (maAddButtonRow this content
+                  (list-of Button
+                    (button "B All"
+                      (lambda ()
+                        (setFireGroup "beta" betaFireSelectionInput FIRE_GROUP_ALL)))
+                    (button "B Heavy"
+                      (lambda ()
+                        (setFireGroup "beta" betaFireSelectionInput FIRE_GROUP_HEAVY)))
+                    (button "B Phaser"
+                      (lambda ()
+                        (setFireGroup "beta" betaFireSelectionInput FIRE_GROUP_PHASER)))))
+                (maAddButtonRow this content
+                  (list-of Button
                     (button "Map" (lambda ()
                       (maSelfOpenPanel this "Tactical Map" (maMapAsView tacticalMap))))
                     (button "Bridge" (lambda ()