diff --git a/OpenRA.Mods.Cnc/ProductionAirdrop.cs b/OpenRA.Mods.Cnc/ProductionAirdrop.cs index 082238478d..137e0f6bc7 100644 --- a/OpenRA.Mods.Cnc/ProductionAirdrop.cs +++ b/OpenRA.Mods.Cnc/ProductionAirdrop.cs @@ -15,6 +15,7 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Render; using OpenRA.Traits; using OpenRA.Traits.Activities; +using OpenRA.Mods.RA.Air; namespace OpenRA.Mods.Cnc { diff --git a/OpenRA.Mods.RA/Aircraft.cs b/OpenRA.Mods.RA/Air/Aircraft.cs similarity index 95% rename from OpenRA.Mods.RA/Aircraft.cs rename to OpenRA.Mods.RA/Air/Aircraft.cs index 9246c291ce..1cb5ac330d 100755 --- a/OpenRA.Mods.RA/Aircraft.cs +++ b/OpenRA.Mods.RA/Air/Aircraft.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Air { public class AircraftInfo : ITraitInfo { diff --git a/OpenRA.Mods.RA/AttackHeli.cs b/OpenRA.Mods.RA/Air/AttackHeli.cs old mode 100644 new mode 100755 similarity index 93% rename from OpenRA.Mods.RA/AttackHeli.cs rename to OpenRA.Mods.RA/Air/AttackHeli.cs index d659c45310..8cb7d1c5d2 --- a/OpenRA.Mods.RA/AttackHeli.cs +++ b/OpenRA.Mods.RA/Air/AttackHeli.cs @@ -11,7 +11,7 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Air { class AttackHeliInfo : AttackFrontalInfo { diff --git a/OpenRA.Mods.RA/AttackPlane.cs b/OpenRA.Mods.RA/Air/AttackPlane.cs old mode 100644 new mode 100755 similarity index 93% rename from OpenRA.Mods.RA/AttackPlane.cs rename to OpenRA.Mods.RA/Air/AttackPlane.cs index b80e1e137a..966a54e645 --- a/OpenRA.Mods.RA/AttackPlane.cs +++ b/OpenRA.Mods.RA/Air/AttackPlane.cs @@ -11,7 +11,7 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Air { class AttackPlaneInfo : AttackFrontalInfo { diff --git a/OpenRA.Mods.RA/FallsToEarth.cs b/OpenRA.Mods.RA/Air/FallsToEarth.cs old mode 100644 new mode 100755 similarity index 94% rename from OpenRA.Mods.RA/FallsToEarth.cs rename to OpenRA.Mods.RA/Air/FallsToEarth.cs index 29890d6f32..9a8a0f9509 --- a/OpenRA.Mods.RA/FallsToEarth.cs +++ b/OpenRA.Mods.RA/Air/FallsToEarth.cs @@ -11,7 +11,7 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Air { class FallsToEarthInfo : TraitInfo { diff --git a/OpenRA.Mods.RA/Activities/Fly.cs b/OpenRA.Mods.RA/Air/Fly.cs old mode 100644 new mode 100755 similarity index 94% rename from OpenRA.Mods.RA/Activities/Fly.cs rename to OpenRA.Mods.RA/Air/Fly.cs index 4cdb8317d3..8f92eb1513 --- a/OpenRA.Mods.RA/Activities/Fly.cs +++ b/OpenRA.Mods.RA/Air/Fly.cs @@ -12,7 +12,7 @@ using System; using System.Collections.Generic; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.RA.Air { public class Fly : CancelableActivity { diff --git a/OpenRA.Mods.RA/Activities/FlyAttack.cs b/OpenRA.Mods.RA/Air/FlyAttack.cs old mode 100644 new mode 100755 similarity index 93% rename from OpenRA.Mods.RA/Activities/FlyAttack.cs rename to OpenRA.Mods.RA/Air/FlyAttack.cs index 2c31128714..5f6d920096 --- a/OpenRA.Mods.RA/Activities/FlyAttack.cs +++ b/OpenRA.Mods.RA/Air/FlyAttack.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.RA.Air { public class FlyAttack : CancelableActivity { diff --git a/OpenRA.Mods.RA/Activities/FlyTimed.cs b/OpenRA.Mods.RA/Air/FlyTimed.cs old mode 100644 new mode 100755 similarity index 93% rename from OpenRA.Mods.RA/Activities/FlyTimed.cs rename to OpenRA.Mods.RA/Air/FlyTimed.cs index ee572d1dc0..2f715531da --- a/OpenRA.Mods.RA/Activities/FlyTimed.cs +++ b/OpenRA.Mods.RA/Air/FlyTimed.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.RA.Air { public class FlyTimed : CancelableActivity { diff --git a/OpenRA.Mods.RA/Activities/HeliAttack.cs b/OpenRA.Mods.RA/Air/HeliAttack.cs old mode 100644 new mode 100755 similarity index 94% rename from OpenRA.Mods.RA/Activities/HeliAttack.cs rename to OpenRA.Mods.RA/Air/HeliAttack.cs index f2228d5c87..d408dd3b11 --- a/OpenRA.Mods.RA/Activities/HeliAttack.cs +++ b/OpenRA.Mods.RA/Air/HeliAttack.cs @@ -12,7 +12,7 @@ using System; using System.Linq; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.RA.Air { public class HeliAttack : CancelableActivity { diff --git a/OpenRA.Mods.RA/Activities/HeliFly.cs b/OpenRA.Mods.RA/Air/HeliFly.cs old mode 100644 new mode 100755 similarity index 93% rename from OpenRA.Mods.RA/Activities/HeliFly.cs rename to OpenRA.Mods.RA/Air/HeliFly.cs index 7d95f94b44..62e4fec4c3 --- a/OpenRA.Mods.RA/Activities/HeliFly.cs +++ b/OpenRA.Mods.RA/Air/HeliFly.cs @@ -12,7 +12,7 @@ using System; using System.Collections.Generic; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.RA.Air { class HeliFly : CancelableActivity { diff --git a/OpenRA.Mods.RA/Activities/HeliLand.cs b/OpenRA.Mods.RA/Air/HeliLand.cs old mode 100644 new mode 100755 similarity index 92% rename from OpenRA.Mods.RA/Activities/HeliLand.cs rename to OpenRA.Mods.RA/Air/HeliLand.cs index 92ee54f1bb..b74176cf80 --- a/OpenRA.Mods.RA/Activities/HeliLand.cs +++ b/OpenRA.Mods.RA/Air/HeliLand.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.RA.Air { class HeliLand : CancelableActivity { diff --git a/OpenRA.Mods.RA/Activities/HeliReturn.cs b/OpenRA.Mods.RA/Air/HeliReturn.cs old mode 100644 new mode 100755 similarity index 92% rename from OpenRA.Mods.RA/Activities/HeliReturn.cs rename to OpenRA.Mods.RA/Air/HeliReturn.cs index e80f7ced17..5e652f2775 --- a/OpenRA.Mods.RA/Activities/HeliReturn.cs +++ b/OpenRA.Mods.RA/Air/HeliReturn.cs @@ -11,8 +11,9 @@ using System.Linq; using OpenRA.Traits; using OpenRA.Traits.Activities; +using OpenRA.Mods.RA.Activities; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.RA.Air { public class HeliReturn : CancelableActivity { diff --git a/OpenRA.Mods.RA/Helicopter.cs b/OpenRA.Mods.RA/Air/Helicopter.cs old mode 100644 new mode 100755 similarity index 96% rename from OpenRA.Mods.RA/Helicopter.cs rename to OpenRA.Mods.RA/Air/Helicopter.cs index 4a22042aec..e8176f32d6 --- a/OpenRA.Mods.RA/Helicopter.cs +++ b/OpenRA.Mods.RA/Air/Helicopter.cs @@ -18,7 +18,7 @@ using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Orders; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Air { class HelicopterInfo : AircraftInfo { diff --git a/OpenRA.Mods.RA/Activities/Land.cs b/OpenRA.Mods.RA/Air/Land.cs old mode 100644 new mode 100755 similarity index 93% rename from OpenRA.Mods.RA/Activities/Land.cs rename to OpenRA.Mods.RA/Air/Land.cs index af3f54dbac..e6639a5675 --- a/OpenRA.Mods.RA/Activities/Land.cs +++ b/OpenRA.Mods.RA/Air/Land.cs @@ -12,7 +12,7 @@ using System; using System.Linq; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.RA.Air { public class Land : CancelableActivity { diff --git a/OpenRA.Mods.RA/Plane.cs b/OpenRA.Mods.RA/Air/Plane.cs old mode 100644 new mode 100755 similarity index 95% rename from OpenRA.Mods.RA/Plane.cs rename to OpenRA.Mods.RA/Air/Plane.cs index 500a21447e..11dfe5f771 --- a/OpenRA.Mods.RA/Plane.cs +++ b/OpenRA.Mods.RA/Air/Plane.cs @@ -18,7 +18,7 @@ using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Orders; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Air { public class PlaneInfo : AircraftInfo { diff --git a/OpenRA.Mods.RA/ReservableProduction.cs b/OpenRA.Mods.RA/Air/ReservableProduction.cs old mode 100644 new mode 100755 similarity index 90% rename from OpenRA.Mods.RA/ReservableProduction.cs rename to OpenRA.Mods.RA/Air/ReservableProduction.cs index b333cfdea4..a82d9a1220 --- a/OpenRA.Mods.RA/ReservableProduction.cs +++ b/OpenRA.Mods.RA/Air/ReservableProduction.cs @@ -12,7 +12,7 @@ using System.Linq; using OpenRA.FileFormats; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Air { // a small hack to teach Production about Reservable. @@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA var rp = self.TraitOrDefault(); if( rp != null ) { - newUnit.QueueActivity( new Activities.HeliFly( Util.CenterOfCell(rp.rallyPoint)) ); + newUnit.QueueActivity( new HeliFly( Util.CenterOfCell(rp.rallyPoint)) ); } foreach (var t in self.TraitsImplementing()) diff --git a/OpenRA.Mods.RA/ReturnOnIdle.cs b/OpenRA.Mods.RA/Air/ReturnOnIdle.cs similarity index 94% rename from OpenRA.Mods.RA/ReturnOnIdle.cs rename to OpenRA.Mods.RA/Air/ReturnOnIdle.cs index ade4d9d97e..39faa67d8d 100755 --- a/OpenRA.Mods.RA/ReturnOnIdle.cs +++ b/OpenRA.Mods.RA/Air/ReturnOnIdle.cs @@ -12,7 +12,7 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Traits; using OpenRA.Traits.Activities; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Air { class ReturnOnIdleInfo : TraitInfo { } diff --git a/OpenRA.Mods.RA/Activities/ReturnToBase.cs b/OpenRA.Mods.RA/Air/ReturnToBase.cs old mode 100644 new mode 100755 similarity index 94% rename from OpenRA.Mods.RA/Activities/ReturnToBase.cs rename to OpenRA.Mods.RA/Air/ReturnToBase.cs index 3d14a0a8d8..61c94a0111 --- a/OpenRA.Mods.RA/Activities/ReturnToBase.cs +++ b/OpenRA.Mods.RA/Air/ReturnToBase.cs @@ -12,7 +12,7 @@ using System; using System.Linq; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.RA.Air { public class ReturnToBase : CancelableActivity { diff --git a/OpenRA.Mods.RA/TargetableAircraft.cs b/OpenRA.Mods.RA/Air/TargetableAircraft.cs old mode 100644 new mode 100755 similarity index 94% rename from OpenRA.Mods.RA/TargetableAircraft.cs rename to OpenRA.Mods.RA/Air/TargetableAircraft.cs index 2977379407..197e38a1a0 --- a/OpenRA.Mods.RA/TargetableAircraft.cs +++ b/OpenRA.Mods.RA/Air/TargetableAircraft.cs @@ -13,7 +13,7 @@ using OpenRA.Graphics; using System.Linq; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.RA.Air { public class TargetableAircraftInfo : TargetableUnitInfo, ITraitPrerequisite { diff --git a/OpenRA.Mods.RA/CrateDrop.cs b/OpenRA.Mods.RA/CrateDrop.cs index efa3cdaf8c..9304c9ae63 100644 --- a/OpenRA.Mods.RA/CrateDrop.cs +++ b/OpenRA.Mods.RA/CrateDrop.cs @@ -15,6 +15,7 @@ using OpenRA.FileFormats; using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Buildings; using OpenRA.Traits; +using OpenRA.Mods.RA.Air; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/DefaultShellmapScript.cs b/OpenRA.Mods.RA/DefaultShellmapScript.cs index fe5f75b6ed..db0bd57488 100755 --- a/OpenRA.Mods.RA/DefaultShellmapScript.cs +++ b/OpenRA.Mods.RA/DefaultShellmapScript.cs @@ -11,7 +11,8 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Traits; -using System; +using System; +using OpenRA.Mods.RA.Air; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 59c7f19b7b..1d0497a9f1 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -59,23 +59,23 @@ - - - + + + - - - - + + + + - + - + @@ -109,7 +109,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -138,13 +138,13 @@ - + - + - + @@ -177,7 +177,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -231,7 +231,7 @@ - + diff --git a/OpenRA.Mods.RA/ParaDrop.cs b/OpenRA.Mods.RA/ParaDrop.cs index aa1f37ef48..baa9ac4c10 100644 --- a/OpenRA.Mods.RA/ParaDrop.cs +++ b/OpenRA.Mods.RA/ParaDrop.cs @@ -14,6 +14,7 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Effects; using OpenRA.Traits; using OpenRA.Traits.Activities; +using OpenRA.Mods.RA.Air; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs b/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs index 354baff71f..d3649ac871 100755 --- a/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs +++ b/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs @@ -13,6 +13,7 @@ using OpenRA.Orders; using OpenRA.Traits; using OpenRA.Traits.Activities; using OpenRA.FileFormats; +using OpenRA.Mods.RA.Air; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs b/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs index 59320fe648..da016916c3 100755 --- a/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs +++ b/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs @@ -12,6 +12,7 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Orders; using OpenRA.Traits; using OpenRA.FileFormats; +using OpenRA.Mods.RA.Air; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs b/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs index 6a4e0ac43a..0e3b355c43 100755 --- a/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs +++ b/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs @@ -13,6 +13,7 @@ using OpenRA.Orders; using OpenRA.Traits; using OpenRA.Traits.Activities; using OpenRA.FileFormats; +using OpenRA.Mods.RA.Air; namespace OpenRA.Mods.RA {