epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed duplicate AttackActivity from AttackPopupTurreted

Browse Source
This commit is contained in:
Chris Forbes
2011-08-21 21:38:05 +12:00
parent 33ec2b3f5e
commit c0fd252b9f
1 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
View File

@@ -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) public override void ResolveOrder(Actor self, Order order)
{ {
base.ResolveOrder(self, order); base.ResolveOrder(self, order);
@@ -127,33 +122,5 @@ namespace OpenRA.Mods.RA
{ {
return State == PopupState.Closed ? Info.ClosedDamageMultiplier : 1f; 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<IDisable>().Any(d => d.Disabled))
return this;
var attack = self.Trait<AttackPopupTurreted>();
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<Mobile>() && !self.Info.Traits.Get<MobileInfo>().OnRails)
return Util.SequenceActivities(
new Follow( target, Math.Max( 0, (int)weapon.Info.Range - RangeTolerance ) ),
this );
}
return NextActivity;
}
}
} }
} }