diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 16542c956a..7d5f450b66 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -81,8 +81,6 @@
-
-
@@ -140,8 +138,6 @@
-
-
@@ -204,11 +200,7 @@
-
-
-
-
diff --git a/OpenRA.Game/Traits/Activities/Follow.cs b/OpenRA.Game/Traits/Activities/Follow.cs
index ad04dbee8e..dd2347dc93 100644
--- a/OpenRA.Game/Traits/Activities/Follow.cs
+++ b/OpenRA.Game/Traits/Activities/Follow.cs
@@ -20,7 +20,7 @@
namespace OpenRA.Traits.Activities
{
- class Follow : IActivity
+ public class Follow : IActivity
{
Actor Target;
int Range;
diff --git a/OpenRA.Game/Traits/Activities/HeliAttack.cs b/OpenRA.Game/Traits/Activities/HeliAttack.cs
index 5ef0fd1686..cfedda1177 100644
--- a/OpenRA.Game/Traits/Activities/HeliAttack.cs
+++ b/OpenRA.Game/Traits/Activities/HeliAttack.cs
@@ -24,7 +24,7 @@ using OpenRA.GameRules;
namespace OpenRA.Traits.Activities
{
- class HeliAttack : IActivity
+ public class HeliAttack : IActivity
{
Actor target;
public HeliAttack( Actor target ) { this.target = target; }
diff --git a/OpenRA.Game/Traits/Activities/HeliReturn.cs b/OpenRA.Game/Traits/Activities/HeliReturn.cs
index fc67046686..2d447840e0 100644
--- a/OpenRA.Game/Traits/Activities/HeliReturn.cs
+++ b/OpenRA.Game/Traits/Activities/HeliReturn.cs
@@ -22,7 +22,7 @@ using System.Linq;
namespace OpenRA.Traits.Activities
{
- class HeliReturn : IActivity
+ public class HeliReturn : IActivity
{
public IActivity NextActivity { get; set; }
bool isCanceled;
diff --git a/OpenRA.Game/Traits/Render/RenderBuildingCharge.cs b/OpenRA.Game/Traits/Render/RenderBuildingCharge.cs
index 38f7e8d01b..70486d1d6b 100755
--- a/OpenRA.Game/Traits/Render/RenderBuildingCharge.cs
+++ b/OpenRA.Game/Traits/Render/RenderBuildingCharge.cs
@@ -27,7 +27,7 @@ namespace OpenRA.Traits
}
/* used for tesla */
- class RenderBuildingCharge : RenderBuilding
+ public class RenderBuildingCharge : RenderBuilding
{
public RenderBuildingCharge(Actor self)
: base(self)
diff --git a/OpenRA.Game/Traits/Turreted.cs b/OpenRA.Game/Traits/Turreted.cs
index 3b0a6699ef..18528a316b 100644
--- a/OpenRA.Game/Traits/Turreted.cs
+++ b/OpenRA.Game/Traits/Turreted.cs
@@ -28,7 +28,7 @@ namespace OpenRA.Traits
public object Create(Actor self) { return new Turreted(self); }
}
- class Turreted : ITick
+ public class Turreted : ITick
{
[Sync]
public int turretFacing = 0;
diff --git a/OpenRA.Game/Traits/Activities/Leap.cs b/OpenRA.Mods.RA/Activities/Leap.cs
similarity index 93%
rename from OpenRA.Game/Traits/Activities/Leap.cs
rename to OpenRA.Mods.RA/Activities/Leap.cs
index 685705f67f..966b4e10a0 100644
--- a/OpenRA.Game/Traits/Activities/Leap.cs
+++ b/OpenRA.Mods.RA/Activities/Leap.cs
@@ -18,7 +18,8 @@
*/
#endregion
-namespace OpenRA.Traits.Activities
+using OpenRA.Traits;
+namespace OpenRA.Mods.RA.Activities
{
class Leap : IActivity
{
diff --git a/OpenRA.Game/Traits/Attack/AttackFrontal.cs b/OpenRA.Mods.RA/AttackFrontal.cs
similarity index 93%
rename from OpenRA.Game/Traits/Attack/AttackFrontal.cs
rename to OpenRA.Mods.RA/AttackFrontal.cs
index 6c9f756ef2..e9d88cc28b 100644
--- a/OpenRA.Game/Traits/Attack/AttackFrontal.cs
+++ b/OpenRA.Mods.RA/AttackFrontal.cs
@@ -19,8 +19,9 @@
#endregion
using System;
+using OpenRA.Traits;
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
{
abstract class AttackFrontal : AttackBase
{
diff --git a/OpenRA.Game/Traits/Attack/AttackHeli.cs b/OpenRA.Mods.RA/AttackHeli.cs
similarity index 93%
rename from OpenRA.Game/Traits/Attack/AttackHeli.cs
rename to OpenRA.Mods.RA/AttackHeli.cs
index 430aaa8896..e0be5e4844 100644
--- a/OpenRA.Game/Traits/Attack/AttackHeli.cs
+++ b/OpenRA.Mods.RA/AttackHeli.cs
@@ -18,9 +18,10 @@
*/
#endregion
+using OpenRA.Traits;
using OpenRA.Traits.Activities;
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
{
class AttackHeliInfo : AttackBaseInfo
{
diff --git a/OpenRA.Game/Traits/Attack/AttackLeap.cs b/OpenRA.Mods.RA/AttackLeap.cs
similarity index 91%
rename from OpenRA.Game/Traits/Attack/AttackLeap.cs
rename to OpenRA.Mods.RA/AttackLeap.cs
index aca25545e5..d011d59342 100644
--- a/OpenRA.Game/Traits/Attack/AttackLeap.cs
+++ b/OpenRA.Mods.RA/AttackLeap.cs
@@ -18,9 +18,10 @@
*/
#endregion
-using OpenRA.Traits.Activities;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Traits;
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
{
class AttackLeapInfo : AttackBaseInfo
{
diff --git a/OpenRA.Game/Traits/Attack/AttackOmni.cs b/OpenRA.Mods.RA/AttackOmni.cs
old mode 100755
new mode 100644
similarity index 93%
rename from OpenRA.Game/Traits/Attack/AttackOmni.cs
rename to OpenRA.Mods.RA/AttackOmni.cs
index 224f075686..d2885b742c
--- a/OpenRA.Game/Traits/Attack/AttackOmni.cs
+++ b/OpenRA.Mods.RA/AttackOmni.cs
@@ -18,7 +18,9 @@
*/
#endregion
-namespace OpenRA.Traits
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA
{
class AttackOmniInfo : AttackBaseInfo
{
diff --git a/OpenRA.Game/Traits/Attack/AttackPlane.cs b/OpenRA.Mods.RA/AttackPlane.cs
similarity index 93%
rename from OpenRA.Game/Traits/Attack/AttackPlane.cs
rename to OpenRA.Mods.RA/AttackPlane.cs
index 775af3774a..0783081975 100644
--- a/OpenRA.Game/Traits/Attack/AttackPlane.cs
+++ b/OpenRA.Mods.RA/AttackPlane.cs
@@ -18,9 +18,10 @@
*/
#endregion
+using OpenRA.Traits;
using OpenRA.Traits.Activities;
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
{
class AttackPlaneInfo : AttackBaseInfo
{
diff --git a/OpenRA.Game/Traits/Attack/AttackTesla.cs b/OpenRA.Mods.RA/AttackTesla.cs
old mode 100755
new mode 100644
similarity index 90%
rename from OpenRA.Game/Traits/Attack/AttackTesla.cs
rename to OpenRA.Mods.RA/AttackTesla.cs
index 0485aef598..b89148d51e
--- a/OpenRA.Game/Traits/Attack/AttackTesla.cs
+++ b/OpenRA.Mods.RA/AttackTesla.cs
@@ -19,17 +19,14 @@
#endregion
using System;
+using OpenRA.Traits;
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
{
class AttackTeslaInfo : AttackOmniInfo
{
public readonly int MaxCharges = 3;
-
- public override object Create( Actor self )
- {
- return new AttackTesla( self );
- }
+ public override object Create(Actor self) { return new AttackTesla(self); }
}
class AttackTesla : AttackOmni, ITick
diff --git a/OpenRA.Game/Traits/Attack/AttackTurreted.cs b/OpenRA.Mods.RA/AttackTurreted.cs
old mode 100755
new mode 100644
similarity index 93%
rename from OpenRA.Game/Traits/Attack/AttackTurreted.cs
rename to OpenRA.Mods.RA/AttackTurreted.cs
index 02caec449b..900cc08f04
--- a/OpenRA.Game/Traits/Attack/AttackTurreted.cs
+++ b/OpenRA.Mods.RA/AttackTurreted.cs
@@ -19,6 +19,7 @@
#endregion
using System;
+using OpenRA.Traits.Activities;
namespace OpenRA.Traits
{
@@ -61,7 +62,7 @@ namespace OpenRA.Traits
var weapon = order.Subject.GetPrimaryWeapon() ?? order.Subject.GetSecondaryWeapon();
if (self.traits.Contains())
- self.QueueActivity( new Traits.Activities.Follow( order.TargetActor,
+ self.QueueActivity( new Follow( order.TargetActor,
Math.Max( 0, (int)weapon.Range - RangeTolerance ) ) );
target = order.TargetActor;
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index fb64f94dce..0053a94f95 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -52,10 +52,18 @@
+
+
+
+
+
+
+
+