wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

fix standGround units not attacking, patch by karamel, fixes #3284

Browse Source 
This was SVN commit r17109.
This commit is contained in:
mimo 2015-10-08 20:48:05 +00:00
parent 03b00b0041
commit ef4a1e261c
3 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
binaries/data/mods/public/simulation/components/Attack.js
View File

@ -308,6 +308,26 @@ Attack.prototype.GetPreference = function(target)
return minPref;
};
/**
* Get the full range of attack using all available attack types.
*/
Attack.prototype.GetFullAttackRange = function()
{
let ret = {"min": Infinity, "max": 0};
for (let type of this.GetAttackTypes())
{
// Ignore the special attack "slaughter" dedicated to domestic animals
if (type == "Slaughter")
continue;
let range = this.GetRange(type);
if (range.min < ret.min)
ret.min = range.min;
if (range.max > ret.max)
ret.max = range.max;
}
return ret;
};
/**
* Return the type of the best attack.
* TODO: this should probably depend on range, target, etc,
@ -322,7 +342,15 @@ Attack.prototype.GetBestAttackAgainst = function(target, allowCapture)
{
var cmpFormation = Engine.QueryInterface(target, IID_Formation);
if (cmpFormation)
return this.GetBestAttack();
{
// TODO: Formation against formation needs review
let best = ["Ranged", "Melee", "Capture"];
let types = this.GetAttackTypes();
for (let attack of best)
if (types.indexOf(attack) != -1)
return attack;
return undefined;
}
var cmpIdentity = Engine.QueryInterface(target, IID_Identity);
if (!cmpIdentity)

12
binaries/data/mods/public/simulation/components/UnitAI.js
View File

@ -4476,14 +4476,6 @@ UnitAI.prototype.CheckTargetIsInVisionRange = function(target)
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);
@ -5451,7 +5443,7 @@ UnitAI.prototype.GetQueryRange = function(iid)
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;
}
@ -5468,7 +5460,7 @@ UnitAI.prototype.GetQueryRange = function(iid)
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;

4
binaries/data/mods/public/simulation/components/tests/test_UnitAI.js
View File

@ -96,7 +96,7 @@ function TestFormationExiting(mode)
AddMock(unit, IID_Attack, {
GetRange: function() { return { "max": 10, "min": 0}; },
GetBestAttack: function() { return "melee"; },
GetFullAttackRange: function() { return { "max": 40, "min": 0}; },
GetBestAttackAgainst: function(t) { return "melee"; },
GetTimers: function() { return { "prepare": 500, "repeat": 1000 }; },
CanAttack: function(v) { return true; },
@ -245,7 +245,7 @@ function TestMoveIntoFormationWhileAttacking()
AddMock(unit + i, IID_Attack, {
GetRange: function() { return {"max":10, "min": 0}; },
GetBestAttack: function() { return "melee"; },
GetFullAttackRange: function() { return { "max": 40, "min": 0}; },
GetBestAttackAgainst: function(t) { return "melee"; },
GetTimers: function() { return { "prepare": 500, "repeat": 1000 }; },
CanAttack: function(v) { return true; },