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

Add support for queuing Guard orders.

Browse Source
This commit is contained in:
Paul Chote
2017-07-23 17:54:42 +01:00
committed by Matthias Mailänder
parent f4f27f8980
commit 898ef8fe50
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs
View File

@@ -31,9 +31,11 @@ namespace OpenRA.Mods.Common.Orders
yield break; yield break;
world.CancelInputMode(); world.CancelInputMode();
var queued = mi.Modifiers.HasModifier(Modifiers.Shift);
foreach (var subject in Subjects) foreach (var subject in Subjects)
if (subject != target) if (subject != target)
yield return new Order(OrderName, subject, false) { TargetActor = target }; yield return new Order(OrderName, subject, queued) { TargetActor = target };
} }
public override void Tick(World world) public override void Tick(World world)

13
OpenRA.Mods.Common/Traits/Guard.cs
View File

@@ -41,19 +41,18 @@ namespace OpenRA.Mods.Common.Traits
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "Guard") if (order.OrderString == "Guard")
{ GuardTarget(self, Target.FromActor(order.TargetActor), order.Queued);
var target = Target.FromActor(order.TargetActor);
GuardTarget(self, target);
}
} }
public void GuardTarget(Actor self, Target target) public void GuardTarget(Actor self, Target target, bool queued = false)
{ {
if (!queued)
self.CancelActivity();
self.SetTargetLine(target, Color.Yellow); self.SetTargetLine(target, Color.Yellow);
var range = target.Actor.Info.TraitInfo<GuardableInfo>().Range; var range = target.Actor.Info.TraitInfo<GuardableInfo>().Range;
self.QueueActivity(false, new AttackMoveActivity(self, move.MoveFollow(self, target, WDist.Zero, range))); self.QueueActivity(new AttackMoveActivity(self, move.MoveFollow(self, target, WDist.Zero, range)));
} }
public string VoicePhraseForOrder(Actor self, Order order) public string VoicePhraseForOrder(Actor self, Order order)