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

Expose TransformsInto* targetline colors to yaml.

Browse Source
This commit is contained in:
Paul Chote
2020-11-15 11:10:54 +00:00
committed by abcdefg30
parent 05e8026713
commit e9ad38667e
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/Buildings/TransformsIntoAircraft.cs
View File

@@ -40,6 +40,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Cursor to display when unable to land at target building.")] [Desc("Cursor to display when unable to land at target building.")]
public readonly string EnterBlockedCursor = "enter-blocked"; 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); } public override object Create(ActorInitializer init) { return new TransformsIntoAircraft(init, this); }
} }
@@ -135,7 +138,7 @@ namespace OpenRA.Mods.Common.Traits
if (!order.Queued) if (!order.Queued)
activity.NextActivity?.Cancel(self); 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) if (currentTransform == null)
self.QueueActivity(order.Queued, activity); self.QueueActivity(order.Queued, activity);

5
OpenRA.Mods.Common/Traits/Buildings/TransformsIntoEntersTunnels.cs
View File

@@ -26,6 +26,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Cursor to display when unable to enter target tunnel.")] [Desc("Cursor to display when unable to enter target tunnel.")]
public readonly string EnterBlockedCursor = "enter-blocked"; public readonly string EnterBlockedCursor = "enter-blocked";
[Desc("Color to use for the target line while in tunnels.")]
public readonly Color TargetLineColor = Color.Green;
[VoiceReference] [VoiceReference]
public readonly string Voice = "Action"; public readonly string Voice = "Action";
@@ -98,7 +101,7 @@ namespace OpenRA.Mods.Common.Traits
if (!order.Queued) if (!order.Queued)
activity.NextActivity?.Cancel(self); 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) if (currentTransform == null)
self.QueueActivity(order.Queued, activity); self.QueueActivity(order.Queued, activity);

5
OpenRA.Mods.Common/Traits/Buildings/TransformsIntoPassenger.cs
View File

@@ -27,6 +27,9 @@ namespace OpenRA.Mods.Common.Traits
[VoiceReference] [VoiceReference]
public readonly string Voice = "Action"; 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.")] [Desc("Require the force-move modifier to display the enter cursor.")]
public readonly bool RequiresForceMove = false; public readonly bool RequiresForceMove = false;
@@ -132,7 +135,7 @@ namespace OpenRA.Mods.Common.Traits
if (!order.Queued) if (!order.Queued)
activity.NextActivity?.Cancel(self); 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) if (currentTransform == null)
self.QueueActivity(order.Queued, activity); self.QueueActivity(order.Queued, activity);

5
OpenRA.Mods.Common/Traits/Buildings/TransformsIntoRepairable.cs
View File

@@ -28,6 +28,9 @@ namespace OpenRA.Mods.Common.Traits
[VoiceReference] [VoiceReference]
public readonly string Voice = "Action"; 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.")] [Desc("Require the force-move modifier to display the enter cursor.")]
public readonly bool RequiresForceMove = false; public readonly bool RequiresForceMove = false;
@@ -126,7 +129,7 @@ namespace OpenRA.Mods.Common.Traits
if (!order.Queued) if (!order.Queued)
activity.NextActivity?.Cancel(self); 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) if (currentTransform == null)
self.QueueActivity(order.Queued, activity); self.QueueActivity(order.Queued, activity);

3
OpenRA.Mods.Common/Traits/Buildings/TransformsIntoTransforms.cs
View File

@@ -10,7 +10,6 @@
#endregion #endregion
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Activities;
using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
@@ -44,7 +43,7 @@ namespace OpenRA.Mods.Common.Traits
if (!order.Queued) if (!order.Queued)
currentTransform.NextActivity?.Cancel(self); currentTransform.NextActivity?.Cancel(self);
currentTransform.Queue(new IssueOrderAfterTransform("DeployTransform", order.Target, Color.Green)); currentTransform.Queue(new IssueOrderAfterTransform("DeployTransform", order.Target));
self.ShowTargetLines(); self.ShowTargetLines();
} }