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

Replace CanPowerDown with ToggleConditionOnOrder.

Browse Source
This commit is contained in:
Paul Chote
2017-12-25 10:16:38 +00:00
committed by Oliver Brakmann
parent b8ec20a010
commit 5425a5a28e
8 changed files with 186 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs
View File

@@ -33,6 +33,11 @@ namespace OpenRA.Mods.Common.Orders
return OrderInner(world, mi);
}
protected virtual bool IsValidTrait(T t)
{
return Exts.IsTraitEnabled(t);
}
protected IEnumerable<Order> OrderInner(World world, MouseInput mi)
{
if (mi.Button == MouseButton.Left)
@@ -40,7 +45,7 @@ namespace OpenRA.Mods.Common.Orders
var underCursor = world.ScreenMap.ActorsAtMouse(mi)
.Select(a => a.Actor)
.FirstOrDefault(a => a.Owner == world.LocalPlayer && a.TraitsImplementing<T>()
.Any(Exts.IsTraitEnabled));
.Any(IsValidTrait));
if (underCursor == null)
yield break;
@@ -66,10 +71,15 @@ namespace OpenRA.Mods.Common.Orders
public abstract string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi);
}
public class PowerDownOrderGenerator : GlobalButtonOrderGenerator<CanPowerDown>
public class PowerDownOrderGenerator : GlobalButtonOrderGenerator<ToggleConditionOnOrder>
{
public PowerDownOrderGenerator() : base("PowerDown") { }
protected override bool IsValidTrait(ToggleConditionOnOrder t)
{
return !t.IsTraitDisabled && !t.IsTraitPaused;
}
public override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
{
mi.Button = MouseButton.Left;