From e9ad38667eb5e3705d6572b554878439c549a53b Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 15 Nov 2020 11:10:54 +0000 Subject: [PATCH] Expose TransformsInto* targetline colors to yaml. --- .../Traits/Buildings/TransformsIntoAircraft.cs | 5 ++++- .../Traits/Buildings/TransformsIntoEntersTunnels.cs | 5 ++++- .../Traits/Buildings/TransformsIntoPassenger.cs | 5 ++++- .../Traits/Buildings/TransformsIntoRepairable.cs | 5 ++++- .../Traits/Buildings/TransformsIntoTransforms.cs | 3 +-- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs index 29043d3364..641887ab5d 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs @@ -40,6 +40,9 @@ namespace OpenRA.Mods.Common.Traits [Desc("Cursor to display when unable to land at target building.")] public readonly string EnterBlockedCursor = "enter-blocked"; + [Desc("Color to use for the target line for regular move orders.")] + public readonly Color TargetLineColor = Color.Green; + public override object Create(ActorInitializer init) { return new TransformsIntoAircraft(init, this); } } @@ -135,7 +138,7 @@ namespace OpenRA.Mods.Common.Traits if (!order.Queued) activity.NextActivity?.Cancel(self); - activity.Queue(new IssueOrderAfterTransform(order.OrderString, order.Target, Color.Green)); + activity.Queue(new IssueOrderAfterTransform(order.OrderString, order.Target, Info.TargetLineColor)); if (currentTransform == null) self.QueueActivity(order.Queued, activity); diff --git a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoEntersTunnels.cs b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoEntersTunnels.cs index ec9c221d6a..4363e911cc 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoEntersTunnels.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoEntersTunnels.cs @@ -26,6 +26,9 @@ namespace OpenRA.Mods.Common.Traits [Desc("Cursor to display when unable to enter target tunnel.")] public readonly string EnterBlockedCursor = "enter-blocked"; + [Desc("Color to use for the target line while in tunnels.")] + public readonly Color TargetLineColor = Color.Green; + [VoiceReference] public readonly string Voice = "Action"; @@ -98,7 +101,7 @@ namespace OpenRA.Mods.Common.Traits if (!order.Queued) activity.NextActivity?.Cancel(self); - activity.Queue(new IssueOrderAfterTransform(order.OrderString, order.Target, Color.Green)); + activity.Queue(new IssueOrderAfterTransform(order.OrderString, order.Target, Info.TargetLineColor)); if (currentTransform == null) self.QueueActivity(order.Queued, activity); diff --git a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoPassenger.cs b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoPassenger.cs index 97985f3661..47ef570cb6 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoPassenger.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoPassenger.cs @@ -27,6 +27,9 @@ namespace OpenRA.Mods.Common.Traits [VoiceReference] public readonly string Voice = "Action"; + [Desc("Color to use for the target line.")] + public readonly Color TargetLineColor = Color.Green; + [Desc("Require the force-move modifier to display the enter cursor.")] public readonly bool RequiresForceMove = false; @@ -132,7 +135,7 @@ namespace OpenRA.Mods.Common.Traits if (!order.Queued) activity.NextActivity?.Cancel(self); - activity.Queue(new IssueOrderAfterTransform(order.OrderString, order.Target, Color.Green)); + activity.Queue(new IssueOrderAfterTransform(order.OrderString, order.Target, Info.TargetLineColor)); if (currentTransform == null) self.QueueActivity(order.Queued, activity); diff --git a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoRepairable.cs b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoRepairable.cs index 5438686886..1d3544dab0 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoRepairable.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoRepairable.cs @@ -28,6 +28,9 @@ namespace OpenRA.Mods.Common.Traits [VoiceReference] public readonly string Voice = "Action"; + [Desc("Color to use for the target line.")] + public readonly Color TargetLineColor = Color.Green; + [Desc("Require the force-move modifier to display the enter cursor.")] public readonly bool RequiresForceMove = false; @@ -126,7 +129,7 @@ namespace OpenRA.Mods.Common.Traits if (!order.Queued) activity.NextActivity?.Cancel(self); - activity.Queue(new IssueOrderAfterTransform(order.OrderString, order.Target, Color.Green)); + activity.Queue(new IssueOrderAfterTransform(order.OrderString, order.Target, Info.TargetLineColor)); if (currentTransform == null) self.QueueActivity(order.Queued, activity); diff --git a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoTransforms.cs b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoTransforms.cs index 1103c5078b..b672cb40d5 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoTransforms.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/TransformsIntoTransforms.cs @@ -10,7 +10,6 @@ #endregion using OpenRA.Mods.Common.Activities; -using OpenRA.Primitives; using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits @@ -44,7 +43,7 @@ namespace OpenRA.Mods.Common.Traits if (!order.Queued) currentTransform.NextActivity?.Cancel(self); - currentTransform.Queue(new IssueOrderAfterTransform("DeployTransform", order.Target, Color.Green)); + currentTransform.Queue(new IssueOrderAfterTransform("DeployTransform", order.Target)); self.ShowTargetLines(); }