Ticket #1670: ticket1670.patch

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

@@ -305 +305 @@
 ResourceGatherer.prototype.CanCarryMore = function(type)
 {
     let amount = (this.carrying[type] || 0);
-    return (amount < this.GetCapacity(type));
+    return amount < this.GetCapacity(type);
 };
 
+
+ResourceGatherer.prototype.IsCarrying = function(type)
+{
+    let amount = (this.carrying[type] || 0);
+    return amount > 0;
+};
+
 /**
  * Returns whether this unit is carrying any resources of a type that is
  * not the requested type. (This is to support cases where the unit is

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

@@ -2347 +2347 @@
                     var herdPos = this.order.data.initPos;
 
                     // Give up on this order and try our next queued order
+                    // but first check what is our next order and, if needed, insert a returnResource order
+                    let cmpResourceGatherer = Engine.QueryInterface(this.entity, IID_ResourceGatherer);
+                    if (cmpResourceGatherer.IsCarrying(resourceType.generic) &&
+                        this.orderQueue.length > 1 && this.orderQueue[1] !== "ReturnResource" &&
+                        (this.orderQueue[1].type !== "Gather" || this.orderQueue[1].data.type.generic !== resourceType.generic))
+                    {
+                        let nearby = this.FindNearestDropsite(resourceType.generic);
+                        if (nearby)
+                            this.orderQueue.splice(1, 0, { "type": "ReturnResource", "data": { "target": nearby, "force": false } });
+                    }
                     if (this.FinishOrder())
                         return;