Merge pull request #7036 from penev92/bleed_moveFiles_1

Moved several render traits from Mods.RA to Common

OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs

@@ -10,10 +10,9 @@
 
 using System;
 using System.Collections.Generic;
-using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Move;
-using OpenRA.Mods.RA.Render;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 

OpenRA.Mods.Cnc/Traits/Render/RenderGunboat.cs

@@ -10,7 +10,7 @@
 
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render

OpenRA.Mods.Cnc/Traits/Render/WithFire.cs

@@ -9,7 +9,7 @@
 #endregion
 
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Cnc.Traits

OpenRA.Mods.Cnc/Traits/Render/WithRoof.cs

@@ -9,7 +9,7 @@
 #endregion
 
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Cnc.Traits

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -108,6 +108,7 @@
     <Compile Include="Scripting\Properties\ResourceProperties.cs" />
     <Compile Include="Scripting\Properties\UpgradeProperties.cs" />
     <Compile Include="Traits\BlocksBullets.cs" />
+    <Compile Include="Traits\Buildings\DeadBuildingState.cs" />
     <Compile Include="Traits\Burns.cs" />
     <Compile Include="Traits\CustomBuildTimeValue.cs" />
     <Compile Include="Traits\CustomSellValue.cs" />
@@ -130,7 +131,14 @@
     <Compile Include="Traits\Power\ScalePowerWithHealth.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
     <Compile Include="Traits\RallyPoint.cs" />
+    <Compile Include="Traits\Render\RenderEditorOnly.cs" />
+    <Compile Include="Traits\Render\RenderFlare.cs" />
+    <Compile Include="Traits\Render\RenderSimple.cs" />
     <Compile Include="Traits\Render\RenderSprites.cs" />
+    <Compile Include="Traits\Render\RenderUnit.cs" />
+    <Compile Include="Traits\Render\WithBuildingPlacedAnimation.cs" />
+    <Compile Include="Traits\Render\WithDeathAnimation.cs" />
+    <Compile Include="Traits\Render\WithResources.cs" />
     <Compile Include="Traits\ShakeOnDeath.cs" />
     <Compile Include="Traits\Sound\ActorLostNotification.cs" />
     <Compile Include="Traits\Sound\AnnounceOnBuild.cs" />

OpenRA.Mods.Common/Traits/Buildings/DeadBuildingState.cs

@@ -10,9 +10,8 @@
 
 using OpenRA.Effects;
 using OpenRA.Traits;
-using OpenRA.Mods.RA.Render;
 
-namespace OpenRA.Mods.Cnc
+namespace OpenRA.Mods.Common.Traits
 {
 	class DeadBuildingStateInfo : ITraitInfo, Requires<HealthInfo>, Requires<RenderSimpleInfo>
 	{

OpenRA.Mods.Common/Traits/Burns.cs

@@ -9,7 +9,7 @@
 #endregion
 
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common

OpenRA.Mods.Common/Traits/Render/RenderEditorOnly.cs

@@ -10,9 +10,8 @@
 
 using System.Collections.Generic;
 using OpenRA.Graphics;
-using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Invisible during games.")]
 	class RenderEditorOnlyInfo : RenderSimpleInfo

OpenRA.Mods.Common/Traits/Render/RenderFlare.cs

@@ -8,9 +8,7 @@
  */
 #endregion
 
-using OpenRA.Traits;
-
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
 {
 	class RenderFlareInfo : RenderSimpleInfo
 	{

OpenRA.Mods.Common/Traits/Render/RenderSimple.cs

@@ -12,10 +12,9 @@ using System;
 using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
 {
 	public class RenderSimpleInfo : RenderSpritesInfo, IRenderActorPreviewSpritesInfo, IQuantizeBodyOrientationInfo, ILegacyEditorRenderInfo, Requires<IBodyOrientationInfo>
 	{

OpenRA.Mods.Common/Traits/Render/RenderSprites.cs

@@ -16,7 +16,7 @@ using OpenRA.Mods.Common.Graphics;
 using OpenRA.Traits;
 using OpenRA.Primitives;
 
-namespace OpenRA.Mods.Common.Traits.Render
+namespace OpenRA.Mods.Common.Traits
 {
 	public interface IRenderActorPreviewSpritesInfo { IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p); }
 

OpenRA.Mods.Common/Traits/Render/RenderUnit.cs

@@ -11,7 +11,7 @@
 using System;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
 {
 	public class RenderUnitInfo : RenderSimpleInfo, Requires<IFacingInfo>
 	{

OpenRA.Mods.Common/Traits/Render/WithBuildingPlacedAnimation.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Changes the animation when the actor constructed a building.")]
 	public class WithBuildingPlacedAnimationInfo : ITraitInfo, Requires<RenderSimpleInfo>

OpenRA.Mods.Common/Traits/Render/WithDeathAnimation.cs

@@ -11,7 +11,7 @@
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("This actor has a death animation.")]
 	public class WithDeathAnimationInfo : ITraitInfo, Requires<RenderSimpleInfo>

OpenRA.Mods.Common/Traits/Render/WithResources.cs

@@ -11,7 +11,7 @@
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Displays the fill status of PlayerResources with an extra sprite overlay on the actor.")]
 	class WithResourcesInfo : ITraitInfo, Requires<RenderSimpleInfo>

OpenRA.Mods.D2k/AutoCarryall/AutoCarryall.cs

@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;

OpenRA.Mods.D2k/Traits/Render/WithBuildingPlacedOverlay.cs

@@ -9,7 +9,7 @@
 #endregion
 
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 

OpenRA.Mods.D2k/Traits/Render/WithCrumbleOverlay.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Graphics;
 using OpenRA.Mods.Common;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA;
 using OpenRA.Traits;
 

OpenRA.Mods.D2k/Traits/Render/WithDeliveryOverlay.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Effects;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 

OpenRA.Mods.D2k/Traits/Render/WithDockingOverlay.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Effects;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 

OpenRA.Mods.D2k/Traits/Render/WithProductionOverlay.cs

@@ -11,7 +11,7 @@
 using System;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;

OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs

@@ -15,10 +15,10 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Power;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Orders;
-using OpenRA.Mods.RA.Render;
 using OpenRA.Network;
 using OpenRA.Primitives;
 using OpenRA.Traits;

OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs

@@ -10,8 +10,8 @@
 
 using System;
 using System.Collections.Generic;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Render;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Attack/AttackGarrisoned.cs

@@ -12,10 +12,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
-using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Render;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/Buildings/Bib.cs

@@ -9,7 +9,7 @@
 #endregion
 
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Buildings

OpenRA.Mods.RA/Crate.cs

@@ -10,7 +10,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;

OpenRA.Mods.RA/Crushable.cs

@@ -9,8 +9,8 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Move;
-using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/Disguise.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Mods.Common.Orders;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/Lint/CheckSequences.cs

@@ -10,8 +10,8 @@
 
 using System;
 using System.Linq;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
-using OpenRA.Mods.RA.Render;
 
 namespace OpenRA.Mods.RA
 {

OpenRA.Mods.RA/MadTank.cs

@@ -11,11 +11,10 @@
 using System.Linq;
 using System.Drawing;
 using System.Collections.Generic;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Mods.RA.Move;
-using OpenRA.Mods.RA.Render;
-using OpenRA.Mods.RA.Orders;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.Common.Orders;
 

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -127,10 +127,12 @@
     <Compile Include="ActorExts.cs" />
     <Compile Include="AI\SupportPowerDecision.cs" />
     <Compile Include="Crates\DuplicateUnitCrateAction.cs" />
+    <Compile Include="Crushable.cs" />
     <Compile Include="Effects\GpsSatellite.cs" />
     <Compile Include="Effects\Rank.cs" />
     <Compile Include="Effects\SatelliteLaunch.cs" />
     <Compile Include="Effects\TeslaZap.cs" />
+    <Compile Include="Render\RenderUnitReload.cs" />
     <Compile Include="TeslaZapRenderable.cs" />
     <Compile Include="GainsExperience.cs" />
     <Compile Include="Infiltration\InfiltrateForPowerOutage.cs" />
@@ -156,7 +158,6 @@
     <Compile Include="CaptureNotification.cs" />
     <Compile Include="Buildings\Building.cs" />
     <Compile Include="Buildings\BuildingInfluence.cs" />
-    <Compile Include="Buildings\DeadBuildingState.cs" />
     <Compile Include="Buildings\FootprintUtils.cs" />
     <Compile Include="Buildings\LineBuild.cs" />
     <Compile Include="Buildings\RepairableBuilding.cs" />
@@ -184,7 +185,6 @@
     <Compile Include="Crates\LevelUpCrateAction.cs" />
     <Compile Include="Crates\RevealMapCrateAction.cs" />
     <Compile Include="Crates\SupportPowerCrateAction.cs" />
-    <Compile Include="Crushable.cs" />
     <Compile Include="DemoTruck.cs" />
     <Compile Include="DetectCloaked.cs" />
     <Compile Include="Effects\GpsDot.cs" />
@@ -244,16 +244,11 @@
     <Compile Include="Render\RenderBuildingTurreted.cs" />
     <Compile Include="Render\RenderBuildingWall.cs" />
     <Compile Include="Render\RenderBuildingWarFactory.cs" />
-    <Compile Include="Render\RenderEditorOnly.cs" />
-    <Compile Include="Render\RenderFlare.cs" />
     <Compile Include="Render\RenderHarvester.cs" />
     <Compile Include="Render\RenderInfantry.cs" />
     <Compile Include="Render\RenderDisguise.cs" />
     <Compile Include="Render\RenderLandingCraft.cs" />
-    <Compile Include="Render\RenderUnit.cs" />
-    <Compile Include="Render\RenderUnitReload.cs" />
     <Compile Include="Render\WithBuildingExplosion.cs" />
-    <Compile Include="Render\WithDeathAnimation.cs" />
     <Compile Include="Render\WithMuzzleFlash.cs" />
     <Compile Include="Render\RenderNameTag.cs" />
     <Compile Include="Render\WithRotor.cs" />
@@ -371,7 +366,6 @@
     <Compile Include="Render\WithVoxelBody.cs" />
     <Compile Include="Render\WithVoxelBarrel.cs" />
     <Compile Include="Widgets\Logic\CreditsLogic.cs" />
-    <Compile Include="Render\WithResources.cs" />
     <Compile Include="Render\WithHarvestAnimation.cs" />
     <Compile Include="Widgets\Logic\SimpleTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\WorldTooltipLogic.cs" />
@@ -395,7 +389,6 @@
     <Compile Include="Orders\BeaconOrderGenerator.cs" />
     <Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
     <Compile Include="Buildings\LineBuildNode.cs" />
-    <Compile Include="Render\WithBuildingPlacedAnimation.cs" />
     <Compile Include="Scripting\Global\ReinforcementsGlobal.cs" />
     <Compile Include="Scripting\Properties\ProductionProperties.cs" />
     <Compile Include="Scripting\Properties\MissionObjectiveProperties.cs" />
@@ -418,7 +411,6 @@
     <Compile Include="Widgets\Logic\InstallMusicLogic.cs" />
     <Compile Include="Render\WithActiveAnimation.cs" />
     <Compile Include="SupportPowers\SpawnActorPower.cs" />
-    <Compile Include="Render\RenderSimple.cs" />
     <Compile Include="Buildings\ClonesProducedUnits.cs" />
     <Compile Include="Cloneable.cs" />
     <Compile Include="Widgets\ProductionPaletteWidget.cs" />

OpenRA.Mods.RA/Render/RenderBuilding.cs

@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Render/RenderBuildingSilo.cs

@@ -10,7 +10,7 @@
 
 using System.Collections.Generic;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 using OpenRA.Mods.Common.Graphics;
 

OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs

@@ -13,7 +13,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render

OpenRA.Mods.RA/Render/RenderBuildingWall.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render

OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs

@@ -11,7 +11,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.Common.Graphics;
 using OpenRA.Traits;

OpenRA.Mods.RA/Render/RenderHarvester.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using OpenRA.Graphics;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 using OpenRA.Mods.Common;

OpenRA.Mods.RA/Render/RenderInfantry.cs

@@ -10,8 +10,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common.Traits.Render;
-using OpenRA.Mods.RA.Effects;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Graphics;
 using OpenRA.Graphics;
 using OpenRA.Traits;

OpenRA.Mods.RA/Render/RenderLandingCraft.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render

OpenRA.Mods.RA/Render/RenderUnitReload.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render

OpenRA.Mods.RA/Render/WithBarrel.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render

OpenRA.Mods.RA/Render/WithCrateBody.cs

@@ -11,7 +11,7 @@
 using System;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render

OpenRA.Mods.RA/Render/WithHarvestAnimation.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Graphics;
 using OpenRA.Mods.Common;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render

OpenRA.Mods.RA/Render/WithIdleOverlay.cs

@@ -11,7 +11,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.Common.Graphics;
 using OpenRA.Traits;

OpenRA.Mods.RA/Render/WithMuzzleFlash.cs

@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Render/WithRepairOverlay.cs

@@ -11,7 +11,7 @@
 using System.Linq;
 using OpenRA.Effects;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Render/WithRotor.cs

@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render

OpenRA.Mods.RA/Render/WithSmoke.cs

@@ -9,7 +9,7 @@
 #endregion
 
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render

OpenRA.Mods.RA/Render/WithTurret.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render

OpenRA.Mods.RA/SupportPowers/NukePower.cs

@@ -11,9 +11,8 @@
 using System;
 using OpenRA.Effects;
 using OpenRA.Mods.Common.Effects;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Effects;
-using OpenRA.Mods.RA.Render;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/ThrowsParticle.cs

@@ -9,8 +9,8 @@
 #endregion
 
 using OpenRA.Graphics;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
-using OpenRA.Mods.RA.Render;
 
 namespace OpenRA.Mods.RA
 {

OpenRA.Mods.RA/Widgets/ObserverProductionIconsWidget.cs

@@ -13,8 +13,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.RA.Render;
-using OpenRA.Traits;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.RA.Widgets

OpenRA.Mods.RA/Widgets/ProductionPaletteWidget.cs

@@ -13,12 +13,10 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.RA;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Orders;
-using OpenRA.Mods.RA.Render;
 using OpenRA.Network;
-using OpenRA.Traits;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.RA.Widgets