move aircraft code into Mods.RA/Air/

This commit is contained in:
Bob
2010-11-06 12:15:14 +13:00
parent aa0c14c214
commit 801aa1156f
26 changed files with 46 additions and 38 deletions

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -11,7 +11,7 @@
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Air
{
class AttackHeliInfo : AttackFrontalInfo
{

View File

@@ -11,7 +11,7 @@
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Air
{
class AttackPlaneInfo : AttackFrontalInfo
{

View File

@@ -11,7 +11,7 @@
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Air
{
class FallsToEarthInfo : TraitInfo<FallsToEarth>
{

View File

@@ -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
{

View File

@@ -10,7 +10,7 @@
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
namespace OpenRA.Mods.RA.Air
{
public class FlyAttack : CancelableActivity
{

View File

@@ -10,7 +10,7 @@
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
namespace OpenRA.Mods.RA.Air
{
public class FlyTimed : CancelableActivity
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -10,7 +10,7 @@
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
namespace OpenRA.Mods.RA.Air
{
class HeliLand : CancelableActivity
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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<RallyPoint>();
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<INotifyProduction>())

View File

@@ -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<ReturnOnIdle> { }

View File

@@ -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
{

View File

@@ -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<AircraftInfo>
{

View File

@@ -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
{

View File

@@ -12,6 +12,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
using System;
using OpenRA.Mods.RA.Air;
namespace OpenRA.Mods.RA
{

View File

@@ -59,23 +59,23 @@
<Compile Include="Activities\Demolish.cs" />
<Compile Include="Activities\Enter.cs" />
<Compile Include="Activities\EnterTransport.cs" />
<Compile Include="Activities\Fly.cs" />
<Compile Include="Activities\FlyAttack.cs" />
<Compile Include="Activities\FlyTimed.cs" />
<Compile Include="Air\Fly.cs" />
<Compile Include="Air\FlyAttack.cs" />
<Compile Include="Air\FlyTimed.cs" />
<Compile Include="Activities\Follow.cs" />
<Compile Include="Activities\HeliAttack.cs" />
<Compile Include="Activities\HeliFly.cs" />
<Compile Include="Activities\HeliLand.cs" />
<Compile Include="Activities\HeliReturn.cs" />
<Compile Include="Air\HeliAttack.cs" />
<Compile Include="Air\HeliFly.cs" />
<Compile Include="Air\HeliLand.cs" />
<Compile Include="Air\HeliReturn.cs" />
<Compile Include="Activities\Infiltrate.cs" />
<Compile Include="Activities\Land.cs" />
<Compile Include="Air\Land.cs" />
<Compile Include="Activities\LayMines.cs" />
<Compile Include="Activities\Leap.cs" />
<Compile Include="Activities\MoveAdjacentTo.cs" />
<Compile Include="Activities\Rearm.cs" />
<Compile Include="Activities\RemoveSelf.cs" />
<Compile Include="Activities\Repair.cs" />
<Compile Include="Activities\ReturnToBase.cs" />
<Compile Include="Air\ReturnToBase.cs" />
<Compile Include="Activities\Teleport.cs" />
<Compile Include="Activities\Turn.cs" />
<Compile Include="Activities\UnloadCargo.cs" />
@@ -109,7 +109,7 @@
<Compile Include="Effects\RepairIndicator.cs" />
<Compile Include="Effects\Smoke.cs" />
<Compile Include="Effects\TeslaZap.cs" />
<Compile Include="FallsToEarth.cs" />
<Compile Include="Air\FallsToEarth.cs" />
<Compile Include="CashTrickler.cs" />
<Compile Include="LimitedAmmo.cs" />
<Compile Include="Move\Drag.cs" />
@@ -123,7 +123,7 @@
<Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
<Compile Include="Orders\UnitOrderTargeter.cs" />
<Compile Include="Player\ActorGroupProxy.cs" />
<Compile Include="Aircraft.cs" />
<Compile Include="Air\Aircraft.cs" />
<Compile Include="Player\ClassicProductionQueue.cs" />
<Compile Include="Player\PlaceBuilding.cs" />
<Compile Include="Player\ProductionQueue.cs" />
@@ -138,13 +138,13 @@
<Compile Include="Render\RenderUnit.cs" />
<Compile Include="Render\RenderUnitTurreted.cs" />
<Compile Include="Buildings\RepairableBuilding.cs" />
<Compile Include="ReservableProduction.cs" />
<Compile Include="Air\ReservableProduction.cs" />
<Compile Include="SupportPowers\AirstrikePower.cs" />
<Compile Include="AttackFrontal.cs" />
<Compile Include="AttackHeli.cs" />
<Compile Include="Air\AttackHeli.cs" />
<Compile Include="AttackLeap.cs" />
<Compile Include="AttackOmni.cs" />
<Compile Include="AttackPlane.cs" />
<Compile Include="Air\AttackPlane.cs" />
<Compile Include="AttackTesla.cs" />
<Compile Include="AttackTurreted.cs" />
<Compile Include="AutoHeal.cs" />
@@ -177,7 +177,7 @@
<Compile Include="Fake.cs" />
<Compile Include="Harvester.cs" />
<Compile Include="FreeActor.cs" />
<Compile Include="Helicopter.cs" />
<Compile Include="Air\Helicopter.cs" />
<Compile Include="Husk.cs" />
<Compile Include="InvisibleToOthers.cs" />
<Compile Include="LeavesHusk.cs" />
@@ -201,7 +201,7 @@
<Compile Include="ParaDrop.cs" />
<Compile Include="SupportPowers\ParatroopersPower.cs" />
<Compile Include="Passenger.cs" />
<Compile Include="Plane.cs" />
<Compile Include="Air\Plane.cs" />
<Compile Include="Render\RenderBuildingCharge.cs" />
<Compile Include="Render\RenderBuildingOre.cs" />
<Compile Include="Render\RenderBuildingWall.cs" />
@@ -220,7 +220,7 @@
<Compile Include="Render\RenderSpy.cs" />
<Compile Include="RepairableNear.cs" />
<Compile Include="Reservable.cs" />
<Compile Include="ReturnOnIdle.cs" />
<Compile Include="Air\ReturnOnIdle.cs" />
<Compile Include="SeedsResource.cs" />
<Compile Include="SelfHealing.cs" />
<Compile Include="ShroudPalette.cs" />
@@ -231,7 +231,7 @@
<Compile Include="SupportPowers\NukePower.cs" />
<Compile Include="SupportPowers\SupportPower.cs" />
<Compile Include="TakeCover.cs" />
<Compile Include="TargetableAircraft.cs" />
<Compile Include="Air\TargetableAircraft.cs" />
<Compile Include="TargetableBuilding.cs" />
<Compile Include="TargetableUnit.cs" />
<Compile Include="TeslaInstantKills.cs" />

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{