From 1b6f67e9ee1946b1d462be68ad8d6603003d0724 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 14 May 2016 02:15:46 +0200 Subject: [PATCH] Improve AutoTarget code readability --- OpenRA.Mods.Common/Traits/AutoTarget.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/AutoTarget.cs b/OpenRA.Mods.Common/Traits/AutoTarget.cs index c02b99efe7..4b77d5b353 100644 --- a/OpenRA.Mods.Common/Traits/AutoTarget.cs +++ b/OpenRA.Mods.Common/Traits/AutoTarget.cs @@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Traits public class AutoTarget : UpgradableTrait, INotifyIdle, INotifyDamage, ITick, IResolveOrder, ISync { readonly AttackBase attack; - readonly AttackFollow at; + readonly AttackFollow attackFollow; [Sync] int nextScanTime = 0; public UnitStance Stance; @@ -75,7 +75,7 @@ namespace OpenRA.Mods.Common.Traits Stance = self.Owner.IsBot || !self.Owner.Playable ? info.InitialStanceAI : info.InitialStance; PredictedStance = Stance; - at = self.TraitOrDefault(); + attackFollow = self.TraitsImplementing().FirstOrDefault(Exts.IsTraitEnabled); } public void ResolveOrder(Actor self, Order order) @@ -117,8 +117,8 @@ namespace OpenRA.Mods.Common.Traits return; Aggressor = attacker; - if (at == null || !at.IsReachableTarget(at.Target, allowMove)) var allowMove = Info.AllowMovement && Stance != UnitStance.Defend; + if (attackFollow == null || !attackFollow.IsReachableTarget(attackFollow.Target, allowMove)) Attack(self, Aggressor, allowMove); } @@ -130,8 +130,8 @@ namespace OpenRA.Mods.Common.Traits if (Stance < UnitStance.Defend || !Info.TargetWhenIdle) return; - if (at == null || !at.IsReachableTarget(at.Target, allowMove)) var allowMove = Info.AllowMovement && Stance != UnitStance.Defend; + if (attackFollow == null || !attackFollow.IsReachableTarget(attackFollow.Target, allowMove)) ScanAndAttack(self, allowMove); }