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 @@ - - - - - @@ -247,6 +242,7 @@ + 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 @@ + + + + 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 {