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

Merge pull request #7126 from penev92/bleed_sandworm

Browse Source 
Fix worms not releasing targets when they move deep onto rock
This commit is contained in:
Paul Chote
2014-12-22 14:46:08 +13:00
parent f352aedf61 fbda9dc1b1
commit e212517bbb
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

@@ -24,6 +24,7 @@ namespace OpenRA.Mods.RA.Activities
readonly IFacing facing;
readonly WRange minRange;
readonly WRange maxRange;
readonly IPositionable positionable;
public Attack(Actor self, Target target, WRange minRange, WRange maxRange, bool allowMovement)
{
@@ -33,6 +34,7 @@ namespace OpenRA.Mods.RA.Activities
attack = self.Trait<AttackBase>();
facing = self.Trait<IFacing>();
positionable = self.Trait<IPositionable>();
move = allowMovement ? self.TraitOrDefault<IMove>() : null;
}
@@ -52,6 +54,9 @@ namespace OpenRA.Mods.RA.Activities
var type = Target.Type;
if (!Target.IsValidFor(self) || type == TargetType.FrozenActor)
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.
// HACK: This would otherwise break targeting frozen actors