Ticket #2047: hunt.diff

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

@@ -1405 +1405 @@
                         // Check we can still reach the target
                         if (this.CheckTargetRange(target, IID_Attack, this.order.data.attackType))
                         {
+                            // If we are hunting, first update the target position of the gather order so we know where will be the killed animal
+                            if (this.order.data.hunting && this.orderQueue[1] && this.orderQueue[1].data.lastPos)
+                            {
+                                var cmpPosition = Engine.QueryInterface(this.order.data.target, IID_Position);
+                                if (cmpPosition && cmpPosition.IsInWorld())
+                                {
+                                    // keep in memory the initial position which usually is the herd position
+                                    if (!this.orderQueue[1].data.initPos)
+                                        this.orderQueue[1].data.initPos = this.orderQueue[1].data.lastPos;
+                                    this.orderQueue[1].data.lastPos = cmpPosition.GetPosition();
+                                    this.orderQueue[1].data.secondTry = undefined;
+                                }
+                            }
+
                             var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
                             this.lastAttacked = cmpTimer.GetTime() - msg.lateness;
 
@@ -1650 +1664 @@
                     }
 
                     // Couldn't find nearby resources, so give up
-                    this.FinishOrder();
+                    if( this.FinishOrder())
+                        return;
+
+                    // Nothing better to do : go back to dropsite
+                    var nearby = this.FindNearestDropsite(resourceType.generic);
+                    if (nearby)
+                        this.PushOrderFront("ReturnResource", { "target": nearby, "force": false });
                 },
             },
 
@@ -1805 +1825 @@
 
                     // We're already in range, can't get anywhere near it or the target is exhausted.
 
+                    // If hunting, keep in memory the position of the herd in case we do not find any more animals here
+                    var herdPos = this.order.data.initPos;
+
                     // Give up on this order and try our next queued order
                     if (this.FinishOrder())
                         return;
@@ -1826 +1849 @@
                         return;
                     }
 
+                    // If hunting, try to go to the initial herd position to see if we are more lucky
+                    if (herdPos)
+                        this.GatherNearPosition(herdPos.x, herdPos.z, resourceType, resourceTemplate);
+
                     // Nothing else to gather - if we're carrying anything then we should
                     // drop it off, and if not then we might as well head to the dropsite
                     // anyway because that's a nice enough place to congregate and idle
@@ -3832 +3859 @@
 
     // Remember the position of our target, if any, in case it disappears
     // later and we want to head to its last known position
-    // (TODO: if the target moves a lot (e.g. it's an animal), maybe we
-    // need to update this lastPos regularly rather than just here?)
     var lastPos = undefined;
     var cmpPosition = Engine.QueryInterface(target, IID_Position);
     if (cmpPosition && cmpPosition.IsInWorld())