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

Fix worms getting stuck when target reaches rock

Browse Source
This commit is contained in:
penev92
2014-12-14 02:32:01 +02:00
parent 299a933dac
commit fbda9dc1b1
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.RA/Activities/Attack.cs
View File

@@ -23,6 +23,7 @@ namespace OpenRA.Mods.RA.Activities
readonly IFacing facing; readonly IFacing facing;
readonly WRange minRange; readonly WRange minRange;
readonly WRange maxRange; readonly WRange maxRange;
readonly IPositionable positionable;
public Attack(Actor self, Target target, WRange minRange, WRange maxRange, bool allowMovement) public Attack(Actor self, Target target, WRange minRange, WRange maxRange, bool allowMovement)
{ {
@@ -32,6 +33,7 @@ namespace OpenRA.Mods.RA.Activities
attack = self.Trait<AttackBase>(); attack = self.Trait<AttackBase>();
facing = self.Trait<IFacing>(); facing = self.Trait<IFacing>();
positionable = self.Trait<IPositionable>();
move = allowMovement ? self.TraitOrDefault<IMove>() : null; move = allowMovement ? self.TraitOrDefault<IMove>() : null;
} }
@@ -52,6 +54,9 @@ namespace OpenRA.Mods.RA.Activities
if (!Target.IsValidFor(self) || type == TargetType.FrozenActor) if (!Target.IsValidFor(self) || type == TargetType.FrozenActor)
return NextActivity; return NextActivity;
if (attack.Info.AttackRequiresEnteringCell && !positionable.CanEnterCell(Target.Actor.Location, null, false))
return NextActivity;
// Drop the target if it moves under the shroud / fog. // Drop the target if it moves under the shroud / fog.
// HACK: This would otherwise break targeting frozen actors // HACK: This would otherwise break targeting frozen actors
// The problem is that Shroud.IsTargetable returns false (as it should) for // The problem is that Shroud.IsTargetable returns false (as it should) for