Ticket #2946: NonworkerDistance_PATCHv2.patch

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

@@ -324 +324 @@
             return;
         }
 
-        var ok = this.MoveToTarget(this.order.data.target);
+        var ok = this.MoveToTargetRangeExplicit(this.order.data.target, this.order.data.min, this.order.data.max);
         if (ok)
         {
             // We've started walking to the given point
@@ -4914 +4914 @@
  */
 UnitAI.prototype.WalkToTarget = function(target, queued)
 {
-    this.AddOrder("WalkToTarget", { "target": target, "force": true }, queued);
+    this.AddOrder("WalkToTarget", { "min":0, "max":0, "target": target, "force": true }, queued);
 };
 
 /**
+ * Adds walk to target order with explicit range to queue.
+ * Used when a unit which cannot build/repair is told to do so - they should walk to
+ * the structure but not get so close to interfere with other workers.
+ */
+UnitAI.prototype.WalkToTargetRangeExplicit = function(rangeMin, rangeMax, target, queued)
+{
+    this.AddOrder("WalkToTarget", { "min":rangeMin, "max":rangeMax, "target": target, "force": true }, queued);
+};
+
+/**
  * Adds walk-and-fight order to queue, this only occurs in response
  * to a player order, and so is forced.
  * If targetClasses is given, only entities matching the targetClasses can be attacked.
@@ -5012 +5022 @@
 {
     if (!this.CanGather(target))
     {
-        this.WalkToTarget(target, queued);
+        var cmpObstruction = Engine.QueryInterface(this.entity, IID_Obstruction);
+        var distance = 10 * cmpObstruction.GetUnitRadius();
+        this.WalkToTargetRangeExplicit(10, 10, target, queued);
         return;
     }
 
@@ -5071 +5083 @@
 {
     if (!this.CanHeal(target))
     {
-        this.WalkToTarget(target, queued);
+        this.WalkToTargetRangeExplicit(10, 10, target, queued);
         return;
     }
     
@@ -5085 +5097 @@
 {
     if (!this.CanReturnResource(target, true))
     {
-        this.WalkToTarget(target, queued);
+        var cmpObstruction = Engine.QueryInterface(this.entity, IID_Obstruction);
+        var distance = 10 * cmpObstruction.GetUnitRadius();
+        this.WalkToTargetRangeExplicit(distance, distance, target, queued);
         return;
     }
 
@@ -5102 +5116 @@
 {
     if (!this.CanTrade(target))
     {
-        this.WalkToTarget(target, queued);
+        this.WalkToTargetRangeExplicit(10, 10, target, queued);
         return;
     }
 
@@ -5227 +5241 @@
 {
     if (!this.CanRepair(target))
     {
-        this.WalkToTarget(target, queued);
+        var cmpObstruction = Engine.QueryInterface(this.entity, IID_Obstruction);
+        var distance = 10 * cmpObstruction.GetUnitRadius();
+        this.WalkToTargetRangeExplicit(distance, distance, target, queued);
         return;
     }