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

Remove two pointless references and fix a typo. Patch by fatherbushido, refs #4276.

Browse Source 
This was SVN commit r18929.
This commit is contained in:
elexis 2016-11-14 01:44:17 +00:00
parent 59edc42042
commit 9dca10e32f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,8 +312,7 @@ Attack.prototype.GetBestAttackAgainst = function(target, allowCapture)
if (isTargetClass("Domestic") && this.template.Slaughter)
return "Slaughter";
let attack = this;
let types = this.GetAttackTypes().filter(type => !attack.GetRestrictedClasses(type).some(isTargetClass));
let types = this.GetAttackTypes().filter(type => !this.GetRestrictedClasses(type).some(isTargetClass));
// check if the target is capturable
let captureIndex = types.indexOf("Capture");
@ -324,11 +323,11 @@ Attack.prototype.GetBestAttackAgainst = function(target, allowCapture)
let cmpPlayer = QueryOwnerInterface(this.entity);
if (allowCapture && cmpPlayer && cmpCapturable && cmpCapturable.CanCapture(cmpPlayer.GetPlayerID()))
return "Capture";
// not captureable, so remove this attack
// not capturable, so remove this attack
types.splice(captureIndex, 1);
}
let isPreferred = className => attack.GetPreferredClasses(className).some(isTargetClass);
let isPreferred = className => this.GetPreferredClasses(className).some(isTargetClass);
return types.sort((a, b) =>
(types.indexOf(a) + (isPreferred(a) ? types.length : 0)) -