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

Fix c4 force-firing. TODO: remove magic numbers

Browse Source
This commit is contained in:
Paul Chote
2010-09-12 18:20:25 +12:00
parent 2b6328f0ee
commit 91aa5302a8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/AttackBase.cs
View File

@@ -176,7 +176,7 @@ namespace OpenRA.Mods.RA
public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor) public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{ {
return mi.Modifiers.HasModifier(Modifiers.Ctrl) ? int.MaxValue : 1; return mi.Modifiers.HasModifier(Modifiers.Ctrl) ? 1000 : 1;
} }
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor) public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)

4
OpenRA.Mods.RA/C4Demolition.cs
View File

@@ -25,15 +25,15 @@ namespace OpenRA.Mods.RA
{ {
public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor) public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{ {
return 5; return mi.Modifiers.HasModifier(Modifiers.Ctrl) ? 1001 : 1;
} }
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.Right) return null; if (mi.Button != MouseButton.Right) return null;
if (underCursor == null) return null; if (underCursor == null) return null;
if (underCursor.Owner == self.Owner && !mi.Modifiers.HasModifier(Modifiers.Ctrl)) return null;
if (!underCursor.HasTrait<Building>()) return null; if (!underCursor.HasTrait<Building>()) return null;
if (self.Owner.Stances[underCursor.Owner] != Stance.Enemy && !mi.Modifiers.HasModifier(Modifiers.Ctrl)) return null;
return new Order("C4", self, underCursor); return new Order("C4", self, underCursor);
} }