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

Allow deploy orders to be queued from the command bar.

Browse Source
This commit is contained in:
Paul Chote
2018-09-09 05:22:57 +01:00
committed by abcdefg30
parent 3abc85b588
commit 0a507f3d33
9 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Cnc/Traits/MadTank.cs
View File

@@ -137,9 +137,9 @@ namespace OpenRA.Mods.Cnc.Traits
return new Order(order.OrderID, self, target, queued); return new Order(order.OrderID, self, target, queued);
} }
Order IIssueDeployOrder.IssueDeployOrder(Actor self) Order IIssueDeployOrder.IssueDeployOrder(Actor self, bool queued)
{ {
return new Order("Detonate", self, false); return new Order("Detonate", self, queued);
} }
bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return true; } bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return true; }

4
OpenRA.Mods.Cnc/Traits/Minelayer.cs
View File

@@ -81,9 +81,9 @@ namespace OpenRA.Mods.Cnc.Traits
} }
} }
Order IIssueDeployOrder.IssueDeployOrder(Actor self) Order IIssueDeployOrder.IssueDeployOrder(Actor self, bool queued)
{ {
return new Order("PlaceMine", self, Target.FromCell(self.World, self.Location), false); return new Order("PlaceMine", self, Target.FromCell(self.World, self.Location), queued);
} }
bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return true; } bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return true; }

4
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -662,12 +662,12 @@ namespace OpenRA.Mods.Common.Traits
return null; return null;
} }
Order IIssueDeployOrder.IssueDeployOrder(Actor self) Order IIssueDeployOrder.IssueDeployOrder(Actor self, bool queued)
{ {
if (!Info.RearmBuildings.Any()) if (!Info.RearmBuildings.Any())
return null; return null;
return new Order("ReturnToBase", self, false); return new Order("ReturnToBase", self, queued);
} }
bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return Info.RearmBuildings.Any(); } bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return Info.RearmBuildings.Any(); }

4
OpenRA.Mods.Common/Traits/Attack/AttackSuicides.cs
View File

@@ -59,9 +59,9 @@ namespace OpenRA.Mods.Common.Traits
return new Order(order.OrderID, self, target, queued); return new Order(order.OrderID, self, target, queued);
} }
Order IIssueDeployOrder.IssueDeployOrder(Actor self) Order IIssueDeployOrder.IssueDeployOrder(Actor self, bool queued)
{ {
return new Order("Detonate", self, false); return new Order("Detonate", self, queued);
} }
bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return true; } bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return true; }

4
OpenRA.Mods.Common/Traits/Cargo.cs
View File

@@ -174,9 +174,9 @@ namespace OpenRA.Mods.Common.Traits
return null; return null;
} }
Order IIssueDeployOrder.IssueDeployOrder(Actor self) Order IIssueDeployOrder.IssueDeployOrder(Actor self, bool queued)
{ {
return new Order("Unload", self, false); return new Order("Unload", self, queued);
} }
bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return true; } bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return true; }

4
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeploy.cs
View File

@@ -136,9 +136,9 @@ namespace OpenRA.Mods.Common.Traits
return null; return null;
} }
Order IIssueDeployOrder.IssueDeployOrder(Actor self) Order IIssueDeployOrder.IssueDeployOrder(Actor self, bool queued)
{ {
return new Order("GrantConditionOnDeploy", self, false); return new Order("GrantConditionOnDeploy", self, queued);
} }
bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return !IsTraitPaused && !IsTraitDisabled; } bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return !IsTraitPaused && !IsTraitDisabled; }

4
OpenRA.Mods.Common/Traits/Transforms.cs
View File

@@ -102,9 +102,9 @@ namespace OpenRA.Mods.Common.Traits
return null; return null;
} }
Order IIssueDeployOrder.IssueDeployOrder(Actor self) Order IIssueDeployOrder.IssueDeployOrder(Actor self, bool queued)
{ {
return new Order("DeployTransform", self, false); return new Order("DeployTransform", self, queued);
} }
bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return !IsTraitPaused && !IsTraitDisabled; } bool IIssueDeployOrder.CanIssueDeployOrder(Actor self) { return !IsTraitPaused && !IsTraitDisabled; }

2
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -371,7 +371,7 @@ namespace OpenRA.Mods.Common.Traits
[RequireExplicitImplementation] [RequireExplicitImplementation]
public interface IIssueDeployOrder public interface IIssueDeployOrder
{ {
Order IssueDeployOrder(Actor self); Order IssueDeployOrder(Actor self, bool queued);
bool CanIssueDeployOrder(Actor self); bool CanIssueDeployOrder(Actor self);
} }

29
OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs
View File

@@ -162,7 +162,8 @@ namespace OpenRA.Mods.Common.Widgets
if (highlightOnButtonPress) if (highlightOnButtonPress)
deployHighlighted = 2; deployHighlighted = 2;
PerformDeployOrderOnSelection(); var queued = Game.GetModifierKeys().HasModifier(Modifiers.Shift);
PerformDeployOrderOnSelection(queued);
}; };
deployButton.OnKeyPress = ki => { deployHighlighted = 2; deployButton.OnClick(); }; deployButton.OnKeyPress = ki => { deployHighlighted = 2; deployButton.OnClick(); };
@@ -207,14 +208,30 @@ namespace OpenRA.Mods.Common.Widgets
{ {
keyOverrides.AddHandler(e => keyOverrides.AddHandler(e =>
{ {
// HACK: enable attack move to be triggered if the ctrl key is pressed // HACK: allow attack move to be triggered if the ctrl key is pressed (assault move)
e.Modifiers &= ~Modifiers.Ctrl; var eNoCtrl = e;
if (!attackMoveDisabled && attackMoveButton.Key.IsActivatedBy(e)) eNoCtrl.Modifiers &= ~Modifiers.Ctrl;
if (attackMoveButton != null && !attackMoveDisabled && attackMoveButton.Key.IsActivatedBy(eNoCtrl))
{ {
attackMoveButton.OnKeyPress(e); attackMoveButton.OnKeyPress(e);
return true; return true;
} }
// HACK: allow deploy to be triggered if the shift key is pressed (queued order)
if (e.Modifiers.HasModifier(Modifiers.Shift) && e.Event == KeyInputEvent.Down)
{
var eNoShift = e;
eNoShift.Modifiers &= ~Modifiers.Shift;
if (deployButton != null && !deployButton.IsDisabled() &&
deployButton.Key.IsActivatedBy(eNoShift))
{
deployButton.OnKeyPress(e);
return true;
}
}
return false; return false;
}); });
} }
@@ -302,13 +319,13 @@ namespace OpenRA.Mods.Common.Widgets
world.PlayVoiceForOrders(orders); world.PlayVoiceForOrders(orders);
} }
void PerformDeployOrderOnSelection() void PerformDeployOrderOnSelection(bool queued)
{ {
UpdateStateIfNecessary(); UpdateStateIfNecessary();
var orders = selectedDeploys var orders = selectedDeploys
.Where(pair => pair.Trait.CanIssueDeployOrder(pair.Actor)) .Where(pair => pair.Trait.CanIssueDeployOrder(pair.Actor))
.Select(d => d.Trait.IssueDeployOrder(d.Actor)) .Select(d => d.Trait.IssueDeployOrder(d.Actor, queued))
.Where(d => d != null) .Where(d => d != null)
.ToArray(); .ToArray();