Ticket #3605: attackByPreference.patch

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

@@ -5830 +5830 @@
 
 UnitAI.prototype.AttackEntitiesByPreference = function(ents)
 {
+    if (!ents.length)
+        return false;
+
     var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
-
     if (!cmpAttack)
         return false;
 
@@ -5843 +5845 @@
         return cmpUnitAI && (!cmpUnitAI.IsAnimal() || cmpUnitAI.IsDangerousAnimal());
     };
 
-    return this.RespondToTargetedEntities(
-        ents.filter(function (v) { return cmpAttack.CanAttack(v) && attackfilter(v); })
-        .sort(function (a, b) { return cmpAttack.CompareEntitiesByPreference(a, b); })
-    );
+    let entsByPreferences = {};
+    let preferences = [];
+    for (let ent of ents)
+    {
+        if (!attackfilter(ent))
+            continue;
+        let pref = cmpAttack.GetPreference(ent);
+        if (pref === null || pref === undefined)
+            pref = 999;
+        if (!entsByPreferences[pref])
+        {
+            preferences.push(pref);
+            entsByPreferences[pref] = [ent];
+        }
+        else
+            entsByPreferences[pref].push(ent);
+    }
+    preferences.sort((a, b) => a - b);
+    for (let pref of preferences)
+        if (this.RespondToTargetedEntities(entsByPreferences[pref]))
+            return true;
+
+    return false;
 };
 
 /**