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

Fix activity cancellation on FlyAttack RTB.

Browse Source 
* AbortOnResupply will now cancel queued activities
  in addition to the current attack.
* Resupply if no ammo is available during a standard attack.
* Don't resupply (move directly to target) if no ammo is available
  during an attack move (C&C3 style).
This commit is contained in:
Paul Chote
2020-01-11 10:44:21 +00:00
committed by teinarss
parent 51870a471a
commit d0f44143c2
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ namespace OpenRA.Mods.Common.Activities
readonly Aircraft aircraft;
readonly AttackAircraft attackAircraft;
readonly Rearmable rearmable;
readonly AttackSource source;
readonly bool forceAttack;
readonly Color? targetLineColor;
readonly WDist strafeDistance;
@@ -36,8 +37,9 @@ namespace OpenRA.Mods.Common.Activities
bool hasTicked;
bool returnToBase;
public FlyAttack(Actor self, Target target, bool forceAttack, Color? targetLineColor)
public FlyAttack(Actor self, AttackSource source, Target target, bool forceAttack, Color? targetLineColor)
{
this.source = source;
this.target = target;
this.forceAttack = forceAttack;
this.targetLineColor = targetLineColor;
@@ -122,6 +124,14 @@ namespace OpenRA.Mods.Common.Activities
// and resume the activity after reloading if AbortOnResupply is set to 'false'
if (rearmable != null && !useLastVisibleTarget && attackAircraft.Armaments.All(x => x.IsTraitPaused || !x.Weapon.IsValidAgainst(target, self.World, self)))
{
// Attack moves never resupply
if (source == AttackSource.AttackMove)
return true;
// AbortOnResupply cancels the current activity (after resupplying) plus any queued activities
if (attackAircraft.Info.AbortOnResupply && NextActivity != null)
NextActivity.Cancel(self);
QueueChild(new ReturnToBase(self));
returnToBase = true;
return attackAircraft.Info.AbortOnResupply;

2
OpenRA.Mods.Common/Traits/Air/AttackAircraft.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Traits
public override Activity GetAttackActivity(Actor self, AttackSource source, Target newTarget, bool allowMove, bool forceAttack, Color? targetLineColor = null)
{
return new FlyAttack(self, newTarget, forceAttack, targetLineColor);
return new FlyAttack(self, source, newTarget, forceAttack, targetLineColor);
}
protected override bool CanAttack(Actor self, Target target)