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

Merge pull request #3822 from pchote/new-target-fix

Browse Source 
Revert AI target filtering
This commit is contained in:
Matthias Mailänder
2013-09-08 00:03:11 -07:00
parent 420542ba5d d272715c50
commit ae6caa1c0e
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()

4
OpenRA.Mods.RA/AI/States/AirStates.cs
View File

@@ -183,8 +183,8 @@ namespace OpenRA.Mods.RA.AI
if (!owner.TargetIsValid)
{
var targeter = owner.units.Random(owner.random);
var closestEnemy = owner.bot.FindClosestEnemy(targeter, targeter.CenterPosition);
var a = owner.units.Random(owner.random);
var closestEnemy = owner.bot.FindClosestEnemy(a.CenterPosition);
if (closestEnemy != null)
owner.Target = closestEnemy;
else

15
OpenRA.Mods.RA/AI/States/GroundStates.cs
View File

@@ -33,11 +33,8 @@ namespace OpenRA.Mods.RA.AI
if (!owner.TargetIsValid)
{
var targeter = owner.units.First();
var t = owner.bot.FindClosestEnemy(targeter, targeter.CenterPosition);
if (t == null)
return;
var t = owner.bot.FindClosestEnemy(owner.units.FirstOrDefault().CenterPosition);
if (t == null) return;
owner.Target = t;
}
@@ -74,8 +71,7 @@ namespace OpenRA.Mods.RA.AI
if (!owner.TargetIsValid)
{
var targeter = owner.units.Random(owner.random);
var closestEnemy = owner.bot.FindClosestEnemy(targeter, targeter.CenterPosition);
var closestEnemy = owner.bot.FindClosestEnemy(owner.units.Random(owner.random).CenterPosition);
if (closestEnemy != null)
owner.Target = closestEnemy;
else
@@ -133,8 +129,7 @@ namespace OpenRA.Mods.RA.AI
if (!owner.TargetIsValid)
{
var targeter = owner.units.Random(owner.random);
var closestEnemy = owner.bot.FindClosestEnemy(targeter, targeter.CenterPosition);
var closestEnemy = owner.bot.FindClosestEnemy(owner.units.Random(owner.random).CenterPosition);
if (closestEnemy != null)
owner.Target = closestEnemy;
else
@@ -146,7 +141,7 @@ namespace OpenRA.Mods.RA.AI
foreach (var a in owner.units)
if (!BusyAttack(a))
owner.world.IssueOrder(new Order("Attack", a, false) { TargetActor = owner.bot.FindClosestEnemy(a, a.CenterPosition) });
owner.world.IssueOrder(new Order("Attack", a, false) { TargetActor = owner.bot.FindClosestEnemy(a.CenterPosition) });
if (ShouldFlee(owner))
{

3
OpenRA.Mods.RA/AI/States/ProtectionStates.cs
View File

@@ -32,8 +32,7 @@ namespace OpenRA.Mods.RA.AI
if (!owner.TargetIsValid)
{
var targeter = owner.units.FirstOrDefault();
owner.Target = owner.bot.FindClosestEnemy(targeter, owner.CenterPosition, WRange.FromCells(8));
owner.Target = owner.bot.FindClosestEnemy(owner.CenterPosition, WRange.FromCells(8));
if (owner.Target == null)
{