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

tidy AttackOrderTargeter

Browse Source
This commit is contained in:
Chris Forbes
2011-11-25 17:38:58 +13:00
parent 2679e91b03
commit 54e8266e37
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.RA/Attack/AttackBase.cs
View File

@@ -209,14 +209,11 @@ namespace OpenRA.Mods.RA
cursor = isHeal ? "heal" : "attack"; cursor = isHeal ? "heal" : "attack";
if( self == target ) return false; if( self == target ) return false;
if( !self.Trait<AttackBase>().HasAnyValidWeapons( Target.FromActor( target ) ) ) return false; if( !self.Trait<AttackBase>().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 self.Owner.Stances[ target.Owner ] == targetableRelationship;
return playerRelationship == Stance.Ally || forceAttack;
else
return playerRelationship == Stance.Enemy || forceAttack;
} }
public bool CanTargetLocation(Actor self, int2 location, List<Actor> actorsAtLocation, bool forceAttack, bool forceQueued, ref string cursor) public bool CanTargetLocation(Actor self, int2 location, List<Actor> actorsAtLocation, bool forceAttack, bool forceQueued, ref string cursor)