From 91aa5302a845823f7f1ae48304e6ac7a9551920b Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 12 Sep 2010 18:20:25 +1200 Subject: [PATCH] Fix c4 force-firing. TODO: remove magic numbers --- OpenRA.Mods.RA/AttackBase.cs | 2 +- OpenRA.Mods.RA/C4Demolition.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.RA/AttackBase.cs b/OpenRA.Mods.RA/AttackBase.cs index 6b4344f7f0..2e72753e41 100644 --- a/OpenRA.Mods.RA/AttackBase.cs +++ b/OpenRA.Mods.RA/AttackBase.cs @@ -176,7 +176,7 @@ namespace OpenRA.Mods.RA 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) diff --git a/OpenRA.Mods.RA/C4Demolition.cs b/OpenRA.Mods.RA/C4Demolition.cs index add89dc374..e23338cfd3 100644 --- a/OpenRA.Mods.RA/C4Demolition.cs +++ b/OpenRA.Mods.RA/C4Demolition.cs @@ -25,15 +25,15 @@ namespace OpenRA.Mods.RA { 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) { if (mi.Button != MouseButton.Right) return null; if (underCursor == null) return null; - if (underCursor.Owner == self.Owner && !mi.Modifiers.HasModifier(Modifiers.Ctrl)) return null; if (!underCursor.HasTrait()) return null; + if (self.Owner.Stances[underCursor.Owner] != Stance.Enemy && !mi.Modifiers.HasModifier(Modifiers.Ctrl)) return null; return new Order("C4", self, underCursor); }