Merge pull request #7354 from penev92/bleed_moveFiles

Move parachutes and crates to Mods.Common

OpenRA.Mods.Common/Effects/Parachute.cs

@@ -13,10 +13,9 @@ using System.Linq;
 using OpenRA.Effects;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Effects
+namespace OpenRA.Mods.Common.Effects
 {
 	public class Parachute : IEffect
 	{

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

@@ -121,6 +121,7 @@
     <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\RallyPointIndicator.cs" />
     <Compile Include="Effects\Rank.cs" />
@@ -246,6 +247,19 @@
     <Compile Include="Traits\Cargo.cs" />
     <Compile Include="Traits\CashTrickler.cs" />
     <Compile Include="Traits\Cloak.cs" />
+    <Compile Include="Traits\Crates\Crate.cs" />
+    <Compile Include="Traits\Crates\CrateAction.cs" />
+    <Compile Include="Traits\Crates\DuplicateUnitCrateAction.cs" />
+    <Compile Include="Traits\Crates\ExplodeCrateAction.cs" />
+    <Compile Include="Traits\Crates\GiveCashCrateAction.cs" />
+    <Compile Include="Traits\Crates\GiveMcvCrateAction.cs" />
+    <Compile Include="Traits\Crates\GiveUnitCrateAction.cs" />
+    <Compile Include="Traits\Crates\GrantUpgradeCrateAction.cs" />
+    <Compile Include="Traits\Crates\HealUnitsCrateAction.cs" />
+    <Compile Include="Traits\Crates\HideMapCrateAction.cs" />
+    <Compile Include="Traits\Crates\LevelUpCrateAction.cs" />
+    <Compile Include="Traits\Crates\RevealMapCrateAction.cs" />
+    <Compile Include="Traits\Crates\SupportPowerCrateAction.cs" />
     <Compile Include="Traits\Crushable.cs" />
     <Compile Include="Traits\EmitInfantryOnSell.cs" />
     <Compile Include="Traits\ExternalCapturable.cs" />
@@ -280,6 +294,8 @@
     <Compile Include="Traits\Modifiers\HiddenUnderFog.cs" />
     <Compile Include="Traits\Modifiers\UpgradeOverlay.cs" />
     <Compile Include="Traits\MustBeDestroyed.cs" />
+    <Compile Include="Traits\Parachutable.cs" />
+    <Compile Include="Traits\ParaDrop.cs" />
     <Compile Include="Traits\Passenger.cs" />
     <Compile Include="Traits\PaletteEffects\CloakPaletteEffect.cs" />
     <Compile Include="Traits\PaletteEffects\LightPaletteRotator.cs" />
@@ -385,6 +401,7 @@
     <Compile Include="Traits\Valued.cs" />
     <Compile Include="Traits\Wanders.cs" />
     <Compile Include="Traits\World\BridgeLayer.cs" />
+    <Compile Include="Traits\World\CrateSpawner.cs" />
     <Compile Include="Traits\World\CreateMPPlayers.cs" />
     <Compile Include="Traits\World\DomainIndex.cs" />
     <Compile Include="Traits\World\LoadWidgetAtGameStart.cs" />

OpenRA.Mods.Common/Traits/Crates/Crate.cs

@@ -10,11 +10,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	class CrateInfo : ITraitInfo, IOccupySpaceInfo, Requires<RenderSpritesInfo>
 	{

OpenRA.Mods.Common/Traits/Crates/CrateAction.cs

@@ -10,10 +10,9 @@
 
 using System.Linq;
 using OpenRA.Mods.Common.Effects;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	public class CrateActionInfo : ITraitInfo
 	{

OpenRA.Mods.Common/Traits/Crates/DuplicateUnitCrateAction.cs

@@ -9,13 +9,11 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Creates duplicates of the actor that collects the crate.")]
 	class DuplicateUnitCrateActionInfo : CrateActionInfo

OpenRA.Mods.Common/Traits/Crates/ExplodeCrateAction.cs

@@ -9,10 +9,9 @@
 #endregion
 
 using System.Linq;
-using OpenRA.GameRules;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Fires a weapon at the location when collected.")]
 	class ExplodeCrateActionInfo : CrateActionInfo

OpenRA.Mods.Common/Traits/Crates/GiveCashCrateAction.cs

@@ -11,7 +11,7 @@
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Gives cash to the collector.")]
 	class GiveCashCrateActionInfo : CrateActionInfo

OpenRA.Mods.Common/Traits/Crates/GiveMcvCrateAction.cs

@@ -9,9 +9,8 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Spawns units when collected.", "Adjust selection shares when player has no base.")]
 	class GiveMcvCrateActionInfo : GiveUnitCrateActionInfo

OpenRA.Mods.Common/Traits/Crates/GiveUnitCrateAction.cs

@@ -10,11 +10,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Spawns units when collected.")]
 	class GiveUnitCrateActionInfo : CrateActionInfo

OpenRA.Mods.Common/Traits/Crates/GrantUpgradeCrateAction.cs

@@ -9,10 +9,8 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Grants an upgrade to the collector.")]
 	public class GrantUpgradeCrateActionInfo : CrateActionInfo

OpenRA.Mods.Common/Traits/Crates/HealUnitsCrateAction.cs

@@ -11,7 +11,7 @@
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Heals all actors that belong to the owner of the collector.")]
 	class HealUnitsCrateActionInfo : CrateActionInfo

OpenRA.Mods.Common/Traits/Crates/HideMapCrateAction.cs

@@ -8,7 +8,7 @@
  */
 #endregion
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Hides the entire map in shroud.")]
 	class HideMapCrateActionInfo : CrateActionInfo

OpenRA.Mods.Common/Traits/Crates/LevelUpCrateAction.cs

@@ -9,9 +9,8 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Gives experience levels to the collector.")]
 	class LevelUpCrateActionInfo : CrateActionInfo

OpenRA.Mods.Common/Traits/Crates/RevealMapCrateAction.cs

@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Reveals the entire map.")]
 	class RevealMapCrateActionInfo : CrateActionInfo

OpenRA.Mods.Common/Traits/Crates/SupportPowerCrateAction.cs

@@ -11,7 +11,7 @@
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Gives a supportpower to the collector.")]
 	class SupportPowerCrateActionInfo : CrateActionInfo

OpenRA.Mods.Common/Traits/ParaDrop.cs

@@ -10,12 +10,10 @@
 
 using System;
 using System.Collections.Generic;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Effects;
+using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("This unit can spawn and eject other actors while flying.")]
 	public class ParaDropInfo : ITraitInfo, Requires<CargoInfo>

OpenRA.Mods.Common/Traits/Parachutable.cs

@@ -9,10 +9,9 @@
 #endregion
 
 using OpenRA.Mods.Common.Effects;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Can be paradropped by a ParaDrop actor.")]
 	class ParachutableInfo : ITraitInfo

OpenRA.Mods.Common/Traits/World/CrateSpawner.cs

@@ -11,12 +11,10 @@
 using System;
 using System.Linq;
 using OpenRA.Mods.Common.Activities;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	public class CrateSpawnerInfo : ITraitInfo
 	{

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

@@ -94,27 +94,11 @@
     <Compile Include="Traits\Attack\AttackLeap.cs" />
     <Compile Include="Traits\PaletteEffects\ChronoshiftPaletteEffect.cs" />
     <Compile Include="Traits\Chronoshiftable.cs" />
-    <Compile Include="CrateSpawner.cs" />
-    <Compile Include="Traits\Crates\CrateAction.cs" />
-    <Compile Include="Traits\Crates\Crate.cs" />
-    <Compile Include="Traits\Crates\DuplicateUnitCrateAction.cs" />
-    <Compile Include="Traits\Crates\ExplodeCrateAction.cs" />
-    <Compile Include="Traits\Crates\GiveCashCrateAction.cs" />
-    <Compile Include="Traits\Crates\GiveMcvCrateAction.cs" />
-    <Compile Include="Traits\Crates\GiveUnitCrateAction.cs" />
-    <Compile Include="Traits\Crates\GrantUpgradeCrateAction.cs" />
-    <Compile Include="Traits\Crates\HealUnitsCrateAction.cs" />
-    <Compile Include="Traits\Crates\HideMapCrateAction.cs" />
-    <Compile Include="Traits\Crates\LevelUpCrateAction.cs" />
-    <Compile Include="Traits\Crates\RevealMapCrateAction.cs" />
-    <Compile Include="Traits\Crates\SupportPowerCrateAction.cs" />
     <Compile Include="Traits\DemoTruck.cs" />
     <Compile Include="Effects\GpsDot.cs" />
-    <Compile Include="Effects\Parachute.cs" />
     <Compile Include="Traits\MadTank.cs" />
     <Compile Include="Traits\Mine.cs" />
     <Compile Include="Traits\Minelayer.cs" />
-    <Compile Include="Traits\ParaDrop.cs" />
     <Compile Include="Traits\PortableChrono.cs" />
     <Compile Include="Traits\Render\RenderJammerCircle.cs" />
     <Compile Include="Traits\Render\RenderHarvester.cs" />
@@ -173,7 +157,6 @@
     <Compile Include="Traits\Attack\AttackGarrisoned.cs" />
     <Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
     <Compile Include="Scripting\Properties\ChronosphereProperties.cs" />
-    <Compile Include="Traits\Parachutable.cs" />
     <Compile Include="Widgets\Logic\InstallFromCDLogic.cs" />
     <Compile Include="Widgets\Logic\InstallMusicLogic.cs" />
     <Compile Include="Traits\Buildings\ClonesProducedUnits.cs" />

OpenRA.Mods.RA/Traits/EjectOnDeath.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Effects;
 using OpenRA.Primitives;