real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Fix an issue with ranged attack: wrong units were damaged. Refs #4276. Commented by leper and Itms.

Browse Source 
This was SVN commit r18828.
This commit is contained in:
fatherbushido 2016-10-10 18:59:59 +00:00
parent fbadd0995d
commit 4edff555a3
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
binaries/data/mods/public/simulation/components/Damage.js
View File

@ -130,21 +130,24 @@ Damage.prototype.MissileHit = function(data, lateness)
// If we didn't hit the main target look for nearby units
let cmpPlayer = QueryPlayerIDInterface(data.attackerOwner);
let ents = this.EntitiesNearPoint(Vector2D.from3D(data.position), targetPosition.horizDistanceTo(data.position) * 2, cmpPlayer.GetEnemies());
let projectileHit = false;
for (let ent of ents)
{
if (!this.TestCollision(ent, data.position, lateness))
{
this.CauseDamage({
"strengths": data.strengths,
"target": ent,
"attacker": data.attacker,
"multiplier": data.multiplier,
"type": data.type,
"attackerOwner": data.attackerOwner
});
continue;
cmpProjectileManager.RemoveProjectile(data.projectileId);
break;
}
projectileHit = true;
this.CauseDamage({
"strengths": data.strengths,
"target": ent,
"attacker": data.attacker,
"multiplier": data.multiplier,
"type": data.type,
"attackerOwner": data.attackerOwner
});
}
if (projectileHit)
cmpProjectileManager.RemoveProjectile(data.projectileId);
};
/**