From 7bc53dd2663b9acd158ca0aa00bc747c45451449 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 27 Oct 2018 18:00:29 +0100 Subject: [PATCH] Remove building lock from ToggleConditionOnOrder. --- OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs | 4 ---- .../UpdateRules/Rules/20180923/RemovedNotifyBuildComplete.cs | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs b/OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs index 5806d73892..4348586c81 100644 --- a/OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs +++ b/OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs @@ -50,10 +50,6 @@ namespace OpenRA.Mods.Common.Orders if (underCursor == null) yield break; - var building = underCursor.TraitOrDefault(); - if (building != null && building.Locked) - yield break; - yield return new Order(order, underCursor, false); } } diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/20180923/RemovedNotifyBuildComplete.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20180923/RemovedNotifyBuildComplete.cs index 5975d3a5d3..8407678c86 100644 --- a/OpenRA.Mods.Common/UpdateRules/Rules/20180923/RemovedNotifyBuildComplete.cs +++ b/OpenRA.Mods.Common/UpdateRules/Rules/20180923/RemovedNotifyBuildComplete.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules get { return "Traits are no longer force-disabled while the WithMakeAnimation trait is active.\n" + - "This affects the With*Animation, With*Overlay, Transforms, Sellable, Gate, and ConyardChronoReturn traits.\n" + + "This affects the With*Animation, With*Overlay, Transforms, Sellable, Gate, ToggleConditionOnOrder, and ConyardChronoReturn traits.\n" + "The AnnounceOnBuild trait has been replaced with a new VoiceAnnouncement trait.\n" + "Affected actors are listed so that conditions may be manually defined."; } @@ -56,6 +56,7 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules "Sellable", "Gate", "ConyardChronoReturn", + "ToggleConditionOnOrder", "VoiceAnnouncement" };