Ticket #1985: restrict-and-prefer-building-attacks-1985_using_splice.diff

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

@@ -169 +169 @@
     else if (msg.tag != this.enemyUnitsQuery)
         return;
 
-    const restrictedClasses = cmpAttack.GetRestrictedClasses(attackType);
-
     if (msg.added.length > 0)
     {
         for each (var entity in msg.added)
         {
-            var cmpIdentity = Engine.QueryInterface(entity, IID_Identity);
-            var targetClasses = cmpIdentity.GetClassesList();
-
-            if (!targetClasses.some(function(c){return restrictedClasses.indexOf(c) > -1;}))
+            if (cmpAttack.CanAttack(entity))
                 this.targetUnits.push(entity);
         }
     }
@@ -285 +280 @@
             this.arrowsLeft 
         );
     }
-    var clonedTargets = this.targetUnits.slice();
+    if (arrowsToFire <= 0)
+    {
+        this.currentRound++;
+        return;
+    }
+    var targets = new WeightedList();
+    for (var i = 0; i < this.targetUnits.length; i++)
+    {
+        var target = this.targetUnits[i],
+            weight = (cmpAttack.GetPreference(target) || 0) + 1
+        targets.add(target, weight);
+    }
     for (var i = 0;i < arrowsToFire;i++)
     {
-        var target = clonedTargets[Math.floor(Math.random() * this.targetUnits.length)];
-        if (target && this.CheckTargetVisible(target)) 
+        var selectedIndex = targets.randomIndex(),
+            selectedTarget = targets.itemAt(selectedIndex);
+        if (selectedTarget && this.CheckTargetVisible(selectedTarget))
         {
-            cmpAttack.PerformAttack(attackType, target);
+            cmpAttack.PerformAttack(attackType, selectedTarget);
             PlaySound("attack", this.entity);
         }
         else 
         {
-            clonedTargets.splice(clonedTargets.indexOf(target),1);
+            targets.removeAt(selectedIndex);
             i--; // one extra arrow left to fire
-            if(clonedTargets.length < 1) 
+            if(targets.length() < 1)
             {
                 this.arrowsLeft += arrowsToFire;
                 // no targets found in this round, save arrows and go to next round

new file inaries/data/mods/public/simulation/helpers/WeightedList.js

@@ +1 @@
+var WeightedList = function()
+{
+    this._elements = [ ];
+    this._totalWeight = 0;
+};
+
+WeightedList.prototype.length = function()
+{
+    return this._elements.length;
+};
+
+WeightedList.prototype.add = function(item, weight)
+{
+    if (weight === undefined)
+        weight = 1;
+    this._totalWeight += weight;
+    this._elements.push({ "item": item, "weight": weight });
+};
+
+WeightedList.prototype.removeAt = function(index)
+{
+    var element = this._elements.splice(index, 1);
+    if (element.length)
+        this._totalWeight -= element[0].weight;
+};
+
+WeightedList.prototype.itemAt = function(index)
+{
+    var element = this._elements[index];
+    return element ? element.item : null;
+};
+
+WeightedList.prototype.randomIndex = function() {
+    var element,
+    targetWeight = Math.random() * this._totalWeight,
+    cumulativeWeight = 0;
+    for (var index = 0; index < this._elements.length; index++)
+    {
+        element = this._elements[index];
+        cumulativeWeight += element.weight;
+        if (cumulativeWeight >= targetWeight)
+            return index;
+    }
+    return -1;
+};
+
+Engine.RegisterGlobal("WeightedList", WeightedList);