Ticket #619: gate-multiselect.patch

binaries/data/mods/public/gui/session/unit_commands.js

@@ -209 +209 @@
             break;
 
         case GATE:
-            if(numberOfItems > 2)
-                numberOfItems = 2;
+            if(numberOfItems > 8)
+                numberOfItems = 8;
             break;
 
         default:
@@ -513 +513 @@
             // If already a gate, show locking actions
             if (unitEntState.gate)
             {
-                gateIcon = "lock_" + GATE_ACTIONS[i].toLowerCase() + "ed.png";
+                gateIcon = "icons/lock_" + GATE_ACTIONS[i].toLowerCase() + "ed.png";
                 selection.hidden = unitEntState.gate.locked != item.locked;
             }
             // otherwise show gate upgrade icon
             else
             {
-                gateIcon = "gate_closed.png";
+                template = GetTemplateData(item.template);
+                gateIcon = template.icon ?  "portraits/" + template.icon : "icons/gate_closed.png";
                 selection.hidden = true;
             }
 
-            icon.sprite = "stretched:session/icons/" + gateIcon;
+            icon.sprite = "stretched:session/" + gateIcon;
         }
         else if (template.icon)
         {
@@ -806 +807 @@
         removeDupes(buildableEnts);
         removeDupes(trainableEnts);
 
+        // Whether the GUI's right panel has been filled.
+        var rightUsed = true;
+
         // The first selected entity's type has priority.
         if (entState.buildEntities)
             setupUnitPanel(CONSTRUCTION, usedPanels, entState, buildableEnts, startBuildingPlacement);
@@ -814 +818 @@
                 function (trainEntType) { addTrainingToQueue(selection, trainEntType); } );
         else if (entState.trader)
             setupUnitTradingPanel(usedPanels, entState, selection);
+        else if (entState.gate)
+        {
+            var items = [];
+            for (var i = 0; i < GATE_ACTIONS.length; ++i)
+                items.push({
+                    "tooltip": GATE_ACTIONS[i] + " gate",
+                    "locked": i == 0
+                });
+            setupUnitPanel(GATE, usedPanels, entState, items,
+                function (item) { lockGate(item.locked); } );
+        }
+        else if (!entState.foundation && (hasClass(entState, "LongWall")))
+        {
+            // Allow long wall pieces to be converted to gates
+            var longWallTypes = {};
+            var items = [];
+            for (var i in selection)
+            {
+                if ((state = GetEntityState(selection[i])) && hasClass(state, "LongWall") &&
+                    !state.gate && !state.foundation && !longWallTypes[state.template])
+                {
+                    var gateTemplate = getWallGateTemplate(state.id);
+                    if (gateTemplate)
+                    {
+                        var wallName = GetTemplateData(state.template).name.generic;
+                        var gateName = GetTemplateData(gateTemplate).name.generic;
+
+                        items.push({
+                            "tooltip": "Convert " + wallName + " to " + gateName,
+                            "template": gateTemplate
+                        });
+                    }
+
+                    // We only need one entity per type.
+                    longWallTypes[state.template] = true;
+                }
+            }
+
+            if (items.length)
+                setupUnitPanel(GATE, usedPanels, entState, items,
+                    function (item) { transformWallToGate(item.template); } );
+            else
+                rightUsed = false;
+        }
         else
+            rightUsed = false;
+
+        if (!rightUsed)
         {
             // The right pane is empty. Fill the pane with a sane type.
             // Prefer buildables for units and trainables for structures.
@@ -838 +889 @@
             setupUnitPanel(QUEUE, usedPanels, entState, entState.production.queue,
                 function (item) { removeFromProductionQueue(entState.id, item.id); } );
         
-        if(!entState.foundation && (entState.gate || hasClass(entState, "LongWall")))
-        {
-            if (entState.gate)
-            {
-                var items = [];
-                for (var i = 0; i < GATE_ACTIONS.length; ++i)
-                    items.push({
-                        "tooltip": GATE_ACTIONS[i] + " gate",
-                        "locked": i == 0
-                    });
-                setupUnitPanel(GATE, usedPanels, entState, items,
-                    function (item) { lockGate(item.locked); } );
-            }
-            else
-            {
-                // Allow long wall pieces to be converted to gates
-                // TODO: find the gate template name in a better way
-                // TODO: selections of multiple different types of walls (breaks currently)
-                var longPos = entState.template.indexOf("long");
-                if (longPos != -1)
-                {
-                    var action = {
-                        "tooltip": "Convert to gate",
-                        "template": entState.template.substr(0, longPos) + "gate"
-                    };
-                    setupUnitPanel(GATE, usedPanels, entState, [action],
-                        function (item) { transformWallToGate(action.template); } );
-                }
-            }
-        }
-        
         supplementalDetailsPanel.hidden = false;
         commandsPanel.hidden = false;
     }

binaries/data/mods/public/gui/session/input.js

@@ -1643 +1643 @@
     var selection = g_Selection.toList();
     Engine.PostNetworkCommand({
         "type": "wall-to-gate",
-        "entities": selection,
+        "entities": selection.filter( function(e) { return getWallGateTemplate(e) == template } ),
         "template": template,
     });
 }
 
+// Gets the gate form (if any) of a given entity.
+function getWallGateTemplate(entity)
+{
+    // TODO: find the gate template name in a better way
+    var entState = GetEntityState(entity);
+    var index;
+
+    if (entState && !entState.foundation && hasClass(entState, "LongWall") && (index = entState.template.indexOf("long")) >= 0)
+        return entState.template.substr(0, index) + "gate";
+    return undefined;
+}
+
 // Set the camera to follow the given unit
 function setCameraFollow(entity)
 {