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

Fix aircraft that don't rearm stalling over invalid targets

Browse Source
This commit is contained in:
tjk-ws
2024-06-16 19:00:28 -05:00
committed by Gustas
parent cf0e73e75e
commit 6a7159e9a1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Activities/Air/FlyAttack.cs
View File

@@ -119,10 +119,14 @@ namespace OpenRA.Mods.Common.Activities
if (useLastVisibleTarget && !lastVisibleTarget.IsValidFor(self)) if (useLastVisibleTarget && !lastVisibleTarget.IsValidFor(self))
return true; return true;
// If all valid weapons have depleted their ammo and Rearmable trait exists, return to RearmActor to reload // If all weapons are invalid against the target
// and resume the activity after reloading if AbortOnResupply is set to 'false' if (!useLastVisibleTarget && attackAircraft.Armaments.All(x => x.IsTraitPaused || !x.Weapon.IsValidAgainst(target, self.World, self)))
if (rearmable != null && !useLastVisibleTarget && attackAircraft.Armaments.All(x => x.IsTraitPaused || !x.Weapon.IsValidAgainst(target, self.World, self)))
{ {
// If Rearmable trait exists, return to RearmActor to reload and resume the activity after
// reloading if AbortOnResupply is set to 'false'.
if (rearmable == null)
return true;
// Attack moves never resupply // Attack moves never resupply
if (source == AttackSource.AttackMove) if (source == AttackSource.AttackMove)
return true; return true;