Ticket #1318: infinite-farms.patch

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

@@ -10 +10 @@
         "<data type='boolean'/>" +
     "</element>" +
     "<element name='Amount' a:help='Amount of resources available from this entity'>" +
-        "<data type='nonNegativeInteger'/>" +
+        "<choice><data type='nonNegativeInteger'/><value>Infinity</value></choice>" +
     "</element>" +
     "<element name='Type' a:help='Type of resources'>" +
         "<choice>" +
@@ -32 +32 @@
     "</element>" +
     "<element name='MaxGatherers' a:help='Amount of gatherers who can gather resources from this entity at the same time'>" +
         "<data type='nonNegativeInteger'/>" +
-    "</element>";
+    "</element>" +
+    "<optional>" +
+        "<element name='DiminishingReturns' a:help='The rate at which adding more gatherers decreases overall efficiency. Lower numbers = faster dropoff. Leave the element out for no diminishing returns.'>" +
+            "<ref name='positiveDecimal'/>" +
+        "</element>" +
+    "</optional>";
 
 ResourceSupply.prototype.Init = function()
 {
     // Current resource amount (non-negative)
     this.amount = this.GetMaxAmount();
     this.gatherers = [];    // list of IDs
+    this.infinite = !isFinite(+this.template.Amount);
 };
 
+ResourceSupply.prototype.IsInfinite = function()
+{
+    return this.infinite;
+};
+
 ResourceSupply.prototype.GetKillBeforeGather = function()
 {
     return (this.template.KillBeforeGather == "true");
@@ -48 +59 @@
 
 ResourceSupply.prototype.GetMaxAmount = function()
 {
-    return +this.template.Amount;
+    return isFinite(+this.template.Amount) ? +this.template.Amount : 9;
 };
 
 ResourceSupply.prototype.GetCurrentAmount = function()
@@ -66 +77 @@
     return this.gatherers;
 };
 
+ResourceSupply.prototype.GetDiminishingReturns = function()
+{
+    if ("DiminishingReturns" in this.template)
+        return +this.template.DiminishingReturns;
+    return null;
+};
+
 ResourceSupply.prototype.TakeResources = function(rate)
 {
+    if (this.infinite)
+        return { "amount": rate, "exhausted": false };
+
     // 'rate' should be a non-negative integer
 
     var old = this.amount;

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

@@ -256 +256 @@
     {
         rate = rates[type.generic] / cmpPlayer.cheatTimeMultiplier;
     }
-    
+
+    // Apply diminishing returns with more gatherers, e.g. for infinite farms. For most resources this has no effect. (GetDiminishingReturns will return Infinity.)
+    var diminishingReturns = cmpResourceSupply.GetDiminishingReturns();
+    if (diminishingReturns)
+        rate = +(rate - Math.pow((cmpResourceSupply.GetGatherers().length || 1) - 1, 2) / diminishingReturns).toFixed(2);
+
     return (rate || 0);
 };
 

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

@@ -116 +116 @@
     var cmpResourceSupply = Engine.QueryInterface(this.entity, IID_ResourceSupply);
     if (cmpResourceSupply)
     {
-        AddBar("supply", cmpResourceSupply.GetCurrentAmount() / cmpResourceSupply.GetMaxAmount());
+        AddBar("supply", cmpResourceSupply.IsInfinite() ? 1 : cmpResourceSupply.GetCurrentAmount() / cmpResourceSupply.GetMaxAmount());
     }
 
     /*

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

@@ -258 +259 @@
     if (cmpResourceSupply)
     {
         ret.resourceSupply = {
+            "isInfinite": cmpResourceSupply.IsInfinite(),
             "max": cmpResourceSupply.GetMaxAmount(),
             "amount": cmpResourceSupply.GetCurrentAmount(),
             "type": cmpResourceSupply.GetType(),

binaries/data/mods/public/gui/session/selection_details.js

@@ -96 +96 @@
     // Resource stats
     if (entState.resourceSupply)
     {
-        var resources = Math.ceil(+entState.resourceSupply.amount) + " / " + entState.resourceSupply.max;
+        var resources = entState.resourceSupply.isInfinite ? "\u221E" :  // Infinity symbol
+                        Math.ceil(+entState.resourceSupply.amount) + " / " + entState.resourceSupply.max;
         var resourceType = entState.resourceSupply.type["generic"];
         if (resourceType == "treasure")
             resourceType = entState.resourceSupply.type["specific"];
@@ -104 +105 @@
         var unitResourceBar = getGUIObjectByName("resourceBar");
         var resourceSize = unitResourceBar.size;
 
-        resourceSize.rright = 100 * Math.max(0, Math.min(1, +entState.resourceSupply.amount / +entState.resourceSupply.max));
+        resourceSize.rright = entState.resourceSupply.isInfinite ? 100 :
+                        100 * Math.max(0, Math.min(1, +entState.resourceSupply.amount / +entState.resourceSupply.max));
         unitResourceBar.size = resourceSize;
         getGUIObjectByName("resourceLabel").caption = toTitleCase(resourceType) + ":";
         getGUIObjectByName("resourceStats").caption = resources;

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

@@ -51 +51 @@
   <RallyPoint disable=""/>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
-    <Amount>2000</Amount>
+    <Amount>Infinity</Amount>
     <Type>food.grain</Type>
-    <MaxGatherers>20</MaxGatherers>
+    <MaxGatherers>5</MaxGatherers>
+    <DiminishingReturns>107</DiminishingReturns>
   </ResourceSupply>
   <Sound>
     <SoundGroups>