diff --git a/OpenRA.Mods.RA/Activities/Hunt.cs b/OpenRA.Mods.Common/Activities/Hunt.cs
similarity index 91%
rename from OpenRA.Mods.RA/Activities/Hunt.cs
rename to OpenRA.Mods.Common/Activities/Hunt.cs
index 987de48011..bbdb100ed4 100644
--- a/OpenRA.Mods.RA/Activities/Hunt.cs
+++ b/OpenRA.Mods.Common/Activities/Hunt.cs
@@ -11,13 +11,10 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Activities;
-using OpenRA.Mods.Common;
-using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Activities
+namespace OpenRA.Mods.Common.Activities
{
public class Hunt : Activity
{
diff --git a/OpenRA.Mods.RA/Activities/Sell.cs b/OpenRA.Mods.Common/Activities/Sell.cs
old mode 100755
new mode 100644
similarity index 95%
rename from OpenRA.Mods.RA/Activities/Sell.cs
rename to OpenRA.Mods.Common/Activities/Sell.cs
index 217d570e85..4a7070c29c
--- a/OpenRA.Mods.RA/Activities/Sell.cs
+++ b/OpenRA.Mods.Common/Activities/Sell.cs
@@ -11,10 +11,9 @@
using OpenRA.Activities;
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Activities
+namespace OpenRA.Mods.Common.Activities
{
class Sell : Activity
{
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index a72cd41217..779933ec0b 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -75,6 +75,7 @@
+
@@ -85,6 +86,7 @@
+
@@ -156,6 +158,7 @@
+
@@ -179,19 +182,25 @@
+
-
+
+
+
+
+
+
@@ -202,6 +211,8 @@
+
+
@@ -242,23 +253,34 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -266,6 +288,8 @@
+
+
@@ -293,6 +317,7 @@
+
diff --git a/OpenRA.Mods.RA/Traits/Air/TargetableAircraft.cs b/OpenRA.Mods.Common/Traits/Air/TargetableAircraft.cs
similarity index 95%
rename from OpenRA.Mods.RA/Traits/Air/TargetableAircraft.cs
rename to OpenRA.Mods.Common/Traits/Air/TargetableAircraft.cs
index 0c0106173a..7c0b8437f0 100644
--- a/OpenRA.Mods.RA/Traits/Air/TargetableAircraft.cs
+++ b/OpenRA.Mods.Common/Traits/Air/TargetableAircraft.cs
@@ -9,10 +9,9 @@
#endregion
using System.Collections.Generic;
-using OpenRA.Mods.RA;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
public class TargetableAircraftInfo : TargetableUnitInfo
{
diff --git a/OpenRA.Mods.RA/Traits/Buildings/TargetableBuilding.cs b/OpenRA.Mods.Common/Traits/Buildings/TargetableBuilding.cs
similarity index 95%
rename from OpenRA.Mods.RA/Traits/Buildings/TargetableBuilding.cs
rename to OpenRA.Mods.Common/Traits/Buildings/TargetableBuilding.cs
index dee814d7f9..b81b42af73 100644
--- a/OpenRA.Mods.RA/Traits/Buildings/TargetableBuilding.cs
+++ b/OpenRA.Mods.Common/Traits/Buildings/TargetableBuilding.cs
@@ -10,10 +10,9 @@
using System.Collections.Generic;
using System.Linq;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
public class TargetableBuildingInfo : ITraitInfo, ITargetableInfo, Requires
{
diff --git a/OpenRA.Mods.RA/CashTrickler.cs b/OpenRA.Mods.Common/Traits/CashTrickler.cs
similarity index 98%
rename from OpenRA.Mods.RA/CashTrickler.cs
rename to OpenRA.Mods.Common/Traits/CashTrickler.cs
index 2860de3da1..65e78d8d01 100644
--- a/OpenRA.Mods.RA/CashTrickler.cs
+++ b/OpenRA.Mods.Common/Traits/CashTrickler.cs
@@ -11,7 +11,7 @@
using OpenRA.Mods.Common.Effects;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Lets the actor generate cash in a set periodic time.")]
class CashTricklerInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Crushable.cs b/OpenRA.Mods.Common/Traits/Crushable.cs
similarity index 96%
rename from OpenRA.Mods.RA/Crushable.cs
rename to OpenRA.Mods.Common/Traits/Crushable.cs
index 266fcfe00b..9809741ee2 100644
--- a/OpenRA.Mods.RA/Crushable.cs
+++ b/OpenRA.Mods.Common/Traits/Crushable.cs
@@ -9,10 +9,9 @@
#endregion
using System.Linq;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
[Desc("This actor is crushable.")]
class CrushableInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Explodes.cs b/OpenRA.Mods.Common/Traits/Explodes.cs
similarity index 94%
rename from OpenRA.Mods.RA/Explodes.cs
rename to OpenRA.Mods.Common/Traits/Explodes.cs
index df6f79ffbe..1010fd8c70 100644
--- a/OpenRA.Mods.RA/Explodes.cs
+++ b/OpenRA.Mods.Common/Traits/Explodes.cs
@@ -12,9 +12,9 @@ using System.Linq;
using OpenRA.GameRules;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
{
- class ExplodesInfo : ITraitInfo
+ public class ExplodesInfo : ITraitInfo
{
[WeaponReference]
public readonly string Weapon = "UnitExplode";
@@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA
public object Create(ActorInitializer init) { return new Explodes(this); }
}
- class Explodes : INotifyKilled
+ public class Explodes : INotifyKilled
{
readonly ExplodesInfo explodesInfo;
diff --git a/OpenRA.Mods.RA/Guard.cs b/OpenRA.Mods.Common/Traits/Guard.cs
similarity index 88%
rename from OpenRA.Mods.RA/Guard.cs
rename to OpenRA.Mods.Common/Traits/Guard.cs
index 0c555ca072..d44dd145ea 100644
--- a/OpenRA.Mods.RA/Guard.cs
+++ b/OpenRA.Mods.Common/Traits/Guard.cs
@@ -14,15 +14,14 @@ using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Activities;
-using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
[Desc("The player can give this unit the order to follow and protect friendly units with the Guardable trait.")]
- class GuardInfo : TraitInfo { }
+ public class GuardInfo : TraitInfo { }
- class Guard : IResolveOrder, IOrderVoice
+ public class Guard : IResolveOrder, IOrderVoice
{
public void ResolveOrder(Actor self, Order order)
{
@@ -48,7 +47,7 @@ namespace OpenRA.Mods.RA.Traits
}
}
- class GuardOrderGenerator : IOrderGenerator
+ public class GuardOrderGenerator : IOrderGenerator
{
readonly IEnumerable subjects;
@@ -104,12 +103,4 @@ namespace OpenRA.Mods.RA.Traits
a.HasTrait());
}
}
-
- [Desc("This unit can be guarded (followed and protected) by a Guard unit.")]
- class GuardableInfo : TraitInfo
- {
- public readonly int Range = 2;
- }
-
- class Guardable { }
}
diff --git a/OpenRA.Mods.Common/Traits/Guardable.cs b/OpenRA.Mods.Common/Traits/Guardable.cs
new file mode 100644
index 0000000000..5edbf3f038
--- /dev/null
+++ b/OpenRA.Mods.Common/Traits/Guardable.cs
@@ -0,0 +1,22 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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 OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+ [Desc("This unit can be guarded (followed and protected) by a Guard unit.")]
+ public class GuardableInfo : TraitInfo
+ {
+ public readonly int Range = 2;
+ }
+
+ public class Guardable { }
+}
diff --git a/OpenRA.Mods.RA/ScaredyCat.cs b/OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs
similarity index 97%
rename from OpenRA.Mods.RA/ScaredyCat.cs
rename to OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs
index ce0e422d8a..06193d341e 100644
--- a/OpenRA.Mods.RA/ScaredyCat.cs
+++ b/OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs
@@ -8,10 +8,9 @@
*/
#endregion
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Makes the unit automatically run around when taking damage.")]
class ScaredyCatInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/TakeCover.cs b/OpenRA.Mods.Common/Traits/Infantry/TakeCover.cs
similarity index 97%
rename from OpenRA.Mods.RA/TakeCover.cs
rename to OpenRA.Mods.Common/Traits/Infantry/TakeCover.cs
index d358f1fb3f..4d964424ba 100644
--- a/OpenRA.Mods.RA/TakeCover.cs
+++ b/OpenRA.Mods.Common/Traits/Infantry/TakeCover.cs
@@ -9,10 +9,9 @@
#endregion
using OpenRA.GameRules;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Make the unit go prone when under attack, in an attempt to reduce damage.")]
public class TakeCoverInfo : TurretedInfo
diff --git a/OpenRA.Mods.RA/Render/RenderBuildingSilo.cs b/OpenRA.Mods.Common/Traits/Render/RenderBuildingSilo.cs
similarity index 96%
rename from OpenRA.Mods.RA/Render/RenderBuildingSilo.cs
rename to OpenRA.Mods.Common/Traits/Render/RenderBuildingSilo.cs
index 70401dcf58..c294a4cb70 100644
--- a/OpenRA.Mods.RA/Render/RenderBuildingSilo.cs
+++ b/OpenRA.Mods.Common/Traits/Render/RenderBuildingSilo.cs
@@ -11,10 +11,9 @@
using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
class RenderBuildingSiloInfo : RenderBuildingInfo
{
diff --git a/OpenRA.Mods.RA/Render/RenderBuildingWall.cs b/OpenRA.Mods.Common/Traits/Render/RenderBuildingWall.cs
similarity index 97%
rename from OpenRA.Mods.RA/Render/RenderBuildingWall.cs
rename to OpenRA.Mods.Common/Traits/Render/RenderBuildingWall.cs
index 3c04d4fa80..ea950e3681 100644
--- a/OpenRA.Mods.RA/Render/RenderBuildingWall.cs
+++ b/OpenRA.Mods.Common/Traits/Render/RenderBuildingWall.cs
@@ -12,10 +12,9 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
class RenderBuildingWallInfo : RenderBuildingInfo
{
diff --git a/OpenRA.Mods.RA/RenderDetectionCircle.cs b/OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs
similarity index 94%
rename from OpenRA.Mods.RA/RenderDetectionCircle.cs
rename to OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs
index 78b67e2112..abe32894a6 100644
--- a/OpenRA.Mods.RA/RenderDetectionCircle.cs
+++ b/OpenRA.Mods.Common/Traits/Render/RenderDetectionCircle.cs
@@ -12,10 +12,9 @@ using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
class RenderDetectionCircleInfo : ITraitInfo
{
diff --git a/OpenRA.Mods.RA/Render/RenderInfantry.cs b/OpenRA.Mods.Common/Traits/Render/RenderInfantry.cs
similarity index 98%
rename from OpenRA.Mods.RA/Render/RenderInfantry.cs
rename to OpenRA.Mods.Common/Traits/Render/RenderInfantry.cs
index 233b3da4c6..381a71a7da 100644
--- a/OpenRA.Mods.RA/Render/RenderInfantry.cs
+++ b/OpenRA.Mods.Common/Traits/Render/RenderInfantry.cs
@@ -12,10 +12,9 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
public class RenderInfantryInfo : RenderSimpleInfo, Requires
{
diff --git a/OpenRA.Mods.RA/RenderRangeCircle.cs b/OpenRA.Mods.Common/Traits/Render/RenderRangeCircle.cs
similarity index 97%
rename from OpenRA.Mods.RA/RenderRangeCircle.cs
rename to OpenRA.Mods.Common/Traits/Render/RenderRangeCircle.cs
index 86a3371549..9aaf3771a2 100644
--- a/OpenRA.Mods.RA/RenderRangeCircle.cs
+++ b/OpenRA.Mods.Common/Traits/Render/RenderRangeCircle.cs
@@ -13,10 +13,9 @@ using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Draw a circle indicating my weapon's range.")]
class RenderRangeCircleInfo : ITraitInfo, IPlaceBuildingDecoration, Requires
diff --git a/OpenRA.Mods.RA/Render/WithBuildingExplosion.cs b/OpenRA.Mods.Common/Traits/Render/WithBuildingExplosion.cs
old mode 100755
new mode 100644
similarity index 95%
rename from OpenRA.Mods.RA/Render/WithBuildingExplosion.cs
rename to OpenRA.Mods.Common/Traits/Render/WithBuildingExplosion.cs
index 00dc7e7075..490896abfe
--- a/OpenRA.Mods.RA/Render/WithBuildingExplosion.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithBuildingExplosion.cs
@@ -9,10 +9,9 @@
#endregion
using OpenRA.Mods.Common.Effects;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Display explosions over the building footprint when it is destroyed.")]
class WithBuildingExplosionInfo : ITraitInfo, Requires
diff --git a/OpenRA.Mods.RA/WithRangeCircle.cs b/OpenRA.Mods.Common/Traits/Render/WithRangeCircle.cs
similarity index 96%
rename from OpenRA.Mods.RA/WithRangeCircle.cs
rename to OpenRA.Mods.Common/Traits/Render/WithRangeCircle.cs
index 422e81ac41..4b2ae32e0a 100644
--- a/OpenRA.Mods.RA/WithRangeCircle.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithRangeCircle.cs
@@ -12,10 +12,9 @@ using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Renders an arbitrary circle when selected or placing a structure")]
class WithRangeCircleInfo : ITraitInfo, IPlaceBuildingDecoration
diff --git a/OpenRA.Mods.RA/Traits/SeedsResource.cs b/OpenRA.Mods.Common/Traits/SeedsResource.cs
similarity index 97%
rename from OpenRA.Mods.RA/Traits/SeedsResource.cs
rename to OpenRA.Mods.Common/Traits/SeedsResource.cs
index 2aa7cf4cd9..a18fe47da3 100644
--- a/OpenRA.Mods.RA/Traits/SeedsResource.cs
+++ b/OpenRA.Mods.Common/Traits/SeedsResource.cs
@@ -11,11 +11,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Support;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Lets the actor spread resources around it in a circle.")]
class SeedsResourceInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/SelfHealing.cs b/OpenRA.Mods.Common/Traits/SelfHealing.cs
similarity index 96%
rename from OpenRA.Mods.RA/SelfHealing.cs
rename to OpenRA.Mods.Common/Traits/SelfHealing.cs
index c7d9a86bc2..84a9b9a7a4 100644
--- a/OpenRA.Mods.RA/SelfHealing.cs
+++ b/OpenRA.Mods.Common/Traits/SelfHealing.cs
@@ -10,10 +10,9 @@
using System;
using System.Linq;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Attach this to actors which should be able to regenerate their health points.")]
class SelfHealingInfo : UpgradableTraitInfo, ITraitInfo, Requires
diff --git a/OpenRA.Mods.RA/Sellable.cs b/OpenRA.Mods.Common/Traits/Sellable.cs
similarity index 93%
rename from OpenRA.Mods.RA/Sellable.cs
rename to OpenRA.Mods.Common/Traits/Sellable.cs
index 39e021afac..794b354649 100644
--- a/OpenRA.Mods.RA/Sellable.cs
+++ b/OpenRA.Mods.Common/Traits/Sellable.cs
@@ -9,11 +9,10 @@
#endregion
using System.Linq;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.Common.Activities;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Actor can be sold")]
public class SellableInfo : UpgradableTraitInfo, ITraitInfo
diff --git a/OpenRA.Mods.RA/StoresResources.cs b/OpenRA.Mods.Common/Traits/StoresResources.cs
similarity index 98%
rename from OpenRA.Mods.RA/StoresResources.cs
rename to OpenRA.Mods.Common/Traits/StoresResources.cs
index df7830332b..981b7954a4 100644
--- a/OpenRA.Mods.RA/StoresResources.cs
+++ b/OpenRA.Mods.Common/Traits/StoresResources.cs
@@ -12,7 +12,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Used for silos.")]
class StoresResourcesInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Traits/TargetableUnit.cs b/OpenRA.Mods.Common/Traits/TargetableUnit.cs
similarity index 95%
rename from OpenRA.Mods.RA/Traits/TargetableUnit.cs
rename to OpenRA.Mods.Common/Traits/TargetableUnit.cs
index 3a15013599..8bd289163b 100644
--- a/OpenRA.Mods.RA/Traits/TargetableUnit.cs
+++ b/OpenRA.Mods.Common/Traits/TargetableUnit.cs
@@ -9,10 +9,9 @@
#endregion
using System.Collections.Generic;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Actor can be targeted.")]
public class TargetableUnitInfo : ITraitInfo, ITargetableInfo
diff --git a/OpenRA.Mods.RA/ThrowsParticle.cs b/OpenRA.Mods.Common/Traits/ThrowsParticle.cs
similarity index 97%
rename from OpenRA.Mods.RA/ThrowsParticle.cs
rename to OpenRA.Mods.Common/Traits/ThrowsParticle.cs
index 6cf623cbc9..6c9c65fc15 100644
--- a/OpenRA.Mods.RA/ThrowsParticle.cs
+++ b/OpenRA.Mods.Common/Traits/ThrowsParticle.cs
@@ -9,10 +9,9 @@
#endregion
using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
class ThrowsParticleInfo : ITraitInfo, Requires, Requires
{
diff --git a/OpenRA.Mods.RA/SpawnMPUnits.cs b/OpenRA.Mods.Common/Traits/World/SpawnMPUnits.cs
similarity index 97%
rename from OpenRA.Mods.RA/SpawnMPUnits.cs
rename to OpenRA.Mods.Common/Traits/World/SpawnMPUnits.cs
index c7f21c138c..0c5e69827c 100644
--- a/OpenRA.Mods.RA/SpawnMPUnits.cs
+++ b/OpenRA.Mods.Common/Traits/World/SpawnMPUnits.cs
@@ -11,11 +11,10 @@
using System;
using System.Linq;
using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Spawn base actor at the spawnpoint and support units in an annulus around the base actor. Both are defined at MPStartUnits. Attach this to the world actor.")]
public class SpawnMPUnitsInfo : TraitInfo, Requires, Requires { }
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 47bc1ee77c..c6db94d7f3 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -79,7 +79,6 @@
-
@@ -95,11 +94,9 @@
-
-
@@ -116,7 +113,6 @@
-
@@ -138,8 +134,6 @@
-
-
@@ -149,7 +143,6 @@
-
@@ -164,51 +157,35 @@
-
-
-
-
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
@@ -244,7 +221,7 @@
-
+
@@ -317,7 +294,6 @@
-
diff --git a/OpenRA.Mods.RA/Render/RenderDisguise.cs b/OpenRA.Mods.RA/Render/RenderDisguise.cs
index 9d0f32deaf..32e03a02e1 100644
--- a/OpenRA.Mods.RA/Render/RenderDisguise.cs
+++ b/OpenRA.Mods.RA/Render/RenderDisguise.cs
@@ -8,6 +8,7 @@
*/
#endregion
+using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
diff --git a/OpenRA.Mods.RA/Scripting/Properties/GuardProperties.cs b/OpenRA.Mods.RA/Scripting/Properties/GuardProperties.cs
index 0078f80919..a21ca307d1 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/GuardProperties.cs
+++ b/OpenRA.Mods.RA/Scripting/Properties/GuardProperties.cs
@@ -8,7 +8,7 @@
*/
#endregion
-using OpenRA.Mods.RA.Traits;
+using OpenRA.Mods.Common.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Traits/DemoTruck.cs b/OpenRA.Mods.RA/Traits/DemoTruck.cs
index 879f3017c4..bb1e073c43 100644
--- a/OpenRA.Mods.RA/Traits/DemoTruck.cs
+++ b/OpenRA.Mods.RA/Traits/DemoTruck.cs
@@ -14,6 +14,7 @@ using OpenRA.Activities;
using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders;
+using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
diff --git a/OpenRA.Mods.RA/RenderJammerCircle.cs b/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs
similarity index 100%
rename from OpenRA.Mods.RA/RenderJammerCircle.cs
rename to OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs
diff --git a/OpenRA.Mods.RA/RenderShroudCircle.cs b/OpenRA.Mods.RA/Traits/Render/RenderShroudCircle.cs
similarity index 100%
rename from OpenRA.Mods.RA/RenderShroudCircle.cs
rename to OpenRA.Mods.RA/Traits/Render/RenderShroudCircle.cs
diff --git a/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs b/OpenRA.Mods.RA/Traits/SupportPowers/ParatroopersPower.cs
similarity index 100%
rename from OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs
rename to OpenRA.Mods.RA/Traits/SupportPowers/ParatroopersPower.cs