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

Add force-move

Browse Source
This commit is contained in:
Scott_NZ
2013-05-18 17:52:36 +12:00
parent cfcccb590d
commit ac430bd3bc
16 changed files with 77 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.RA/RepairsBridges.cs
View File

@@ -69,9 +69,9 @@ namespace OpenRA.Mods.RA
public RepairBridgeOrderTargeter()
: base("RepairBridge", 6, "goldwrench", true, true) { }
public override bool CanTargetActor(Actor self, Actor target, bool forceAttack, bool forceQueued, ref string cursor)
public override bool CanTargetActor(Actor self, Actor target, TargetModifiers modifiers, ref string cursor)
{
if (!base.CanTargetActor(self, target, forceAttack, forceQueued, ref cursor))
if (!base.CanTargetActor(self, target, modifiers, ref cursor))
return false;
var bridge = target.TraitOrDefault<BridgeHut>();
@@ -80,10 +80,10 @@ namespace OpenRA.Mods.RA
// Require force attack to heal partially damaged bridges to avoid unnecessary cursor noise
var damage = bridge.BridgeDamageState;
if (!forceAttack && damage != DamageState.Dead)
if (!modifiers.HasModifier(TargetModifiers.ForceAttack) && damage != DamageState.Dead)
return false;
IsQueued = forceQueued;
IsQueued = modifiers.HasModifier(TargetModifiers.ForceQueue);
// Can't repair an undamaged bridge
if (damage == DamageState.Undamaged)