From 385b3d0a2b2a5d0e9c0bd0d8324d08bec1fd1565 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 13 May 2010 12:15:07 +1200 Subject: [PATCH] simplify AutoAttack so it probably actually works --- OpenRA.Game/Traits/AI/AutoTarget.cs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/OpenRA.Game/Traits/AI/AutoTarget.cs b/OpenRA.Game/Traits/AI/AutoTarget.cs index 0053164396..c8b120ba30 100644 --- a/OpenRA.Game/Traits/AI/AutoTarget.cs +++ b/OpenRA.Game/Traits/AI/AutoTarget.cs @@ -50,9 +50,9 @@ namespace OpenRA.Traits var attack = self.traits.Get(); 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(); nextScanTime = (int)(25 * (info.ScanTimeAverage + @@ -75,12 +75,6 @@ namespace OpenRA.Traits { if (!self.IsIdle) return; - var attack = self.traits.Get(); - 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); } } }