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

Dissolve RA.Buildings namespace.

Browse Source 
Move a handfull related, loose traits to RA.Traits as well.
This commit is contained in:
reaperrr
2014-12-25 22:44:37 +01:00
parent 9e806d5869
commit d58807cdb8
57 changed files with 47 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Traits/AttackPopupTurreted.cs
View File

@@ -13,7 +13,7 @@ using OpenRA.Activities;
using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;

2
OpenRA.Mods.D2k/Traits/Buildings/LaysTerrain.cs
View File

@@ -9,7 +9,7 @@
#endregion
using System.Linq;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits

2
OpenRA.Mods.D2k/Traits/Render/WithBuildingPlacedOverlay.cs
View File

@@ -10,7 +10,7 @@
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits

2
OpenRA.Mods.D2k/Traits/Render/WithDeliveryOverlay.cs
View File

@@ -11,7 +11,7 @@
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits

2
OpenRA.Mods.D2k/Traits/Render/WithDockingOverlay.cs
View File

@@ -11,7 +11,7 @@
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.D2k.Traits

1
OpenRA.Mods.D2k/Traits/Render/WithProductionOverlay.cs
View File

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

2
OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs
View File

@@ -15,7 +15,7 @@ using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Orders;
using OpenRA.Network;
using OpenRA.Primitives;

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

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

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

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

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

@@ -13,7 +13,6 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.AI

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

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

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

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

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

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

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

@@ -14,7 +14,7 @@ using System.Drawing;
using System.Linq;
using OpenRA.Activities;
using OpenRA.GameRules;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA

2
OpenRA.Mods.RA/Buildings/Bib.cs
View File

@@ -12,7 +12,7 @@ using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Buildings
namespace OpenRA.Mods.RA.Traits
{
public class BibInfo : ITraitInfo, Requires<BuildingInfo>, Requires<RenderSpritesInfo>
{

2
OpenRA.Mods.RA/Buildings/Building.cs
View File

@@ -16,7 +16,7 @@ using OpenRA.Mods.RA.Render;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Buildings
namespace OpenRA.Mods.RA.Traits
{
[Desc("Remove this trait to limit base-walking by cheap or defensive buildings.")]
public class GivesBuildableAreaInfo : TraitInfo<GivesBuildableArea> {}

2
OpenRA.Mods.RA/Buildings/BuildingInfluence.cs
View File

@@ -10,7 +10,7 @@
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Buildings
namespace OpenRA.Mods.RA.Traits
{
[Desc("A dictionary of buildings placed on the map. Attach this to the world actor.")]
public class BuildingInfluenceInfo : ITraitInfo

3
OpenRA.Mods.RA/Buildings/BuildingUtils.cs
View File

@@ -11,10 +11,9 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Buildings
namespace OpenRA.Mods.RA.Traits
{
public static class BuildingUtils
{

3
OpenRA.Mods.RA/Buildings/ClonesProducedUnits.cs
View File

@@ -10,10 +10,9 @@
using System;
using System.Linq;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Traits
{
[Desc("Creates a free duplicate of produced units.")]
public class ClonesProducedUnitsInfo : ITraitInfo, Requires<ProductionInfo>, Requires<ExitInfo>

2
OpenRA.Mods.RA/Buildings/FootprintUtils.cs
View File

@@ -12,7 +12,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
namespace OpenRA.Mods.RA.Buildings
namespace OpenRA.Mods.RA.Traits
{
public static class FootprintUtils
{

2
OpenRA.Mods.RA/Buildings/RepairableBuilding.cs
View File

@@ -16,7 +16,7 @@ using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Effects;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Buildings
namespace OpenRA.Mods.RA.Traits
{
[Desc("Building can be repaired by the repair button.")]
public class RepairableBuildingInfo : UpgradableTraitInfo, ITraitInfo, Requires<HealthInfo>

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

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

2
OpenRA.Mods.RA/Effects/RepairIndicator.cs
View File

@@ -12,7 +12,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
namespace OpenRA.Mods.RA.Effects
{

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

@@ -10,11 +10,10 @@
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Traits
{
[Desc("Spawn new actors when sold.")]
class EmitInfantryOnSellInfo : TraitInfo<EmitInfantryOnSell>

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

@@ -9,10 +9,9 @@
#endregion
using System.Linq;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Traits
{
[Desc("This actor can be captured by a unit with ExternalCaptures: trait.")]
public class ExternalCapturableInfo : ITraitInfo

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

@@ -11,7 +11,7 @@
using System.Drawing;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Traits
{
[Desc("Visualize the remaining CaptureCompleteTime from ExternalCapturable: trait.")]
class ExternalCapturableBarInfo : ITraitInfo, Requires<ExternalCapturableInfo>

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

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

2
OpenRA.Mods.RA/Lint/LintBuildablePrerequisites.cs
View File

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

1
OpenRA.Mods.RA/Orders/GlobalButtonOrderGenerator.cs
View File

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

1
OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -14,7 +14,6 @@ using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Render;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;

2
OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs
View File

@@ -11,7 +11,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Orders

3
OpenRA.Mods.RA/Player/AllyRepair.cs
View File

@@ -8,10 +8,9 @@
*/
#endregion
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Traits
{
[Desc("Attach this to the player actor to allow building repair by team mates.")]

3
OpenRA.Mods.RA/Player/BaseAttackNotifier.cs
View File

@@ -10,10 +10,9 @@
using System.Drawing;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Traits
{
[Desc("Plays an audio notification and shows a radar ping when a building is attacked.",
"Attach this to the player actor.")]

1
OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
View File

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

1
OpenRA.Mods.RA/Player/PlaceBuilding.cs
View File

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

2
OpenRA.Mods.RA/Player/PlayerStatistics.cs
View File

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

1
OpenRA.Mods.RA/Player/ProductionQueue.cs
View File

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

2
OpenRA.Mods.RA/Render/RenderBuilding.cs
View File

@@ -13,7 +13,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render

4
OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
View File

@@ -11,9 +11,9 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render

2
OpenRA.Mods.RA/Render/WithBuildingExplosion.cs
View File

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

4
OpenRA.Mods.RA/Render/WithIdleOverlay.cs
View File

@@ -11,9 +11,9 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render

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

@@ -13,8 +13,7 @@ using System.Linq;
using OpenRA.Activities;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Render;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render

2
OpenRA.Mods.RA/Render/WithRepairOverlay.cs
View File

@@ -12,7 +12,7 @@ using System.Linq;
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render

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

@@ -16,10 +16,9 @@ using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Traits
{
[Desc("This actor can be sent to a structure for repairs.")]
class RepairableInfo : ITraitInfo, Requires<HealthInfo>

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

@@ -13,10 +13,9 @@ using System.Drawing;
using System.Linq;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Traits
{
class RepairableNearInfo : ITraitInfo, Requires<HealthInfo>
{

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

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

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

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

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

@@ -11,11 +11,10 @@
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Traits
{
[Desc("Actor can be sold")]

2
OpenRA.Mods.RA/Traits/Air/Aircraft.cs
View File

@@ -14,9 +14,7 @@ using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Primitives;
using OpenRA.Traits;

2
OpenRA.Mods.RA/Traits/Air/ReturnOnIdle.cs
View File

@@ -10,9 +10,7 @@
using System.Linq;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits

1
OpenRA.Mods.RA/Traits/Buildings/Bridge.cs
View File

@@ -14,7 +14,6 @@ using System.Linq;
using OpenRA.Effects;
using OpenRA.GameRules;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Primitives;
using OpenRA.Traits;

1
OpenRA.Mods.RA/Traits/Buildings/TargetableBuilding.cs
View File

@@ -10,7 +10,6 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits

1
OpenRA.Mods.RA/Traits/Crates/Crate.cs
View File

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

1
OpenRA.Mods.RA/Traits/Modifiers/FrozenUnderFog.cs
View File

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

1
OpenRA.Mods.RA/Traits/World/ResourceLayer.cs
View File

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

11
OpenRA.Mods.RA/Transforms.cs
View File

@@ -10,14 +10,13 @@
using System.Collections.Generic;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
using OpenRA.Mods.RA.Render;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
namespace OpenRA.Mods.RA.Traits
{
[Desc("Actor becomes a specified actor type when this trait is triggered.")]
class TransformsInfo : ITraitInfo

2
OpenRA.Mods.RA/Widgets/ProductionPaletteWidget.cs
View File

@@ -14,7 +14,7 @@ using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Orders;
using OpenRA.Network;
using OpenRA.Widgets;