Fix return fire logic ignoring AutoAttack priotities

Added brand new feature Unnecessary assignmet removed
2023-03-10 11:06:57 +01:00
parent 3b0b15abb9
commit b3d468aca1
1 changed files with 9 additions and 0 deletions
--- a/OpenRA.Mods.Common/Traits/AutoTarget.cs
+++ b/OpenRA.Mods.Common/Traits/AutoTarget.cs
@@ -256,6 +256,15 @@ namespace OpenRA.Mods.Common.Traits
 			if (attacker.AppearsFriendlyTo(self))
 				return;

+			// Respect AutoAttack priorities.
+			if (stance > UnitStance.ReturnFire)
+			{
+				var autoTarget = ScanForTarget(self, allowMove, true);
+
+				if (autoTarget != Target.Invalid)
+					attacker = autoTarget.Actor;
+			}
+
 			Aggressor = attacker;

 			Attack(Target.FromActor(Aggressor), allowMove);