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

Don't crash on multiple Attack* traits

Browse Source 
This is important for actors that use upgrades to switch between attack types.
This commit is contained in:
Pavel Penev
2016-02-13 18:46:42 +02:00
parent 65942ecfbf
commit 07947179cd
2 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@
*/
#endregion
using System;
using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.Common.Traits;
@@ -18,8 +19,11 @@ namespace OpenRA.Mods.Common.Activities
/* non-turreted attack */
public class Attack : Activity
{
[Flags]
enum AttackStatus { UnableToAttack, NeedsToTurn, NeedsToMove, Attacking }
protected readonly Target Target;
readonly AttackBase attack;
readonly AttackBase[] attackTraits;
readonly IMove move;
readonly IFacing facing;
readonly IPositionable positionable;
@@ -27,6 +31,9 @@ namespace OpenRA.Mods.Common.Activities
WDist minRange;
WDist maxRange;
Activity turnActivity;
Activity moveActivity;
AttackStatus attackStatus = AttackStatus.UnableToAttack;
public Attack(Actor self, Target target, bool allowMovement, bool forceAttack)
{
@@ -34,7 +41,7 @@ namespace OpenRA.Mods.Common.Activities
this.forceAttack = forceAttack;
attack = self.Trait<AttackBase>();
attackTraits = self.TraitsImplementing<AttackBase>().ToArray();
facing = self.Trait<IFacing>();
positionable = self.Trait<IPositionable>();
@@ -43,9 +50,25 @@ namespace OpenRA.Mods.Common.Activities
public override Activity Tick(Actor self)
{
var ret = InnerTick(self, attack);
attack.IsAttacking = ret == this;
return ret;
turnActivity = moveActivity = null;
attackStatus = AttackStatus.UnableToAttack;
foreach (var attack in attackTraits.Where(x => !x.IsTraitDisabled))
{
var activity = InnerTick(self, attack);
attack.IsAttacking = activity == this;
}
if (attackStatus.HasFlag(AttackStatus.Attacking))
return this;
if (attackStatus.HasFlag(AttackStatus.NeedsToTurn))
return turnActivity;
if (attackStatus.HasFlag(AttackStatus.NeedsToMove))
return moveActivity;
return NextActivity;
}
protected virtual Activity InnerTick(Actor self, AttackBase attack)
@@ -81,13 +104,21 @@ namespace OpenRA.Mods.Common.Activities
// Try to move within range, drop the target otherwise
if (move == null)
return NextActivity;
return ActivityUtils.SequenceActivities(move.MoveWithinRange(Target, minRange, maxRange), this);
attackStatus |= AttackStatus.NeedsToMove;
moveActivity = ActivityUtils.SequenceActivities(move.MoveWithinRange(Target, minRange, maxRange), this);
return NextActivity;
}
var desiredFacing = (Target.CenterPosition - self.CenterPosition).Yaw.Facing;
if (facing.Facing != desiredFacing)
return ActivityUtils.SequenceActivities(new Turn(self, desiredFacing), this);
{
attackStatus |= AttackStatus.NeedsToTurn;
turnActivity = ActivityUtils.SequenceActivities(new Turn(self, desiredFacing), this);
return NextActivity;
}
attackStatus |= AttackStatus.Attacking;
attack.DoAttack(self, Target, armaments);
return this;