Ticket #2343: combat_preference_by_bonus_4.patch

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

@@ -5408 +5408 @@
 {
     var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
 
-    if (!cmpAttack)
+    if (!cmpAttack || !ents.length)
         return false;
 
-    const animalfilter = function(e) {
+    const filter = function(e) {
         var cmpUnitAI = Engine.QueryInterface(e, IID_UnitAI);
         return !cmpUnitAI || !cmpUnitAI.IsAnimal() || cmpUnitAI.IsDangerousAnimal();
     };
 
-    return this.RespondToTargetedEntities(
-        ents.filter(function (v, i, a) { return cmpAttack.CanAttack(v) && animalfilter(v); })
-        .sort(function (a, b) { return cmpAttack.CompareEntitiesByPreference(a, b); })
-    );
+    // Use filter() to remove non-dangerous animals from ents.
+    var filteredEnts = ents.filter(function (v, i, a) { return cmpAttack.CanAttack(v) && filter(v); });
+    
+    // If it was only non-dangerous animals, do nothing.
+    if (!filteredEnts.length)
+        return false;
+
+    while (filteredEnts.length) 
+    {
+        // Otherwise prefer unit for best attack bonus. 
+        var preferredEntity = this.GetAttackBonusPreference(filteredEnts);
+        if (this.RespondToTargetedEntities([preferredEntity]))
+            return true;
+        else 
+            filteredEnts = filteredEnts.filter(function (v, i, a) { return v != preferredEntity; });
+    }
+    
+    return false;
+    
 };
 
+UnitAI.prototype.GetAttackBonusPreference = function(ents) 
+{
+    var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
+
+    if (!cmpAttack || !ents.length)
+        return false;
+
+    var preferredUnit = ents[0];
+    var bestBonus = 0;
+    var bestPref = 0;
+
+    for each (var target in ents) 
+    {
+        var thisBonus = cmpAttack.GetAttackBonus(cmpAttack.GetBestAttackAgainst(target),target);
+        var thisPref = cmpAttack.GetPreference(target);
+
+        if (thisPref) 
+        {
+            if ( thisPref > bestPref ) 
+            {
+                preferredUnit = target;
+                bestPref = thisPref;
+            }
+            else if (thisPref == bestPref && thisBonus > bestBonus) 
+            {
+                preferredUnit = target;
+                bestBonus = thisBonus;
+            }   
+        } else if (bestPref == 0) 
+        {
+            if ( thisBonus > bestBonus ) 
+            {
+                preferredUnit = target;
+                bestBonus = thisBonus;
+            }
+        }
+    }
+
+    return preferredUnit;
+};
+
 Engine.RegisterComponentType(IID_UnitAI, "UnitAI", UnitAI);