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

Add ForceFireIgnoresActors to AttackBase.

Browse Source
This commit is contained in:
Paul Chote
2019-01-25 20:56:19 +00:00
committed by reaperrr
parent a2e35144a7
commit ab6dd3dcf2
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Allow firing into the fog to target frozen actors without requiring force-fire.")] [Desc("Allow firing into the fog to target frozen actors without requiring force-fire.")]
public readonly bool TargetFrozenActors = false; public readonly bool TargetFrozenActors = false;
[Desc("Force-fire mode ignores actors and targets the ground instead.")]
public readonly bool ForceFireIgnoresActors = false;
[VoiceReference] public readonly string Voice = "Action"; [VoiceReference] public readonly string Voice = "Action";
public override abstract object Create(ActorInitializer init); public override abstract object Create(ActorInitializer init);
@@ -402,6 +405,9 @@ namespace OpenRA.Mods.Common.Traits
if (modifiers.HasModifier(TargetModifiers.ForceMove)) if (modifiers.HasModifier(TargetModifiers.ForceMove))
return false; return false;
if (ab.Info.ForceFireIgnoresActors && modifiers.HasModifier(TargetModifiers.ForceAttack))
return false;
// Disguised actors are revealed by the attack cursor // Disguised actors are revealed by the attack cursor
// HACK: works around limitations in the targeting code that force the // HACK: works around limitations in the targeting code that force the
// targeting and attacking logic (which should be logically separate) // targeting and attacking logic (which should be logically separate)