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

Revert "Fixes AttackMove moving even if an enemy is within range."

Browse Source 
This reverts commit a155c7b7ac.
This commit is contained in:
Paul Chote
2014-12-22 15:17:51 +13:00
parent e212517bbb
commit 488f0d1140
3 changed files with 17 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Mods.RA/Activities/AttackMoveActivity.cs
View File

@@ -20,42 +20,24 @@ namespace OpenRA.Mods.RA.Activities
{
const int ScanInterval = 7;
int scanTicks;
bool hasMoved;
Activity inner;
int scanTicks;
AutoTarget autoTarget;
public AttackMoveActivity(Actor self, Activity inner)
{
this.inner = inner;
autoTarget = self.TraitOrDefault<AutoTarget>();
hasMoved = false;
}
public override Activity Tick(Actor self)
{
if (autoTarget != null)
if (autoTarget != null && --scanTicks <= 0)
{
// If the actor hasn't moved since the activity was issued
if (!hasMoved)
autoTarget.ResetScanTimer();
if (--scanTicks <= 0)
{
var attackActivity = autoTarget.ScanAndAttack(self);
if (attackActivity != null)
{
if (!hasMoved)
return attackActivity;
self.QueueActivity(false, attackActivity);
}
scanTicks = ScanInterval;
}
autoTarget.ScanAndAttack(self);
scanTicks = ScanInterval;
}
hasMoved = true;
if (inner == null)
return NextActivity;