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

simplify AutoAttack so it probably actually works

Browse Source
This commit is contained in:
Chris Forbes
2010-05-13 12:15:07 +12:00
parent 0669758d26
commit 385b3d0a2b
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Traits/AI/AutoTarget.cs
View File

@@ -50,9 +50,9 @@ namespace OpenRA.Traits
var attack = self.traits.Get<AttackBase>();
var range = Util.GetMaximumRange(self);
if( attack.target == null ||
( attack.target.Location - self.Location ).LengthSquared > range * range )
attack.target = ChooseTarget( self, range );
if (attack.target == null ||
(attack.target.Location - self.Location).LengthSquared > range * range)
AttackTarget(self, ChooseTarget(self, range));
var info = self.Info.Traits.Get<AutoTargetInfo>();
nextScanTime = (int)(25 * (info.ScanTimeAverage +
@@ -75,12 +75,6 @@ namespace OpenRA.Traits
{
if (!self.IsIdle) return;
var attack = self.traits.Get<AttackBase>();
var range = Util.GetMaximumRange(self);
if( attack.target != null && ( attack.target.Location - self.Location ).LengthSquared <= range * range )
return;
// not a lot we can do about things we can't hurt... although maybe we should automatically run away?
if (!Combat.HasAnyValidWeapons(self, e.Attacker)) return;
@@ -89,7 +83,7 @@ namespace OpenRA.Traits
if (e.Damage < 0) return; // don't retaliate against healers
attack.target = e.Attacker;
AttackTarget(self, e.Attacker);
}
}
}