diff --git a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs b/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs index 0fbc73e06c..ce2be8f58e 100644 --- a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs +++ b/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs @@ -97,11 +97,6 @@ namespace OpenRA.Mods.RA } } - public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove) - { - return new AttackActivity( newTarget ); - } - public override void ResolveOrder(Actor self, Order order) { base.ResolveOrder(self, order); @@ -127,33 +122,5 @@ namespace OpenRA.Mods.RA { return State == PopupState.Closed ? Info.ClosedDamageMultiplier : 1f; } - - class AttackActivity : Activity - { - readonly Target target; - public AttackActivity( Target newTarget ) { this.target = newTarget; } - - public override Activity Tick( Actor self ) - { - if( IsCanceled || !target.IsValid ) return NextActivity; - - if (self.TraitsImplementing().Any(d => d.Disabled)) - return this; - - var attack = self.Trait(); - const int RangeTolerance = 1; /* how far inside our maximum range we should try to sit */ - var weapon = attack.ChooseWeaponForTarget(target); - if (weapon != null) - { - attack.target = target; - - if (self.HasTrait() && !self.Info.Traits.Get().OnRails) - return Util.SequenceActivities( - new Follow( target, Math.Max( 0, (int)weapon.Info.Range - RangeTolerance ) ), - this ); - } - return NextActivity; - } - } } }