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

Remove AttackBase.IgnoresVisibility.

Browse Source 
This was a workaround for D2K sandworms, which is
now implemented using a custom attack activity.
This commit is contained in:
Paul Chote
2018-12-17 11:05:51 +00:00
committed by Oliver Brakmann
parent 8eeb6d68e7
commit 2ac7e451b4
7 changed files with 87 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,6 +74,8 @@ namespace OpenRA.Mods.Common.Activities
return NextActivity;
}
protected virtual bool IgnoresVisibility { get { return false; } }
protected virtual AttackStatus TickAttack(Actor self, AttackBase attack)
{
if (IsCanceled)
@@ -90,7 +92,7 @@ namespace OpenRA.Mods.Common.Activities
// HACK: This would otherwise break targeting frozen actors
// The problem is that Shroud.IsTargetable returns false (as it should) for
// frozen actors, but we do want to explicitly target the underlying actor here.
if (!attack.Info.IgnoresVisibility && type == TargetType.Actor
if (!IgnoresVisibility && type == TargetType.Actor
&& !Target.Actor.Info.HasTraitInfo<FrozenUnderFogInfo>()
&& !Target.Actor.CanBeViewedByPlayer(self.Owner))
return AttackStatus.UnableToAttack;