Ticket #1720: UnitAI.js.patch

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

@@ -3215 +3215 @@
     this.lastHealed = undefined;
 
     this.SetStance(this.template.DefaultStance);
+
+    this.isOnPatrol = false;
 };
 
 UnitAI.prototype.IsTurret = function()
@@ -3562 +3564 @@
         var template = cmpTemplateManager.GetCurrentTemplateName(this.entity);
         error("FinishOrder called for entity " + this.entity + " (" + template + ") when order queue is empty\n" + stack);
     }
+    
+    //warn(this.GetCurrentState())
+    // break automatic patrol order if the order queue is reset by a new single order
+    if (this.orderQueue.length < 2) {
+        this.isOnPatrol = false;
+    }
 
+    if (this.isOnPatrol) {
+        // repeat walk to current position after doing other orders
+        this.orderQueue.push(this.order);
+    }
+    else {
+        this.isOnPatrol = this.CheckPatrolWalk();
+    }
+
+    // debug print
+    /*
+    let s =""
+    for each (let o in this.orderQueue)
+        s += (""+o.data.x).substring(0,3) + "/" + (""+o.data.z).substring(0,3) + " -> ";
+    warn(s)
+    */
+
+    // next order
     this.orderQueue.shift();
     this.order = this.orderQueue[0];
 
@@ -3607 +3632 @@
     }
 };
 
+// activate a automatically patrol if the first and last order have the same coordinates.
+UnitAI.prototype.CheckPatrolWalk = function()
+{
+    if (this.orderQueue.length < 2)
+    {
+        // a patrol is not possible if less then 2 walk commands are given
+        return false;
+    }
+
+    let finishedOrder = this.order;
+    let lastOrder = this.orderQueue.slice(-1)[0];
+    let epsilon = 2; // TODO remove to a better place?
+
+    if ((finishedOrder.type != "WalkAndFight" && lastOrder.type != "WalkAndFight") &&
+        (finishedOrder.type != "Walk" && lastOrder.type != "Walk"))
+    {
+        // a none-walking order cannot be a patrol by nature
+        warn(finishedOrder.type + " / " + lastOrder.type)
+        return false;
+    }
+
+    // do not this check because it is not possible when pressing the shift-key
+    /*for each(let o in this.orderQueue)
+    {
+        if (o.type != "Walk") {
+            warn("not all are walks")
+            return false;
+        }
+    }*/
+
+    if (finishedOrder.data.x === undefined /*|| finishedOrder.data.y === undefined*/ || finishedOrder.data.z === undefined) 
+    {
+        warn("missing data finishedOrder")
+        return false;
+    }
+
+    if (lastOrder.data.x === undefined /*|| finishedOrder.data.y === undefined*/ || lastOrder.data.z === undefined) 
+    {
+        warn("missing data lastOrder")
+        return false;
+    }
+
+    warn(finishedOrder.data.x + " / " + finishedOrder.data.z)
+    warn(lastOrder.data.x + " / " + lastOrder.data.z)
+    
+    // compare coordinates of current and last order
+    // TODO x and y are always positive? 
+    if (Math.abs(finishedOrder.data.x - lastOrder.data.x) < epsilon && Math.abs(finishedOrder.data.z - lastOrder.data.z) < epsilon)
+    {
+        warn("PATROL");
+        return true;
+    }
+
+    // check neighbours
+    /*for (let i = 0; i < this.orderQueue - 1; i++)
+    {
+        let a = this.orderQueue[i];
+        let b = this.orderQueue[i+1];
+
+        if (Math.abs(a.data.x - b.data.x) < epsilon && Math.abs(a.data.z - b.data.z) < epsilon)
+        {
+            warn("HERE 2")
+            return true;
+        }
+    }*/
+
+    return false;
+}
+
 /**
  * Add an order onto the back of the queue,
  * and execute it if we didn't already have an order.