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

Fix Obelisk not dropping targets when they move out of range.

Browse Source
This commit is contained in:
Paul Chote
2017-03-10 19:34:41 +00:00
parent 5e737980fe
commit a9cfbd9ad7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Attack/AttackOmni.cs
View File

@@ -26,23 +26,25 @@ namespace OpenRA.Mods.Common.Traits
public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove, bool forceAttack) public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove, bool forceAttack)
{ {
return new SetTarget(this, newTarget); return new SetTarget(this, newTarget, allowMove);
} }
protected class SetTarget : Activity protected class SetTarget : Activity
{ {
readonly Target target; readonly Target target;
readonly AttackOmni attack; readonly AttackOmni attack;
readonly bool allowMove;
public SetTarget(AttackOmni attack, Target target) public SetTarget(AttackOmni attack, Target target, bool allowMove)
{ {
this.target = target; this.target = target;
this.attack = attack; this.attack = attack;
this.allowMove = allowMove;
} }
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
if (IsCanceled || !target.IsValidFor(self)) if (IsCanceled || !target.IsValidFor(self) || !attack.IsReachableTarget(target, allowMove))
return NextActivity; return NextActivity;
attack.DoAttack(self, target); attack.DoAttack(self, target);