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

Moves Attack, Armament, Move, Air traits and activities as well as anything required by them to Mods.Common.

Browse Source 
Extracts Exit from Production into its own trait.
This commit is contained in:
reaperrr
2015-01-01 18:08:08 +01:00
parent 158517c09f
commit 654f56c5d5
113 changed files with 255 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
OpenRA.Mods.Cnc/Traits/Render/WithCargo.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.RA; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits namespace OpenRA.Mods.Cnc.Traits

4
OpenRA.Mods.RA/Activities/Air/FallToEarth.cs → OpenRA.Mods.Common/Activities/Air/FallToEarth.cs
View File

@@ -11,10 +11,10 @@
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class FallToEarth : Activity public class FallToEarth : Activity
{ {

4
OpenRA.Mods.RA/Activities/Air/Fly.cs → OpenRA.Mods.Common/Activities/Air/Fly.cs
View File

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

4
OpenRA.Mods.RA/Activities/Air/FlyAttack.cs → OpenRA.Mods.Common/Activities/Air/FlyAttack.cs
View File

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

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

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

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

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

4
OpenRA.Mods.RA/Activities/Air/FlyTimed.cs → OpenRA.Mods.Common/Activities/Air/FlyTimed.cs
View File

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

4
OpenRA.Mods.RA/Activities/Air/HeliAttack.cs → OpenRA.Mods.Common/Activities/Air/HeliAttack.cs
View File

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

4
OpenRA.Mods.RA/Activities/Air/HeliFly.cs → OpenRA.Mods.Common/Activities/Air/HeliFly.cs
View File

@@ -10,10 +10,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class HeliFly : Activity public class HeliFly : Activity
{ {

5
OpenRA.Mods.RA/Activities/Air/HeliFlyCircle.cs → OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs
View File

@@ -11,11 +11,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class HeliFlyCircle : Activity public class HeliFlyCircle : Activity
{ {

4
OpenRA.Mods.RA/Activities/Air/HeliLand.cs → OpenRA.Mods.Common/Activities/Air/HeliLand.cs
View File

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

5
OpenRA.Mods.RA/Activities/Air/HeliReturn.cs → OpenRA.Mods.Common/Activities/Air/HeliReturn.cs
View File

@@ -10,11 +10,10 @@
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class HeliReturn : Activity public class HeliReturn : Activity
{ {

4
OpenRA.Mods.RA/Activities/Air/Land.cs → OpenRA.Mods.Common/Activities/Air/Land.cs
View File

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

4
OpenRA.Mods.RA/Activities/Air/ResupplyAircraft.cs → OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs
View File

@@ -12,11 +12,11 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class ResupplyAircraft : Activity public class ResupplyAircraft : Activity
{ {

4
OpenRA.Mods.RA/Activities/Air/ReturnToBase.cs → OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
View File

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

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

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

4
OpenRA.Mods.RA/Activities/Attack.cs → OpenRA.Mods.Common/Activities/Attack.cs Executable file → Normal file
View File

@@ -9,12 +9,10 @@
#endregion #endregion
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.Common.Activities
{ {
/* non-turreted attack */ /* non-turreted attack */
public class Attack : Activity public class Attack : Activity

4
OpenRA.Mods.RA/Activities/EnterTransport.cs → OpenRA.Mods.Common/Activities/EnterTransport.cs
View File

@@ -9,10 +9,10 @@
#endregion #endregion
using System; using System;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.Common.Activities
{ {
class EnterTransport : Enter class EnterTransport : Enter
{ {

4
OpenRA.Mods.RA/Activities/Heal.cs → OpenRA.Mods.Common/Activities/Heal.cs Executable file → Normal file
View File

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

4
OpenRA.Mods.RA/Activities/AttackMoveActivity.cs → OpenRA.Mods.Common/Activities/Move/AttackMoveActivity.cs
View File

@@ -10,10 +10,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class AttackMoveActivity : Activity public class AttackMoveActivity : Activity
{ {

3
OpenRA.Mods.RA/Activities/Follow.cs → OpenRA.Mods.Common/Activities/Move/Follow.cs
View File

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

9
OpenRA.Mods.RA/Activities/Move.cs → OpenRA.Mods.Common/Activities/Move/Move.cs
View File

@@ -13,14 +13,13 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.Common.Activities
{ {
class Move : Activity public class Move : Activity
{ {
static readonly List<CPos> NoPath = new List<CPos>(); static readonly List<CPos> NoPath = new List<CPos>();
@@ -443,7 +442,7 @@ namespace OpenRA.Mods.RA.Activities
// HACK: Dirty, but it suffices until we do something better: // HACK: Dirty, but it suffices until we do something better:
if (a.GetType() == typeof(Move)) return true; if (a.GetType() == typeof(Move)) return true;
if (a.GetType() == typeof(MoveAdjacentTo)) return true; if (a.GetType() == typeof(MoveAdjacentTo)) return true;
if (a.GetType() == typeof(AttackMove)) return true; if (a.GetType() == typeof(AttackMoveActivity)) return true;
// Not a move: // Not a move:
return false; return false;

4
OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs → OpenRA.Mods.Common/Activities/Move/MoveAdjacentTo.cs Executable file → Normal file
View File

@@ -12,10 +12,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class MoveAdjacentTo : Activity public class MoveAdjacentTo : Activity
{ {

4
OpenRA.Mods.RA/Activities/MoveWithinRange.cs → OpenRA.Mods.Common/Activities/Move/MoveWithinRange.cs Executable file → Normal file
View File

@@ -11,10 +11,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class MoveWithinRange : MoveAdjacentTo public class MoveWithinRange : MoveAdjacentTo
{ {

3
OpenRA.Mods.RA/Activities/Rearm.cs → OpenRA.Mods.Common/Activities/Rearm.cs
View File

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

3
OpenRA.Mods.RA/Activities/Repair.cs → OpenRA.Mods.Common/Activities/Repair.cs
View File

@@ -11,10 +11,9 @@
using System; using System;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class Repair : Activity public class Repair : Activity
{ {

5
OpenRA.Mods.RA/Activities/UnloadCargo.cs → OpenRA.Mods.Common/Activities/UnloadCargo.cs
View File

@@ -12,12 +12,11 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.Common.Activities
{ {
public class UnloadCargo : Activity public class UnloadCargo : Activity
{ {

67
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -56,12 +56,38 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<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\HeliFlyCircle.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="Activities\Attack.cs" />
<Compile Include="Activities\Enter.cs" /> <Compile Include="Activities\Enter.cs" />
<Compile Include="Activities\EnterTransport.cs" />
<Compile Include="Activities\Heal.cs" />
<Compile Include="Activities\Move\AttackMoveActivity.cs" />
<Compile Include="Activities\Move\Drag.cs" /> <Compile Include="Activities\Move\Drag.cs" />
<Compile Include="Activities\Move\Follow.cs" />
<Compile Include="Activities\Move\Move.cs" />
<Compile Include="Activities\Move\MoveAdjacentTo.cs" />
<Compile Include="Activities\Move\MoveWithinRange.cs" />
<Compile Include="Activities\Rearm.cs" />
<Compile Include="Activities\RemoveSelf.cs" /> <Compile Include="Activities\RemoveSelf.cs" />
<Compile Include="Activities\Repair.cs" />
<Compile Include="Activities\RepairBuilding.cs" /> <Compile Include="Activities\RepairBuilding.cs" />
<Compile Include="Activities\SimpleTeleport.cs" /> <Compile Include="Activities\SimpleTeleport.cs" />
<Compile Include="Activities\Turn.cs" /> <Compile Include="Activities\Turn.cs" />
<Compile Include="Activities\UnloadCargo.cs" />
<Compile Include="Activities\Wait.cs" /> <Compile Include="Activities\Wait.cs" />
<Compile Include="ActorExts.cs" /> <Compile Include="ActorExts.cs" />
<Compile Include="Effects\Beacon.cs" /> <Compile Include="Effects\Beacon.cs" />
@@ -121,7 +147,28 @@
<Compile Include="Scripting\Properties\ResourceProperties.cs" /> <Compile Include="Scripting\Properties\ResourceProperties.cs" />
<Compile Include="Scripting\Properties\UpgradeProperties.cs" /> <Compile Include="Scripting\Properties\UpgradeProperties.cs" />
<Compile Include="TraitsInterfaces.cs" /> <Compile Include="TraitsInterfaces.cs" />
<Compile Include="Traits\Air\Aircraft.cs" />
<Compile Include="Traits\Air\AttackBomber.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\AppearsOnRadar.cs" /> <Compile Include="Traits\AppearsOnRadar.cs" />
<Compile Include="Traits\Armament.cs" />
<Compile Include="Traits\AttackMove.cs" />
<Compile Include="Traits\Attack\AttackBase.cs" />
<Compile Include="Traits\Attack\AttackCharge.cs" />
<Compile Include="Traits\Attack\AttackFollow.cs" />
<Compile Include="Traits\Attack\AttackFrontal.cs" />
<Compile Include="Traits\Attack\AttackMedic.cs" />
<Compile Include="Traits\Attack\AttackOmni.cs" />
<Compile Include="Traits\Attack\AttackTurreted.cs" />
<Compile Include="Traits\Attack\AttackWander.cs" />
<Compile Include="Traits\AutoHeal.cs" />
<Compile Include="Traits\AutoTarget.cs" />
<Compile Include="Traits\BlocksBullets.cs" /> <Compile Include="Traits\BlocksBullets.cs" />
<Compile Include="Traits\Buildable.cs" /> <Compile Include="Traits\Buildable.cs" />
<Compile Include="Traits\Buildings\BaseBuilding.cs" /> <Compile Include="Traits\Buildings\BaseBuilding.cs" />
@@ -131,13 +178,17 @@
<Compile Include="Traits\Buildings\BuildingInfluence.cs" /> <Compile Include="Traits\Buildings\BuildingInfluence.cs" />
<Compile Include="Traits\Buildings\BuildingUtils.cs" /> <Compile Include="Traits\Buildings\BuildingUtils.cs" />
<Compile Include="Traits\Buildings\DeadBuildingState.cs" /> <Compile Include="Traits\Buildings\DeadBuildingState.cs" />
<Compile Include="Traits\Buildings\Exit.cs" />
<Compile Include="Traits\Buildings\FreeActor.cs" /> <Compile Include="Traits\Buildings\FreeActor.cs" />
<Compile Include="Traits\Buildings\LineBuild.cs" /> <Compile Include="Traits\Buildings\LineBuild.cs" />
<Compile Include="Traits\Buildings\LineBuildNode.cs" /> <Compile Include="Traits\Buildings\LineBuildNode.cs" />
<Compile Include="Traits\Buildings\RallyPoint.cs" /> <Compile Include="Traits\Buildings\RallyPoint.cs" />
<Compile Include="Traits\Buildings\RepairsUnits.cs" /> <Compile Include="Traits\Buildings\RepairsUnits.cs" />
<Compile Include="Traits\Buildings\Reservable.cs" />
<Compile Include="Traits\Buildings\FootprintUtils.cs" /> <Compile Include="Traits\Buildings\FootprintUtils.cs" />
<Compile Include="Traits\Burns.cs" /> <Compile Include="Traits\Burns.cs" />
<Compile Include="Traits\Cargo.cs" />
<Compile Include="Traits\Cloak.cs" />
<Compile Include="Traits\IgnoresDisguise.cs" /> <Compile Include="Traits\IgnoresDisguise.cs" />
<Compile Include="Traits\DetectCloaked.cs" /> <Compile Include="Traits\DetectCloaked.cs" />
<Compile Include="Traits\EngineerRepair.cs" /> <Compile Include="Traits\EngineerRepair.cs" />
@@ -153,11 +204,14 @@
<Compile Include="Traits\Immobile.cs" /> <Compile Include="Traits\Immobile.cs" />
<Compile Include="Traits\JamsMissiles.cs" /> <Compile Include="Traits\JamsMissiles.cs" />
<Compile Include="Traits\KillsSelf.cs" /> <Compile Include="Traits\KillsSelf.cs" />
<Compile Include="Traits\LimitedAmmo.cs" />
<Compile Include="Traits\Mobile.cs" />
<Compile Include="Traits\Modifiers\DisabledOverlay.cs" /> <Compile Include="Traits\Modifiers\DisabledOverlay.cs" />
<Compile Include="Traits\Modifiers\FrozenUnderFog.cs" /> <Compile Include="Traits\Modifiers\FrozenUnderFog.cs" />
<Compile Include="Traits\Modifiers\HiddenUnderFog.cs" /> <Compile Include="Traits\Modifiers\HiddenUnderFog.cs" />
<Compile Include="Traits\Modifiers\UpgradeOverlay.cs" /> <Compile Include="Traits\Modifiers\UpgradeOverlay.cs" />
<Compile Include="Traits\MustBeDestroyed.cs" /> <Compile Include="Traits\MustBeDestroyed.cs" />
<Compile Include="Traits\Passenger.cs" />
<Compile Include="Traits\PaletteEffects\CloakPaletteEffect.cs" /> <Compile Include="Traits\PaletteEffects\CloakPaletteEffect.cs" />
<Compile Include="Traits\PaletteEffects\LightPaletteRotator.cs" /> <Compile Include="Traits\PaletteEffects\LightPaletteRotator.cs" />
<Compile Include="Traits\PaletteEffects\MenuPaletteEffect.cs" /> <Compile Include="Traits\PaletteEffects\MenuPaletteEffect.cs" />
@@ -181,7 +235,11 @@
<Compile Include="Traits\Power\ScalePowerWithHealth.cs" /> <Compile Include="Traits\Power\ScalePowerWithHealth.cs" />
<Compile Include="Traits\ProvidesRadar.cs" /> <Compile Include="Traits\ProvidesRadar.cs" />
<Compile Include="Traits\RadarColorFromTerrain.cs" /> <Compile Include="Traits\RadarColorFromTerrain.cs" />
<Compile Include="Traits\Reloads.cs" />
<Compile Include="Traits\Render\Hovers.cs" />
<Compile Include="Traits\Render\RenderBuilding.cs" /> <Compile Include="Traits\Render\RenderBuilding.cs" />
<Compile Include="Traits\Render\RenderBuildingCharge.cs" />
<Compile Include="Traits\Render\RenderBuildingTurreted.cs" />
<Compile Include="Traits\Render\RenderEditorOnly.cs" /> <Compile Include="Traits\Render\RenderEditorOnly.cs" />
<Compile Include="Traits\Render\RenderFlare.cs" /> <Compile Include="Traits\Render\RenderFlare.cs" />
<Compile Include="Traits\Render\RenderNameTag.cs" /> <Compile Include="Traits\Render\RenderNameTag.cs" />
@@ -189,15 +247,18 @@
<Compile Include="Traits\Render\RenderSprites.cs" /> <Compile Include="Traits\Render\RenderSprites.cs" />
<Compile Include="Traits\Render\RenderUnit.cs" /> <Compile Include="Traits\Render\RenderUnit.cs" />
<Compile Include="Traits\Render\TimedUpgradeBar.cs" /> <Compile Include="Traits\Render\TimedUpgradeBar.cs" />
<Compile Include="Traits\Render\WithBarrel.cs" />
<Compile Include="Traits\Render\WithBuildingPlacedAnimation.cs" /> <Compile Include="Traits\Render\WithBuildingPlacedAnimation.cs" />
<Compile Include="Traits\Render\WithMakeAnimation.cs" /> <Compile Include="Traits\Render\WithMakeAnimation.cs" />
<Compile Include="Traits\Render\WithCrateBody.cs" /> <Compile Include="Traits\Render\WithCrateBody.cs" />
<Compile Include="Traits\Render\WithDeathAnimation.cs" /> <Compile Include="Traits\Render\WithDeathAnimation.cs" />
<Compile Include="Traits\Render\WithHarvestAnimation.cs" /> <Compile Include="Traits\Render\WithHarvestAnimation.cs" />
<Compile Include="Traits\Render\WithMuzzleFlash.cs" />
<Compile Include="Traits\Render\WithResources.cs" /> <Compile Include="Traits\Render\WithResources.cs" />
<Compile Include="Traits\Render\WithRotor.cs" /> <Compile Include="Traits\Render\WithRotor.cs" />
<Compile Include="Traits\Render\WithShadow.cs" /> <Compile Include="Traits\Render\WithShadow.cs" />
<Compile Include="Traits\Render\WithSmoke.cs" /> <Compile Include="Traits\Render\WithSmoke.cs" />
<Compile Include="Traits\Render\WithTurret.cs" />
<Compile Include="Traits\ShakeOnDeath.cs" /> <Compile Include="Traits\ShakeOnDeath.cs" />
<Compile Include="Traits\SmokeTrailWhenDamaged.cs" /> <Compile Include="Traits\SmokeTrailWhenDamaged.cs" />
<Compile Include="Traits\Sound\ActorLostNotification.cs" /> <Compile Include="Traits\Sound\ActorLostNotification.cs" />
@@ -206,16 +267,22 @@
<Compile Include="Traits\Sound\DeathSounds.cs" /> <Compile Include="Traits\Sound\DeathSounds.cs" />
<Compile Include="Traits\Sound\SoundOnDamageTransition.cs" /> <Compile Include="Traits\Sound\SoundOnDamageTransition.cs" />
<Compile Include="Traits\Tooltip.cs" /> <Compile Include="Traits\Tooltip.cs" />
<Compile Include="Traits\Turreted.cs" />
<Compile Include="Traits\Upgrades\UpgradableTrait.cs" /> <Compile Include="Traits\Upgrades\UpgradableTrait.cs" />
<Compile Include="Traits\Upgrades\UpgradeManager.cs" /> <Compile Include="Traits\Upgrades\UpgradeManager.cs" />
<Compile Include="Traits\Valued.cs" /> <Compile Include="Traits\Valued.cs" />
<Compile Include="Traits\Wanders.cs" />
<Compile Include="Traits\World\CreateMPPlayers.cs" /> <Compile Include="Traits\World\CreateMPPlayers.cs" />
<Compile Include="Traits\World\DomainIndex.cs" />
<Compile Include="Traits\World\LoadWidgetAtGameStart.cs" /> <Compile Include="Traits\World\LoadWidgetAtGameStart.cs" />
<Compile Include="Traits\World\MPStartLocations.cs" /> <Compile Include="Traits\World\MPStartLocations.cs" />
<Compile Include="Traits\World\MPStartUnits.cs" /> <Compile Include="Traits\World\MPStartUnits.cs" />
<Compile Include="Traits\World\PaletteFromCurrentTileset.cs" /> <Compile Include="Traits\World\PaletteFromCurrentTileset.cs" />
<Compile Include="Traits\World\PaletteFromFile.cs" /> <Compile Include="Traits\World\PaletteFromFile.cs" />
<Compile Include="Traits\World\PaletteFromRGBA.cs" /> <Compile Include="Traits\World\PaletteFromRGBA.cs" />
<Compile Include="Traits\World\PathFinder.cs" />
<Compile Include="Traits\World\PathfinderDebugOverlay.cs" />
<Compile Include="Traits\World\PathSearch.cs" />
<Compile Include="Traits\World\PlayerPaletteFromCurrentTileset.cs" /> <Compile Include="Traits\World\PlayerPaletteFromCurrentTileset.cs" />
<Compile Include="Traits\World\PlayMusicOnMapLoad.cs" /> <Compile Include="Traits\World\PlayMusicOnMapLoad.cs" />
<Compile Include="Traits\World\RadarPings.cs" /> <Compile Include="Traits\World\RadarPings.cs" />

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

@@ -12,14 +12,12 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common; using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders; using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
public class AircraftInfo : ITraitInfo, IFacingInfo, IOccupySpaceInfo, ICruiseAltitudeInfo, UsesInit<LocationInit>, UsesInit<FacingInit> public class AircraftInfo : ITraitInfo, IFacingInfo, IOccupySpaceInfo, ICruiseAltitudeInfo, UsesInit<LocationInit>, UsesInit<FacingInit>
{ {

7
OpenRA.Mods.RA/Traits/Air/AttackBomber.cs → OpenRA.Mods.Common/Traits/Air/AttackBomber.cs
View File

@@ -11,12 +11,11 @@
using System; using System;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
class AttackBomberInfo : AttackBaseInfo public class AttackBomberInfo : AttackBaseInfo
{ {
[Desc("Armament name")] [Desc("Armament name")]
public readonly string Bombs = "primary"; public readonly string Bombs = "primary";
@@ -28,7 +27,7 @@ namespace OpenRA.Mods.RA.Traits
public override object Create(ActorInitializer init) { return new AttackBomber(init.self, this); } public override object Create(ActorInitializer init) { return new AttackBomber(init.self, this); }
} }
class AttackBomber : AttackBase, ITick, ISync, INotifyRemovedFromWorld public class AttackBomber : AttackBase, ITick, ISync, INotifyRemovedFromWorld
{ {
AttackBomberInfo info; AttackBomberInfo info;
[Sync] Target target; [Sync] Target target;

9
OpenRA.Mods.RA/Traits/Air/AttackHeli.cs → OpenRA.Mods.Common/Traits/Air/AttackHeli.cs
View File

@@ -9,18 +9,17 @@
#endregion #endregion
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA; using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
class AttackHeliInfo : AttackFrontalInfo public class AttackHeliInfo : AttackFrontalInfo
{ {
public override object Create(ActorInitializer init) { return new AttackHeli(init.self, this); } public override object Create(ActorInitializer init) { return new AttackHeli(init.self, this); }
} }
class AttackHeli : AttackFrontal public class AttackHeli : AttackFrontal
{ {
public AttackHeli(Actor self, AttackHeliInfo info) public AttackHeli(Actor self, AttackHeliInfo info)
: base(self, info) { } : base(self, info) { }

9
OpenRA.Mods.RA/Traits/Air/AttackPlane.cs → OpenRA.Mods.Common/Traits/Air/AttackPlane.cs
View File

@@ -9,18 +9,17 @@
#endregion #endregion
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA; using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
class AttackPlaneInfo : AttackFrontalInfo public class AttackPlaneInfo : AttackFrontalInfo
{ {
public override object Create(ActorInitializer init) { return new AttackPlane(init.self, this); } public override object Create(ActorInitializer init) { return new AttackPlane(init.self, this); }
} }
class AttackPlane : AttackFrontal public class AttackPlane : AttackFrontal
{ {
public AttackPlane(Actor self, AttackPlaneInfo info) public AttackPlane(Actor self, AttackPlaneInfo info)
: base(self, info) { } : base(self, info) { }

5
OpenRA.Mods.RA/Traits/Air/FallsToEarth.cs → OpenRA.Mods.Common/Traits/Air/FallsToEarth.cs
View File

@@ -10,11 +10,10 @@
using System.Linq; using System.Linq;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Mods.RA; using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Causes aircraft husks that are spawned in the air to crash to the ground.")] [Desc("Causes aircraft husks that are spawned in the air to crash to the ground.")]
public class FallsToEarthInfo : ITraitInfo public class FallsToEarthInfo : ITraitInfo

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

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

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

@@ -14,11 +14,9 @@ using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
public class HelicopterInfo : AircraftInfo, IMoveInfo public class HelicopterInfo : AircraftInfo, IMoveInfo
{ {

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

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

4
OpenRA.Mods.RA/Traits/Air/ReturnOnIdle.cs → OpenRA.Mods.Common/Traits/Air/ReturnOnIdle.cs
View File

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

3
OpenRA.Mods.RA/Armament.cs → OpenRA.Mods.Common/Traits/Armament.cs
View File

@@ -12,11 +12,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
public class Barrel public class Barrel
{ {

3
OpenRA.Mods.RA/Attack/AttackBase.cs → OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -15,10 +15,9 @@ using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Mods.Common; using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
public abstract class AttackBaseInfo : ITraitInfo public abstract class AttackBaseInfo : ITraitInfo
{ {

2
OpenRA.Mods.RA/Attack/AttackCharge.cs → OpenRA.Mods.Common/Traits/Attack/AttackCharge.cs
View File

@@ -12,7 +12,7 @@ using OpenRA.Activities;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Charges up before being able to attack.")] [Desc("Charges up before being able to attack.")]
class AttackChargeInfo : AttackOmniInfo class AttackChargeInfo : AttackOmniInfo

2
OpenRA.Mods.RA/Attack/AttackFollow.cs → OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
View File

@@ -12,7 +12,7 @@ using System;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Actor will follow units until in range to attack them.")] [Desc("Actor will follow units until in range to attack them.")]
public class AttackFollowInfo : AttackBaseInfo public class AttackFollowInfo : AttackBaseInfo

2
OpenRA.Mods.RA/Attack/AttackFrontal.cs → OpenRA.Mods.Common/Traits/Attack/AttackFrontal.cs
View File

@@ -12,7 +12,7 @@ using System;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Unit got to face the target")] [Desc("Unit got to face the target")]
public class AttackFrontalInfo : AttackBaseInfo, Requires<IFacingInfo> public class AttackFrontalInfo : AttackBaseInfo, Requires<IFacingInfo>

2
OpenRA.Mods.RA/Attack/AttackMedic.cs → OpenRA.Mods.Common/Traits/Attack/AttackMedic.cs
View File

@@ -11,7 +11,7 @@
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Give the unit a \"heal-weapon\" that attacks friendly targets if they are damaged.", [Desc("Give the unit a \"heal-weapon\" that attacks friendly targets if they are damaged.",
"It conflicts with any other weapon or Attack*: trait because it will hurt friendlies during the", "It conflicts with any other weapon or Attack*: trait because it will hurt friendlies during the",

2
OpenRA.Mods.RA/Attack/AttackOmni.cs → OpenRA.Mods.Common/Traits/Attack/AttackOmni.cs
View File

@@ -11,7 +11,7 @@
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
class AttackOmniInfo : AttackBaseInfo class AttackOmniInfo : AttackBaseInfo
{ {

2
OpenRA.Mods.RA/Attack/AttackTurreted.cs → OpenRA.Mods.Common/Traits/Attack/AttackTurreted.cs
View File

@@ -12,7 +12,7 @@ using System.Collections.Generic;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Actor has a visual turret used to attack.")] [Desc("Actor has a visual turret used to attack.")]
public class AttackTurretedInfo : AttackFollowInfo, Requires<TurretedInfo> public class AttackTurretedInfo : AttackFollowInfo, Requires<TurretedInfo>

2
OpenRA.Mods.RA/Attack/AttackWander.cs → OpenRA.Mods.Common/Traits/Attack/AttackWander.cs
View File

@@ -10,7 +10,7 @@
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Will AttackMove to a random location within MoveRadius when idle.", [Desc("Will AttackMove to a random location within MoveRadius when idle.",
"This conflicts with player orders and should only be added to animal creeps.")] "This conflicts with player orders and should only be added to animal creeps.")]

4
OpenRA.Mods.RA/Traits/AttackMove.cs → OpenRA.Mods.Common/Traits/AttackMove.cs
View File

@@ -10,10 +10,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.Common.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Provides access to the attack-move command, which will make the actor automatically engage viable targets while moving to the destination.")] [Desc("Provides access to the attack-move command, which will make the actor automatically engage viable targets while moving to the destination.")]
class AttackMoveInfo : ITraitInfo class AttackMoveInfo : ITraitInfo

3
OpenRA.Mods.RA/AutoHeal.cs → OpenRA.Mods.Common/Traits/AutoHeal.cs
View File

@@ -9,10 +9,9 @@
#endregion #endregion
using System.Linq; using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Used together with AttackMedic: to make the healer do it's job automatically to nearby units.")] [Desc("Used together with AttackMedic: to make the healer do it's job automatically to nearby units.")]
class AutoHealInfo : TraitInfo<AutoHeal>, Requires<AttackBaseInfo> { } class AutoHealInfo : TraitInfo<AutoHeal>, Requires<AttackBaseInfo> { }

3
OpenRA.Mods.RA/AutoTarget.cs → OpenRA.Mods.Common/Traits/AutoTarget.cs
View File

@@ -10,10 +10,9 @@
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("The actor will automatically engage the enemy when it is in range.")] [Desc("The actor will automatically engage the enemy when it is in range.")]
public class AutoTargetInfo : ITraitInfo, Requires<AttackBaseInfo> public class AutoTargetInfo : ITraitInfo, Requires<AttackBaseInfo>

32
OpenRA.Mods.Common/Traits/Buildings/Exit.cs Normal file
View File

@@ -0,0 +1,32 @@
#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.Collections.Generic;
using OpenRA.Mods.Common.Effects;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Where the unit should leave the building. Multiples are allowed if IDs are added: Exit@2, ...")]
public class ExitInfo : TraitInfo<Exit>
{
[Desc("Offset at which that the exiting actor is spawned")]
public readonly WVec SpawnOffset = WVec.Zero;
[Desc("Cell offset where the exiting actor enters the ActorMap")]
public readonly CVec ExitCell = CVec.Zero;
public readonly int Facing = -1;
[Desc("AttackMove to a RallyPoint or stay where you are spawned.")]
public readonly bool MoveIntoWorld = true;
}
public class Exit { }
}

2
OpenRA.Mods.RA/Traits/Buildings/Reservable.cs → OpenRA.Mods.Common/Traits/Buildings/Reservable.cs
View File

@@ -12,7 +12,7 @@ using System;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Reserve landing places for aircraft.")] [Desc("Reserve landing places for aircraft.")]
class ReservableInfo : TraitInfo<Reservable> { } class ReservableInfo : TraitInfo<Reservable> { }

6
OpenRA.Mods.RA/Cargo.cs → OpenRA.Mods.Common/Traits/Cargo.cs
View File

@@ -11,14 +11,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders; using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.Common.Traits
{ {
[Desc("This actor can transport Passenger actors.")] [Desc("This actor can transport Passenger actors.")]
public class CargoInfo : ITraitInfo, Requires<IOccupySpaceInfo> public class CargoInfo : ITraitInfo, Requires<IOccupySpaceInfo>

3
OpenRA.Mods.RA/Traits/Cloak.cs → OpenRA.Mods.Common/Traits/Cloak.cs
View File

@@ -13,10 +13,9 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("This unit can cloak and uncloak in specific situations.")] [Desc("This unit can cloak and uncloak in specific situations.")]
public class CloakInfo : UpgradableTraitInfo, ITraitInfo public class CloakInfo : UpgradableTraitInfo, ITraitInfo

2
OpenRA.Mods.RA/LimitedAmmo.cs → OpenRA.Mods.Common/Traits/LimitedAmmo.cs
View File

@@ -12,7 +12,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Actor has a limited amount of ammo, after using it all the actor must reload in some way.")] [Desc("Actor has a limited amount of ammo, after using it all the actor must reload in some way.")]
public class LimitedAmmoInfo : ITraitInfo public class LimitedAmmoInfo : ITraitInfo

3
OpenRA.Mods.RA/Traits/Mobile.cs → OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -15,11 +15,10 @@ using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common; using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.RA.Activities;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Flags] [Flags]
public enum CellConditions public enum CellConditions

4
OpenRA.Mods.RA/Passenger.cs → OpenRA.Mods.Common/Traits/Passenger.cs
View File

@@ -12,11 +12,11 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders; using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.Common.Traits
{ {
public enum AlternateTransportsMode { None, Force, Default, Always } public enum AlternateTransportsMode { None, Force, Default, Always }

2
OpenRA.Mods.RA/Reloads.cs → OpenRA.Mods.Common/Traits/Reloads.cs
View File

@@ -10,7 +10,7 @@
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Unit will reload its limited ammo itself.")] [Desc("Unit will reload its limited ammo itself.")]
public class ReloadsInfo : ITraitInfo, Requires<LimitedAmmoInfo> public class ReloadsInfo : ITraitInfo, Requires<LimitedAmmoInfo>

4
OpenRA.Mods.RA/Render/Hovers.cs → OpenRA.Mods.Common/Traits/Render/Hovers.cs
View File

@@ -12,10 +12,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.Common.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Changes the visual Z position periodically.")] [Desc("Changes the visual Z position periodically.")]
class HoversInfo : ITraitInfo, Requires<IMoveInfo> class HoversInfo : ITraitInfo, Requires<IMoveInfo>

4
OpenRA.Mods.RA/Render/RenderBuildingCharge.cs → OpenRA.Mods.Common/Traits/Render/RenderBuildingCharge.cs Executable file → Normal file
View File

@@ -8,9 +8,7 @@
*/ */
#endregion #endregion
using OpenRA.Mods.Common.Traits; namespace OpenRA.Mods.Common.Traits
namespace OpenRA.Mods.RA.Traits
{ {
[Desc("Used for tesla coil and obelisk.")] [Desc("Used for tesla coil and obelisk.")]
public class RenderBuildingChargeInfo : RenderBuildingInfo public class RenderBuildingChargeInfo : RenderBuildingInfo

3
OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs → OpenRA.Mods.Common/Traits/Render/RenderBuildingTurreted.cs
View File

@@ -13,10 +13,9 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
class RenderBuildingTurretedInfo : RenderBuildingInfo, Requires<TurretedInfo> class RenderBuildingTurretedInfo : RenderBuildingInfo, Requires<TurretedInfo>
{ {

3
OpenRA.Mods.RA/Render/WithBarrel.cs → OpenRA.Mods.Common/Traits/Render/WithBarrel.cs
View File

@@ -12,10 +12,9 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Renders barrels for units with the Turreted trait.")] [Desc("Renders barrels for units with the Turreted trait.")]
class WithBarrelInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo> class WithBarrelInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>

3
OpenRA.Mods.RA/Render/WithMuzzleFlash.cs → OpenRA.Mods.Common/Traits/Render/WithMuzzleFlash.cs
View File

@@ -12,10 +12,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Renders the MuzzleSequence from the Armament trait.")] [Desc("Renders the MuzzleSequence from the Armament trait.")]
class WithMuzzleFlashInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<AttackBaseInfo>, Requires<ArmamentInfo> class WithMuzzleFlashInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<AttackBaseInfo>, Requires<ArmamentInfo>

7
OpenRA.Mods.RA/Render/WithTurret.cs → OpenRA.Mods.Common/Traits/Render/WithTurret.cs Executable file → Normal file
View File

@@ -12,13 +12,12 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Renders turrets for units with the Turreted trait.")] [Desc("Renders turrets for units with the Turreted trait.")]
class WithTurretInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<TurretedInfo>, Requires<IBodyOrientationInfo> public class WithTurretInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<TurretedInfo>, Requires<IBodyOrientationInfo>
{ {
[Desc("Sequence name to use")] [Desc("Sequence name to use")]
public readonly string Sequence = "turret"; public readonly string Sequence = "turret";
@@ -49,7 +48,7 @@ namespace OpenRA.Mods.RA.Traits
} }
} }
class WithTurret : ITick public class WithTurret : ITick
{ {
WithTurretInfo info; WithTurretInfo info;
RenderSprites rs; RenderSprites rs;

2
OpenRA.Mods.RA/Turreted.cs → OpenRA.Mods.Common/Traits/Turreted.cs Executable file → Normal file
View File

@@ -11,7 +11,7 @@
using System; using System;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
public class TurretedInfo : ITraitInfo, UsesInit<TurretFacingInit> public class TurretedInfo : ITraitInfo, UsesInit<TurretFacingInit>
{ {

2
OpenRA.Mods.RA/Traits/Wanders.cs → OpenRA.Mods.Common/Traits/Wanders.cs
View File

@@ -11,7 +11,7 @@
using System; using System;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Wanders around aimlessly while idle.")] [Desc("Wanders around aimlessly while idle.")]
abstract class WandersInfo : ITraitInfo abstract class WandersInfo : ITraitInfo

2
OpenRA.Mods.RA/Traits/World/DomainIndex.cs → OpenRA.Mods.Common/Traits/World/DomainIndex.cs
View File

@@ -16,7 +16,7 @@ using OpenRA.Graphics;
using OpenRA.Support; using OpenRA.Support;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Identify untraversable regions of the map for faster pathfinding, especially with AI.", [Desc("Identify untraversable regions of the map for faster pathfinding, especially with AI.",
"This trait is required. Every mod needs it attached to the world actor.")] "This trait is required. Every mod needs it attached to the world actor.")]

2
OpenRA.Mods.RA/Traits/World/PathFinder.cs → OpenRA.Mods.Common/Traits/World/PathFinder.cs
View File

@@ -17,7 +17,7 @@ using OpenRA.Primitives;
using OpenRA.Support; using OpenRA.Support;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Calculates routes for mobile units based on the A* search algorithm.", " Attach this to the world actor.")] [Desc("Calculates routes for mobile units based on the A* search algorithm.", " Attach this to the world actor.")]
public class PathFinderInfo : ITraitInfo public class PathFinderInfo : ITraitInfo

2
OpenRA.Mods.RA/Traits/World/PathSearch.cs → OpenRA.Mods.Common/Traits/World/PathSearch.cs
View File

@@ -15,7 +15,7 @@ using System.Linq;
using OpenRA; using OpenRA;
using OpenRA.Primitives; using OpenRA.Primitives;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
public sealed class PathSearch : IDisposable public sealed class PathSearch : IDisposable
{ {

6
OpenRA.Mods.RA/Traits/World/PathfinderDebugOverlay.cs → OpenRA.Mods.Common/Traits/World/PathfinderDebugOverlay.cs
View File

@@ -16,11 +16,11 @@ using OpenRA.Graphics;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Required for the A* PathDebug from DeveloperMode. Attach this to the world actor.")] [Desc("Required for the A* PathDebug from DeveloperMode. Attach this to the world actor.")]
class PathfinderDebugOverlayInfo : TraitInfo<PathfinderDebugOverlay> { } public class PathfinderDebugOverlayInfo : TraitInfo<PathfinderDebugOverlay> { }
class PathfinderDebugOverlay : IRenderOverlay, IWorldLoaded public class PathfinderDebugOverlay : IRenderOverlay, IWorldLoaded
{ {
Dictionary<Player, CellLayer<int>> layers; Dictionary<Player, CellLayer<int>> layers;
int refreshTick; int refreshTick;

1
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -26,6 +26,7 @@ namespace OpenRA.Mods.Common.Traits
IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition); IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition);
} }
public interface INotifyAttack { void Attacking(Actor self, Target target, Armament a, Barrel barrel); }
public interface INotifyChat { bool OnChat(string from, string message); } public interface INotifyChat { bool OnChat(string from, string message); }
public interface INotifyParachuteLanded { void OnLanded(); } public interface INotifyParachuteLanded { void OnLanded(); }
public interface IRenderActorPreviewInfo { IEnumerable<IActorPreview> RenderPreview(ActorPreviewInitializer init); } public interface IRenderActorPreviewInfo { IEnumerable<IActorPreview> RenderPreview(ActorPreviewInitializer init); }

2
OpenRA.Mods.D2k/Activities/CarryUnit.cs
View File

@@ -10,9 +10,9 @@
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.D2k.Traits; using OpenRA.Mods.D2k.Traits;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Activities namespace OpenRA.Mods.D2k.Activities

2
OpenRA.Mods.D2k/Traits/AttackSwallow.cs
View File

@@ -9,7 +9,7 @@
#endregion #endregion
using OpenRA.Mods.D2k.Activities; using OpenRA.Mods.D2k.Activities;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits namespace OpenRA.Mods.D2k.Traits

2
OpenRA.Mods.D2k/Traits/AutoCarryall.cs
View File

@@ -11,10 +11,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.D2k.Activities; using OpenRA.Mods.D2k.Activities;
using OpenRA.Mods.RA; using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;

1
OpenRA.Mods.RA/AI/AttackOrFleeFuzzy.cs
View File

@@ -13,6 +13,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using AI.Fuzzy.Library; using AI.Fuzzy.Library;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;

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

@@ -10,6 +10,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;

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

@@ -11,6 +11,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;

3
OpenRA.Mods.RA/Activities/Demolish.cs
View File

@@ -12,8 +12,9 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Effects; using OpenRA.Effects;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Activities;
using OpenRA.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.RA.Activities
{ {

2
OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs
View File

@@ -10,6 +10,8 @@
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Effects; using OpenRA.Effects;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;

1
OpenRA.Mods.RA/Activities/LayMines.cs
View File

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

1
OpenRA.Mods.RA/Activities/Leap.cs
View File

@@ -12,6 +12,7 @@ using System;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;

1
OpenRA.Mods.RA/CombatDebugOverlay.cs
View File

@@ -12,6 +12,7 @@ using System;
using System.Drawing; using System.Drawing;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Effects; using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Effects; using OpenRA.Mods.RA.Effects;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;

1
OpenRA.Mods.RA/EjectOnDeath.cs
View File

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

1
OpenRA.Mods.RA/Guard.cs
View File

@@ -13,6 +13,7 @@ using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common; using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;

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

@@ -79,51 +79,26 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Activities\CaptureActor.cs" /> <Compile Include="Activities\CaptureActor.cs" />
<Compile Include="Traits\Wanders.cs" />
<Compile Include="Activities\Hunt.cs" /> <Compile Include="Activities\Hunt.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\AttackOrFleeFuzzy.cs" />
<Compile Include="AI\BaseBuilder.cs" /> <Compile Include="AI\BaseBuilder.cs" />
<Compile Include="AI\HackyAI.cs" /> <Compile Include="AI\HackyAI.cs" />
<Compile Include="Player\AllyRepair.cs" /> <Compile Include="Player\AllyRepair.cs" />
<Compile Include="Render\WithIdleOverlay.cs" /> <Compile Include="Render\WithIdleOverlay.cs" />
<Compile Include="Traits\AcceptsSupplies.cs" /> <Compile Include="Traits\AcceptsSupplies.cs" />
<Compile Include="Activities\Attack.cs" />
<Compile Include="Activities\AttackMoveActivity.cs" />
<Compile Include="Activities\ExternalCaptureActor.cs" /> <Compile Include="Activities\ExternalCaptureActor.cs" />
<Compile Include="Activities\DeliverResources.cs" /> <Compile Include="Activities\DeliverResources.cs" />
<Compile Include="Activities\Demolish.cs" /> <Compile Include="Activities\Demolish.cs" />
<Compile Include="Activities\DonateSupplies.cs" /> <Compile Include="Activities\DonateSupplies.cs" />
<Compile Include="Activities\EnterTransport.cs" />
<Compile Include="Activities\FindResources.cs" /> <Compile Include="Activities\FindResources.cs" />
<Compile Include="Activities\Follow.cs" />
<Compile Include="Activities\Heal.cs" />
<Compile Include="Activities\Infiltrate.cs" /> <Compile Include="Activities\Infiltrate.cs" />
<Compile Include="Activities\LayMines.cs" /> <Compile Include="Activities\LayMines.cs" />
<Compile Include="Activities\Leap.cs" /> <Compile Include="Activities\Leap.cs" />
<Compile Include="Activities\MoveAdjacentTo.cs" />
<Compile Include="Activities\RAHarvesterDockSequence.cs" /> <Compile Include="Activities\RAHarvesterDockSequence.cs" />
<Compile Include="Activities\Rearm.cs" />
<Compile Include="Activities\Repair.cs" />
<Compile Include="Activities\Sell.cs" /> <Compile Include="Activities\Sell.cs" />
<Compile Include="Activities\Teleport.cs" /> <Compile Include="Activities\Teleport.cs" />
<Compile Include="Activities\Transform.cs" /> <Compile Include="Activities\Transform.cs" />
<Compile Include="Activities\UnloadCargo.cs" />
<Compile Include="AI\SupportPowerDecision.cs" /> <Compile Include="AI\SupportPowerDecision.cs" />
<Compile Include="Attack\AttackTurreted.cs" />
<Compile Include="Crushable.cs" /> <Compile Include="Crushable.cs" />
<Compile Include="Effects\GpsSatellite.cs" /> <Compile Include="Effects\GpsSatellite.cs" />
<Compile Include="Effects\SatelliteLaunch.cs" /> <Compile Include="Effects\SatelliteLaunch.cs" />
@@ -133,16 +108,7 @@
<Compile Include="EjectOnDeath.cs" /> <Compile Include="EjectOnDeath.cs" />
<Compile Include="AI\RushFuzzy.cs" /> <Compile Include="AI\RushFuzzy.cs" />
<Compile Include="AI\StateMachine.cs" /> <Compile Include="AI\StateMachine.cs" />
<Compile Include="Traits\AttackMove.cs" />
<Compile Include="Attack\AttackBase.cs" />
<Compile Include="Attack\AttackFrontal.cs" />
<Compile Include="Traits\Attack\AttackLeap.cs" /> <Compile Include="Traits\Attack\AttackLeap.cs" />
<Compile Include="Attack\AttackMedic.cs" />
<Compile Include="Attack\AttackOmni.cs" />
<Compile Include="Attack\AttackCharge.cs" />
<Compile Include="Attack\AttackWander.cs" />
<Compile Include="AutoHeal.cs" />
<Compile Include="AutoTarget.cs" />
<Compile Include="CaptureNotification.cs" /> <Compile Include="CaptureNotification.cs" />
<Compile Include="Scripting\Properties\RepairableBuildingProperties.cs" /> <Compile Include="Scripting\Properties\RepairableBuildingProperties.cs" />
<Compile Include="C4Demolition.cs" /> <Compile Include="C4Demolition.cs" />
@@ -150,7 +116,6 @@
<Compile Include="ExternalCapturableBar.cs" /> <Compile Include="ExternalCapturableBar.cs" />
<Compile Include="Capturable.cs" /> <Compile Include="Capturable.cs" />
<Compile Include="ExternalCaptures.cs" /> <Compile Include="ExternalCaptures.cs" />
<Compile Include="Cargo.cs" />
<Compile Include="CashTrickler.cs" /> <Compile Include="CashTrickler.cs" />
<Compile Include="Traits\PaletteEffects\ChronoshiftPaletteEffect.cs" /> <Compile Include="Traits\PaletteEffects\ChronoshiftPaletteEffect.cs" />
<Compile Include="Traits\Chronoshiftable.cs" /> <Compile Include="Traits\Chronoshiftable.cs" />
@@ -177,7 +142,6 @@
<Compile Include="Guard.cs" /> <Compile Include="Guard.cs" />
<Compile Include="Invulnerable.cs" /> <Compile Include="Invulnerable.cs" />
<Compile Include="Captures.cs" /> <Compile Include="Captures.cs" />
<Compile Include="LimitedAmmo.cs" />
<Compile Include="Lint\CheckActorReferences.cs" /> <Compile Include="Lint\CheckActorReferences.cs" />
<Compile Include="Lint\CheckSyncAnnotations.cs" /> <Compile Include="Lint\CheckSyncAnnotations.cs" />
<Compile Include="Lint\CheckTraitPrerequisites.cs" /> <Compile Include="Lint\CheckTraitPrerequisites.cs" />
@@ -185,35 +149,25 @@
<Compile Include="Traits\MadTank.cs" /> <Compile Include="Traits\MadTank.cs" />
<Compile Include="Traits\Mine.cs" /> <Compile Include="Traits\Mine.cs" />
<Compile Include="Traits\Minelayer.cs" /> <Compile Include="Traits\Minelayer.cs" />
<Compile Include="Traits\Mobile.cs" />
<Compile Include="Activities\Move.cs" />
<Compile Include="Traits\SeedsResource.cs" /> <Compile Include="Traits\SeedsResource.cs" />
<Compile Include="Traits\World\PathFinder.cs" />
<Compile Include="Traits\World\PathSearch.cs" />
<Compile Include="Orders\PlaceBuildingOrderGenerator.cs" /> <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
<Compile Include="Orders\GlobalButtonOrderGenerator.cs" /> <Compile Include="Orders\GlobalButtonOrderGenerator.cs" />
<Compile Include="Orders\RepairOrderGenerator.cs" /> <Compile Include="Orders\RepairOrderGenerator.cs" />
<Compile Include="ParaDrop.cs" /> <Compile Include="ParaDrop.cs" />
<Compile Include="Passenger.cs" />
<Compile Include="Player\ClassicProductionQueue.cs" /> <Compile Include="Player\ClassicProductionQueue.cs" />
<Compile Include="Player\PlaceBuilding.cs" /> <Compile Include="Player\PlaceBuilding.cs" />
<Compile Include="Player\ProductionQueue.cs" /> <Compile Include="Player\ProductionQueue.cs" />
<Compile Include="Traits\PortableChrono.cs" /> <Compile Include="Traits\PortableChrono.cs" />
<Compile Include="Scripting\Properties\GuardProperties.cs" /> <Compile Include="Scripting\Properties\GuardProperties.cs" />
<Compile Include="Traits\World\DomainIndex.cs" />
<Compile Include="Turreted.cs" />
<Compile Include="Widgets\Logic\TabCompletionLogic.cs" /> <Compile Include="Widgets\Logic\TabCompletionLogic.cs" />
<Compile Include="Production.cs" /> <Compile Include="Production.cs" />
<Compile Include="ProductionBar.cs" /> <Compile Include="ProductionBar.cs" />
<Compile Include="ProximityCaptor.cs" /> <Compile Include="ProximityCaptor.cs" />
<Compile Include="ProximityCapturable.cs" /> <Compile Include="ProximityCapturable.cs" />
<Compile Include="Reloads.cs" />
<Compile Include="RenderDetectionCircle.cs" /> <Compile Include="RenderDetectionCircle.cs" />
<Compile Include="RenderJammerCircle.cs" /> <Compile Include="RenderJammerCircle.cs" />
<Compile Include="RenderRangeCircle.cs" /> <Compile Include="RenderRangeCircle.cs" />
<Compile Include="Render\RenderBuildingCharge.cs" />
<Compile Include="Render\RenderBuildingSilo.cs" /> <Compile Include="Render\RenderBuildingSilo.cs" />
<Compile Include="Render\RenderBuildingTurreted.cs" />
<Compile Include="Render\RenderBuildingWall.cs" /> <Compile Include="Render\RenderBuildingWall.cs" />
<Compile Include="Render\RenderBuildingWarFactory.cs" /> <Compile Include="Render\RenderBuildingWarFactory.cs" />
<Compile Include="Render\RenderHarvester.cs" /> <Compile Include="Render\RenderHarvester.cs" />
@@ -221,7 +175,6 @@
<Compile Include="Render\RenderDisguise.cs" /> <Compile Include="Render\RenderDisguise.cs" />
<Compile Include="Render\RenderLandingCraft.cs" /> <Compile Include="Render\RenderLandingCraft.cs" />
<Compile Include="Render\WithBuildingExplosion.cs" /> <Compile Include="Render\WithBuildingExplosion.cs" />
<Compile Include="Render\WithMuzzleFlash.cs" />
<Compile Include="Repairable.cs" /> <Compile Include="Repairable.cs" />
<Compile Include="RepairableNear.cs" /> <Compile Include="RepairableNear.cs" />
<Compile Include="ScaredyCat.cs" /> <Compile Include="ScaredyCat.cs" />
@@ -242,15 +195,6 @@
<Compile Include="TakeCover.cs" /> <Compile Include="TakeCover.cs" />
<Compile Include="ThrowsParticle.cs" /> <Compile Include="ThrowsParticle.cs" />
<Compile Include="TraitsInterfaces.cs" /> <Compile Include="TraitsInterfaces.cs" />
<Compile Include="Traits\Air\Aircraft.cs" />
<Compile Include="Traits\Air\AttackBomber.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="Traits\Air\TargetableAircraft.cs" />
<Compile Include="Traits\Buildings\Bridge.cs" /> <Compile Include="Traits\Buildings\Bridge.cs" />
<Compile Include="Traits\Buildings\BridgeHut.cs" /> <Compile Include="Traits\Buildings\BridgeHut.cs" />
@@ -258,9 +202,7 @@
<Compile Include="Traits\Buildings\OreRefinery.cs" /> <Compile Include="Traits\Buildings\OreRefinery.cs" />
<Compile Include="Traits\Buildings\PrimaryBuilding.cs" /> <Compile Include="Traits\Buildings\PrimaryBuilding.cs" />
<Compile Include="Traits\Buildings\RepairableBuilding.cs" /> <Compile Include="Traits\Buildings\RepairableBuilding.cs" />
<Compile Include="Traits\Buildings\Reservable.cs" />
<Compile Include="Traits\Buildings\TargetableBuilding.cs" /> <Compile Include="Traits\Buildings\TargetableBuilding.cs" />
<Compile Include="Traits\Cloak.cs" />
<Compile Include="Traits\Harvester.cs" /> <Compile Include="Traits\Harvester.cs" />
<Compile Include="Traits\HarvesterHuskModifier.cs" /> <Compile Include="Traits\HarvesterHuskModifier.cs" />
<Compile Include="Traits\LeavesHusk.cs" /> <Compile Include="Traits\LeavesHusk.cs" />
@@ -268,7 +210,6 @@
<Compile Include="Traits\TargetableSubmarine.cs" /> <Compile Include="Traits\TargetableSubmarine.cs" />
<Compile Include="Traits\TargetableUnit.cs" /> <Compile Include="Traits\TargetableUnit.cs" />
<Compile Include="Traits\World\BridgeLayer.cs" /> <Compile Include="Traits\World\BridgeLayer.cs" />
<Compile Include="Traits\World\PathfinderDebugOverlay.cs" />
<Compile Include="TransformOnCapture.cs" /> <Compile Include="TransformOnCapture.cs" />
<Compile Include="TransformOnPassenger.cs" /> <Compile Include="TransformOnPassenger.cs" />
<Compile Include="Transforms.cs" /> <Compile Include="Transforms.cs" />
@@ -309,14 +250,11 @@
<Compile Include="Traits\Infiltration\InfiltrateForPowerOutage.cs" /> <Compile Include="Traits\Infiltration\InfiltrateForPowerOutage.cs" />
<Compile Include="Traits\Infiltration\InfiltrateForSupportPower.cs" /> <Compile Include="Traits\Infiltration\InfiltrateForSupportPower.cs" />
<Compile Include="Traits\Infiltration\Infiltrates.cs" /> <Compile Include="Traits\Infiltration\Infiltrates.cs" />
<Compile Include="Armament.cs" />
<Compile Include="Widgets\Logic\ObserverShroudSelectorLogic.cs" /> <Compile Include="Widgets\Logic\ObserverShroudSelectorLogic.cs" />
<Compile Include="Activities\RepairBridge.cs" /> <Compile Include="Activities\RepairBridge.cs" />
<Compile Include="Lint\CheckSequences.cs" /> <Compile Include="Lint\CheckSequences.cs" />
<Compile Include="Widgets\Logic\SpawnSelectorTooltipLogic.cs" /> <Compile Include="Widgets\Logic\SpawnSelectorTooltipLogic.cs" />
<Compile Include="Widgets\Logic\ClientTooltipLogic.cs" /> <Compile Include="Widgets\Logic\ClientTooltipLogic.cs" />
<Compile Include="Render\WithTurret.cs" />
<Compile Include="Render\WithBarrel.cs" />
<Compile Include="Widgets\Logic\CreditsLogic.cs" /> <Compile Include="Widgets\Logic\CreditsLogic.cs" />
<Compile Include="Widgets\Logic\SimpleTooltipLogic.cs" /> <Compile Include="Widgets\Logic\SimpleTooltipLogic.cs" />
<Compile Include="Widgets\Logic\WorldTooltipLogic.cs" /> <Compile Include="Widgets\Logic\WorldTooltipLogic.cs" />
@@ -329,8 +267,7 @@
<Compile Include="CombatDebugOverlay.cs" /> <Compile Include="CombatDebugOverlay.cs" />
<Compile Include="Widgets\Logic\GameTimerLogic.cs" /> <Compile Include="Widgets\Logic\GameTimerLogic.cs" />
<Compile Include="Widgets\Logic\ReplayControlBarLogic.cs" /> <Compile Include="Widgets\Logic\ReplayControlBarLogic.cs" />
<Compile Include="Attack\AttackFollow.cs" /> <Compile Include="Traits\Attack\AttackGarrisoned.cs" />
<Compile Include="Attack\AttackGarrisoned.cs" />
<Compile Include="Widgets\Logic\LobbyMapPreviewLogic.cs" /> <Compile Include="Widgets\Logic\LobbyMapPreviewLogic.cs" />
<Compile Include="Orders\BeaconOrderGenerator.cs" /> <Compile Include="Orders\BeaconOrderGenerator.cs" />
<Compile Include="Widgets\Logic\ControlGroupLogic.cs" /> <Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
@@ -345,7 +282,6 @@
<Compile Include="Scripting\Properties\ChronosphereProperties.cs" /> <Compile Include="Scripting\Properties\ChronosphereProperties.cs" />
<Compile Include="Render\WithRepairAnimation.cs" /> <Compile Include="Render\WithRepairAnimation.cs" />
<Compile Include="Render\WithRepairOverlay.cs" /> <Compile Include="Render\WithRepairOverlay.cs" />
<Compile Include="Activities\MoveWithinRange.cs" />
<Compile Include="Lint\CheckPlayers.cs" /> <Compile Include="Lint\CheckPlayers.cs" />
<Compile Include="Lint\CheckActors.cs" /> <Compile Include="Lint\CheckActors.cs" />
<Compile Include="Lint\CheckMapCordon.cs" /> <Compile Include="Lint\CheckMapCordon.cs" />
@@ -387,8 +323,6 @@
<Compile Include="UtilityCommands\ExportCharacterSeparatedRules.cs" /> <Compile Include="UtilityCommands\ExportCharacterSeparatedRules.cs" />
<Compile Include="UtilityCommands\Extensions.cs" /> <Compile Include="UtilityCommands\Extensions.cs" />
<Compile Include="Lint\CheckMapRules.cs" /> <Compile Include="Lint\CheckMapRules.cs" />
<Compile Include="Activities\Air\HeliFlyCircle.cs" />
<Compile Include="Render\Hovers.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj"> <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">

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

@@ -10,6 +10,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Effects; using OpenRA.Mods.RA.Effects;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;

17
OpenRA.Mods.RA/Production.cs
View File

@@ -12,6 +12,7 @@ using System;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Primitives; using OpenRA.Primitives;
@@ -28,22 +29,6 @@ namespace OpenRA.Mods.RA.Traits
public virtual object Create(ActorInitializer init) { return new Production(this, init.self); } public virtual object Create(ActorInitializer init) { return new Production(this, init.self); }
} }
[Desc("Where the unit should leave the building. Multiples are allowed if IDs are added: Exit@2, ...")]
public class ExitInfo : TraitInfo<Exit>
{
[Desc("Offset at which that the exiting actor is spawned")]
public readonly WVec SpawnOffset = WVec.Zero;
[Desc("Cell offset where the exiting actor enters the ActorMap")]
public readonly CVec ExitCell = CVec.Zero;
public readonly int Facing = -1;
[Desc("AttackMove to a RallyPoint or stay where you are spawned.")]
public readonly bool MoveIntoWorld = true;
}
public class Exit { }
public class Production public class Production
{ {
Lazy<RallyPoint> rp; Lazy<RallyPoint> rp;

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

@@ -11,9 +11,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders; using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.RA.Traits

1
OpenRA.Mods.RA/ScaredyCat.cs
View File

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

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

@@ -16,6 +16,7 @@ using OpenRA;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Effects; using OpenRA.Effects;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;
using OpenRA.Primitives; using OpenRA.Primitives;

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

@@ -13,8 +13,8 @@ using System.Linq;
using Eluant; using Eluant;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting; using OpenRA.Scripting;
using OpenRA.Traits; using OpenRA.Traits;

1
OpenRA.Mods.RA/Scripting/Properties/GeneralProperties.cs
View File

@@ -10,6 +10,7 @@
using Eluant; using Eluant;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting; using OpenRA.Scripting;

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

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

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

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

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

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

1
OpenRA.Mods.RA/Scripting/Properties/PlayerProperties.cs
View File

@@ -11,6 +11,7 @@
using System; using System;
using System.Linq; using System.Linq;
using Eluant; using Eluant;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Traits;
using OpenRA.Scripting; using OpenRA.Scripting;

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

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

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

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

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

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

1
OpenRA.Mods.RA/TakeCover.cs
View File

@@ -9,6 +9,7 @@
#endregion #endregion
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits namespace OpenRA.Mods.RA.Traits

Some files were not shown because too many files have changed in this diff Show More