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

added force-fire capability

Browse Source
This commit is contained in:
Chris Forbes
2009-12-16 11:35:13 +13:00
parent 5bf3e05f03
commit 0a4db765a9
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/AttackBase.cs
View File

@@ -128,7 +128,7 @@ namespace OpenRa.Game.Traits
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor) public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{ {
if (mi.Button == MouseButton.Left || underCursor == null) return null; if (mi.Button == MouseButton.Left || underCursor == null) return null;
if (underCursor.Owner == self.Owner) return null; if (underCursor.Owner == self.Owner && !mi.Modifiers.HasModifier( Modifiers.Ctrl )) return null;
if (!Combat.HasAnyValidWeapons(self, underCursor)) return null; if (!Combat.HasAnyValidWeapons(self, underCursor)) return null;
return Order.Attack(self, underCursor); return Order.Attack(self, underCursor);
} }
@@ -148,7 +148,7 @@ namespace OpenRa.Game.Traits
/* todo: choose the appropriate weapon, when only one works against this target */ /* todo: choose the appropriate weapon, when only one works against this target */
var weapon = order.Subject.Info.Primary ?? order.Subject.Info.Secondary; var weapon = order.Subject.Info.Primary ?? order.Subject.Info.Secondary;
self.QueueActivity(new Traits.Activities.Attack(order.TargetActor, self.QueueActivity(new Activities.Attack(order.TargetActor,
Math.Max(0, (int)Rules.WeaponInfo[weapon].Range - RangeTolerance))); Math.Max(0, (int)Rules.WeaponInfo[weapon].Range - RangeTolerance)));
} }
} }