From 0a57fbda3cbe4e0834b9f334e8991c55d112921a Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 2 Feb 2019 11:31:24 +0000 Subject: [PATCH] Prefer target to lastVisible target if it is visible. --- OpenRA.Mods.Common/Activities/Attack.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Activities/Attack.cs b/OpenRA.Mods.Common/Activities/Attack.cs index f6dc9b3895..2403bac50d 100644 --- a/OpenRA.Mods.Common/Activities/Attack.cs +++ b/OpenRA.Mods.Common/Activities/Attack.cs @@ -195,8 +195,10 @@ namespace OpenRA.Mods.Common.Activities return AttackStatus.UnableToAttack; attackStatus |= AttackStatus.NeedsToMove; + + var checkTarget = useLastVisibleTarget ? lastVisibleTarget : target; moveActivity = ActivityUtils.SequenceActivities( - move.MoveWithinRange(target, minRange, maxRange, lastVisibleTarget.CenterPosition, Color.Red), + move.MoveWithinRange(target, minRange, maxRange, checkTarget.CenterPosition, Color.Red), this); return AttackStatus.NeedsToMove;