epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Filter AI targets based on what it can actually attack. Fixes #3763."

Browse Source 
This reverts commit 4791f93d77.
This commit is contained in:
Paul Chote
2013-09-08 16:57:29 +12:00
parent 420542ba5d
commit d272715c50
4 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
OpenRA.Mods.RA/AI/HackyAI.cs
View File

@@ -441,34 +441,28 @@ namespace OpenRA.Mods.RA.AI
return target;
}
bool IsValidTarget(Actor a, Actor targeter)
internal Actor FindClosestEnemy(WPos pos)
{
if (p.Stances[a.Owner] != Stance.Enemy)
return false;
var allEnemyUnits = world.Actors
.Where(unit => p.Stances[unit.Owner] == Stance.Enemy && !unit.HasTrait<Husk>() &&
unit.HasTrait<ITargetable>()).ToList();
// TODO: We shouldn't need to check this explicitly
if (!a.HasTrait<Husk>())
return false;
if (allEnemyUnits.Count > 0)
return allEnemyUnits.ClosestTo(pos);
var targetable = a.TraitOrDefault<ITargetable>();
if (targetable == null || !targetable.TargetableBy(a, targeter))
return false;
return true;
return null;
}
internal Actor FindClosestEnemy(Actor targeter, WPos pos)
internal Actor FindClosestEnemy(WPos pos, WRange radius)
{
return world.Actors
.Where(unit => IsValidTarget(unit, targeter))
.ClosestTo(pos);
}
var enemyUnits = world.FindActorsInCircle(pos, radius)
.Where(unit => p.Stances[unit.Owner] == Stance.Enemy &&
!unit.HasTrait<Husk>() && unit.HasTrait<ITargetable>()).ToList();
internal Actor FindClosestEnemy(Actor targeter, WPos pos, WRange radius)
{
return world.FindActorsInCircle(pos, radius)
.Where(unit => IsValidTarget(unit, targeter))
.ClosestTo(pos);
if (enemyUnits.Count > 0)
return enemyUnits.ClosestTo(pos);
return null;
}
List<Actor> FindEnemyConstructionYards()