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

Fix blocked cursor for queued undeploy orders.

Browse Source
This commit is contained in:
Paul Chote
2019-06-20 20:19:23 +00:00
committed by reaperrr
parent 8f573568c8
commit 739f437c18
6 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,15 +32,19 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Require the force-move modifier to display the enter cursor.")]
public readonly bool RequiresForceMove = false;
public override object Create(ActorInitializer init) { return new TransformsIntoEntersTunnels(this); }
public override object Create(ActorInitializer init) { return new TransformsIntoEntersTunnels(init.Self, this); }
}
public class TransformsIntoEntersTunnels : ConditionalTrait<TransformsIntoEntersTunnelsInfo>, IIssueOrder, IResolveOrder, IOrderVoice
{
readonly Actor self;
Transforms[] transforms;
public TransformsIntoEntersTunnels(TransformsIntoEntersTunnelsInfo info)
: base(info) { }
public TransformsIntoEntersTunnels(Actor self, TransformsIntoEntersTunnelsInfo info)
: base(info)
{
this.self = self;
}
protected override void Created(Actor self)
{
@@ -53,10 +57,20 @@ namespace OpenRA.Mods.Common.Traits
get
{
if (!IsTraitDisabled)
yield return new EntersTunnels.EnterTunnelOrderTargeter(Info.EnterCursor, Info.EnterBlockedCursor, () => Info.RequiresForceMove);
yield return new EntersTunnels.EnterTunnelOrderTargeter(Info.EnterCursor, Info.EnterBlockedCursor, CanEnterTunnel, UseEnterCursor);
}
}
bool CanEnterTunnel(Actor target, TargetModifiers modifiers)
{
return !Info.RequiresForceMove || modifiers.HasModifier(TargetModifiers.ForceMove);
}
bool UseEnterCursor(Actor target)
{
return self.CurrentActivity is Transform || transforms.Any(t => !t.IsTraitDisabled && !t.IsTraitPaused);
}
Order IIssueOrder.IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
{
if (order.OrderID == "EnterTunnel")