From 3372914216cfceb0c7f8b557f6570b558e602b27 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 9 Nov 2014 16:03:36 +0100
Subject: [PATCH 1/5] Move some traits from RA.Buildings to Common

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                   | 3 +++
 .../Buildings => OpenRA.Mods.Common/Traits}/Demolishable.cs    | 2 +-
 .../Buildings => OpenRA.Mods.Common/Traits}/ShakeOnDeath.cs    | 2 +-
 .../Traits/Sound}/SoundOnDamageTransition.cs                   | 2 +-
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                           | 3 ---
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename {OpenRA.Mods.RA/Buildings => OpenRA.Mods.Common/Traits}/Demolishable.cs (96%)
 rename {OpenRA.Mods.RA/Buildings => OpenRA.Mods.Common/Traits}/ShakeOnDeath.cs (96%)
 rename {OpenRA.Mods.RA/Buildings => OpenRA.Mods.Common/Traits/Sound}/SoundOnDamageTransition.cs (96%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 5714130f15..4abdddea0f 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -99,8 +99,10 @@
     <Compile Include="ServerTraits\PlayerPinger.cs" />
     <Compile Include="Traits\BlocksBullets.cs" />
     <Compile Include="Traits\Immobile.cs" />
+    <Compile Include="Traits\Demolishable.cs" />
     <Compile Include="Traits\JamsMissiles.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
+    <Compile Include="Traits\ShakeOnDeath.cs" />
     <Compile Include="Traits\Power\AffectedByPowerOutage.cs" />
     <Compile Include="Traits\Power\CanPowerDown.cs" />
     <Compile Include="Traits\Power\Player\PowerManager.cs" />
@@ -112,6 +114,7 @@
     <Compile Include="Traits\Sound\AnnounceOnBuild.cs" />
     <Compile Include="Traits\Sound\AnnounceOnKill.cs" />
     <Compile Include="Traits\Sound\DeathSounds.cs" />
+    <Compile Include="Traits\Sound\SoundOnDamageTransition.cs" />
     <Compile Include="UtilityCommands\ConvertPngToShpCommand.cs" />
     <Compile Include="UtilityCommands\ConvertSpriteToPngCommand.cs" />
     <Compile Include="UtilityCommands\ExtractFilesCommand.cs" />
diff --git a/OpenRA.Mods.RA/Buildings/Demolishable.cs b/OpenRA.Mods.Common/Traits/Demolishable.cs
similarity index 96%
rename from OpenRA.Mods.RA/Buildings/Demolishable.cs
rename to OpenRA.Mods.Common/Traits/Demolishable.cs
index 6afef8bd28..bbb70a833d 100644
--- a/OpenRA.Mods.RA/Buildings/Demolishable.cs
+++ b/OpenRA.Mods.Common/Traits/Demolishable.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Handle demolitions from C4 explosives.")]
 	public class DemolishableInfo : IDemolishableInfo, ITraitInfo
diff --git a/OpenRA.Mods.RA/Buildings/ShakeOnDeath.cs b/OpenRA.Mods.Common/Traits/ShakeOnDeath.cs
similarity index 96%
rename from OpenRA.Mods.RA/Buildings/ShakeOnDeath.cs
rename to OpenRA.Mods.Common/Traits/ShakeOnDeath.cs
index 7dd369f65d..3ac259f27a 100644
--- a/OpenRA.Mods.RA/Buildings/ShakeOnDeath.cs
+++ b/OpenRA.Mods.Common/Traits/ShakeOnDeath.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Buildings
+namespace OpenRA.Mods.Common
 {
 	public class ShakeOnDeathInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.RA/Buildings/SoundOnDamageTransition.cs b/OpenRA.Mods.Common/Traits/Sound/SoundOnDamageTransition.cs
similarity index 96%
rename from OpenRA.Mods.RA/Buildings/SoundOnDamageTransition.cs
rename to OpenRA.Mods.Common/Traits/Sound/SoundOnDamageTransition.cs
index a822bff71c..9b1f6f7bf2 100644
--- a/OpenRA.Mods.RA/Buildings/SoundOnDamageTransition.cs
+++ b/OpenRA.Mods.Common/Traits/Sound/SoundOnDamageTransition.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Buildings
+namespace OpenRA.Mods.Common
 {
 	public class SoundOnDamageTransitionInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 6f39df1861..28cce932cb 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -170,8 +170,6 @@
     <Compile Include="Buildings\FootprintUtils.cs" />
     <Compile Include="Buildings\LineBuild.cs" />
     <Compile Include="Buildings\RepairableBuilding.cs" />
-    <Compile Include="Buildings\ShakeOnDeath.cs" />
-    <Compile Include="Buildings\SoundOnDamageTransition.cs" />
     <Compile Include="Buildings\Util.cs" />
     <Compile Include="Burns.cs" />
     <Compile Include="C4Demolition.cs" />
@@ -389,7 +387,6 @@
     <Compile Include="AttackBomber.cs" />
     <Compile Include="ShroudRenderer.cs" />
     <Compile Include="Render\WithCrateBody.cs" />
-    <Compile Include="Buildings\Demolishable.cs" />
     <Compile Include="Activities\FlyFollow.cs" />
     <Compile Include="Widgets\Logic\GameTimerLogic.cs" />
     <Compile Include="Widgets\Logic\ReplayControlBarLogic.cs" />

From 41f3ee1080018d0e8a1e6af0667145d5f00d860d Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 9 Nov 2014 16:04:23 +0100
Subject: [PATCH 2/5] Move ShroudPalette, ShroudRenderer and
 StartGameNotification to Common

Move World into Traits folder
---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj  | 24 +++++++++++--------
 .../{ => Traits}/World/CreateMPPlayers.cs     |  0
 .../{ => Traits}/World/MPStartLocations.cs    |  0
 .../{ => Traits}/World/MPStartUnits.cs        |  0
 .../{ => Traits}/World/PlayMusicOnMapLoad.cs  |  0
 .../{ => Traits}/World/RadarPings.cs          |  0
 .../{ => Traits}/World/ResourceClaim.cs       |  0
 .../{ => Traits}/World/ResourceClaimLayer.cs  |  0
 .../Traits/World}/ShroudPalette.cs            |  2 +-
 .../Traits/World}/ShroudRenderer.cs           |  2 +-
 .../{ => Traits}/World/SmudgeLayer.cs         |  0
 .../{ => Traits}/World/SpawnMapActors.cs      |  0
 .../Traits/World}/StartGameNotification.cs    |  2 +-
 .../World/TerrainGeometryOverlay.cs           |  0
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj          |  3 ---
 15 files changed, 17 insertions(+), 16 deletions(-)
 rename OpenRA.Mods.Common/{ => Traits}/World/CreateMPPlayers.cs (100%)
 rename OpenRA.Mods.Common/{ => Traits}/World/MPStartLocations.cs (100%)
 rename OpenRA.Mods.Common/{ => Traits}/World/MPStartUnits.cs (100%)
 rename OpenRA.Mods.Common/{ => Traits}/World/PlayMusicOnMapLoad.cs (100%)
 rename OpenRA.Mods.Common/{ => Traits}/World/RadarPings.cs (100%)
 rename OpenRA.Mods.Common/{ => Traits}/World/ResourceClaim.cs (100%)
 rename OpenRA.Mods.Common/{ => Traits}/World/ResourceClaimLayer.cs (100%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits/World}/ShroudPalette.cs (98%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits/World}/ShroudRenderer.cs (99%)
 rename OpenRA.Mods.Common/{ => Traits}/World/SmudgeLayer.cs (100%)
 rename OpenRA.Mods.Common/{ => Traits}/World/SpawnMapActors.cs (100%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits/World}/StartGameNotification.cs (96%)
 rename OpenRA.Mods.Common/{ => Traits}/World/TerrainGeometryOverlay.cs (100%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 4abdddea0f..fb2815147f 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -115,6 +115,20 @@
     <Compile Include="Traits\Sound\AnnounceOnKill.cs" />
     <Compile Include="Traits\Sound\DeathSounds.cs" />
     <Compile Include="Traits\Sound\SoundOnDamageTransition.cs" />
+    <Compile Include="Traits\Valued.cs" />
+    <Compile Include="Traits\World\CreateMPPlayers.cs" />
+    <Compile Include="Traits\World\MPStartLocations.cs" />
+    <Compile Include="Traits\World\MPStartUnits.cs" />
+    <Compile Include="Traits\World\PlayMusicOnMapLoad.cs" />
+    <Compile Include="Traits\World\RadarPings.cs" />
+    <Compile Include="Traits\World\ResourceClaim.cs" />
+    <Compile Include="Traits\World\ResourceClaimLayer.cs" />
+    <Compile Include="Traits\World\ShroudPalette.cs" />
+    <Compile Include="Traits\World\ShroudRenderer.cs" />
+    <Compile Include="Traits\World\SmudgeLayer.cs" />
+    <Compile Include="Traits\World\SpawnMapActors.cs" />
+    <Compile Include="Traits\World\StartGameNotification.cs" />
+    <Compile Include="Traits\World\TerrainGeometryOverlay.cs" />
     <Compile Include="UtilityCommands\ConvertPngToShpCommand.cs" />
     <Compile Include="UtilityCommands\ConvertSpriteToPngCommand.cs" />
     <Compile Include="UtilityCommands\ExtractFilesCommand.cs" />
@@ -151,19 +165,10 @@
     <Compile Include="Widgets\MenuButtonWidget.cs" />
     <Compile Include="Widgets\RadarWidget.cs" />
     <Compile Include="Widgets\ResourceBarWidget.cs" />
-    <Compile Include="World\CreateMPPlayers.cs" />
-    <Compile Include="World\MPStartLocations.cs" />
-    <Compile Include="World\MPStartUnits.cs" />
     <Compile Include="World\PaletteFromCurrentTileset.cs" />
     <Compile Include="World\PaletteFromFile.cs" />
     <Compile Include="World\PaletteFromRGBA.cs" />
     <Compile Include="World\PlayerPaletteFromCurrentTileset.cs" />
-    <Compile Include="World\PlayMusicOnMapLoad.cs" />
-    <Compile Include="World\RadarPings.cs" />
-    <Compile Include="World\ResourceClaim.cs" />
-    <Compile Include="World\ResourceClaimLayer.cs" />
-    <Compile Include="World\SmudgeLayer.cs" />
-    <Compile Include="World\SpawnMapActors.cs" />
     <Compile Include="SpriteLoaders\ShpTDLoader.cs" />
     <Compile Include="SpriteLoaders\ShpTSLoader.cs" />
     <Compile Include="SpriteLoaders\TmpRALoader.cs" />
@@ -171,7 +176,6 @@
     <Compile Include="SpriteLoaders\ShpD2Loader.cs" />
     <Compile Include="Widgets\Logic\SettingsLogic.cs" />
     <Compile Include="Widgets\TerrainTemplatePreviewWidget.cs" />
-    <Compile Include="World\TerrainGeometryOverlay.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/OpenRA.Mods.Common/World/CreateMPPlayers.cs b/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/CreateMPPlayers.cs
rename to OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs
diff --git a/OpenRA.Mods.Common/World/MPStartLocations.cs b/OpenRA.Mods.Common/Traits/World/MPStartLocations.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/MPStartLocations.cs
rename to OpenRA.Mods.Common/Traits/World/MPStartLocations.cs
diff --git a/OpenRA.Mods.Common/World/MPStartUnits.cs b/OpenRA.Mods.Common/Traits/World/MPStartUnits.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/MPStartUnits.cs
rename to OpenRA.Mods.Common/Traits/World/MPStartUnits.cs
diff --git a/OpenRA.Mods.Common/World/PlayMusicOnMapLoad.cs b/OpenRA.Mods.Common/Traits/World/PlayMusicOnMapLoad.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/PlayMusicOnMapLoad.cs
rename to OpenRA.Mods.Common/Traits/World/PlayMusicOnMapLoad.cs
diff --git a/OpenRA.Mods.Common/World/RadarPings.cs b/OpenRA.Mods.Common/Traits/World/RadarPings.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/RadarPings.cs
rename to OpenRA.Mods.Common/Traits/World/RadarPings.cs
diff --git a/OpenRA.Mods.Common/World/ResourceClaim.cs b/OpenRA.Mods.Common/Traits/World/ResourceClaim.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/ResourceClaim.cs
rename to OpenRA.Mods.Common/Traits/World/ResourceClaim.cs
diff --git a/OpenRA.Mods.Common/World/ResourceClaimLayer.cs b/OpenRA.Mods.Common/Traits/World/ResourceClaimLayer.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/ResourceClaimLayer.cs
rename to OpenRA.Mods.Common/Traits/World/ResourceClaimLayer.cs
diff --git a/OpenRA.Mods.RA/ShroudPalette.cs b/OpenRA.Mods.Common/Traits/World/ShroudPalette.cs
similarity index 98%
rename from OpenRA.Mods.RA/ShroudPalette.cs
rename to OpenRA.Mods.Common/Traits/World/ShroudPalette.cs
index d7613ad11c..ff51213d86 100644
--- a/OpenRA.Mods.RA/ShroudPalette.cs
+++ b/OpenRA.Mods.Common/Traits/World/ShroudPalette.cs
@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Adds the hard-coded shroud palette to the game")]
 	class ShroudPaletteInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/ShroudRenderer.cs b/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs
similarity index 99%
rename from OpenRA.Mods.RA/ShroudRenderer.cs
rename to OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs
index fcc50315e3..1d7f288370 100644
--- a/OpenRA.Mods.RA/ShroudRenderer.cs
+++ b/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs
@@ -12,7 +12,7 @@ using System;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	public class ShroudRendererInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.Common/World/SmudgeLayer.cs b/OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/SmudgeLayer.cs
rename to OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs
diff --git a/OpenRA.Mods.Common/World/SpawnMapActors.cs b/OpenRA.Mods.Common/Traits/World/SpawnMapActors.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/SpawnMapActors.cs
rename to OpenRA.Mods.Common/Traits/World/SpawnMapActors.cs
diff --git a/OpenRA.Mods.RA/StartGameNotification.cs b/OpenRA.Mods.Common/Traits/World/StartGameNotification.cs
similarity index 96%
rename from OpenRA.Mods.RA/StartGameNotification.cs
rename to OpenRA.Mods.Common/Traits/World/StartGameNotification.cs
index f8db63aaae..514968f466 100644
--- a/OpenRA.Mods.RA/StartGameNotification.cs
+++ b/OpenRA.Mods.Common/Traits/World/StartGameNotification.cs
@@ -11,7 +11,7 @@
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	class StartGameNotificationInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.Common/World/TerrainGeometryOverlay.cs b/OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/TerrainGeometryOverlay.cs
rename to OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 28cce932cb..12cdb6dc8a 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -289,7 +289,6 @@
     <Compile Include="SeedsResource.cs" />
     <Compile Include="SelfHealing.cs" />
     <Compile Include="Sellable.cs" />
-    <Compile Include="ShroudPalette.cs" />
     <Compile Include="SmokeTrailWhenDamaged.cs" />
     <Compile Include="SpawnMPUnits.cs" />
     <Compile Include="Disguise.cs" />
@@ -385,7 +384,6 @@
     <Compile Include="CombatDebugOverlay.cs" />
     <Compile Include="World\PathfinderDebugOverlay.cs" />
     <Compile Include="AttackBomber.cs" />
-    <Compile Include="ShroudRenderer.cs" />
     <Compile Include="Render\WithCrateBody.cs" />
     <Compile Include="Activities\FlyFollow.cs" />
     <Compile Include="Widgets\Logic\GameTimerLogic.cs" />
@@ -399,7 +397,6 @@
     <Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
     <Compile Include="Buildings\LineBuildNode.cs" />
     <Compile Include="Render\WithBuildingPlacedAnimation.cs" />
-    <Compile Include="StartGameNotification.cs" />
     <Compile Include="Scripting\LuaScript.cs" />
     <Compile Include="Scripting\CallLuaFunc.cs" />
     <Compile Include="Scripting\Global\ActorGlobal.cs" />

From 5e866b862bd039a1bec43185b6afc274d3e73c93 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 9 Nov 2014 16:42:31 +0100
Subject: [PATCH 3/5] Move Burns from RA to Common, move RallyPoint to Traits
 folder

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj           | 3 ++-
 {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Burns.cs | 2 +-
 OpenRA.Mods.Common/{ => Traits}/RallyPoint.cs          | 0
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                   | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Burns.cs (97%)
 rename OpenRA.Mods.Common/{ => Traits}/RallyPoint.cs (100%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index fb2815147f..1e5952956e 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -91,7 +91,6 @@
     <Compile Include="PaletteEffects\MenuPaletteEffect.cs" />
     <Compile Include="PaletteEffects\NukePaletteEffect.cs" />
     <Compile Include="PaletteEffects\WaterPaletteRotation.cs" />
-    <Compile Include="RallyPoint.cs" />
     <Compile Include="ServerTraits\ColorValidator.cs" />
     <Compile Include="ServerTraits\LobbyCommands.cs" />
     <Compile Include="ServerTraits\LobbySettingsNotification.cs" />
@@ -99,9 +98,11 @@
     <Compile Include="ServerTraits\PlayerPinger.cs" />
     <Compile Include="Traits\BlocksBullets.cs" />
     <Compile Include="Traits\Immobile.cs" />
+    <Compile Include="Traits\Burns.cs" />
     <Compile Include="Traits\Demolishable.cs" />
     <Compile Include="Traits\JamsMissiles.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
+    <Compile Include="Traits\RallyPoint.cs" />
     <Compile Include="Traits\ShakeOnDeath.cs" />
     <Compile Include="Traits\Power\AffectedByPowerOutage.cs" />
     <Compile Include="Traits\Power\CanPowerDown.cs" />
diff --git a/OpenRA.Mods.RA/Burns.cs b/OpenRA.Mods.Common/Traits/Burns.cs
similarity index 97%
rename from OpenRA.Mods.RA/Burns.cs
rename to OpenRA.Mods.Common/Traits/Burns.cs
index 2726855688..fcf66b2446 100644
--- a/OpenRA.Mods.RA/Burns.cs
+++ b/OpenRA.Mods.Common/Traits/Burns.cs
@@ -12,7 +12,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits.Render;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("This actor will play a fire animation over its body and take damage over time.")]
 	class BurnsInfo : ITraitInfo, Requires<RenderSpritesInfo>
diff --git a/OpenRA.Mods.Common/RallyPoint.cs b/OpenRA.Mods.Common/Traits/RallyPoint.cs
similarity index 100%
rename from OpenRA.Mods.Common/RallyPoint.cs
rename to OpenRA.Mods.Common/Traits/RallyPoint.cs
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 12cdb6dc8a..0175a5d0fb 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -171,7 +171,6 @@
     <Compile Include="Buildings\LineBuild.cs" />
     <Compile Include="Buildings\RepairableBuilding.cs" />
     <Compile Include="Buildings\Util.cs" />
-    <Compile Include="Burns.cs" />
     <Compile Include="C4Demolition.cs" />
     <Compile Include="ExternalCapturable.cs" />
     <Compile Include="ExternalCapturableBar.cs" />

From 0cbcae93a9403f1ae18cba4103e260a98c49f315 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 9 Nov 2014 16:43:36 +0100
Subject: [PATCH 4/5] Move Valued, CustomSellValue and CustomBuildTimeValue to
 Common

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                   | 2 ++
 .../Traits}/CustomBuildTimeValue.cs                            | 2 +-
 .../Buildings => OpenRA.Mods.Common/Traits}/CustomSellValue.cs | 2 +-
 {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Valued.cs        | 2 +-
 OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs                  | 3 ++-
 OpenRA.Mods.RA/AI/SupportPowerDecision.cs                      | 1 +
 OpenRA.Mods.RA/Activities/Repair.cs                            | 1 +
 OpenRA.Mods.RA/Activities/Sell.cs                              | 2 +-
 OpenRA.Mods.RA/Buildings/RepairableBuilding.cs                 | 1 +
 OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs              | 1 +
 OpenRA.Mods.RA/EmitInfantryOnSell.cs                           | 1 +
 OpenRA.Mods.RA/GainsExperience.cs                              | 1 +
 OpenRA.Mods.RA/GivesBounty.cs                                  | 2 +-
 OpenRA.Mods.RA/GivesExperience.cs                              | 1 +
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                           | 3 ---
 OpenRA.Mods.RA/Player/ClassicProductionQueue.cs                | 3 ++-
 OpenRA.Mods.RA/Player/PlayerStatistics.cs                      | 1 +
 OpenRA.Mods.RA/Player/ProductionQueue.cs                       | 3 ++-
 OpenRA.Mods.RA/Scripting/Global/ActorGlobal.cs                 | 1 +
 OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs             | 1 +
 OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs             | 1 +
 OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs         | 1 +
 22 files changed, 25 insertions(+), 11 deletions(-)
 rename {OpenRA.Mods.RA/Buildings => OpenRA.Mods.Common/Traits}/CustomBuildTimeValue.cs (96%)
 mode change 100755 => 100644
 rename {OpenRA.Mods.RA/Buildings => OpenRA.Mods.Common/Traits}/CustomSellValue.cs (96%)
 mode change 100755 => 100644
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Valued.cs (95%)
 mode change 100755 => 100644

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 1e5952956e..7867d0ae2f 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -99,6 +99,8 @@
     <Compile Include="Traits\BlocksBullets.cs" />
     <Compile Include="Traits\Immobile.cs" />
     <Compile Include="Traits\Burns.cs" />
+    <Compile Include="Traits\CustomBuildTimeValue.cs" />
+    <Compile Include="Traits\CustomSellValue.cs" />
     <Compile Include="Traits\Demolishable.cs" />
     <Compile Include="Traits\JamsMissiles.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
diff --git a/OpenRA.Mods.RA/Buildings/CustomBuildTimeValue.cs b/OpenRA.Mods.Common/Traits/CustomBuildTimeValue.cs
old mode 100755
new mode 100644
similarity index 96%
rename from OpenRA.Mods.RA/Buildings/CustomBuildTimeValue.cs
rename to OpenRA.Mods.Common/Traits/CustomBuildTimeValue.cs
index 629f73e577..2ef19fd6c7
--- a/OpenRA.Mods.RA/Buildings/CustomBuildTimeValue.cs
+++ b/OpenRA.Mods.Common/Traits/CustomBuildTimeValue.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Buildings
+namespace OpenRA.Mods.Common
 {
 	[Desc("Overrides the build time calculated by actor value.")]
 	public class CustomBuildTimeValueInfo : TraitInfo<CustomBuildTimeValue>
diff --git a/OpenRA.Mods.RA/Buildings/CustomSellValue.cs b/OpenRA.Mods.Common/Traits/CustomSellValue.cs
old mode 100755
new mode 100644
similarity index 96%
rename from OpenRA.Mods.RA/Buildings/CustomSellValue.cs
rename to OpenRA.Mods.Common/Traits/CustomSellValue.cs
index 5634cbbb8e..1290e9fd76
--- a/OpenRA.Mods.RA/Buildings/CustomSellValue.cs
+++ b/OpenRA.Mods.Common/Traits/CustomSellValue.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Buildings
+namespace OpenRA.Mods.Common
 {
 	[Desc("Allow a non-standard sell/repair value to avoid buy-sell exploits.")]
 	public class CustomSellValueInfo : TraitInfo<CustomSellValue>
diff --git a/OpenRA.Mods.RA/Valued.cs b/OpenRA.Mods.Common/Traits/Valued.cs
old mode 100755
new mode 100644
similarity index 95%
rename from OpenRA.Mods.RA/Valued.cs
rename to OpenRA.Mods.Common/Traits/Valued.cs
index 4c046a7199..3648ce8a27
--- a/OpenRA.Mods.RA/Valued.cs
+++ b/OpenRA.Mods.Common/Traits/Valued.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("How much the unit is worth.")]
 	public class ValuedInfo : TraitInfo<Valued>
diff --git a/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs
index a40cb9d194..e7cb847cd9 100644
--- a/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs
+++ b/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs
@@ -13,10 +13,11 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Power;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Orders;
-using OpenRA.Mods.Common.Power;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Network;
 using OpenRA.Primitives;
diff --git a/OpenRA.Mods.RA/AI/SupportPowerDecision.cs b/OpenRA.Mods.RA/AI/SupportPowerDecision.cs
index f884e76cd8..20cded50a2 100644
--- a/OpenRA.Mods.RA/AI/SupportPowerDecision.cs
+++ b/OpenRA.Mods.RA/AI/SupportPowerDecision.cs
@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using OpenRA;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.AI;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Repair.cs b/OpenRA.Mods.RA/Activities/Repair.cs
index e83ad6ffe3..c0f11f0068 100644
--- a/OpenRA.Mods.RA/Activities/Repair.cs
+++ b/OpenRA.Mods.RA/Activities/Repair.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System;
+using OpenRA.Mods.Common;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/Sell.cs b/OpenRA.Mods.RA/Activities/Sell.cs
index 7f8e784d85..bf0428ef22 100755
--- a/OpenRA.Mods.RA/Activities/Sell.cs
+++ b/OpenRA.Mods.RA/Activities/Sell.cs
@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs b/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs
index ea2ca0ab37..9ab249ab92 100755
--- a/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs
+++ b/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Effects;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs b/OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs
index de078920cb..8a74aabdfe 100644
--- a/OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs
+++ b/OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs
@@ -11,6 +11,7 @@
 using System;
 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/EmitInfantryOnSell.cs b/OpenRA.Mods.RA/EmitInfantryOnSell.cs
index 690d5919a5..9853b4a5e3 100644
--- a/OpenRA.Mods.RA/EmitInfantryOnSell.cs
+++ b/OpenRA.Mods.RA/EmitInfantryOnSell.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Primitives;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/GainsExperience.cs b/OpenRA.Mods.RA/GainsExperience.cs
index 844b71e402..3244ed52af 100644
--- a/OpenRA.Mods.RA/GainsExperience.cs
+++ b/OpenRA.Mods.RA/GainsExperience.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.RA.Effects;
 using OpenRA.Primitives;
diff --git a/OpenRA.Mods.RA/GivesBounty.cs b/OpenRA.Mods.RA/GivesBounty.cs
index ee7f11489a..fc680f4469 100644
--- a/OpenRA.Mods.RA/GivesBounty.cs
+++ b/OpenRA.Mods.RA/GivesBounty.cs
@@ -9,7 +9,7 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/GivesExperience.cs b/OpenRA.Mods.RA/GivesExperience.cs
index 78e23aa5c1..d3bdc9dd31 100644
--- a/OpenRA.Mods.RA/GivesExperience.cs
+++ b/OpenRA.Mods.RA/GivesExperience.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Mods.Common;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 0175a5d0fb..e564035462 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -164,8 +164,6 @@
     <Compile Include="CaptureNotification.cs" />
     <Compile Include="Buildings\Building.cs" />
     <Compile Include="Buildings\BuildingInfluence.cs" />
-    <Compile Include="Buildings\CustomSellValue.cs" />
-    <Compile Include="Buildings\CustomBuildTimeValue.cs" />
     <Compile Include="Buildings\DeadBuildingState.cs" />
     <Compile Include="Buildings\FootprintUtils.cs" />
     <Compile Include="Buildings\LineBuild.cs" />
@@ -312,7 +310,6 @@
     <Compile Include="TransformOnPassenger.cs" />
     <Compile Include="Transforms.cs" />
     <Compile Include="Turreted.cs" />
-    <Compile Include="Valued.cs" />
     <Compile Include="Widgets\Logic\KickSpectatorsLogic.cs" />
     <Compile Include="Widgets\Logic\MissionBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\IngameMenuLogic.cs" />
diff --git a/OpenRA.Mods.RA/Player/ClassicProductionQueue.cs b/OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
index 492aafe841..555d1dc91f 100644
--- a/OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
+++ b/OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
@@ -10,8 +10,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Power;
+using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Player/PlayerStatistics.cs b/OpenRA.Mods.RA/Player/PlayerStatistics.cs
index 73b537af4a..9348b17461 100644
--- a/OpenRA.Mods.RA/Player/PlayerStatistics.cs
+++ b/OpenRA.Mods.RA/Player/PlayerStatistics.cs
@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Player/ProductionQueue.cs b/OpenRA.Mods.RA/Player/ProductionQueue.cs
index 810bef7df1..cd0f48d94d 100644
--- a/OpenRA.Mods.RA/Player/ProductionQueue.cs
+++ b/OpenRA.Mods.RA/Player/ProductionQueue.cs
@@ -11,8 +11,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Power;
+using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Scripting/Global/ActorGlobal.cs b/OpenRA.Mods.RA/Scripting/Global/ActorGlobal.cs
index 178d07a2ef..43f08dc9aa 100644
--- a/OpenRA.Mods.RA/Scripting/Global/ActorGlobal.cs
+++ b/OpenRA.Mods.RA/Scripting/Global/ActorGlobal.cs
@@ -10,6 +10,7 @@
 
 using System.Linq;
 using Eluant;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Air;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Primitives;
diff --git a/OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs b/OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs
index 5c405328ba..6f464eed2a 100644
--- a/OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs
+++ b/OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs
@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using OpenRA.GameRules;
+using OpenRA.Mods.Common;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.UtilityCommands
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs
index 10c96f1b00..67eef99fe5 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs
@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Power;
 using OpenRA.Network;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs
index 2016f00d9d..07b5db9eec 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Power;
 using OpenRA.Traits;
 using OpenRA.Widgets;

From 5213aef105a8ec8f4d57878adf2e5f8a3b9a2879 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Fri, 14 Nov 2014 00:57:08 +0100
Subject: [PATCH 5/5] Move Palette traits into Traits\World

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj              | 8 ++++----
 .../{ => Traits}/World/PaletteFromCurrentTileset.cs       | 0
 OpenRA.Mods.Common/{ => Traits}/World/PaletteFromFile.cs  | 0
 OpenRA.Mods.Common/{ => Traits}/World/PaletteFromRGBA.cs  | 0
 .../{ => Traits}/World/PlayerPaletteFromCurrentTileset.cs | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename OpenRA.Mods.Common/{ => Traits}/World/PaletteFromCurrentTileset.cs (100%)
 rename OpenRA.Mods.Common/{ => Traits}/World/PaletteFromFile.cs (100%)
 rename OpenRA.Mods.Common/{ => Traits}/World/PaletteFromRGBA.cs (100%)
 rename OpenRA.Mods.Common/{ => Traits}/World/PlayerPaletteFromCurrentTileset.cs (100%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 7867d0ae2f..1117b04de5 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -122,6 +122,10 @@
     <Compile Include="Traits\World\CreateMPPlayers.cs" />
     <Compile Include="Traits\World\MPStartLocations.cs" />
     <Compile Include="Traits\World\MPStartUnits.cs" />
+    <Compile Include="Traits\World\PaletteFromCurrentTileset.cs" />
+    <Compile Include="Traits\World\PaletteFromFile.cs" />
+    <Compile Include="Traits\World\PaletteFromRGBA.cs" />
+    <Compile Include="Traits\World\PlayerPaletteFromCurrentTileset.cs" />
     <Compile Include="Traits\World\PlayMusicOnMapLoad.cs" />
     <Compile Include="Traits\World\RadarPings.cs" />
     <Compile Include="Traits\World\ResourceClaim.cs" />
@@ -168,10 +172,6 @@
     <Compile Include="Widgets\MenuButtonWidget.cs" />
     <Compile Include="Widgets\RadarWidget.cs" />
     <Compile Include="Widgets\ResourceBarWidget.cs" />
-    <Compile Include="World\PaletteFromCurrentTileset.cs" />
-    <Compile Include="World\PaletteFromFile.cs" />
-    <Compile Include="World\PaletteFromRGBA.cs" />
-    <Compile Include="World\PlayerPaletteFromCurrentTileset.cs" />
     <Compile Include="SpriteLoaders\ShpTDLoader.cs" />
     <Compile Include="SpriteLoaders\ShpTSLoader.cs" />
     <Compile Include="SpriteLoaders\TmpRALoader.cs" />
diff --git a/OpenRA.Mods.Common/World/PaletteFromCurrentTileset.cs b/OpenRA.Mods.Common/Traits/World/PaletteFromCurrentTileset.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/PaletteFromCurrentTileset.cs
rename to OpenRA.Mods.Common/Traits/World/PaletteFromCurrentTileset.cs
diff --git a/OpenRA.Mods.Common/World/PaletteFromFile.cs b/OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/PaletteFromFile.cs
rename to OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs
diff --git a/OpenRA.Mods.Common/World/PaletteFromRGBA.cs b/OpenRA.Mods.Common/Traits/World/PaletteFromRGBA.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/PaletteFromRGBA.cs
rename to OpenRA.Mods.Common/Traits/World/PaletteFromRGBA.cs
diff --git a/OpenRA.Mods.Common/World/PlayerPaletteFromCurrentTileset.cs b/OpenRA.Mods.Common/Traits/World/PlayerPaletteFromCurrentTileset.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/PlayerPaletteFromCurrentTileset.cs
rename to OpenRA.Mods.Common/Traits/World/PlayerPaletteFromCurrentTileset.cs