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

Allow force-attacking things with the Lua API's Attack() method

Browse Source
This commit is contained in:
Oliver Brakmann
2015-10-24 00:27:23 +02:00
parent 206f644949
commit 6420a6ec8a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Scripting/Properties/CombatProperties.cs
View File

@@ -77,7 +77,7 @@ namespace OpenRA.Mods.Common.Scripting
} }
[Desc("Attack the target actor. The target actor needs to be visible.")] [Desc("Attack the target actor. The target actor needs to be visible.")]
public void Attack(Actor targetActor, bool allowMove = true) public void Attack(Actor targetActor, bool allowMove = true, bool forceAttack = false)
{ {
var target = Target.FromActor(targetActor); var target = Target.FromActor(targetActor);
if (!target.IsValidFor(Self) || target.Type == TargetType.FrozenActor) if (!target.IsValidFor(Self) || target.Type == TargetType.FrozenActor)
@@ -86,7 +86,7 @@ namespace OpenRA.Mods.Common.Scripting
if (!targetActor.Info.HasTraitInfo<FrozenUnderFogInfo>() && !Self.Owner.CanTargetActor(targetActor)) if (!targetActor.Info.HasTraitInfo<FrozenUnderFogInfo>() && !Self.Owner.CanTargetActor(targetActor))
Log.Write("lua", "{1} is not revealed for player {0}!", Self.Owner, targetActor); Log.Write("lua", "{1} is not revealed for player {0}!", Self.Owner, targetActor);
attackBase.AttackTarget(target, true, allowMove); attackBase.AttackTarget(target, true, allowMove, forceAttack);
} }
} }
} }