From 3c60794e2ed79a26920ccca44394a2c1334b12f9 Mon Sep 17 00:00:00 2001
From: steelphase <ebajumpaa@gmail.com>
Date: Sat, 4 Oct 2014 16:01:20 -0400
Subject: [PATCH] Mods.Common Effects

Moved over more effects to Mods.Common
---
 .../Effects/Beacon.cs                         |  2 +-
 .../Effects/Bullet.cs                         |  7 +++---
 .../Effects/Contrail.cs                       |  3 +--
 .../Effects/Corpse.cs                         |  2 +-
 .../Effects/CrateEffect.cs                    |  4 ++--
 .../Effects/GravityBomb.cs                    |  2 +-
 .../Effects/LaserZap.cs                       |  5 ++--
 .../Effects/Missile.cs                        | 10 ++++----
 .../Effects/RallyPoint.cs                     |  6 ++---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj  | 11 +++++++++
 .../RallyPoint.cs                             |  2 +-
 .../Traits}/JamsMissiles.cs                   |  4 ++--
 OpenRA.Mods.RA/AI/HackyAI.cs                  |  1 +
 OpenRA.Mods.RA/Air/TakeOff.cs                 |  1 +
 OpenRA.Mods.RA/CrateAction.cs                 |  2 +-
 OpenRA.Mods.RA/GainsExperience.cs             |  2 +-
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj          | 23 +++++--------------
 OpenRA.Mods.RA/Player/PlaceBeacon.cs          |  2 +-
 OpenRA.Mods.RA/Production.cs                  |  2 +-
 OpenRA.Mods.RA/Render/WithDeathAnimation.cs   |  4 +---
 OpenRA.Mods.RA/Repairable.cs                  |  1 +
 .../SupportPowers/AirstrikePower.cs           |  2 +-
 OpenRA.Mods.RA/SupportPowers/NukePower.cs     |  1 +
 .../SupportPowers/ParatroopersPower.cs        |  2 +-
 24 files changed, 51 insertions(+), 50 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Effects/Beacon.cs (98%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Effects/Bullet.cs (95%)
 mode change 100755 => 100644
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Effects/Contrail.cs (96%)
 mode change 100755 => 100644
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Effects/Corpse.cs (96%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Effects/CrateEffect.cs (93%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Effects/GravityBomb.cs (98%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Effects/LaserZap.cs (98%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Effects/Missile.cs (95%)
 mode change 100755 => 100644
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Effects/RallyPoint.cs (93%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/RallyPoint.cs (98%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/JamsMissiles.cs (91%)

diff --git a/OpenRA.Mods.RA/Effects/Beacon.cs b/OpenRA.Mods.Common/Effects/Beacon.cs
similarity index 98%
rename from OpenRA.Mods.RA/Effects/Beacon.cs
rename to OpenRA.Mods.Common/Effects/Beacon.cs
index 48e7d2bdb9..81186e1d98 100644
--- a/OpenRA.Mods.RA/Effects/Beacon.cs
+++ b/OpenRA.Mods.Common/Effects/Beacon.cs
@@ -13,7 +13,7 @@ using System.Collections.Generic;
 using OpenRA.Effects;
 using OpenRA.Graphics;
 
-namespace OpenRA.Mods.RA.Effects
+namespace OpenRA.Mods.Common.Effects
 {
 	public class Beacon : IEffect
 	{
diff --git a/OpenRA.Mods.RA/Effects/Bullet.cs b/OpenRA.Mods.Common/Effects/Bullet.cs
old mode 100755
new mode 100644
similarity index 95%
rename from OpenRA.Mods.RA/Effects/Bullet.cs
rename to OpenRA.Mods.Common/Effects/Bullet.cs
index 1fc0b0ad50..ead6cde5ec
--- a/OpenRA.Mods.RA/Effects/Bullet.cs
+++ b/OpenRA.Mods.Common/Effects/Bullet.cs
@@ -15,11 +15,10 @@ using System.Linq;
 using OpenRA.Effects;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.Common.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Effects
+namespace OpenRA.Mods.Common.Effects
 {
 	public class BulletInfo : IProjectileInfo
 	{
@@ -83,12 +82,12 @@ namespace OpenRA.Mods.RA.Effects
 			target = args.PassiveTarget;
 			if (info.Inaccuracy.Range > 0)
 			{
-				var inaccuracy = Traits.Util.ApplyPercentageModifiers(info.Inaccuracy.Range, args.InaccuracyModifiers);
+				var inaccuracy = OpenRA.Traits.Util.ApplyPercentageModifiers(info.Inaccuracy.Range, args.InaccuracyModifiers);
 				var maxOffset = inaccuracy * (target - pos).Length / args.Weapon.Range.Range;
 				target += WVec.FromPDF(world.SharedRandom, 2) * maxOffset / 1024;
 			}
 
-			facing = Traits.Util.GetFacing(target - pos, 0);
+			facing = OpenRA.Traits.Util.GetFacing(target - pos, 0);
 			length = Math.Max((target - pos).Length / speed.Range, 1);
 
 			if (info.Image != null)
diff --git a/OpenRA.Mods.RA/Effects/Contrail.cs b/OpenRA.Mods.Common/Effects/Contrail.cs
old mode 100755
new mode 100644
similarity index 96%
rename from OpenRA.Mods.RA/Effects/Contrail.cs
rename to OpenRA.Mods.Common/Effects/Contrail.cs
index 0564097747..55da537f40
--- a/OpenRA.Mods.RA/Effects/Contrail.cs
+++ b/OpenRA.Mods.Common/Effects/Contrail.cs
@@ -11,11 +11,10 @@
 using System.Collections.Generic;
 using System.Drawing;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.Common.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Effects
 {
 	[Desc("Draw a colored contrail behind this actor when they move.")]
 	class ContrailInfo : ITraitInfo, Requires<IBodyOrientationInfo>
diff --git a/OpenRA.Mods.RA/Effects/Corpse.cs b/OpenRA.Mods.Common/Effects/Corpse.cs
similarity index 96%
rename from OpenRA.Mods.RA/Effects/Corpse.cs
rename to OpenRA.Mods.Common/Effects/Corpse.cs
index 8d2bac4459..bb57ff2360 100644
--- a/OpenRA.Mods.RA/Effects/Corpse.cs
+++ b/OpenRA.Mods.Common/Effects/Corpse.cs
@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using OpenRA.Effects;
 using OpenRA.Graphics;
 
-namespace OpenRA.Mods.RA.Effects
+namespace OpenRA.Mods.Common.Effects
 {
 	public class Corpse : IEffect
 	{
diff --git a/OpenRA.Mods.RA/Effects/CrateEffect.cs b/OpenRA.Mods.Common/Effects/CrateEffect.cs
similarity index 93%
rename from OpenRA.Mods.RA/Effects/CrateEffect.cs
rename to OpenRA.Mods.Common/Effects/CrateEffect.cs
index 3c2b78b7c1..5c7ffcd869 100644
--- a/OpenRA.Mods.RA/Effects/CrateEffect.cs
+++ b/OpenRA.Mods.Common/Effects/CrateEffect.cs
@@ -12,9 +12,9 @@ using System.Collections.Generic;
 using OpenRA.Effects;
 using OpenRA.Graphics;
 
-namespace OpenRA.Mods.RA.Effects
+namespace OpenRA.Mods.Common.Effects
 {
-	class CrateEffect : IEffect
+	public class CrateEffect : IEffect
 	{
 		readonly string palette;
 		readonly Actor a;
diff --git a/OpenRA.Mods.RA/Effects/GravityBomb.cs b/OpenRA.Mods.Common/Effects/GravityBomb.cs
similarity index 98%
rename from OpenRA.Mods.RA/Effects/GravityBomb.cs
rename to OpenRA.Mods.Common/Effects/GravityBomb.cs
index 6368667e79..71bc53bb5b 100644
--- a/OpenRA.Mods.RA/Effects/GravityBomb.cs
+++ b/OpenRA.Mods.Common/Effects/GravityBomb.cs
@@ -14,7 +14,7 @@ using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Effects
+namespace OpenRA.Mods.Common.Effects
 {
 	public class GravityBombInfo : IProjectileInfo
 	{
diff --git a/OpenRA.Mods.RA/Effects/LaserZap.cs b/OpenRA.Mods.Common/Effects/LaserZap.cs
similarity index 98%
rename from OpenRA.Mods.RA/Effects/LaserZap.cs
rename to OpenRA.Mods.Common/Effects/LaserZap.cs
index a130418e9c..d698675f61 100644
--- a/OpenRA.Mods.RA/Effects/LaserZap.cs
+++ b/OpenRA.Mods.Common/Effects/LaserZap.cs
@@ -13,10 +13,11 @@ using System.Drawing;
 using OpenRA.Effects;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
-using OpenRA.Traits;
 using OpenRA.Mods.Common.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Effects
+
+namespace OpenRA.Mods.Common.Effects
 {
 	[Desc("Not a sprite, but an engine effect.")]
 	class LaserZapInfo : IProjectileInfo
diff --git a/OpenRA.Mods.RA/Effects/Missile.cs b/OpenRA.Mods.Common/Effects/Missile.cs
old mode 100755
new mode 100644
similarity index 95%
rename from OpenRA.Mods.RA/Effects/Missile.cs
rename to OpenRA.Mods.Common/Effects/Missile.cs
index d1865b336d..ff55f25b66
--- a/OpenRA.Mods.RA/Effects/Missile.cs
+++ b/OpenRA.Mods.Common/Effects/Missile.cs
@@ -14,11 +14,11 @@ using System.Linq;
 using OpenRA.Effects;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.Common.Graphics;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Effects
+namespace OpenRA.Mods.Common.Effects
 {
 	class MissileInfo : IProjectileInfo
 	{
@@ -97,7 +97,7 @@ namespace OpenRA.Mods.RA.Effects
 
 			if (info.Inaccuracy.Range > 0)
 			{
-				var inaccuracy = Traits.Util.ApplyPercentageModifiers(info.Inaccuracy.Range, args.InaccuracyModifiers);
+				var inaccuracy = OpenRA.Traits.Util.ApplyPercentageModifiers(info.Inaccuracy.Range, args.InaccuracyModifiers);
 				offset = WVec.FromPDF(world.SharedRandom, 2) * inaccuracy / 1024;
 			}
 
@@ -135,7 +135,7 @@ namespace OpenRA.Mods.RA.Effects
 				targetPosition = args.GuidedTarget.CenterPosition;
 
 			var dist = targetPosition + offset - pos;
-			var desiredFacing = Traits.Util.GetFacing(dist, facing);
+			var desiredFacing = OpenRA.Traits.Util.GetFacing(dist, facing);
 			var desiredAltitude = targetPosition.Z;
 			var jammed = info.Jammable && world.ActorsWithTrait<JamsMissiles>().Any(JammedBy);
 
@@ -147,7 +147,7 @@ namespace OpenRA.Mods.RA.Effects
 			else if (!args.GuidedTarget.IsValidFor(args.SourceActor))
 				desiredFacing = facing;
 
-			facing = Traits.Util.TickFacing(facing, desiredFacing, info.ROT);
+			facing = OpenRA.Traits.Util.TickFacing(facing, desiredFacing, info.ROT);
 			var move = new WVec(0, -1024, 0).Rotate(WRot.FromFacing(facing)) * info.Speed.Range / 1024;
 			if (targetPosition.Z > 0 && info.TurboBoost)
 				move = (move * 3) / 2;
diff --git a/OpenRA.Mods.RA/Effects/RallyPoint.cs b/OpenRA.Mods.Common/Effects/RallyPoint.cs
similarity index 93%
rename from OpenRA.Mods.RA/Effects/RallyPoint.cs
rename to OpenRA.Mods.Common/Effects/RallyPoint.cs
index cf5ca23225..7ef001a1e8 100644
--- a/OpenRA.Mods.RA/Effects/RallyPoint.cs
+++ b/OpenRA.Mods.Common/Effects/RallyPoint.cs
@@ -13,12 +13,12 @@ using System.Linq;
 using OpenRA.Effects;
 using OpenRA.Graphics;
 
-namespace OpenRA.Mods.RA.Effects
+namespace OpenRA.Mods.Common.Effects
 {
 	class RallyPoint : IEffect
 	{
 		readonly Actor building;
-		readonly RA.RallyPoint rp;
+		readonly Common.RallyPoint rp;
 		readonly string palettePrefix;
 		readonly Animation flag;
 		readonly Animation circles;
@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA.Effects
 			this.building = building;
 			this.palettePrefix = palettePrefix;
 
-			rp = building.Trait<RA.RallyPoint>();
+			rp = building.Trait<Common.RallyPoint>();
 
 			flag = new Animation(building.World, "rallypoint");
 			circles = new Animation(building.World, "rallypoint");
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 59df02b9ee..25a741cc5d 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -42,9 +42,18 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CommonTraitsInterfaces.cs" />
+    <Compile Include="Effects\Beacon.cs" />
+    <Compile Include="Effects\Bullet.cs" />
+    <Compile Include="Effects\Contrail.cs" />
     <Compile Include="Effects\ContrailFader.cs" />
+    <Compile Include="Effects\Corpse.cs" />
+    <Compile Include="Effects\CrateEffect.cs" />
     <Compile Include="Effects\Explosion.cs" />
     <Compile Include="Effects\FloatingText.cs" />
+    <Compile Include="Effects\GravityBomb.cs" />
+    <Compile Include="Effects\LaserZap.cs" />
+    <Compile Include="Effects\Missile.cs" />
+    <Compile Include="Effects\RallyPoint.cs" />
     <Compile Include="Effects\Smoke.cs" />
     <Compile Include="Console\ChatCommands.cs" />
     <Compile Include="Console\DevCommands.cs" />
@@ -60,9 +69,11 @@
     <Compile Include="Graphics\VoxelRenderable.cs" />
     <Compile Include="ModChooserLoadScreen.cs" />
     <Compile Include="PaletteFromFile.cs" />
+    <Compile Include="RallyPoint.cs" />
     <Compile Include="ServerTraits\ColorValidator.cs" />
     <Compile Include="ServerTraits\MasterServerPinger.cs" />
     <Compile Include="ServerTraits\PlayerPinger.cs" />
+    <Compile Include="Traits\JamsMissiles.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
     <Compile Include="UtilityCommands\ConvertPngToShpCommand.cs" />
     <Compile Include="UtilityCommands\ConvertSpriteToPngCommand.cs" />
diff --git a/OpenRA.Mods.RA/RallyPoint.cs b/OpenRA.Mods.Common/RallyPoint.cs
similarity index 98%
rename from OpenRA.Mods.RA/RallyPoint.cs
rename to OpenRA.Mods.Common/RallyPoint.cs
index 6875d68be2..8e1294a0c3 100644
--- a/OpenRA.Mods.RA/RallyPoint.cs
+++ b/OpenRA.Mods.Common/RallyPoint.cs
@@ -11,7 +11,7 @@
 using System.Collections.Generic;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Used to waypoint units after production or repair is finished.")]
 	public class RallyPointInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/JamsMissiles.cs b/OpenRA.Mods.Common/Traits/JamsMissiles.cs
similarity index 91%
rename from OpenRA.Mods.RA/JamsMissiles.cs
rename to OpenRA.Mods.Common/Traits/JamsMissiles.cs
index 0902af5d60..99619e1ebd 100644
--- a/OpenRA.Mods.RA/JamsMissiles.cs
+++ b/OpenRA.Mods.Common/Traits/JamsMissiles.cs
@@ -10,9 +10,9 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
-	class JamsMissilesInfo : ITraitInfo
+	public class JamsMissilesInfo : ITraitInfo
 	{
 		public readonly int Range = 0;
 		public readonly bool AlliedMissiles = true;
diff --git a/OpenRA.Mods.RA/AI/HackyAI.cs b/OpenRA.Mods.RA/AI/HackyAI.cs
index 13dd7b0509..915d5883d3 100644
--- a/OpenRA.Mods.RA/AI/HackyAI.cs
+++ b/OpenRA.Mods.RA/AI/HackyAI.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Air;
 using OpenRA.Mods.RA.Buildings;
diff --git a/OpenRA.Mods.RA/Air/TakeOff.cs b/OpenRA.Mods.RA/Air/TakeOff.cs
index 02689538e8..cc8be21817 100644
--- a/OpenRA.Mods.RA/Air/TakeOff.cs
+++ b/OpenRA.Mods.RA/Air/TakeOff.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Mods.Common;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Air
diff --git a/OpenRA.Mods.RA/CrateAction.cs b/OpenRA.Mods.RA/CrateAction.cs
index 5afda58ed1..cea96a068a 100644
--- a/OpenRA.Mods.RA/CrateAction.cs
+++ b/OpenRA.Mods.RA/CrateAction.cs
@@ -9,7 +9,7 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.RA.Effects;
+using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/GainsExperience.cs b/OpenRA.Mods.RA/GainsExperience.cs
index c1c88d1736..844b71e402 100644
--- a/OpenRA.Mods.RA/GainsExperience.cs
+++ b/OpenRA.Mods.RA/GainsExperience.cs
@@ -11,7 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.GameRules;
+using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.RA.Effects;
 using OpenRA.Primitives;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 01f3e2520f..833dfb3c3e 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -120,10 +120,15 @@
     <Compile Include="Air\AttackPlane.cs" />
     <Compile Include="AI\SupportPowerDecision.cs" />
     <Compile Include="Crates\DuplicateUnitCrateAction.cs" />
+    <Compile Include="Effects\GpsSatellite.cs" />
+    <Compile Include="Effects\Rank.cs" />
+    <Compile Include="Effects\SatelliteLaunch.cs" />
+    <Compile Include="Effects\TeslaZap.cs" />
+    <Compile Include="TeslaZapRenderable.cs" />
+    <Compile Include="GainsExperience.cs" />
     <Compile Include="Infiltration\InfiltrateForPowerOutage.cs" />
     <Compile Include="Power\AffectedByPowerOutage.cs" />
     <Compile Include="Power\Power.cs" />
-    <Compile Include="Effects\Beacon.cs" />
     <Compile Include="Player\PlaceBeacon.cs" />
     <Compile Include="MenuPaletteEffect.cs" />
     <Compile Include="EjectOnDeath.cs" />
@@ -210,28 +215,16 @@
     <Compile Include="DeathSounds.cs" />
     <Compile Include="DemoTruck.cs" />
     <Compile Include="DetectCloaked.cs" />
-    <Compile Include="Effects\Bullet.cs" />
-    <Compile Include="Effects\Contrail.cs" />
-    <Compile Include="Effects\Corpse.cs" />
-    <Compile Include="Effects\CrateEffect.cs" />
     <Compile Include="Effects\GpsDot.cs" />
-    <Compile Include="Effects\GpsSatellite.cs" />
-    <Compile Include="Effects\GravityBomb.cs" />
-    <Compile Include="Effects\LaserZap.cs" />
-    <Compile Include="Effects\Missile.cs" />
     <Compile Include="Effects\NukeLaunch.cs" />
     <Compile Include="Effects\Parachute.cs" />
     <Compile Include="Effects\PowerdownIndicator.cs" />
-    <Compile Include="Effects\RallyPoint.cs" />
     <Compile Include="Effects\RepairIndicator.cs" />
-    <Compile Include="Effects\SatelliteLaunch.cs" />
-    <Compile Include="Effects\TeslaZap.cs" />
     <Compile Include="EmitInfantryOnSell.cs" />
     <Compile Include="EngineerRepair.cs" />
     <Compile Include="Explodes.cs" />
     <Compile Include="Fake.cs" />
     <Compile Include="FreeActor.cs" />
-    <Compile Include="GainsExperience.cs" />
     <Compile Include="GivesBounty.cs" />
     <Compile Include="GivesExperience.cs" />
     <Compile Include="Guard.cs" />
@@ -240,7 +233,6 @@
     <Compile Include="Husk.cs" />
     <Compile Include="Infiltration\InfiltrateForSupportPower.cs" />
     <Compile Include="Invulnerable.cs" />
-    <Compile Include="JamsMissiles.cs" />
     <Compile Include="LeavesHusk.cs" />
     <Compile Include="Captures.cs" />
     <Compile Include="LightPaletteRotator.cs" />
@@ -298,7 +290,6 @@
     <Compile Include="ProximityCapturable.cs" />
     <Compile Include="DefaultLoadScreen.cs" />
     <Compile Include="RadarColorFromTerrain.cs" />
-    <Compile Include="RallyPoint.cs" />
     <Compile Include="Reloads.cs" />
     <Compile Include="RenderDetectionCircle.cs" />
     <Compile Include="RenderJammerCircle.cs" />
@@ -426,7 +417,6 @@
     <Compile Include="World\DomainIndex.cs" />
     <Compile Include="MPStartUnits.cs" />
     <Compile Include="Widgets\Logic\WorldTooltipLogic.cs" />
-    <Compile Include="TeslaZapRenderable.cs" />
     <Compile Include="Buildings\Bib.cs" />
     <Compile Include="Orders\EnterAlliedActorTargeter.cs" />
     <Compile Include="Render\WithIdleOverlay.cs" />
@@ -441,7 +431,6 @@
     <Compile Include="World\PathfinderDebugOverlay.cs" />
     <Compile Include="Widgets\Logic\SettingsLogic.cs" />
     <Compile Include="AttackBomber.cs" />
-    <Compile Include="Effects\Rank.cs" />
     <Compile Include="ShroudRenderer.cs" />
     <Compile Include="Render\WithCrateBody.cs" />
     <Compile Include="Buildings\Demolishable.cs" />
diff --git a/OpenRA.Mods.RA/Player/PlaceBeacon.cs b/OpenRA.Mods.RA/Player/PlaceBeacon.cs
index 52580f8835..a06e1ff534 100644
--- a/OpenRA.Mods.RA/Player/PlaceBeacon.cs
+++ b/OpenRA.Mods.RA/Player/PlaceBeacon.cs
@@ -9,7 +9,7 @@
 #endregion
 
 using OpenRA.Mods.Common;
-using OpenRA.Mods.RA.Effects;
+using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Production.cs b/OpenRA.Mods.RA/Production.cs
index 75ce88b514..bd8ad78b9a 100755
--- a/OpenRA.Mods.RA/Production.cs
+++ b/OpenRA.Mods.RA/Production.cs
@@ -10,8 +10,8 @@
 
 using System;
 using System.Drawing;
-using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Render/WithDeathAnimation.cs b/OpenRA.Mods.RA/Render/WithDeathAnimation.cs
index c1ec7aeeb3..a5e13bf508 100644
--- a/OpenRA.Mods.RA/Render/WithDeathAnimation.cs
+++ b/OpenRA.Mods.RA/Render/WithDeathAnimation.cs
@@ -8,9 +8,7 @@
  */
 #endregion
 
-using System.Linq;
-using OpenRA.Mods.RA.Effects;
-using OpenRA.Mods.RA.Render;
+using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render
diff --git a/OpenRA.Mods.RA/Repairable.cs b/OpenRA.Mods.RA/Repairable.cs
index 7946ffaf2c..e0190e7721 100644
--- a/OpenRA.Mods.RA/Repairable.cs
+++ b/OpenRA.Mods.RA/Repairable.cs
@@ -15,6 +15,7 @@ using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Orders;
 using OpenRA.Traits;
+using OpenRA.Mods.Common;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs b/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs
index 22b13d3035..fdfe835f31 100644
--- a/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs
@@ -11,9 +11,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Air;
-using OpenRA.Mods.RA.Effects;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/SupportPowers/NukePower.cs b/OpenRA.Mods.RA/SupportPowers/NukePower.cs
index c53a7b8363..f270817e22 100755
--- a/OpenRA.Mods.RA/SupportPowers/NukePower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/NukePower.cs
@@ -10,6 +10,7 @@
 
 using System;
 using OpenRA.Effects;
+using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Effects;
 using OpenRA.Mods.RA.Render;
diff --git a/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs b/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs
index 25c8281b7a..133b7ff262 100644
--- a/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs
@@ -11,9 +11,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Air;
-using OpenRA.Mods.RA.Effects;
 using OpenRA.Primitives;
 using OpenRA.Traits;