Add RemoveOrders into RejectOrders trait

OpenRA · Dec 27, 2023 · d83a871 · d83a871
1 parent a0b1bdd
commit d83a871
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/OpenRA.Mods.Common/Traits/RejectsOrders.cs b/OpenRA.Mods.Common/Traits/RejectsOrders.cs
@@ -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); }
 	}
 
@@ -34,6 +37,12 @@ public class RejectsOrders : ConditionalTrait<RejectsOrdersInfo>
 
 		public RejectsOrders(RejectsOrdersInfo info)
 			: base(info) { }
+
+		protected override void TraitEnabled(Actor self)
+		{
+			if (Info.RemoveOrders)
+				self.CancelActivity();
+		}
 	}
 
 	public static class RejectsOrdersExts