epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Air activities and traits to Activities\Air and Traits\Air, respectively

Browse Source
This commit is contained in:
reaperrr
2014-11-16 17:08:04 +01:00
parent 797ac17e61
commit 127969d014
44 changed files with 175 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs
View File

@@ -11,7 +11,7 @@
using System.Linq;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;

2
OpenRA.Mods.RA/AI/HackyAI.cs
View File

@@ -14,7 +14,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Move;
using OpenRA.Mods.Common.Power;

6
OpenRA.Mods.RA/AI/Squad.cs
View File

@@ -10,6 +10,8 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Traits;
using OpenRA.Support;
using OpenRA.Traits;
@@ -39,7 +41,7 @@ namespace OpenRA.Mods.RA.AI
this.world = bot.world;
this.random = bot.random;
this.type = type;
this.target = Traits.Target.FromActor(target);
this.target = OpenRA.Traits.Target.FromActor(target);
fsm = new StateMachine();
switch (type)
@@ -68,7 +70,7 @@ namespace OpenRA.Mods.RA.AI
public Actor Target
{
get { return target.Actor; }
set { target = Traits.Target.FromActor(value); }
set { target = OpenRA.Traits.Target.FromActor(value); }
}
public bool TargetIsValid

2
OpenRA.Mods.RA/AI/States/AirStates.cs
View File

@@ -11,7 +11,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.AI

2
OpenRA.Mods.RA/AI/States/StateBase.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;

27
OpenRA.Mods.RA/Air/FallsToEarth.cs → OpenRA.Mods.RA/Activities/Air/FallToEarth.cs Executable file → Normal file
View File

@@ -1,4 +1,4 @@
#region Copyright & License Information
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
@@ -10,31 +10,12 @@
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Activities
{
class FallsToEarthInfo : ITraitInfo
{
[WeaponReference]
public readonly string Explosion = "UnitExplode";
public readonly bool Spins = true;
public readonly bool Moves = false;
public readonly WRange Velocity = new WRange(43);
public object Create(ActorInitializer init) { return new FallsToEarth(init.self, this); }
}
class FallsToEarth
{
public FallsToEarth(Actor self, FallsToEarthInfo info)
{
self.QueueActivity(false, new FallToEarth(self, info));
}
}
class FallToEarth : Activity
public class FallToEarth : Activity
{
int acceleration = 0;
int spin = 0;

3
OpenRA.Mods.RA/Air/Fly.cs → OpenRA.Mods.RA/Activities/Air/Fly.cs Executable file → Normal file
View File

@@ -9,9 +9,10 @@
#endregion
using System.Collections.Generic;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Activities
{
public class Fly : Activity
{

3
OpenRA.Mods.RA/Air/FlyAttack.cs → OpenRA.Mods.RA/Activities/Air/FlyAttack.cs Executable file → Normal file
View File

@@ -8,9 +8,10 @@
*/
#endregion
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Activities
{
public class FlyAttack : Activity
{

3
OpenRA.Mods.RA/Air/FlyCircle.cs → OpenRA.Mods.RA/Activities/Air/FlyCircle.cs
View File

@@ -8,9 +8,10 @@
*/
#endregion
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Activities
{
public class FlyCircle : Activity
{

2
OpenRA.Mods.RA/Activities/FlyFollow.cs → OpenRA.Mods.RA/Activities/Air/FlyFollow.cs
View File

@@ -8,7 +8,7 @@
*/
#endregion
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities

3
OpenRA.Mods.RA/Air/FlyTimed.cs → OpenRA.Mods.RA/Activities/Air/FlyTimed.cs Executable file → Normal file
View File

@@ -8,9 +8,10 @@
*/
#endregion
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Activities
{
public class FlyTimed : Activity
{

3
OpenRA.Mods.RA/Air/HeliAttack.cs → OpenRA.Mods.RA/Activities/Air/HeliAttack.cs Executable file → Normal file
View File

@@ -8,9 +8,10 @@
*/
#endregion
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Activities
{
public class HeliAttack : Activity
{

3
OpenRA.Mods.RA/Air/HeliFly.cs → OpenRA.Mods.RA/Activities/Air/HeliFly.cs Executable file → Normal file
View File

@@ -9,9 +9,10 @@
#endregion
using System.Collections.Generic;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Activities
{
class HeliFly : Activity
{

3
OpenRA.Mods.RA/Air/HeliLand.cs → OpenRA.Mods.RA/Activities/Air/HeliLand.cs Executable file → Normal file
View File

@@ -8,9 +8,10 @@
*/
#endregion
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Activities
{
class HeliLand : Activity
{

4
OpenRA.Mods.RA/Air/HeliReturn.cs → OpenRA.Mods.RA/Activities/Air/HeliReturn.cs Executable file → Normal file
View File

@@ -9,10 +9,10 @@
#endregion
using System.Linq;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Activities
{
public class HeliReturn : Activity
{

3
OpenRA.Mods.RA/Air/Land.cs → OpenRA.Mods.RA/Activities/Air/Land.cs Executable file → Normal file
View File

@@ -8,9 +8,10 @@
*/
#endregion
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Activities
{
public class Land : Activity
{

34
OpenRA.Mods.RA/Activities/Air/ResupplyAircraft.cs Normal file
View File

@@ -0,0 +1,34 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
{
public class ResupplyAircraft : Activity
{
public override Activity Tick(Actor self)
{
var aircraft = self.Trait<Aircraft>();
var host = aircraft.GetActorBelow();
if (host == null)
return NextActivity;
return Util.SequenceActivities(
aircraft.GetResupplyActivities(host).Append(NextActivity).ToArray());
}
}
}

3
OpenRA.Mods.RA/Air/ReturnToBase.cs → OpenRA.Mods.RA/Activities/Air/ReturnToBase.cs Executable file → Normal file
View File

@@ -10,9 +10,10 @@
using System;
using System.Linq;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Activities
{
public class ReturnToBase : Activity
{

3
OpenRA.Mods.RA/Air/TakeOff.cs → OpenRA.Mods.RA/Activities/Air/TakeOff.cs
View File

@@ -9,9 +9,10 @@
#endregion
using OpenRA.Mods.Common;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Activities
{
public class TakeOff : Activity
{

6
OpenRA.Mods.RA/Attack/AttackGarrisoned.cs
View File

@@ -13,7 +13,9 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Render;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
@@ -140,7 +142,7 @@ namespace OpenRA.Mods.RA
return;
var pos = self.CenterPosition;
var targetYaw = WAngle.FromFacing(Traits.Util.GetFacing(target.CenterPosition - self.CenterPosition, 0));
var targetYaw = WAngle.FromFacing(OpenRA.Traits.Util.GetFacing(target.CenterPosition - self.CenterPosition, 0));
foreach (var a in Armaments)
{
@@ -160,7 +162,7 @@ namespace OpenRA.Mods.RA
var sequence = a.Info.MuzzleSequence;
if (a.Info.MuzzleSplitFacings > 0)
sequence += Traits.Util.QuantizeFacing(muzzleFacing, a.Info.MuzzleSplitFacings).ToString();
sequence += OpenRA.Traits.Util.QuantizeFacing(muzzleFacing, a.Info.MuzzleSplitFacings).ToString();
var muzzleFlash = new AnimationWithOffset(muzzleAnim,
() => PortOffset(self, port),

2
OpenRA.Mods.RA/Cargo.cs
View File

@@ -13,8 +13,8 @@ using System.Linq;
using System.Collections.Generic;
using OpenRA.Traits;
using OpenRA.Primitives;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.Common.Orders;
namespace OpenRA.Mods.RA

2
OpenRA.Mods.RA/CrateSpawner.cs
View File

@@ -11,7 +11,7 @@
using System;
using System.Linq;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Primitives;
using OpenRA.Traits;

44
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -80,7 +80,20 @@
<ItemGroup>
<Compile Include="Activities\CaptureActor.cs" />
<Compile Include="Activities\Hunt.cs" />
<Compile Include="Air\TakeOff.cs" />
<Compile Include="Activities\Air\FallToEarth.cs" />
<Compile Include="Activities\Air\Fly.cs" />
<Compile Include="Activities\Air\FlyAttack.cs" />
<Compile Include="Activities\Air\FlyCircle.cs" />
<Compile Include="Activities\Air\FlyFollow.cs" />
<Compile Include="Activities\Air\FlyTimed.cs" />
<Compile Include="Activities\Air\HeliAttack.cs" />
<Compile Include="Activities\Air\HeliFly.cs" />
<Compile Include="Activities\Air\HeliLand.cs" />
<Compile Include="Activities\Air\HeliReturn.cs" />
<Compile Include="Activities\Air\Land.cs" />
<Compile Include="Activities\Air\ResupplyAircraft.cs" />
<Compile Include="Activities\Air\ReturnToBase.cs" />
<Compile Include="Activities\Air\TakeOff.cs" />
<Compile Include="AI\AttackOrFleeFuzzy.cs" />
<Compile Include="AI\BaseBuilder.cs" />
<Compile Include="AI\HackyAI.cs" />
@@ -112,9 +125,6 @@
<Compile Include="Activities\UnloadCargo.cs" />
<Compile Include="Activities\Wait.cs" />
<Compile Include="ActorExts.cs" />
<Compile Include="Air\Aircraft.cs" />
<Compile Include="Air\AttackHeli.cs" />
<Compile Include="Air\AttackPlane.cs" />
<Compile Include="AI\SupportPowerDecision.cs" />
<Compile Include="Crates\DuplicateUnitCrateAction.cs" />
<Compile Include="Effects\GpsSatellite.cs" />
@@ -126,21 +136,6 @@
<Compile Include="Infiltration\InfiltrateForPowerOutage.cs" />
<Compile Include="Player\PlaceBeacon.cs" />
<Compile Include="EjectOnDeath.cs" />
<Compile Include="Air\FallsToEarth.cs" />
<Compile Include="Air\Fly.cs" />
<Compile Include="Air\FlyAttack.cs" />
<Compile Include="Air\FlyCircle.cs" />
<Compile Include="Air\FlyTimed.cs" />
<Compile Include="Air\HeliAttack.cs" />
<Compile Include="Air\HeliFly.cs" />
<Compile Include="Air\HeliLand.cs" />
<Compile Include="Air\HeliReturn.cs" />
<Compile Include="Air\Helicopter.cs" />
<Compile Include="Air\Land.cs" />
<Compile Include="Air\Plane.cs" />
<Compile Include="Air\ReturnOnIdle.cs" />
<Compile Include="Air\ReturnToBase.cs" />
<Compile Include="Air\TargetableAircraft.cs" />
<Compile Include="AI\RushFuzzy.cs" />
<Compile Include="AI\StateMachine.cs" />
<Compile Include="AppearsOnRadar.cs" />
@@ -306,6 +301,15 @@
<Compile Include="TargetableUnit.cs" />
<Compile Include="ThrowsParticle.cs" />
<Compile Include="TraitsInterfaces.cs" />
<Compile Include="Traits\Air\Aircraft.cs" />
<Compile Include="Traits\Air\AttackHeli.cs" />
<Compile Include="Traits\Air\AttackPlane.cs" />
<Compile Include="Traits\Air\FlyAwayOnIdle.cs" />
<Compile Include="Traits\Air\FallsToEarth.cs" />
<Compile Include="Traits\Air\Helicopter.cs" />
<Compile Include="Traits\Air\Plane.cs" />
<Compile Include="Traits\Air\ReturnOnIdle.cs" />
<Compile Include="Traits\Air\TargetableAircraft.cs" />
<Compile Include="TransformOnCapture.cs" />
<Compile Include="TransformOnPassenger.cs" />
<Compile Include="Transforms.cs" />
@@ -381,7 +385,6 @@
<Compile Include="World\PathfinderDebugOverlay.cs" />
<Compile Include="AttackBomber.cs" />
<Compile Include="Render\WithCrateBody.cs" />
<Compile Include="Activities\FlyFollow.cs" />
<Compile Include="Widgets\Logic\GameTimerLogic.cs" />
<Compile Include="Widgets\Logic\ReplayControlBarLogic.cs" />
<Compile Include="World\BuildableTerrainLayer.cs" />
@@ -428,7 +431,6 @@
<Compile Include="Render\WithActiveAnimation.cs" />
<Compile Include="SupportPowers\SpawnActorPower.cs" />
<Compile Include="Render\RenderSimple.cs" />
<Compile Include="Air\FlyAwayOnIdle.cs" />
<Compile Include="Buildings\ClonesProducedUnits.cs" />
<Compile Include="Cloneable.cs" />
<Compile Include="Widgets\ProductionPaletteWidget.cs" />

2
OpenRA.Mods.RA/ParaDrop.cs
View File

@@ -11,7 +11,7 @@
using System;
using System.Collections.Generic;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Effects;
using OpenRA.Traits;

3
OpenRA.Mods.RA/Render/WithMuzzleFlash.cs
View File

@@ -13,6 +13,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
@@ -79,7 +80,7 @@ namespace OpenRA.Mods.RA.Render
return;
if (a.Info.MuzzleSplitFacings > 0)
sequence += Traits.Util.QuantizeFacing(getFacing(), a.Info.MuzzleSplitFacings).ToString();
sequence += OpenRA.Traits.Util.QuantizeFacing(getFacing(), a.Info.MuzzleSplitFacings).ToString();
visible[barrel] = true;
anims[barrel].Animation.PlayThen(sequence, () => visible[barrel] = false);

3
OpenRA.Mods.RA/Render/WithShadow.cs
View File

@@ -12,7 +12,8 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render

2
OpenRA.Mods.RA/Reservable.cs
View File

@@ -9,7 +9,7 @@
#endregion
using System;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;

3
OpenRA.Mods.RA/Scripting/Global/ActorGlobal.cs
View File

@@ -11,7 +11,8 @@
using System.Linq;
using Eluant;
using OpenRA.Mods.Common;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Primitives;

2
OpenRA.Mods.RA/Scripting/Global/ReinforcementsGlobal.cs
View File

@@ -18,7 +18,7 @@ using OpenRA.Traits;
using OpenRA.Scripting;
using OpenRA.Effects;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Traits;
namespace OpenRA.Mods.RA.Scripting
{

3
OpenRA.Mods.RA/Scripting/Global/UtilsGlobal.cs
View File

@@ -11,6 +11,7 @@
using System.Linq;
using Eluant;
using OpenRA.Scripting;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Scripting
{
@@ -78,7 +79,7 @@ namespace OpenRA.Mods.RA.Scripting
[Desc("Expands the given footprint one step along the coordinate axes, and (if requested) diagonals.")]
public CPos[] ExpandFootprint(CPos[] footprint, bool allowDiagonal)
{
return Traits.Util.ExpandFootprint(footprint, allowDiagonal).ToArray();
return Util.ExpandFootprint(footprint, allowDiagonal).ToArray();
}
[Desc("Returns a random integer x in the range low &lt;= x &lt; high.")]

3
OpenRA.Mods.RA/Scripting/Properties/HelicopterProperties.cs
View File

@@ -8,7 +8,8 @@
*/
#endregion
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;

3
OpenRA.Mods.RA/Scripting/Properties/PlaneProperties.cs
View File

@@ -8,7 +8,8 @@
*/
#endregion
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;

2
OpenRA.Mods.RA/Scripting/Properties/TransportProperties.cs
View File

@@ -10,7 +10,7 @@
using System.Linq;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting;
using OpenRA.Traits;

2
OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs
View File

@@ -13,7 +13,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;

2
OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs
View File

@@ -13,7 +13,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;

18
OpenRA.Mods.RA/Air/Aircraft.cs → OpenRA.Mods.RA/Traits/Air/Aircraft.cs
View File

@@ -12,12 +12,13 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Traits
{
public class AircraftInfo : ITraitInfo, IFacingInfo, IOccupySpaceInfo, UsesInit<LocationInit>, UsesInit<FacingInit>
{
@@ -296,21 +297,6 @@ namespace OpenRA.Mods.RA.Air
}
}
public class ResupplyAircraft : Activity
{
public override Activity Tick(Actor self)
{
var aircraft = self.Trait<Aircraft>();
var host = aircraft.GetActorBelow();
if (host == null)
return NextActivity;
return Util.SequenceActivities(
aircraft.GetResupplyActivities(host).Append(NextActivity).ToArray());
}
}
class AircraftMoveOrderTargeter : IOrderTargeter
{
public string OrderID { get { return "Move"; } }

4
OpenRA.Mods.RA/Air/AttackHeli.cs → OpenRA.Mods.RA/Traits/Air/AttackHeli.cs Executable file → Normal file
View File

@@ -8,9 +8,11 @@
*/
#endregion
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Traits
{
class AttackHeliInfo : AttackFrontalInfo
{

4
OpenRA.Mods.RA/Air/AttackPlane.cs → OpenRA.Mods.RA/Traits/Air/AttackPlane.cs Executable file → Normal file
View File

@@ -8,9 +8,11 @@
*/
#endregion
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Traits
{
class AttackPlaneInfo : AttackFrontalInfo
{

38
OpenRA.Mods.RA/Traits/Air/FallsToEarth.cs Normal file
View File

@@ -0,0 +1,38 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System.Linq;
using OpenRA.GameRules;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
{
public class FallsToEarthInfo : ITraitInfo
{
[WeaponReference]
public readonly string Explosion = "UnitExplode";
public readonly bool Spins = true;
public readonly bool Moves = false;
public readonly WRange Velocity = new WRange(43);
public object Create(ActorInitializer init) { return new FallsToEarth(init.self, this); }
}
public class FallsToEarth
{
public FallsToEarth(Actor self, FallsToEarthInfo info)
{
self.QueueActivity(false, new FallToEarth(self, info));
}
}
}

3
OpenRA.Mods.RA/Air/FlyAwayOnIdle.cs → OpenRA.Mods.RA/Traits/Air/FlyAwayOnIdle.cs
View File

@@ -8,10 +8,11 @@
*/
#endregion
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Traits
{
[Desc("Leave the map when idle.")]
class FlyAwayOnIdleInfo : TraitInfo<FlyAwayOnIdle> { }

3
OpenRA.Mods.RA/Air/Helicopter.cs → OpenRA.Mods.RA/Traits/Air/Helicopter.cs
View File

@@ -12,10 +12,11 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Traits
{
class HelicopterInfo : AircraftInfo, IMoveInfo
{

3
OpenRA.Mods.RA/Air/Plane.cs → OpenRA.Mods.RA/Traits/Air/Plane.cs
View File

@@ -10,10 +10,11 @@
using System;
using System.Drawing;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Traits
{
public class PlaneInfo : AircraftInfo, IMoveInfo
{

3
OpenRA.Mods.RA/Air/ReturnOnIdle.cs → OpenRA.Mods.RA/Traits/Air/ReturnOnIdle.cs Executable file → Normal file
View File

@@ -9,11 +9,12 @@
#endregion
using System.Linq;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Air
namespace OpenRA.Mods.RA.Traits
{
[Desc("Return to a player owned RearmBuildings. If none available, head back to base and circle over it.")]
class ReturnOnIdleInfo : TraitInfo<ReturnOnIdle> { }

6
OpenRA.Mods.RA/Air/TargetableAircraft.cs → OpenRA.Mods.RA/Traits/Air/TargetableAircraft.cs Executable file → Normal file
View File

@@ -8,7 +8,11 @@
*/
#endregion
namespace OpenRA.Mods.RA.Air
using System.Collections.Generic;
using OpenRA.Mods.RA;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
{
public class TargetableAircraftInfo : TargetableUnitInfo
{