Ticket #1387: Gatherers3.patch

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

@@ -190 +190 @@
     if (!this.GetTargetGatherRate(target))
         return { "exhausted": true };
 
+    var cmpResourceSupply = Engine.QueryInterface(target, IID_ResourceSupply);
+    if (!cmpResourceSupply.AddGatherer(this.entity))
+        return { "exhausted": true };
+
     var gatherAmount = 1;
-
-    var cmpResourceSupply = Engine.QueryInterface(target, IID_ResourceSupply);
+    
     var type = cmpResourceSupply.GetType();
 
     // Initialise the carried count if necessary

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

@@ -29 +29 @@
             "<value>treasure.metal</value>" +
             "<value>treasure.food</value>" +
         "</choice>" +
+    "</element>" +
+    "<element name='MaxGatherers' a:help='Amount of gatherers who can gather resources from this entity at the same time'>" +
+        "<data type='nonNegativeInteger'/>" +
     "</element>";
 
 ResourceSupply.prototype.Init = function()
 {
     // Current resource amount (non-negative)
     this.amount = this.GetMaxAmount();
+    this.gatherersAmount = 0;
+    this.gatherers = {};
 };
 
 ResourceSupply.prototype.GetKillBeforeGather = function()
@@ -52 +57 @@
     return this.amount;
 };
 
+ResourceSupply.prototype.GetMaxGatherers = function()
+{
+    return +this.template.MaxGatherers;
+};
+
 ResourceSupply.prototype.TakeResources = function(rate)
 {
     // 'rate' should be a non-negative integer
@@ -77 +87 @@
     return { "generic": type, "specific": subtype };
 };
 
+ResourceSupply.prototype.RefreshGatherers = function()
+{
+    for (var gatherer in this.gatherers)
+    {
+        var cmpUnitAI = Engine.QueryInterface(+gatherer, IID_UnitAI);
+        var orders = cmpUnitAI.GetOrders();
+        if (orders.length == 0 || orders[0].type != 'Gather' || orders[0].data.target != this.entity)
+        {
+            delete this.gatherers[gatherer];
+            this.gatherersAmount--;
+        }
+    }
+};
+
+ResourceSupply.prototype.IsAvailable = function(gatherer)
+{
+    // Check if supply is available for gatherer
+    
+    if (gatherer in this.gatherers || this.gatherersAmount < this.GetMaxGatherers()) return true;
+    this.RefreshGatherers();
+    if (this.gatherersAmount < this.GetMaxGatherers()) return true;
+    return false;
+};
+
+ResourceSupply.prototype.AddGatherer = function(gatherer)
+{
+    if (!this.IsAvailable(gatherer)) return false;
+    
+    if (!(gatherer in this.gatherers)) this.gatherersAmount++;
+    this.gatherers[gatherer] = true;
+    return true;
+};
+
 Engine.RegisterComponentType(IID_ResourceSupply, "ResourceSupply", ResourceSupply);

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

@@ -2997 +2997 @@
         if (template.indexOf("resource|") != -1)
             template = template.slice(9);
 
-        if (amount > 0 && filter(ent, type, template))
+        if (amount > 0 && filter(ent, type, template) && cmpResourceSupply.IsAvailable(this.entity)) {
             return ent;
+        }
     }
 
     return undefined;

binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml

@@ -53 +53 @@
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>2000</Amount>
     <Type>food.grain</Type>
+    <MaxGatherers>5</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>