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

force-fire etc with stances

Browse Source
This commit is contained in:
Chris Forbes
2010-03-19 18:34:21 +13:00
parent 0eb1646565
commit 793a337797
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Traits/Attack/AttackBase.cs
View File

@@ -214,13 +214,13 @@ namespace OpenRA.Traits
{ {
if (underCursor.Owner == null) if (underCursor.Owner == null)
return null; return null;
if (underCursor.Owner != self.Owner && !forceFire) if (self.Owner.Stances[ underCursor.Owner ] != Stance.Ally && !forceFire)
return null; return null;
if (underCursor.Health >= underCursor.GetMaxHP()) if (underCursor.Health >= underCursor.GetMaxHP())
return null; // don't allow healing of fully-healed stuff! return null; // don't allow healing of fully-healed stuff!
} }
else else
if ((underCursor.Owner == self.Owner || underCursor.Owner == null) && !forceFire) if ((self.Owner.Stances[ underCursor.Owner ] != Stance.Enemy) && !forceFire)
return null; return null;
if (!Combat.HasAnyValidWeapons(self, underCursor)) return null; if (!Combat.HasAnyValidWeapons(self, underCursor)) return null;