From 456d32f3eb1f4fc5dfd1fc30544a71bf1577482b Mon Sep 17 00:00:00 2001 From: reaperrr Date: Tue, 17 Oct 2017 16:38:25 +0200 Subject: [PATCH] Make Attack* traits PausableConditional and replace IsDisabled with IsTraitDisabled checks --- OpenRA.Mods.Common/Traits/Attack/AttackBase.cs | 8 ++++---- OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs index 12afa9ebee..f018ecb26a 100644 --- a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs +++ b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs @@ -19,7 +19,7 @@ using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits { - public abstract class AttackBaseInfo : ConditionalTraitInfo + public abstract class AttackBaseInfo : PausableConditionalTraitInfo { [Desc("Armament names")] public readonly string[] Armaments = { "primary", "secondary" }; @@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Traits public override abstract object Create(ActorInitializer init); } - public abstract class AttackBase : ConditionalTrait, INotifyCreated, IIssueOrder, IResolveOrder, IOrderVoice, ISync + public abstract class AttackBase : PausableConditionalTrait, INotifyCreated, IIssueOrder, IResolveOrder, IOrderVoice, ISync { readonly string attackOrderName = "Attack"; readonly string forceAttackOrderName = "ForceAttack"; @@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.Traits protected virtual bool CanAttack(Actor self, Target target) { - if (!self.IsInWorld || IsTraitDisabled || self.IsDisabled()) + if (!self.IsInWorld || IsTraitDisabled || IsTraitPaused) return false; if (!target.IsValidFor(self)) @@ -333,7 +333,7 @@ namespace OpenRA.Mods.Common.Traits public void AttackTarget(Target target, bool queued, bool allowMove, bool forceAttack = false) { - if (self.IsDisabled() || IsTraitDisabled) + if (IsTraitDisabled || IsTraitPaused) return; if (!target.IsValidFor(self)) diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs index ebcf5fd1bf..e44c9b22f7 100644 --- a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs +++ b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs @@ -84,7 +84,7 @@ namespace OpenRA.Mods.Common.Traits if (IsCanceled || !target.IsValidFor(self)) return NextActivity; - if (self.IsDisabled()) + if (attack.IsTraitPaused) return this; var weapon = attack.ChooseArmamentsForTarget(target, forceAttack).FirstOrDefault();