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

Cancel support power targeting if power cannot be activated.

Browse Source
This commit is contained in:
Paul Chote
2021-01-10 12:17:25 +00:00
committed by reaperrr
parent 02a2624bcc
commit e990a83b7a
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Traits/SupportPowers/AttackOrderPower.cs
View File

@@ -120,7 +120,7 @@ namespace OpenRA.Mods.Cnc.Traits
protected override void Tick(World world) protected override void Tick(World world)
{ {
// Cancel the OG if we can't use the power // Cancel the OG if we can't use the power
if (!manager.Powers.ContainsKey(order)) if (!manager.Powers.TryGetValue(order, out var p) || !p.Active || !p.Ready)
world.CancelInputMode(); world.CancelInputMode();
} }

4
OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs
View File

@@ -174,7 +174,7 @@ namespace OpenRA.Mods.Cnc.Traits
protected override void Tick(World world) protected override void Tick(World world)
{ {
// Cancel the OG if we can't use the power // Cancel the OG if we can't use the power
if (!manager.Powers.ContainsKey(order)) if (!manager.Powers.TryGetValue(order, out var p) || !p.Active || !p.Ready)
world.CancelInputMode(); world.CancelInputMode();
} }
@@ -274,7 +274,7 @@ namespace OpenRA.Mods.Cnc.Traits
protected override void Tick(World world) protected override void Tick(World world)
{ {
// Cancel the OG if we can't use the power // Cancel the OG if we can't use the power
if (!manager.Powers.ContainsKey(order)) if (!manager.Powers.TryGetValue(order, out var p) || !p.Active || !p.Ready)
world.CancelInputMode(); world.CancelInputMode();
} }

2
OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs
View File

@@ -137,7 +137,7 @@ namespace OpenRA.Mods.Common.Traits
protected override void Tick(World world) protected override void Tick(World world)
{ {
// Cancel the OG if we can't use the power // Cancel the OG if we can't use the power
if (!manager.Powers.ContainsKey(order)) if (!manager.Powers.TryGetValue(order, out var p) || !p.Active || !p.Ready)
world.CancelInputMode(); world.CancelInputMode();
} }

2
OpenRA.Mods.Common/Traits/SupportPowers/SelectDirectionalTarget.cs
View File

@@ -106,7 +106,7 @@ namespace OpenRA.Mods.Common.Traits
void IOrderGenerator.Tick(World world) void IOrderGenerator.Tick(World world)
{ {
// Cancel the OG if we can't use the power // Cancel the OG if we can't use the power
if (!manager.Powers.ContainsKey(order)) if (!manager.Powers.TryGetValue(order, out var p) || !p.Active || !p.Ready)
world.CancelInputMode(); world.CancelInputMode();
} }

2
OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
View File

@@ -309,7 +309,7 @@ namespace OpenRA.Mods.Common.Traits
protected override void Tick(World world) protected override void Tick(World world)
{ {
// Cancel the OG if we can't use the power // Cancel the OG if we can't use the power
if (!manager.Powers.ContainsKey(order)) if (!manager.Powers.TryGetValue(order, out var p) || !p.Active || !p.Ready)
world.CancelInputMode(); world.CancelInputMode();
} }