Ticket #4253: patrol_prepare_v1.patch

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

@@ -207 +207 @@
                 cursor = "action-attack-move";
             }
             else if (Engine.HotkeyIsPressed("session.patrol"))
             {
                 data.command = "patrol";
-                data.targetClasses = { "attack": ["Unit"] };
+                data.targetClasses = { "attack": g_PatrolTargets };
                 cursor = "action-patrol";
             }
             return { "possible": true, "data": data, "cursor": cursor };
         }
 

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

@@ -1 +1 @@
 /**
+ * Which enemy entity types will be attacked on sight when patroling.
+ */
+var g_PatrolTargets = ["Unit", "Structure"];
+
+/**
  * List of different actions units can execute,
  * this is mostly used to determine which actions can be executed
  *
  * "execute" is meant to send the command to the engine
  *
@@ -216 +221 @@
                 "type": "patrol",
                 "entities": selection,
                 "x": target.x,
                 "z": target.z,
                 "target": action.target,
-                "targetClasses": { "attack": ["Unit"] }, // patrol should only attack units
+                "targetClasses": { "attack": g_PatrolTargets },
                 "queued": queued,
                 "allowCapture": false
             });
             Engine.GuiInterfaceCall("PlaySound", { "name": "order_patrol", "entity": selection[0] });
             return true;

binaries/data/mods/public/simulation/components/UnitAI.js

@@ -1113 +1113 @@
                     return;
                 }
                 if (!this.patrolStartPosOrder)
                 {
                     this.patrolStartPosOrder = cmpPosition.GetPosition();
-                    this.patrolStartPosOrder.targetClasses = { "attack": ["Unit"] };
+                    this.patrolStartPosOrder.targetClasses = this.order.data.targetClasses;
                 }
 
                 this.StartTimer(0, 1000);
             },
 
@@ -1643 +1643 @@
                     return;
                 }
                 if (!this.patrolStartPosOrder)
                 {
                     this.patrolStartPosOrder = cmpPosition.GetPosition();
-                    this.patrolStartPosOrder.targetClasses = { "attack": ["Unit"] };
+                    this.patrolStartPosOrder.targetClasses = this.order.data.targetClasses;
                 }
 
                 this.StartTimer(0, 1000);
                 this.SelectAnimation("move");
             },