From 8e8e02dae8364ce247b8bf0e4ad942b104a0973b Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sun, 17 Aug 2014 20:01:21 +1200
Subject: [PATCH] Move warheads into mod code.

---
 OpenRA.Game/GameRules/{Warheads => }/DamageWarhead.cs       | 0
 OpenRA.Game/OpenRA.Game.csproj                              | 6 +-----
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                        | 4 ++++
 .../Warheads/AbsoluteSpreadDamageWarhead.cs                 | 3 ++-
 .../Warheads/HealthPercentageDamageWarhead.cs               | 3 ++-
 .../Warheads/PerCellDamageWarhead.cs                        | 3 ++-
 .../Warheads/SpreadDamageWarhead.cs                         | 3 ++-
 7 files changed, 13 insertions(+), 9 deletions(-)
 rename OpenRA.Game/GameRules/{Warheads => }/DamageWarhead.cs (100%)
 rename {OpenRA.Game/GameRules => OpenRA.Mods.RA}/Warheads/AbsoluteSpreadDamageWarhead.cs (97%)
 rename {OpenRA.Game/GameRules => OpenRA.Mods.RA}/Warheads/HealthPercentageDamageWarhead.cs (97%)
 rename {OpenRA.Game/GameRules => OpenRA.Mods.RA}/Warheads/PerCellDamageWarhead.cs (97%)
 rename {OpenRA.Game/GameRules => OpenRA.Mods.RA}/Warheads/SpreadDamageWarhead.cs (97%)

diff --git a/OpenRA.Game/GameRules/Warheads/DamageWarhead.cs b/OpenRA.Game/GameRules/DamageWarhead.cs
similarity index 100%
rename from OpenRA.Game/GameRules/Warheads/DamageWarhead.cs
rename to OpenRA.Game/GameRules/DamageWarhead.cs
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index c66c36231f..626be20eaf 100644
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -76,11 +76,6 @@
   <ItemGroup>
     <Compile Include="Actor.cs" />
     <Compile Include="GameRules\Warhead.cs" />
-    <Compile Include="GameRules\Warheads\AbsoluteSpreadDamageWarhead.cs" />
-    <Compile Include="GameRules\Warheads\DamageWarhead.cs" />
-    <Compile Include="GameRules\Warheads\HealthPercentageDamageWarhead.cs" />
-    <Compile Include="GameRules\Warheads\PerCellDamageWarhead.cs" />
-    <Compile Include="GameRules\Warheads\SpreadDamageWarhead.cs" />
     <Compile Include="Graphics\QuadRenderer.cs" />
     <Compile Include="Download.cs" />
     <Compile Include="Effects\DelayedAction.cs" />
@@ -247,6 +242,7 @@
     <Compile Include="Graphics\SelectionBarsRenderable.cs" />
     <Compile Include="Graphics\TargetLineRenderable.cs" />
     <Compile Include="Graphics\UISpriteRenderable.cs" />
+    <Compile Include="GameRules\DamageWarhead.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FileSystem\D2kSoundResources.cs" />
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 6935478767..7ac4a7e41e 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -562,6 +562,10 @@
     <Compile Include="GainsStatUpgrades.cs" />
     <Compile Include="Player\Extensions.cs" />
     <Compile Include="ServerTraits\LobbySettingsNotification.cs" />
+    <Compile Include="Warheads\AbsoluteSpreadDamageWarhead.cs" />
+    <Compile Include="Warheads\HealthPercentageDamageWarhead.cs" />
+    <Compile Include="Warheads\PerCellDamageWarhead.cs" />
+    <Compile Include="Warheads\SpreadDamageWarhead.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
diff --git a/OpenRA.Game/GameRules/Warheads/AbsoluteSpreadDamageWarhead.cs b/OpenRA.Mods.RA/Warheads/AbsoluteSpreadDamageWarhead.cs
similarity index 97%
rename from OpenRA.Game/GameRules/Warheads/AbsoluteSpreadDamageWarhead.cs
rename to OpenRA.Mods.RA/Warheads/AbsoluteSpreadDamageWarhead.cs
index 17a3398731..defa314f15 100644
--- a/OpenRA.Game/GameRules/Warheads/AbsoluteSpreadDamageWarhead.cs
+++ b/OpenRA.Mods.RA/Warheads/AbsoluteSpreadDamageWarhead.cs
@@ -12,9 +12,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Effects;
+using OpenRA.GameRules;
 using OpenRA.Traits;
 
-namespace OpenRA.GameRules
+namespace OpenRA.Mods.RA
 {
 	public class AbsoluteSpreadDamageWarhead : DamageWarhead
 	{
diff --git a/OpenRA.Game/GameRules/Warheads/HealthPercentageDamageWarhead.cs b/OpenRA.Mods.RA/Warheads/HealthPercentageDamageWarhead.cs
similarity index 97%
rename from OpenRA.Game/GameRules/Warheads/HealthPercentageDamageWarhead.cs
rename to OpenRA.Mods.RA/Warheads/HealthPercentageDamageWarhead.cs
index 822a003786..2bab70e713 100644
--- a/OpenRA.Game/GameRules/Warheads/HealthPercentageDamageWarhead.cs
+++ b/OpenRA.Mods.RA/Warheads/HealthPercentageDamageWarhead.cs
@@ -12,9 +12,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Effects;
+using OpenRA.GameRules;
 using OpenRA.Traits;
 
-namespace OpenRA.GameRules
+namespace OpenRA.Mods.RA
 {
 	public class HealthPercentageDamageWarhead : DamageWarhead
 	{
diff --git a/OpenRA.Game/GameRules/Warheads/PerCellDamageWarhead.cs b/OpenRA.Mods.RA/Warheads/PerCellDamageWarhead.cs
similarity index 97%
rename from OpenRA.Game/GameRules/Warheads/PerCellDamageWarhead.cs
rename to OpenRA.Mods.RA/Warheads/PerCellDamageWarhead.cs
index 5f0a370bea..92e4e70e15 100644
--- a/OpenRA.Game/GameRules/Warheads/PerCellDamageWarhead.cs
+++ b/OpenRA.Mods.RA/Warheads/PerCellDamageWarhead.cs
@@ -12,9 +12,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Effects;
+using OpenRA.GameRules;
 using OpenRA.Traits;
 
-namespace OpenRA.GameRules
+namespace OpenRA.Mods.RA
 {
 	public class PerCellDamageWarhead : DamageWarhead
 	{
diff --git a/OpenRA.Game/GameRules/Warheads/SpreadDamageWarhead.cs b/OpenRA.Mods.RA/Warheads/SpreadDamageWarhead.cs
similarity index 97%
rename from OpenRA.Game/GameRules/Warheads/SpreadDamageWarhead.cs
rename to OpenRA.Mods.RA/Warheads/SpreadDamageWarhead.cs
index 150739b302..728f9f91e8 100644
--- a/OpenRA.Game/GameRules/Warheads/SpreadDamageWarhead.cs
+++ b/OpenRA.Mods.RA/Warheads/SpreadDamageWarhead.cs
@@ -12,9 +12,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Effects;
+using OpenRA.GameRules;
 using OpenRA.Traits;
 
-namespace OpenRA.GameRules
+namespace OpenRA.Mods.RA
 {
 	public class SpreadDamageWarhead : DamageWarhead
 	{