From 15b465c1e25af4b8d95434fcf3cd2cc239801ea9 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 23 Dec 2016 15:07:35 +0000 Subject: [PATCH] Change DeployToUpgrade order to GrantConditionOnDeploy. --- .../Traits/Upgrades/GrantConditionOnDeploy.cs | 6 +++--- OpenRA.Mods.Common/Widgets/UnitCommandWidget.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDeploy.cs b/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDeploy.cs index a1589781a5..296e217418 100644 --- a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDeploy.cs +++ b/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDeploy.cs @@ -119,13 +119,13 @@ namespace OpenRA.Mods.Common.Traits public IEnumerable Orders { - get { yield return new DeployOrderTargeter("DeployToUpgrade", 5, + get { yield return new DeployOrderTargeter("GrantConditionOnDeploy", 5, () => IsCursorBlocked() ? info.DeployBlockedCursor : info.DeployCursor); } } public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued) { - if (order.OrderID == "DeployToUpgrade") + if (order.OrderID == "GrantConditionOnDeploy") return new Order(order.OrderID, self, queued); return null; @@ -133,7 +133,7 @@ namespace OpenRA.Mods.Common.Traits public void ResolveOrder(Actor self, Order order) { - if (order.OrderString != "DeployToUpgrade" || deployState == DeployState.Deploying || deployState == DeployState.Undeploying) + if (order.OrderString != "GrantConditionOnDeploy" || deployState == DeployState.Deploying || deployState == DeployState.Undeploying) return; if (!order.Queued) diff --git a/OpenRA.Mods.Common/Widgets/UnitCommandWidget.cs b/OpenRA.Mods.Common/Widgets/UnitCommandWidget.cs index e5c6947f20..d24dd82984 100644 --- a/OpenRA.Mods.Common/Widgets/UnitCommandWidget.cs +++ b/OpenRA.Mods.Common/Widgets/UnitCommandWidget.cs @@ -125,7 +125,7 @@ namespace OpenRA.Mods.Common.Widgets PerformKeyboardOrderOnSelection(a => new Order("DeployTransform", a, false)); PerformKeyboardOrderOnSelection(a => new Order("Unload", a, false)); PerformKeyboardOrderOnSelection(a => new Order("Detonate", a, false)); - PerformKeyboardOrderOnSelection(a => new Order("DeployToUpgrade", a, false)); + PerformKeyboardOrderOnSelection(a => new Order("GrantConditionOnDeploy", a, false)); return true; }