Ticket #1046: 1046.3.patch

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

@@ -560 +560 @@
                 data.target = targetState.id;
                 cursor = "action-repair";
             }
+            else if (playerCheck(entState, targetState, ["Enemy"]))
+            {
+                data.allowCapture = false;
+                data.target = targetState.id;
+                data.command = "attack";
+                
+                if (hasClass(targetState, "Unit"))
+                {
+                    cursor = "action-attack";
+                }
+                else if (hasClass(targetState, "Structure"))
+                {
+                    if (targetState.foundation)
+                    {
+                        cursor = "action-attack";
+                    }
+                    else
+                    {
+                        cursor = "action-capture";
+                        data.allowCapture = true;
+                    }
+                }
+            }
 
             // Don't allow the rally point to be set on any of the currently selected entities (used for unset)
             // except if the autorallypoint hotkey is pressed and the target can produce entities

binaries/data/mods/public/simulation/helpers/RallyPointCommands.js

@@ -70 +70 @@
                 "queued": true
             });
             break;
+        case "attack":
+        {
+            var cmpUnitAI = Engine.QueryInterface(data[i].target, IID_UnitAI);
+            if (cmpUnitAI.CheckTargetVisible(data[i].target) && cmpUnitAI.TargetIsAlive(data[i].target))
+                ret.push( {
+                    "type": "attack",
+                    "entities": spawnedEnts,
+                    "target": data[i].target,
+                    "allowCapture": data[i].allowCapture,
+                    "queued": true,
+                });
+            break;
+        }
         case "trade":
             ret.push( {
                 "type": "setup-trade-route",