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

Moves traits from Common and Power namespaces to Common.Traits namespace

Browse Source
This commit is contained in:
reaperrr
2014-12-09 23:39:39 +01:00
parent 9a1e110481
commit ffca040c47
103 changed files with 113 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Common/Scripting/Global/ActorGlobal.cs
View File

@@ -10,6 +10,7 @@
using System.Linq;
using Eluant;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Scripting;

1
OpenRA.Mods.Common/Scripting/Global/MapGlobal.cs
View File

@@ -11,6 +11,7 @@
using System;
using System.Linq;
using Eluant;
using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting;
namespace OpenRA.Mods.Common.Scripting

2
OpenRA.Mods.Common/Scripting/LuaScript.cs
View File

@@ -10,7 +10,7 @@
using System;
using OpenRA.Graphics;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;

7
OpenRA.Mods.Common/Scripting/Properties/PowerProperties.cs
View File

@@ -12,7 +12,8 @@ using System;
using System.Collections.Generic;
using System.Linq;
using Eluant;
using OpenRA.Mods.Common.Power;
using OpenRA.Mods.Common.Traits;
using PowerTrait = OpenRA.Mods.Common.Traits.Power;
using OpenRA.Scripting;
using OpenRA.Traits;
@@ -58,12 +59,12 @@ namespace OpenRA.Mods.Common.Scripting
[ScriptPropertyGroup("Power")]
public class ActorPowerProperties : ScriptActorProperties, Requires<PowerInfo>
{
readonly IEnumerable<Power.Power> power;
readonly IEnumerable<PowerTrait> power;
public ActorPowerProperties(ScriptContext context, Actor self)
: base(context, self)
{
power = self.TraitsImplementing<Power.Power>();
power = self.TraitsImplementing<PowerTrait>();
}
[Desc("Returns the power drained/provided by this actor.")]

1
OpenRA.Mods.Common/Scripting/Properties/UpgradeProperties.cs
View File

@@ -8,6 +8,7 @@
*/
#endregion
using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;