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

Allow RallyPoint cursor to be defined via Yaml

Browse Source
This commit is contained in:
Andre Mohren
2017-10-25 22:50:04 +02:00
committed by reaperrr
parent cfeeb6563e
commit aadfcdac66
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
View File

@@ -23,6 +23,8 @@ namespace OpenRA.Mods.Common.Traits
[SequenceReference("Image")] public readonly string FlagSequence = "flag"; [SequenceReference("Image")] public readonly string FlagSequence = "flag";
[SequenceReference("Image")] public readonly string CirclesSequence = "circles"; [SequenceReference("Image")] public readonly string CirclesSequence = "circles";
public readonly string Cursor = "ability";
[Desc("Custom indicator palette name")] [Desc("Custom indicator palette name")]
[PaletteReference("IsPlayerPalette")] public readonly string Palette = "player"; [PaletteReference("IsPlayerPalette")] public readonly string Palette = "player";
@@ -71,7 +73,7 @@ namespace OpenRA.Mods.Common.Traits
public IEnumerable<IOrderTargeter> Orders public IEnumerable<IOrderTargeter> Orders
{ {
get { yield return new RallyPointOrderTargeter(); } get { yield return new RallyPointOrderTargeter(Info.Cursor); }
} }
public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued) public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
@@ -96,6 +98,13 @@ namespace OpenRA.Mods.Common.Traits
class RallyPointOrderTargeter : IOrderTargeter class RallyPointOrderTargeter : IOrderTargeter
{ {
readonly string cursor;
public RallyPointOrderTargeter(string cursor)
{
this.cursor = cursor;
}
public string OrderID { get { return "SetRallyPoint"; } } public string OrderID { get { return "SetRallyPoint"; } }
public int OrderPriority { get { return 0; } } public int OrderPriority { get { return 0; } }
public bool TargetOverridesSelection(TargetModifiers modifiers) { return true; } public bool TargetOverridesSelection(TargetModifiers modifiers) { return true; }
@@ -109,7 +118,7 @@ namespace OpenRA.Mods.Common.Traits
var location = self.World.Map.CellContaining(target.CenterPosition); var location = self.World.Map.CellContaining(target.CenterPosition);
if (self.World.Map.Contains(location)) if (self.World.Map.Contains(location))
{ {
cursor = "ability"; cursor = this.cursor;
// Notify force-set 'RallyPoint' order watchers with Ctrl and only if this is the only building of its type selected // Notify force-set 'RallyPoint' order watchers with Ctrl and only if this is the only building of its type selected
if (modifiers.HasModifier(TargetModifiers.ForceAttack)) if (modifiers.HasModifier(TargetModifiers.ForceAttack))