dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix nearGatherPosition, fixes #3658

Browse source 
This was SVN commit r17322.
This commit is contained in:
mimo 2015-11-29 14:43:28 +00:00
parent 42d42243ac
commit 9f75b78a84
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
binaries/data/mods/public/simulation/components/UnitAI.js
View file

@ -2052,7 +2052,7 @@ UnitAI.prototype.UnitFsmSpec = {
|| (type.specific == oldType.specific
&& (type.specific != "meat" || oldTemplate == template)))
);
});
}, oldTarget);
if (nearby)
{
this.PerformGather(nearby, false, false);
@ -3982,10 +3982,11 @@ UnitAI.prototype.MustKillGatherTarget = function(ent)
/**
* Returns the entity ID of the nearest resource supply where the given
* filter returns true, or undefined if none can be found.
* if target if given, the nearest is computed versus this target position.
* TODO: extend this to exclude resources that already have lots of
* gatherers.
*/
UnitAI.prototype.FindNearbyResource = function(filter)
UnitAI.prototype.FindNearbyResource = function(filter, target)
{
var cmpOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
if (!cmpOwnership || cmpOwnership.GetOwner() == -1)
@ -4002,7 +4003,14 @@ UnitAI.prototype.FindNearbyResource = function(filter)
var cmpTemplateManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
var nearby = cmpRangeManager.ExecuteQuery(this.entity, 0, range, players, IID_ResourceSupply);
let entity = this.entity;
if (target)
{
let cmpPosition = Engine.QueryInterface(this.entity, IID_Position);
if (cmpPosition && cmpPosition.IsInWorld())
entity = target;
}
var nearby = cmpRangeManager.ExecuteQuery(entity, 0, range, players, IID_ResourceSupply);
return nearby.find(ent => {
if (!this.CanGather(ent))
return false;