From 225d26bfdbef4fd15c4598c6a353b8ceb31cd58f Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 18 Mar 2017 18:12:02 +0100 Subject: [PATCH 1/2] Add explicit Reject field to RejectsOrders --- OpenRA.Mods.Common/Traits/RejectsOrders.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/RejectsOrders.cs b/OpenRA.Mods.Common/Traits/RejectsOrders.cs index 4d17fb6de3..4ecd66be91 100644 --- a/OpenRA.Mods.Common/Traits/RejectsOrders.cs +++ b/OpenRA.Mods.Common/Traits/RejectsOrders.cs @@ -17,7 +17,10 @@ namespace OpenRA.Mods.Common.Traits [Desc("Can be used to make a unit partly uncontrollable by the player.")] public class RejectsOrdersInfo : ConditionalTraitInfo { - [Desc("Possible values include Attack, AttackMove, Guard, Move.")] + [Desc("Explicit list of rejected orders. Leave empty to reject all minus those listed under Except.")] + public readonly HashSet Reject = new HashSet(); + + [Desc("List of orders that should *not* be rejected.")] public readonly HashSet Except = new HashSet(); public override object Create(ActorInitializer init) { return new RejectsOrders(this); } @@ -25,6 +28,7 @@ namespace OpenRA.Mods.Common.Traits public class RejectsOrders : ConditionalTrait { + public HashSet Reject { get { return Info.Reject; } } public HashSet Except { get { return Info.Except; } } public RejectsOrders(RejectsOrdersInfo info) @@ -36,7 +40,7 @@ namespace OpenRA.Mods.Common.Traits public static bool AcceptsOrder(this Actor self, string orderString) { var r = self.TraitOrDefault(); - return r == null || r.IsTraitDisabled || r.Except.Contains(orderString); + return r == null || r.IsTraitDisabled || (r.Reject.Count > 0 && !r.Reject.Contains(orderString)) || r.Except.Contains(orderString); } } } From 398956b690cb8992b64df77259f9c0ca6536f88f Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 18 Mar 2017 23:51:27 +0100 Subject: [PATCH 2/2] Add support for multiple RejectsOrders traits per actor --- OpenRA.Mods.Common/Traits/RejectsOrders.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/RejectsOrders.cs b/OpenRA.Mods.Common/Traits/RejectsOrders.cs index 4ecd66be91..cb9bf71f88 100644 --- a/OpenRA.Mods.Common/Traits/RejectsOrders.cs +++ b/OpenRA.Mods.Common/Traits/RejectsOrders.cs @@ -10,6 +10,7 @@ #endregion using System.Collections.Generic; +using System.Linq; using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits @@ -20,7 +21,8 @@ namespace OpenRA.Mods.Common.Traits [Desc("Explicit list of rejected orders. Leave empty to reject all minus those listed under Except.")] public readonly HashSet Reject = new HashSet(); - [Desc("List of orders that should *not* be rejected.")] + [Desc("List of orders that should *not* be rejected.", + "Also overrides other instances of this trait's Reject fields.")] public readonly HashSet Except = new HashSet(); public override object Create(ActorInitializer init) { return new RejectsOrders(this); } @@ -39,8 +41,8 @@ namespace OpenRA.Mods.Common.Traits { public static bool AcceptsOrder(this Actor self, string orderString) { - var r = self.TraitOrDefault(); - return r == null || r.IsTraitDisabled || (r.Reject.Count > 0 && !r.Reject.Contains(orderString)) || r.Except.Contains(orderString); + var r = self.TraitsImplementing().Where(Exts.IsTraitEnabled).ToList(); + return !r.Any() || r.Any(t => t.Reject.Any() && !t.Reject.Contains(orderString)) || r.Any(t => t.Except.Contains(orderString)); } } }