Add RejectsOrders to disallow orders for offmap aircraft etc

This commit is contained in:
ScottNZ
2013-07-12 16:01:35 +12:00
parent 3b6ab58940
commit e4e92ec900
7 changed files with 55 additions and 3 deletions

View File

@@ -170,6 +170,7 @@
<Compile Include="Traits\EditorTilesetFilter.cs" />
<Compile Include="Traits\Health.cs" />
<Compile Include="Traits\LintAttributes.cs" />
<Compile Include="Traits\RejectsOrders.cs" />
<Compile Include="Traits\Player\DeveloperMode.cs" />
<Compile Include="Traits\Player\PlayerResources.cs" />
<Compile Include="Traits\Render\RenderSimple.cs" />

View File

@@ -0,0 +1,43 @@
#region Copyright & License Information
/*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System.Linq;
using OpenRA.Network;
namespace OpenRA.Traits
{
public class RejectsOrdersInfo : ITraitInfo
{
public readonly string[] Except = { };
public object Create(ActorInitializer init) { return new RejectsOrders(this); }
}
public class RejectsOrders
{
public string[] Except { get { return info.Except; } }
readonly RejectsOrdersInfo info;
public RejectsOrders(RejectsOrdersInfo info)
{
this.info = info;
}
}
public static class RejectsOrdersExts
{
public static bool AcceptsOrder(this Actor self, string orderString)
{
var r = self.TraitOrDefault<RejectsOrders>();
return r == null || r.Except.Contains(orderString);
}
}
}

View File

@@ -8,7 +8,6 @@
*/
#endregion
using System.Collections.Generic;
using OpenRA.Network;
namespace OpenRA.Traits
@@ -40,7 +39,7 @@ namespace OpenRA.Traits
return false;
}
return true;
return order.Subject.AcceptsOrder(order.OrderString);
}
}
}