From 54e8266e373dd17fe96285993a0af354afd9cc75 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 25 Nov 2011 17:38:58 +1300 Subject: [PATCH] tidy AttackOrderTargeter --- OpenRA.Mods.RA/Attack/AttackBase.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/OpenRA.Mods.RA/Attack/AttackBase.cs b/OpenRA.Mods.RA/Attack/AttackBase.cs index e23924f3ad..5db1666756 100644 --- a/OpenRA.Mods.RA/Attack/AttackBase.cs +++ b/OpenRA.Mods.RA/Attack/AttackBase.cs @@ -209,14 +209,11 @@ namespace OpenRA.Mods.RA cursor = isHeal ? "heal" : "attack"; if( self == target ) return false; if( !self.Trait().HasAnyValidWeapons( Target.FromActor( target ) ) ) return false; + if (forceAttack) return true; - var playerRelationship = self.Owner.Stances[ target.Owner ]; + var targetableRelationship = isHeal ? Stance.Ally : Stance.Enemy; - if( isHeal ) - return playerRelationship == Stance.Ally || forceAttack; - - else - return playerRelationship == Stance.Enemy || forceAttack; + return self.Owner.Stances[ target.Owner ] == targetableRelationship; } public bool CanTargetLocation(Actor self, int2 location, List actorsAtLocation, bool forceAttack, bool forceQueued, ref string cursor)