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

require force-fire to attack bridges

Browse Source
This commit is contained in:
Chris Forbes
2010-01-19 11:54:10 +13:00
parent 6345f7baee
commit eb81076bce
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRa.Game/Traits/AttackBase.cs
View File

@@ -180,8 +180,18 @@ namespace OpenRa.Traits
if (self == underCursor) return null; if (self == underCursor) return null;
var isHeal = self.GetPrimaryWeapon().Damage < 0; var isHeal = self.GetPrimaryWeapon().Damage < 0;
if (((underCursor.Owner == self.Owner) ^ isHeal) var forceFire = mi.Modifiers.HasModifier(Modifiers.Ctrl);
&& !mi.Modifiers.HasModifier( Modifiers.Ctrl )) return null;
if (isHeal)
{
if (underCursor.Owner == null)
return null;
if (underCursor.Owner != self.Owner && !forceFire)
return null;
}
else
if ((underCursor.Owner == self.Owner || underCursor.Owner == null) && !forceFire)
return null;
if (!Combat.HasAnyValidWeapons(self, underCursor)) return null; if (!Combat.HasAnyValidWeapons(self, underCursor)) return null;