Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Don't exceed vision range in hold ground and stand ground query ranges

Browse Source 
Differential Revision: https://code.wildfiregames.com/D1394
Reviewed by: bb
Comments by: elexis
Refs: #4725

This was SVN commit r21584.
This commit is contained in:
temple 2018-03-18 18:49:06 +00:00
parent 182103c143
commit b36363a53e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5570,8 +5570,11 @@ UnitAI.prototype.GetQueryRange = function(iid)
if (!cmpRanged)
return ret;
var range = iid !== IID_Attack ? cmpRanged.GetRange() : cmpRanged.GetFullAttackRange();
var cmpVision = Engine.QueryInterface(this.entity, IID_Vision);
if (!cmpVision)
return ret;
ret.min = range.min;
ret.max = range.max;
ret.max = Math.min(range.max, cmpVision.GetRange());
}
else if (this.GetStance().respondChase)
{
@ -5590,8 +5593,8 @@ UnitAI.prototype.GetQueryRange = function(iid)
var cmpVision = Engine.QueryInterface(this.entity, IID_Vision);
if (!cmpVision)
return ret;
var halfvision = cmpVision.GetRange() / 2;
ret.max = range.max + halfvision;
var vision = cmpVision.GetRange();
ret.max = Math.min(range.max + vision / 2, vision);
}
// We probably have stance 'passive' and we wouldn't have a range,
// but as it is the default for healers we need to set it to something sane.