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

Move Armament, Attack* and various other traits to Traits namespace

Browse Source
This commit is contained in:
reaperrr
2014-12-26 00:31:22 +01:00
parent 2054e41552
commit 2f67a88b93
41 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits namespace OpenRA.Mods.D2k.Traits

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

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

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

@@ -13,6 +13,7 @@ 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.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities namespace OpenRA.Mods.RA.Activities

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

@@ -11,7 +11,7 @@
using System.Drawing; using System.Drawing;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
public static class ActorExts public static class ActorExts
{ {

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

@@ -16,7 +16,7 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
public class Barrel public class Barrel
{ {

3
OpenRA.Mods.RA/Attack/AttackBase.cs
View File

@@ -14,10 +14,9 @@ using System.Drawing;
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.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
public abstract class AttackBaseInfo : ITraitInfo public abstract class AttackBaseInfo : ITraitInfo
{ {

3
OpenRA.Mods.RA/Attack/AttackCharge.cs
View File

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

3
OpenRA.Mods.RA/Attack/AttackFollow.cs
View File

@@ -10,10 +10,9 @@
using System; using System;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.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
View File

@@ -12,7 +12,7 @@ using System;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.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>

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

@@ -14,10 +14,9 @@ using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Graphics; using OpenRA.Graphics;
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 namespace OpenRA.Mods.RA.Traits
{ {
public class FirePort public class FirePort
{ {

2
OpenRA.Mods.RA/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 namespace OpenRA.Mods.RA.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
View File

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

2
OpenRA.Mods.RA/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 namespace OpenRA.Mods.RA.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>

3
OpenRA.Mods.RA/Attack/AttackWander.cs
View File

@@ -9,10 +9,9 @@
#endregion #endregion
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.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.")]

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

@@ -11,7 +11,7 @@
using System.Linq; using System.Linq;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.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> { }

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

@@ -13,7 +13,7 @@ using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.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>

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

@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
class C4DemolitionInfo : ITraitInfo class C4DemolitionInfo : ITraitInfo
{ {

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

@@ -11,7 +11,7 @@
using System.Linq; using System.Linq;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
[Desc("This actor can be captured by a unit with Captures: trait.")] [Desc("This actor can be captured by a unit with Captures: trait.")]
class CapturableInfo : ITraitInfo class CapturableInfo : ITraitInfo

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

@@ -10,7 +10,7 @@
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
class CaptureNotificationInfo : ITraitInfo class CaptureNotificationInfo : ITraitInfo
{ {

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

@@ -14,7 +14,7 @@ using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
[Desc("This actor can capture other actors which have the Capturable: trait.")] [Desc("This actor can capture other actors which have the Capturable: trait.")]
class CapturesInfo : ITraitInfo class CapturesInfo : ITraitInfo

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

@@ -11,9 +11,10 @@
using System; using System;
using System.Drawing; using System.Drawing;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Traits;
using OpenRA.Mods.Common.Effects; using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.RA.Effects; using OpenRA.Mods.RA.Effects;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {

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

@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
[Desc("Overrides the default ToolTip when this actor is disguised (aids in deceiving enemy players).")] [Desc("Overrides the default ToolTip when this actor is disguised (aids in deceiving enemy players).")]
class DisguiseToolTipInfo : TooltipInfo, Requires<DisguiseInfo> class DisguiseToolTipInfo : TooltipInfo, Requires<DisguiseInfo>

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

@@ -14,7 +14,7 @@ using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
[Desc("Can instantly repair other actors, but gets consumed afterwards.")] [Desc("Can instantly repair other actors, but gets consumed afterwards.")]
class EngineerRepairInfo : TraitInfo<EngineerRepair> { } class EngineerRepairInfo : TraitInfo<EngineerRepair> { }

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

@@ -15,7 +15,7 @@ using OpenRA.Graphics;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
[Desc("The player can give this unit the order to follow and protect friendly units with the Guardable trait.")] [Desc("The player can give this unit the order to follow and protect friendly units with the Guardable trait.")]
class GuardInfo : TraitInfo<Guard> { } class GuardInfo : TraitInfo<Guard> { }

2
OpenRA.Mods.RA/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 namespace OpenRA.Mods.RA.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

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

@@ -10,7 +10,7 @@
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.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>

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

@@ -14,7 +14,7 @@ using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
class RenderDetectionCircleInfo : ITraitInfo class RenderDetectionCircleInfo : ITraitInfo
{ {

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

@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
// TODO: remove all the Render*Circle duplication // TODO: remove all the Render*Circle duplication
class RenderJammerCircleInfo : ITraitInfo, IPlaceBuildingDecoration class RenderJammerCircleInfo : ITraitInfo, IPlaceBuildingDecoration

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

@@ -15,7 +15,7 @@ using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
public interface IPlaceBuildingDecoration public interface IPlaceBuildingDecoration
{ {

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

@@ -14,7 +14,7 @@ using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
class RenderShroudCircleInfo : ITraitInfo, IPlaceBuildingDecoration class RenderShroudCircleInfo : ITraitInfo, IPlaceBuildingDecoration
{ {

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

@@ -11,6 +11,7 @@
using Eluant; using Eluant;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Activities;
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/GuardProperties.cs
View File

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

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

@@ -11,7 +11,7 @@
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
[Desc("Make the unit go prone when under attack, in an attempt to reduce damage.")] [Desc("Make the unit go prone when under attack, in an attempt to reduce damage.")]
public class TakeCoverInfo : TurretedInfo public class TakeCoverInfo : TurretedInfo

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

@@ -12,7 +12,7 @@ using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
class ThrowsParticleInfo : ITraitInfo, Requires<RenderSimpleInfo>, Requires<IBodyOrientationInfo> class ThrowsParticleInfo : ITraitInfo, Requires<RenderSimpleInfo>, Requires<IBodyOrientationInfo>
{ {

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

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

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

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

1
OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs
View File

@@ -14,6 +14,7 @@ using System.Data;
using System.Linq; using System.Linq;
using OpenRA.GameRules; using OpenRA.GameRules;
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.UtilityCommands namespace OpenRA.Mods.RA.UtilityCommands

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

@@ -14,7 +14,7 @@ using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA.Traits
{ {
[Desc("Renders an arbitrary circle when selected or placing a structure")] [Desc("Renders an arbitrary circle when selected or placing a structure")]
class WithRangeCircleInfo : ITraitInfo, IPlaceBuildingDecoration class WithRangeCircleInfo : ITraitInfo, IPlaceBuildingDecoration

2
OpenRA.Mods.TS/Traits/Render/WithVoxelBarrel.cs
View File

@@ -12,7 +12,7 @@ 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.RA; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.TS.Traits namespace OpenRA.Mods.TS.Traits

2
OpenRA.Mods.TS/Traits/Render/WithVoxelTurret.cs
View File

@@ -12,7 +12,7 @@ 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.RA; using OpenRA.Mods.RA.Traits;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.TS.Traits namespace OpenRA.Mods.TS.Traits