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

Improve AutoTarget code readability

Browse Source
This commit is contained in:
reaperrr
2016-05-14 02:15:46 +02:00
parent d5915431dd
commit 1b6f67e9ee
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/AutoTarget.cs
View File

@@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Traits
public class AutoTarget : UpgradableTrait<AutoTargetInfo>, INotifyIdle, INotifyDamage, ITick, IResolveOrder, ISync public class AutoTarget : UpgradableTrait<AutoTargetInfo>, INotifyIdle, INotifyDamage, ITick, IResolveOrder, ISync
{ {
readonly AttackBase attack; readonly AttackBase attack;
readonly AttackFollow at; readonly AttackFollow attackFollow;
[Sync] int nextScanTime = 0; [Sync] int nextScanTime = 0;
public UnitStance Stance; public UnitStance Stance;
@@ -75,7 +75,7 @@ namespace OpenRA.Mods.Common.Traits
Stance = self.Owner.IsBot || !self.Owner.Playable ? info.InitialStanceAI : info.InitialStance; Stance = self.Owner.IsBot || !self.Owner.Playable ? info.InitialStanceAI : info.InitialStance;
PredictedStance = Stance; PredictedStance = Stance;
at = self.TraitOrDefault<AttackFollow>(); attackFollow = self.TraitsImplementing<AttackFollow>().FirstOrDefault(Exts.IsTraitEnabled);
} }
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
@@ -117,8 +117,8 @@ namespace OpenRA.Mods.Common.Traits
return; return;
Aggressor = attacker; Aggressor = attacker;
if (at == null || !at.IsReachableTarget(at.Target, allowMove))
var allowMove = Info.AllowMovement && Stance != UnitStance.Defend; var allowMove = Info.AllowMovement && Stance != UnitStance.Defend;
if (attackFollow == null || !attackFollow.IsReachableTarget(attackFollow.Target, allowMove))
Attack(self, Aggressor, allowMove); Attack(self, Aggressor, allowMove);
} }
@@ -130,8 +130,8 @@ namespace OpenRA.Mods.Common.Traits
if (Stance < UnitStance.Defend || !Info.TargetWhenIdle) if (Stance < UnitStance.Defend || !Info.TargetWhenIdle)
return; return;
if (at == null || !at.IsReachableTarget(at.Target, allowMove))
var allowMove = Info.AllowMovement && Stance != UnitStance.Defend; var allowMove = Info.AllowMovement && Stance != UnitStance.Defend;
if (attackFollow == null || !attackFollow.IsReachableTarget(attackFollow.Target, allowMove))
ScanAndAttack(self, allowMove); ScanAndAttack(self, allowMove);
} }