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

Fix attack behaviour of disabled units.

Browse Source
This commit is contained in:
Lars Beckers
2019-03-30 14:46:17 +00:00
committed by reaperrr
parent 1bb319425b
commit e6750bf19c
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Activities/Attack.cs
View File

@@ -10,6 +10,7 @@
#endregion #endregion
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
@@ -200,8 +201,16 @@ namespace OpenRA.Mods.Common.Activities
} }
attackStatus |= AttackStatus.Attacking; attackStatus |= AttackStatus.Attacking;
attack.DoAttack(self, target, armaments); DoAttack(self, attack, armaments);
return AttackStatus.Attacking; return AttackStatus.Attacking;
} }
protected virtual void DoAttack(Actor self, AttackFrontal attack, IEnumerable<Armament> armaments)
{
if (!attack.IsTraitPaused)
foreach (var a in armaments)
a.CheckFire(self, facing, target);
}
} }
} }

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

@@ -122,12 +122,12 @@ namespace OpenRA.Mods.Common.Traits
return true; return true;
} }
public virtual void DoAttack(Actor self, Target target, IEnumerable<Armament> armaments = null) public virtual void DoAttack(Actor self, Target target)
{ {
if (armaments == null && !CanAttack(self, target)) if (!CanAttack(self, target))
return; return;
foreach (var a in armaments ?? Armaments) foreach (var a in Armaments)
a.CheckFire(self, facing, target); a.CheckFire(self, facing, target);
} }
@@ -350,7 +350,7 @@ namespace OpenRA.Mods.Common.Traits
public void AttackTarget(Target target, bool queued, bool allowMove, bool forceAttack = false) public void AttackTarget(Target target, bool queued, bool allowMove, bool forceAttack = false)
{ {
if (IsTraitDisabled || IsTraitPaused) if (IsTraitDisabled)
return; return;
if (!target.IsValidFor(self)) if (!target.IsValidFor(self))

2
OpenRA.Mods.Common/Traits/Attack/AttackGarrisoned.cs
View File

@@ -142,7 +142,7 @@ namespace OpenRA.Mods.Common.Traits
return coords.Value.LocalToWorld(p.Offset.Rotate(bodyOrientation)); return coords.Value.LocalToWorld(p.Offset.Rotate(bodyOrientation));
} }
public override void DoAttack(Actor self, Target target, IEnumerable<Armament> armaments = null) public override void DoAttack(Actor self, Target target)
{ {
if (!CanAttack(self, target)) if (!CanAttack(self, target))
return; return;

7
OpenRA.Mods.D2k/Traits/AttackSwallow.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.D2k.Traits
Info = info; Info = info;
} }
public override void DoAttack(Actor self, Target target, IEnumerable<Armament> armaments = null) public override void DoAttack(Actor self, Target target)
{ {
// This is so that the worm does not launch an attack against a target that has reached solid rock // This is so that the worm does not launch an attack against a target that has reached solid rock
if (target.Type != TargetType.Actor || !CanAttack(self, target)) if (target.Type != TargetType.Actor || !CanAttack(self, target))
@@ -86,6 +86,11 @@ namespace OpenRA.Mods.D2k.Traits
targetIsHiddenActor = false; targetIsHiddenActor = false;
return target; return target;
} }
protected override void DoAttack(Actor self, AttackFrontal attack, IEnumerable<Armament> armaments)
{
attack.DoAttack(self, target);
}
} }
} }
} }