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

Fixes AttackMove moving even if an enemy is within range.

Browse Source
This commit is contained in:
WolfGaming
2014-12-04 11:14:15 +00:00
parent fb6b9b8be5
commit a155c7b7ac
3 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.RA/Attack/AttackBase.cs
View File

@@ -124,7 +124,7 @@ namespace OpenRA.Mods.RA
return;
self.SetTargetLine(target, Color.Red);
AttackTarget(target, order.Queued, true);
self.QueueActivity(false, AttackTarget(target, true));
}
}
@@ -143,15 +143,12 @@ namespace OpenRA.Mods.RA
public Armament ChooseArmamentForTarget(Target t) { return Armaments.FirstOrDefault(a => a.Weapon.IsValidAgainst(t, self.World, self)); }
public void AttackTarget(Target target, bool queued, bool allowMove)
public Activity AttackTarget(Target target, bool allowMove)
{
if (!target.IsValidFor(self))
return;
return null;
if (!queued)
self.CancelActivity();
self.QueueActivity(GetAttackActivity(self, target, allowMove));
return GetAttackActivity(self, target, allowMove);
}
public bool IsReachableTarget(Target target, bool allowMove)