Ticket #3196: arrowLimit.diff

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

@@ -8 +8 @@
     "<element name='DefaultArrowCount'>" +
         "<data type='nonNegativeInteger'/>" +
     "</element>" +
+    "<optional>" +
+        "<element name='MaxArrowCount' a:help='Limit the number of arrows to a certain amount'>" +
+            "<data type='nonNegativeInteger'/>" +
+        "</element>" +
+    "</optional>" +
     "<element name='GarrisonArrowMultiplier'>" +
         "<ref name='nonNegativeDecimal'/>" +
     "</element>" +
-    "<element name='GarrisonArrowClasses'>" +
+    "<element name='GarrisonArrowClasses' a:help='Add extra arrows for this class list'>" +
         "<text/>" +
     "</element>";
 
@@ -23 +28 @@
 BuildingAI.prototype.Init = function()
 {
     this.currentRound = 0;
+    this.archersGarrisoned = 0;
     //Arrows left to fire
     this.arrowsLeft = 0;
     this.targetUnits = [];
 };
 
+BuildingAI.prototype.OnGarrisonedUnitsChanged = function(msg)
+{
+    var classes = this.GetGarrisonArrowClasses();
+    for (let ent of msg.added)
+    {
+        var cmpIdentity = Engine.QueryInterface(ent, IID_Identity);
+        if (!cmpIdentity)
+            continue;
+        if (MatchesClassList(cmpIdentity.GetClassesList(), classes))
+            this.archersGarrisoned++;
+    }
+
+    for (let ent of msg.removed)
+    {
+        var cmpIdentity = Engine.QueryInterface(ent, IID_Identity);
+        if (!cmpIdentity)
+            continue;
+        if (MatchesClassList(cmpIdentity.GetClassesList(), classes))
+            this.archersGarrisoned--;
+    }
+};
+
 BuildingAI.prototype.OnOwnershipChanged = function(msg)
 {
     // Remove current targets, to prevent them from being added twice
@@ -205 +233 @@
     return ApplyValueModificationsToEntity("BuildingAI/DefaultArrowCount", arrowCount, this.entity);
 };
 
+BuildingAI.prototype.GetMaxArrowCount = function()
+{
+    if (!this.template.MaxArrowCount)
+        return undefined;
+
+    var maxArrowCount = +this.template.MaxArrowCount;
+    return Math.round(ApplyValueModificationsToEntity("BuildingAI/MaxArrowCount", maxArrowCount, this.entity));
+};
+
 BuildingAI.prototype.GetGarrisonArrowMultiplier = function()
 {
     var arrowMult = +this.template.GarrisonArrowMultiplier;
@@ -213 +250 @@
 
 BuildingAI.prototype.GetGarrisonArrowClasses = function()
 {
-    var string = this.template.GarrisonArrowClasses;
-    if (string)
-        return string.split(/\s+/);
-    return [];
+    return this.template.GarrisonArrowClasses;
 };
 
 /**
@@ -229 +263 @@
     var count = this.GetDefaultArrowCount();
     var cmpGarrisonHolder = Engine.QueryInterface(this.entity, IID_GarrisonHolder);
     if (cmpGarrisonHolder)
-    {
-        count += Math.round(cmpGarrisonHolder.GetGarrisonedArcherCount(this.GetGarrisonArrowClasses()) * this.GetGarrisonArrowMultiplier());
-    }
+        count += Math.round(this.archersGarrisoned * this.GetGarrisonArrowMultiplier());
+
+    if (this.GetMaxArrowCount() < count)
+        return this.GetMaxArrowCount();
     return count;
 };
 

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

@@ -188 +188 @@
 };
 
 /**
- * Get number of garrisoned units capable of shooting arrows
- * Not necessarily archers
- */
-GarrisonHolder.prototype.GetGarrisonedArcherCount = function(garrisonArrowClasses)
-{
-    var count = 0;
-    for each (var entity in this.entities)
-    {
-        var cmpIdentity = Engine.QueryInterface(entity, IID_Identity);
-        var classes = cmpIdentity.GetClassesList();
-        if (classes.some(function(c){return garrisonArrowClasses.indexOf(c) > -1;}))
-            count++;
-    }
-    return count;
-};
-
-/**
  * Checks if an entity can be allowed to garrison in the building
  * based on its class
  */

binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml

@@ -24 +24 @@
     </Ranged>
   </Attack>
   <BuildingAI>
-    <DefaultArrowCount>3</DefaultArrowCount>
-    <GarrisonArrowMultiplier>0.5</GarrisonArrowMultiplier>
+    <DefaultArrowCount>1</DefaultArrowCount>
+    <MaxArrowCount>11</MaxArrowCount>
+    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
   </BuildingAI>
   <BuildRestrictions>
     <Territory>own neutral enemy</Territory>

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

@@ -15 +15 @@
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>2</DefaultArrowCount>
+    <MaxArrowCount>7</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Infantry Ranged</GarrisonArrowClasses>
   </BuildingAI>

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

@@ -23 +23 @@
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>0</DefaultArrowCount>
+    <MaxArrowCount>10</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Catapult</GarrisonArrowClasses>
   </BuildingAI>
@@ -52 +53 @@
   </Health>
   <Identity>
     <GenericName>Heavy Warship</GenericName>
-    <Tooltip>Garrison with catapults to increase ranged fire power.</Tooltip>
+    <Tooltip>Garrison up to 10 catapults to increase fire power.</Tooltip>
     <Classes datatype="tokens">Warship Heavy Ranged</Classes>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>

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

@@ -15 +15 @@
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>3</DefaultArrowCount>
+    <MaxArrowCount>13</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Infantry Ranged</GarrisonArrowClasses>
   </BuildingAI>