Ticket #3284: attack_patch.2.diff

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

@@ -309 +309 @@
 };
 
 /**
- * Return the type of the best attack.
- * TODO: this should probably depend on range, target, etc,
- * so we can automatically switch between ranged and melee
+ * Get the full range of attack regarding available attack types.
  */
-Attack.prototype.GetBestAttack = function()
+Attack.prototype.GetFullAttackRange = function()
 {
-    return this.GetAttackTypes().pop();
-};
+    var ret = {"min": Infinity, "max": 0};
+    var types = this.GetAttackTypes();
+    for (var key in types)
+    {
+        var type = types[key];
+        if (type != "Slaughter")
+        {
+            // Ignore the special attack "slaughter"
+            var range = this.GetRange(type);
+            if (range.min < ret.min)
+                ret.min = range.min;
+            if (range.max > ret.max)
+                ret.max = range.max;
+        }
+    }
+    return ret;
+}
 
 Attack.prototype.GetBestAttackAgainst = function(target, allowCapture)
 {
     var cmpFormation = Engine.QueryInterface(target, IID_Formation);
     if (cmpFormation)
-        return this.GetBestAttack();
+    {
+        // TODO: Formation against formation needs review
+        var best = ["Ranged", "Melee", "Capture"];
+        var types = this.GetAttackTypes();
+        for (var key in best)
+        {
+            if (types.indexOf(best[key]) != -1)
+                return best[key];
+        }
+        return undefined;
+    }
 
     var cmpIdentity = Engine.QueryInterface(target, IID_Identity);
     if (!cmpIdentity) 

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

@@ -4458 +4458 @@
     return distance < range;
 };
 
-UnitAI.prototype.GetBestAttack = function()
-{
-    var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
-    if (!cmpAttack)
-        return undefined;
-    return cmpAttack.GetBestAttack();
-};
-
 UnitAI.prototype.GetBestAttackAgainst = function(target, allowCapture)
 {
     var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
@@ -5458 +5450 @@
         var cmpRanged = Engine.QueryInterface(this.entity, iid);
         if (!cmpRanged)
             return ret;
-        var range = iid !== IID_Attack ? cmpRanged.GetRange() : cmpRanged.GetRange(cmpRanged.GetBestAttack());
+        var range = iid !== IID_Attack ? cmpRanged.GetRange() : cmpRanged.GetFullAttackRange();
         ret.min = range.min;
         ret.max = range.max;
     }
@@ -5475 +5467 @@
         var cmpRanged = Engine.QueryInterface(this.entity, iid);
         if (!cmpRanged)
             return ret;
-        var range = iid !== IID_Attack ? cmpRanged.GetRange() : cmpRanged.GetRange(cmpRanged.GetBestAttack());
+        var range = iid !== IID_Attack ? cmpRanged.GetRange() : cmpRanged.GetFullAttackRange();
         var cmpVision = Engine.QueryInterface(this.entity, IID_Vision);
         if (!cmpVision)
             return ret;

binaries/data/mods/public/simulation/components/tests/test_UnitAI.js

@@ -97 +97 @@
 
     AddMock(unit, IID_Attack, {
         GetRange: function() { return { "max": 10, "min": 0}; },
-        GetBestAttack: function() { return "melee"; },
         GetBestAttackAgainst: function(t) { return "melee"; },
         GetTimers: function() { return { "prepare": 500, "repeat": 1000 }; },
         CanAttack: function(v) { return true; },
@@ -249 +248 @@
     
         AddMock(unit + i, IID_Attack, {
             GetRange: function() { return {"max":10, "min": 0}; },
-            GetBestAttack: function() { return "melee"; },
             GetBestAttackAgainst: function(t) { return "melee"; },
             GetTimers: function() { return { "prepare": 500, "repeat": 1000 }; },
             CanAttack: function(v) { return true; },