Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability to remove all orders when RejectOrders is activated #21233

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions OpenRA.Mods.Common/Traits/RejectsOrders.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ public class RejectsOrdersInfo : ConditionalTraitInfo
"Also overrides other instances of this trait's Reject fields.")]
public readonly HashSet<string> Except = new();

[Desc("Remove current and all queued orders from the actor when this trait is enabled.")]
public readonly bool RemoveOrders = false;

public override object Create(ActorInitializer init) { return new RejectsOrders(this); }
}

Expand All @@ -34,6 +37,12 @@ public class RejectsOrders : ConditionalTrait<RejectsOrdersInfo>

public RejectsOrders(RejectsOrdersInfo info)
: base(info) { }

protected override void TraitEnabled(Actor self)
Porenutak marked this conversation as resolved.
Show resolved Hide resolved
{
if (Info.RemoveOrders)
self.CancelActivity();
}
}

public static class RejectsOrdersExts
Expand Down