From ffca040c473baf64b0d039f80ee022d3df6232de Mon Sep 17 00:00:00 2001 From: reaperrr Date: Tue, 9 Dec 2014 23:39:39 +0100 Subject: [PATCH] Moves traits from Common and Power namespaces to Common.Traits namespace --- OpenRA.Mods.Cnc/Traits/PoisonedByTiberium.cs | 2 +- OpenRA.Mods.Common/CommonTraitsInterfaces.cs | 1 + OpenRA.Mods.Common/Effects/PowerdownIndicator.cs | 2 +- OpenRA.Mods.Common/Effects/RallyPoint.cs | 5 +++-- OpenRA.Mods.Common/OpenRA.Mods.Common.csproj | 7 ++++--- OpenRA.Mods.Common/Scripting/Global/ActorGlobal.cs | 1 + OpenRA.Mods.Common/Scripting/Global/MapGlobal.cs | 1 + OpenRA.Mods.Common/Scripting/LuaScript.cs | 2 +- .../Scripting/Properties/PowerProperties.cs | 7 ++++--- .../Scripting/Properties/UpgradeProperties.cs | 1 + OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs | 4 ++-- .../ServerTraits/LobbySettingsNotification.cs | 1 + OpenRA.Mods.Common/Traits/Burns.cs | 3 +-- OpenRA.Mods.Common/Traits/CustomBuildTimeValue.cs | 2 +- OpenRA.Mods.Common/Traits/CustomSellValue.cs | 2 +- OpenRA.Mods.Common/Traits/Demolishable.cs | 2 +- OpenRA.Mods.Common/Traits/Immobile.cs | 2 +- .../Traits}/KillsSelf.cs | 3 +-- .../{ => Traits}/Modifiers/TimedUpgradeBar.cs | 2 +- .../Traits/Power/AffectedByPowerOutage.cs | 2 +- OpenRA.Mods.Common/Traits/Power/CanPowerDown.cs | 2 +- .../Traits/Power/Player/PowerManager.cs | 2 +- OpenRA.Mods.Common/Traits/Power/Power.cs | 2 +- OpenRA.Mods.Common/Traits/Power/RequiresPower.cs | 2 +- .../Traits/Power/ScalePowerWithHealth.cs | 2 +- OpenRA.Mods.Common/Traits/RallyPoint.cs | 2 +- OpenRA.Mods.Common/Traits/ShakeOnDeath.cs | 2 +- .../Traits/Sound/SoundOnDamageTransition.cs | 2 +- .../{ => Traits}/Upgrades/UpgradableTrait.cs | 2 +- .../{ => Traits}/Upgrades/UpgradeManager.cs | 2 +- OpenRA.Mods.Common/Traits/Valued.cs | 2 +- OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs | 2 +- OpenRA.Mods.Common/Traits/World/MPStartLocations.cs | 2 +- OpenRA.Mods.Common/Traits/World/MPStartUnits.cs | 2 +- .../Traits/World/PaletteFromCurrentTileset.cs | 2 +- OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs | 2 +- OpenRA.Mods.Common/Traits/World/PaletteFromRGBA.cs | 2 +- .../Traits/World/PlayMusicOnMapLoad.cs | 2 +- .../Traits/World/PlayerPaletteFromCurrentTileset.cs | 2 +- OpenRA.Mods.Common/Traits/World/RadarPings.cs | 2 +- OpenRA.Mods.Common/Traits/World/ResourceClaim.cs | 2 +- .../Traits/World/ResourceClaimLayer.cs | 2 +- OpenRA.Mods.Common/Traits/World/ShroudPalette.cs | 2 +- OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs | 2 +- OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs | 2 +- OpenRA.Mods.Common/Traits/World/SpawnMapActors.cs | 2 +- .../Traits/World/StartGameNotification.cs | 2 +- .../Traits/World/TerrainGeometryOverlay.cs | 2 +- OpenRA.Mods.Common/Warheads/LeaveSmudgeWarhead.cs | 1 + .../Widgets/Logic/AssetBrowserLogic.cs | 1 + OpenRA.Mods.Common/Widgets/RadarWidget.cs | 1 + OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs | 1 - OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs | 13 ++++++------- OpenRA.Mods.RA/AI/BaseBuilder.cs | 2 +- OpenRA.Mods.RA/AI/HackyAI.cs | 4 ++-- OpenRA.Mods.RA/AI/SupportPowerDecision.cs | 2 +- OpenRA.Mods.RA/Activities/Air/TakeOff.cs | 2 +- OpenRA.Mods.RA/Activities/FindResources.cs | 1 + OpenRA.Mods.RA/Activities/Repair.cs | 2 +- OpenRA.Mods.RA/Activities/Sell.cs | 2 +- OpenRA.Mods.RA/Activities/Transform.cs | 1 - OpenRA.Mods.RA/Armament.cs | 2 +- OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs | 2 +- OpenRA.Mods.RA/Buildings/Building.cs | 5 +++-- OpenRA.Mods.RA/Buildings/RepairableBuilding.cs | 1 + OpenRA.Mods.RA/Cargo.cs | 5 +++-- OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs | 2 +- OpenRA.Mods.RA/Crates/GrantUpgradeCrateAction.cs | 2 +- OpenRA.Mods.RA/DisableUpgrade.cs | 2 +- OpenRA.Mods.RA/EmitInfantryOnSell.cs | 2 +- OpenRA.Mods.RA/GainsExperience.cs | 2 +- OpenRA.Mods.RA/GivesBounty.cs | 2 +- OpenRA.Mods.RA/GivesExperience.cs | 2 +- .../Infiltration/InfiltrateForPowerOutage.cs | 2 +- OpenRA.Mods.RA/InvulnerabilityUpgrade.cs | 2 +- OpenRA.Mods.RA/OpenRA.Mods.RA.csproj | 3 +-- OpenRA.Mods.RA/Orders/GlobalButtonOrderGenerator.cs | 2 +- OpenRA.Mods.RA/Player/BaseAttackNotifier.cs | 2 +- OpenRA.Mods.RA/Player/ClassicProductionQueue.cs | 2 -- OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs | 2 +- OpenRA.Mods.RA/Player/PlaceBeacon.cs | 2 +- OpenRA.Mods.RA/Player/PlayerStatistics.cs | 2 +- OpenRA.Mods.RA/Player/ProductionQueue.cs | 1 - OpenRA.Mods.RA/Production.cs | 1 - OpenRA.Mods.RA/Repairable.cs | 3 ++- .../Scripting/Properties/ProductionProperties.cs | 1 - OpenRA.Mods.RA/SelfHealing.cs | 2 +- OpenRA.Mods.RA/Sellable.cs | 2 +- OpenRA.Mods.RA/SpawnMPUnits.cs | 2 +- OpenRA.Mods.RA/SupportPowers/GrantUpgradePower.cs | 2 +- OpenRA.Mods.RA/SupportPowers/SupportPower.cs | 2 +- OpenRA.Mods.RA/Traits/Cloak.cs | 2 +- OpenRA.Mods.RA/Traits/Harvester.cs | 1 + OpenRA.Mods.RA/Traits/LeavesHusk.cs | 1 - OpenRA.Mods.RA/UpgradeActorsNear.cs | 2 +- OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs | 1 - OpenRA.Mods.RA/Warheads/GrantUpgradeWarhead.cs | 2 +- .../Widgets/Logic/Ingame/IngamePowerBarLogic.cs | 2 +- .../Widgets/Logic/Ingame/IngamePowerCounterLogic.cs | 2 +- OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs | 1 - OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs | 2 +- .../Widgets/Logic/ProductionTooltipLogic.cs | 1 - OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs | 2 +- 103 files changed, 113 insertions(+), 111 deletions(-) rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/KillsSelf.cs (95%) rename OpenRA.Mods.Common/{ => Traits}/Modifiers/TimedUpgradeBar.cs (97%) rename OpenRA.Mods.Common/{ => Traits}/Upgrades/UpgradableTrait.cs (98%) rename OpenRA.Mods.Common/{ => Traits}/Upgrades/UpgradeManager.cs (99%) diff --git a/OpenRA.Mods.Cnc/Traits/PoisonedByTiberium.cs b/OpenRA.Mods.Cnc/Traits/PoisonedByTiberium.cs index 0f58faeff2..b8579a181d 100644 --- a/OpenRA.Mods.Cnc/Traits/PoisonedByTiberium.cs +++ b/OpenRA.Mods.Cnc/Traits/PoisonedByTiberium.cs @@ -11,9 +11,9 @@ using System.Linq; using OpenRA.Traits; using OpenRA.Mods.RA; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Traits; using OpenRA.GameRules; -using OpenRA.Mods.Common; namespace OpenRA.Mods.Cnc.Traits { diff --git a/OpenRA.Mods.Common/CommonTraitsInterfaces.cs b/OpenRA.Mods.Common/CommonTraitsInterfaces.cs index 17f6f0be74..8ad3d71086 100644 --- a/OpenRA.Mods.Common/CommonTraitsInterfaces.cs +++ b/OpenRA.Mods.Common/CommonTraitsInterfaces.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using OpenRA.Mods.Common.Graphics; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.Common diff --git a/OpenRA.Mods.Common/Effects/PowerdownIndicator.cs b/OpenRA.Mods.Common/Effects/PowerdownIndicator.cs index 96da3461ab..f878a62b82 100644 --- a/OpenRA.Mods.Common/Effects/PowerdownIndicator.cs +++ b/OpenRA.Mods.Common/Effects/PowerdownIndicator.cs @@ -11,7 +11,7 @@ using System.Collections.Generic; using OpenRA.Effects; using OpenRA.Graphics; -using OpenRA.Mods.Common.Power; +using OpenRA.Mods.Common.Traits; namespace OpenRA.Mods.Common.Effects { diff --git a/OpenRA.Mods.Common/Effects/RallyPoint.cs b/OpenRA.Mods.Common/Effects/RallyPoint.cs index 6bbc0f8629..a1561cc530 100644 --- a/OpenRA.Mods.Common/Effects/RallyPoint.cs +++ b/OpenRA.Mods.Common/Effects/RallyPoint.cs @@ -12,13 +12,14 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Effects; using OpenRA.Graphics; +using OpenRA.Mods.Common.Traits; namespace OpenRA.Mods.Common.Effects { class RallyPoint : IEffect { readonly Actor building; - readonly Common.RallyPoint rp; + readonly Common.Traits.RallyPoint rp; readonly string palettePrefix; readonly Animation flag; readonly Animation circles; @@ -28,7 +29,7 @@ namespace OpenRA.Mods.Common.Effects this.building = building; this.palettePrefix = palettePrefix; - rp = building.Trait(); + rp = building.Trait(); flag = new Animation(building.World, "rallypoint"); circles = new Animation(building.World, "rallypoint"); diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index b2b8db7722..44b1d0be0a 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -80,7 +80,6 @@ - @@ -117,8 +116,10 @@ + + @@ -155,6 +156,8 @@ + + @@ -173,8 +176,6 @@ - - diff --git a/OpenRA.Mods.Common/Scripting/Global/ActorGlobal.cs b/OpenRA.Mods.Common/Scripting/Global/ActorGlobal.cs index 638daf08da..227dc80b8e 100644 --- a/OpenRA.Mods.Common/Scripting/Global/ActorGlobal.cs +++ b/OpenRA.Mods.Common/Scripting/Global/ActorGlobal.cs @@ -10,6 +10,7 @@ using System.Linq; using Eluant; +using OpenRA.Mods.Common.Traits; using OpenRA.Primitives; using OpenRA.Scripting; diff --git a/OpenRA.Mods.Common/Scripting/Global/MapGlobal.cs b/OpenRA.Mods.Common/Scripting/Global/MapGlobal.cs index 13a89b5d0e..32ea51a174 100644 --- a/OpenRA.Mods.Common/Scripting/Global/MapGlobal.cs +++ b/OpenRA.Mods.Common/Scripting/Global/MapGlobal.cs @@ -11,6 +11,7 @@ using System; using System.Linq; using Eluant; +using OpenRA.Mods.Common.Traits; using OpenRA.Scripting; namespace OpenRA.Mods.Common.Scripting diff --git a/OpenRA.Mods.Common/Scripting/LuaScript.cs b/OpenRA.Mods.Common/Scripting/LuaScript.cs index fff11d7fe5..58d651d155 100644 --- a/OpenRA.Mods.Common/Scripting/LuaScript.cs +++ b/OpenRA.Mods.Common/Scripting/LuaScript.cs @@ -10,7 +10,7 @@ using System; using OpenRA.Graphics; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Scripting; using OpenRA.Traits; diff --git a/OpenRA.Mods.Common/Scripting/Properties/PowerProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/PowerProperties.cs index fe85ed8233..ff3013ac1b 100644 --- a/OpenRA.Mods.Common/Scripting/Properties/PowerProperties.cs +++ b/OpenRA.Mods.Common/Scripting/Properties/PowerProperties.cs @@ -12,7 +12,8 @@ using System; using System.Collections.Generic; using System.Linq; using Eluant; -using OpenRA.Mods.Common.Power; +using OpenRA.Mods.Common.Traits; +using PowerTrait = OpenRA.Mods.Common.Traits.Power; using OpenRA.Scripting; using OpenRA.Traits; @@ -58,12 +59,12 @@ namespace OpenRA.Mods.Common.Scripting [ScriptPropertyGroup("Power")] public class ActorPowerProperties : ScriptActorProperties, Requires { - readonly IEnumerable power; + readonly IEnumerable power; public ActorPowerProperties(ScriptContext context, Actor self) : base(context, self) { - power = self.TraitsImplementing(); + power = self.TraitsImplementing(); } [Desc("Returns the power drained/provided by this actor.")] diff --git a/OpenRA.Mods.Common/Scripting/Properties/UpgradeProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/UpgradeProperties.cs index 526b227bdf..d6d62c29d7 100644 --- a/OpenRA.Mods.Common/Scripting/Properties/UpgradeProperties.cs +++ b/OpenRA.Mods.Common/Scripting/Properties/UpgradeProperties.cs @@ -8,6 +8,7 @@ */ #endregion +using OpenRA.Mods.Common.Traits; using OpenRA.Scripting; using OpenRA.Traits; diff --git a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs index d37251cf7e..659df43976 100644 --- a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs +++ b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs @@ -13,11 +13,11 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.Graphics; +using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Network; using OpenRA.Server; using S = OpenRA.Server.Server; -using OpenRA.Mods.Common.Server; -using OpenRA.Mods.Common; namespace OpenRA.Mods.Common.Server { diff --git a/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs b/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs index a229760ffa..d7e9c163e3 100644 --- a/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs +++ b/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs @@ -10,6 +10,7 @@ using System.Linq; using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Network; using OpenRA.Server; diff --git a/OpenRA.Mods.Common/Traits/Burns.cs b/OpenRA.Mods.Common/Traits/Burns.cs index c501177445..83a45e5e14 100644 --- a/OpenRA.Mods.Common/Traits/Burns.cs +++ b/OpenRA.Mods.Common/Traits/Burns.cs @@ -9,10 +9,9 @@ #endregion using OpenRA.Graphics; -using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("This actor will play a fire animation over its body and take damage over time.")] class BurnsInfo : ITraitInfo, Requires diff --git a/OpenRA.Mods.Common/Traits/CustomBuildTimeValue.cs b/OpenRA.Mods.Common/Traits/CustomBuildTimeValue.cs index ba06e5d9ad..7bee98498d 100644 --- a/OpenRA.Mods.Common/Traits/CustomBuildTimeValue.cs +++ b/OpenRA.Mods.Common/Traits/CustomBuildTimeValue.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Overrides the build time calculated by actor value.")] public class CustomBuildTimeValueInfo : TraitInfo diff --git a/OpenRA.Mods.Common/Traits/CustomSellValue.cs b/OpenRA.Mods.Common/Traits/CustomSellValue.cs index 1290e9fd76..9c98faba1e 100644 --- a/OpenRA.Mods.Common/Traits/CustomSellValue.cs +++ b/OpenRA.Mods.Common/Traits/CustomSellValue.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Allow a non-standard sell/repair value to avoid buy-sell exploits.")] public class CustomSellValueInfo : TraitInfo diff --git a/OpenRA.Mods.Common/Traits/Demolishable.cs b/OpenRA.Mods.Common/Traits/Demolishable.cs index bbb70a833d..4784350777 100644 --- a/OpenRA.Mods.Common/Traits/Demolishable.cs +++ b/OpenRA.Mods.Common/Traits/Demolishable.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Handle demolitions from C4 explosives.")] public class DemolishableInfo : IDemolishableInfo, ITraitInfo diff --git a/OpenRA.Mods.Common/Traits/Immobile.cs b/OpenRA.Mods.Common/Traits/Immobile.cs index cdcd55aaf4..d858984c37 100644 --- a/OpenRA.Mods.Common/Traits/Immobile.cs +++ b/OpenRA.Mods.Common/Traits/Immobile.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { class ImmobileInfo : ITraitInfo, IOccupySpaceInfo { diff --git a/OpenRA.Mods.RA/KillsSelf.cs b/OpenRA.Mods.Common/Traits/KillsSelf.cs similarity index 95% rename from OpenRA.Mods.RA/KillsSelf.cs rename to OpenRA.Mods.Common/Traits/KillsSelf.cs index 407de06c91..1b97834270 100644 --- a/OpenRA.Mods.RA/KillsSelf.cs +++ b/OpenRA.Mods.Common/Traits/KillsSelf.cs @@ -13,11 +13,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using OpenRA.Effects; -using OpenRA.Mods.Common; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.RA +namespace OpenRA.Mods.Common.Traits { class KillsSelfInfo : UpgradableTraitInfo, ITraitInfo { diff --git a/OpenRA.Mods.Common/Modifiers/TimedUpgradeBar.cs b/OpenRA.Mods.Common/Traits/Modifiers/TimedUpgradeBar.cs similarity index 97% rename from OpenRA.Mods.Common/Modifiers/TimedUpgradeBar.cs rename to OpenRA.Mods.Common/Traits/Modifiers/TimedUpgradeBar.cs index 6e14893de8..3014fb0146 100644 --- a/OpenRA.Mods.Common/Modifiers/TimedUpgradeBar.cs +++ b/OpenRA.Mods.Common/Traits/Modifiers/TimedUpgradeBar.cs @@ -13,7 +13,7 @@ using System.Drawing; using System.Linq; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Visualizes the remaining time for an upgrade.")] class TimedUpgradeBarInfo : ITraitInfo, Requires diff --git a/OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs b/OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs index f354937b36..bbab1a6b3a 100644 --- a/OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs +++ b/OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs @@ -11,7 +11,7 @@ using System.Drawing; using OpenRA.Traits; -namespace OpenRA.Mods.Common.Power +namespace OpenRA.Mods.Common.Traits { [Desc("Disables the actor when a power outage is triggered (see `InfiltrateForPowerOutage` for more information).")] public class AffectedByPowerOutageInfo : ITraitInfo diff --git a/OpenRA.Mods.Common/Traits/Power/CanPowerDown.cs b/OpenRA.Mods.Common/Traits/Power/CanPowerDown.cs index 5225755d55..07e30a03ac 100644 --- a/OpenRA.Mods.Common/Traits/Power/CanPowerDown.cs +++ b/OpenRA.Mods.Common/Traits/Power/CanPowerDown.cs @@ -11,7 +11,7 @@ using OpenRA.Mods.Common.Effects; using OpenRA.Traits; -namespace OpenRA.Mods.Common.Power +namespace OpenRA.Mods.Common.Traits { [Desc("The player can disable the power individually on this actor.")] public class CanPowerDownInfo : UpgradableTraitInfo, ITraitInfo, Requires diff --git a/OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs b/OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs index a93ae75e77..2a3a0cae76 100644 --- a/OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs +++ b/OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Traits; -namespace OpenRA.Mods.Common.Power +namespace OpenRA.Mods.Common.Traits { public class PowerManagerInfo : ITraitInfo, Requires { diff --git a/OpenRA.Mods.Common/Traits/Power/Power.cs b/OpenRA.Mods.Common/Traits/Power/Power.cs index cbac173b1c..cdfb59a1bb 100644 --- a/OpenRA.Mods.Common/Traits/Power/Power.cs +++ b/OpenRA.Mods.Common/Traits/Power/Power.cs @@ -12,7 +12,7 @@ using System; using System.Linq; using OpenRA.Traits; -namespace OpenRA.Mods.Common.Power +namespace OpenRA.Mods.Common.Traits { public class PowerInfo : UpgradableTraitInfo, ITraitInfo { diff --git a/OpenRA.Mods.Common/Traits/Power/RequiresPower.cs b/OpenRA.Mods.Common/Traits/Power/RequiresPower.cs index 41a9ddfdef..1362e3fb24 100644 --- a/OpenRA.Mods.Common/Traits/Power/RequiresPower.cs +++ b/OpenRA.Mods.Common/Traits/Power/RequiresPower.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.Common.Power +namespace OpenRA.Mods.Common.Traits { [Desc("Needs power to operate.")] class RequiresPowerInfo : ITraitInfo diff --git a/OpenRA.Mods.Common/Traits/Power/ScalePowerWithHealth.cs b/OpenRA.Mods.Common/Traits/Power/ScalePowerWithHealth.cs index 6e42759bc9..a39f679838 100644 --- a/OpenRA.Mods.Common/Traits/Power/ScalePowerWithHealth.cs +++ b/OpenRA.Mods.Common/Traits/Power/ScalePowerWithHealth.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.Common.Power +namespace OpenRA.Mods.Common.Traits { [Desc("Scale power amount with the current health.")] public class ScalePowerWithHealthInfo : ITraitInfo, Requires, Requires diff --git a/OpenRA.Mods.Common/Traits/RallyPoint.cs b/OpenRA.Mods.Common/Traits/RallyPoint.cs index 8e1294a0c3..16e02c8578 100644 --- a/OpenRA.Mods.Common/Traits/RallyPoint.cs +++ b/OpenRA.Mods.Common/Traits/RallyPoint.cs @@ -11,7 +11,7 @@ using System.Collections.Generic; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Used to waypoint units after production or repair is finished.")] public class RallyPointInfo : ITraitInfo diff --git a/OpenRA.Mods.Common/Traits/ShakeOnDeath.cs b/OpenRA.Mods.Common/Traits/ShakeOnDeath.cs index 3ac259f27a..63fb583008 100644 --- a/OpenRA.Mods.Common/Traits/ShakeOnDeath.cs +++ b/OpenRA.Mods.Common/Traits/ShakeOnDeath.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { public class ShakeOnDeathInfo : ITraitInfo { diff --git a/OpenRA.Mods.Common/Traits/Sound/SoundOnDamageTransition.cs b/OpenRA.Mods.Common/Traits/Sound/SoundOnDamageTransition.cs index 9b1f6f7bf2..bdde773a31 100644 --- a/OpenRA.Mods.Common/Traits/Sound/SoundOnDamageTransition.cs +++ b/OpenRA.Mods.Common/Traits/Sound/SoundOnDamageTransition.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { public class SoundOnDamageTransitionInfo : ITraitInfo { diff --git a/OpenRA.Mods.Common/Upgrades/UpgradableTrait.cs b/OpenRA.Mods.Common/Traits/Upgrades/UpgradableTrait.cs similarity index 98% rename from OpenRA.Mods.Common/Upgrades/UpgradableTrait.cs rename to OpenRA.Mods.Common/Traits/Upgrades/UpgradableTrait.cs index 1e10ce2e58..2cf75cf25c 100644 --- a/OpenRA.Mods.Common/Upgrades/UpgradableTrait.cs +++ b/OpenRA.Mods.Common/Traits/Upgrades/UpgradableTrait.cs @@ -11,7 +11,7 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { /// Use as base class for *Info to subclass of UpgradableTrait. (See UpgradableTrait.) public abstract class UpgradableTraitInfo diff --git a/OpenRA.Mods.Common/Upgrades/UpgradeManager.cs b/OpenRA.Mods.Common/Traits/Upgrades/UpgradeManager.cs similarity index 99% rename from OpenRA.Mods.Common/Upgrades/UpgradeManager.cs rename to OpenRA.Mods.Common/Traits/Upgrades/UpgradeManager.cs index 0e8ce1f7e0..920626d319 100644 --- a/OpenRA.Mods.Common/Upgrades/UpgradeManager.cs +++ b/OpenRA.Mods.Common/Traits/Upgrades/UpgradeManager.cs @@ -16,7 +16,7 @@ using OpenRA.Graphics; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Attach this to a unit to enable dynamic upgrades by warheads, experience, crates, support powers, etc.")] public class UpgradeManagerInfo : ITraitInfo diff --git a/OpenRA.Mods.Common/Traits/Valued.cs b/OpenRA.Mods.Common/Traits/Valued.cs index 3648ce8a27..913d1f1902 100644 --- a/OpenRA.Mods.Common/Traits/Valued.cs +++ b/OpenRA.Mods.Common/Traits/Valued.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("How much the unit is worth.")] public class ValuedInfo : TraitInfo diff --git a/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs b/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs index aa7f05bb1b..b015d41ee2 100644 --- a/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs +++ b/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs @@ -12,7 +12,7 @@ using System.Linq; using OpenRA.Network; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Attach this to the world actor.")] public class CreateMPPlayersInfo : TraitInfo { } diff --git a/OpenRA.Mods.Common/Traits/World/MPStartLocations.cs b/OpenRA.Mods.Common/Traits/World/MPStartLocations.cs index 790d820a98..d20a247f9f 100644 --- a/OpenRA.Mods.Common/Traits/World/MPStartLocations.cs +++ b/OpenRA.Mods.Common/Traits/World/MPStartLocations.cs @@ -15,7 +15,7 @@ using OpenRA.Graphics; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { public class MPStartLocationsInfo : TraitInfo { diff --git a/OpenRA.Mods.Common/Traits/World/MPStartUnits.cs b/OpenRA.Mods.Common/Traits/World/MPStartUnits.cs index e370bc2738..8bafae7cb5 100644 --- a/OpenRA.Mods.Common/Traits/World/MPStartUnits.cs +++ b/OpenRA.Mods.Common/Traits/World/MPStartUnits.cs @@ -10,7 +10,7 @@ using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Used by SpawnMPUnits. Attach these to the world actor. You can have multiple variants by adding @suffixes.")] public class MPStartUnitsInfo : TraitInfo diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromCurrentTileset.cs b/OpenRA.Mods.Common/Traits/World/PaletteFromCurrentTileset.cs index 3d523abbd6..5a743f23a1 100644 --- a/OpenRA.Mods.Common/Traits/World/PaletteFromCurrentTileset.cs +++ b/OpenRA.Mods.Common/Traits/World/PaletteFromCurrentTileset.cs @@ -12,7 +12,7 @@ using OpenRA.FileSystem; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Loads the palette specified in the tileset definition")] class PaletteFromCurrentTilesetInfo : ITraitInfo diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs b/OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs index 8aeda5d10b..f0db6a262c 100644 --- a/OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs +++ b/OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs @@ -12,7 +12,7 @@ using OpenRA.FileSystem; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { class PaletteFromFileInfo : ITraitInfo { diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromRGBA.cs b/OpenRA.Mods.Common/Traits/World/PaletteFromRGBA.cs index d194ce8215..daddb136be 100644 --- a/OpenRA.Mods.Common/Traits/World/PaletteFromRGBA.cs +++ b/OpenRA.Mods.Common/Traits/World/PaletteFromRGBA.cs @@ -12,7 +12,7 @@ using System.Linq; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Creates a single color palette without any base palette file.")] class PaletteFromRGBAInfo : ITraitInfo diff --git a/OpenRA.Mods.Common/Traits/World/PlayMusicOnMapLoad.cs b/OpenRA.Mods.Common/Traits/World/PlayMusicOnMapLoad.cs index cd9ac50202..d963f41d48 100644 --- a/OpenRA.Mods.Common/Traits/World/PlayMusicOnMapLoad.cs +++ b/OpenRA.Mods.Common/Traits/World/PlayMusicOnMapLoad.cs @@ -12,7 +12,7 @@ using System; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { class PlayMusicOnMapLoadInfo : ITraitInfo { diff --git a/OpenRA.Mods.Common/Traits/World/PlayerPaletteFromCurrentTileset.cs b/OpenRA.Mods.Common/Traits/World/PlayerPaletteFromCurrentTileset.cs index ad42eb7dcc..76691c393b 100644 --- a/OpenRA.Mods.Common/Traits/World/PlayerPaletteFromCurrentTileset.cs +++ b/OpenRA.Mods.Common/Traits/World/PlayerPaletteFromCurrentTileset.cs @@ -12,7 +12,7 @@ using OpenRA.FileSystem; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { class PlayerPaletteFromCurrentTilesetInfo : ITraitInfo { diff --git a/OpenRA.Mods.Common/Traits/World/RadarPings.cs b/OpenRA.Mods.Common/Traits/World/RadarPings.cs index cc65dc886f..6bd49f7377 100644 --- a/OpenRA.Mods.Common/Traits/World/RadarPings.cs +++ b/OpenRA.Mods.Common/Traits/World/RadarPings.cs @@ -13,7 +13,7 @@ using System.Collections.Generic; using System.Drawing; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { public class RadarPingsInfo : ITraitInfo { diff --git a/OpenRA.Mods.Common/Traits/World/ResourceClaim.cs b/OpenRA.Mods.Common/Traits/World/ResourceClaim.cs index 5604fd5006..7daa4bc1e8 100644 --- a/OpenRA.Mods.Common/Traits/World/ResourceClaim.cs +++ b/OpenRA.Mods.Common/Traits/World/ResourceClaim.cs @@ -8,7 +8,7 @@ */ #endregion -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { public sealed class ResourceClaim { diff --git a/OpenRA.Mods.Common/Traits/World/ResourceClaimLayer.cs b/OpenRA.Mods.Common/Traits/World/ResourceClaimLayer.cs index 1bbec5b0d4..78de0f0266 100644 --- a/OpenRA.Mods.Common/Traits/World/ResourceClaimLayer.cs +++ b/OpenRA.Mods.Common/Traits/World/ResourceClaimLayer.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Allows harvesters to coordinate their operations. Attach this to the world actor.")] public sealed class ResourceClaimLayerInfo : TraitInfo { } diff --git a/OpenRA.Mods.Common/Traits/World/ShroudPalette.cs b/OpenRA.Mods.Common/Traits/World/ShroudPalette.cs index ff51213d86..4021140a45 100644 --- a/OpenRA.Mods.Common/Traits/World/ShroudPalette.cs +++ b/OpenRA.Mods.Common/Traits/World/ShroudPalette.cs @@ -13,7 +13,7 @@ using System.Linq; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Adds the hard-coded shroud palette to the game")] class ShroudPaletteInfo : ITraitInfo diff --git a/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs b/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs index 1d7f288370..c9b2b859c6 100644 --- a/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs +++ b/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs @@ -12,7 +12,7 @@ using System; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { public class ShroudRendererInfo : ITraitInfo { diff --git a/OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs b/OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs index 1eac416834..b8963e9fa2 100644 --- a/OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs +++ b/OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs @@ -14,7 +14,7 @@ using OpenRA.Graphics; using OpenRA.Mods.Common.Effects; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Attach this to the world actor.", "Order of the layers defines the Z sorting.")] public class SmudgeLayerInfo : ITraitInfo diff --git a/OpenRA.Mods.Common/Traits/World/SpawnMapActors.cs b/OpenRA.Mods.Common/Traits/World/SpawnMapActors.cs index a64fb62ffd..a50d214d32 100644 --- a/OpenRA.Mods.Common/Traits/World/SpawnMapActors.cs +++ b/OpenRA.Mods.Common/Traits/World/SpawnMapActors.cs @@ -13,7 +13,7 @@ using System.Linq; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Spawns the initial units for each player upon game start.")] public class SpawnMapActorsInfo : TraitInfo { } diff --git a/OpenRA.Mods.Common/Traits/World/StartGameNotification.cs b/OpenRA.Mods.Common/Traits/World/StartGameNotification.cs index 514968f466..9a7dd8fccf 100644 --- a/OpenRA.Mods.Common/Traits/World/StartGameNotification.cs +++ b/OpenRA.Mods.Common/Traits/World/StartGameNotification.cs @@ -11,7 +11,7 @@ using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { class StartGameNotificationInfo : ITraitInfo { diff --git a/OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs b/OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs index f68b7d22c3..08c73bfd93 100644 --- a/OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs +++ b/OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs @@ -15,7 +15,7 @@ using System.Linq; using OpenRA.Traits; using OpenRA.Graphics; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [Desc("Renders a debug overlay showing the terrain cells. Attach this to the world actor.")] public class TerrainGeometryOverlayInfo : ITraitInfo diff --git a/OpenRA.Mods.Common/Warheads/LeaveSmudgeWarhead.cs b/OpenRA.Mods.Common/Warheads/LeaveSmudgeWarhead.cs index 63330d0184..bef3f45cf9 100644 --- a/OpenRA.Mods.Common/Warheads/LeaveSmudgeWarhead.cs +++ b/OpenRA.Mods.Common/Warheads/LeaveSmudgeWarhead.cs @@ -13,6 +13,7 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Effects; using OpenRA.GameRules; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.Common diff --git a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs index 90c63657e4..a6e3452cc6 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs @@ -15,6 +15,7 @@ using System.IO; using System.Linq; using OpenRA.FileSystem; using OpenRA.Graphics; +using OpenRA.Mods.Common.Traits; using OpenRA.Widgets; namespace OpenRA.Mods.Common.Widgets.Logic diff --git a/OpenRA.Mods.Common/Widgets/RadarWidget.cs b/OpenRA.Mods.Common/Widgets/RadarWidget.cs index dcd64bd350..a1d44b1b3e 100644 --- a/OpenRA.Mods.Common/Widgets/RadarWidget.cs +++ b/OpenRA.Mods.Common/Widgets/RadarWidget.cs @@ -12,6 +12,7 @@ using System; using System.Drawing; using System.Linq; using OpenRA.Graphics; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; using OpenRA.Widgets; diff --git a/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs index b9a94774de..fa35568f0a 100644 --- a/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs +++ b/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs @@ -14,7 +14,6 @@ using System.Drawing; using System.Linq; using OpenRA.Graphics; using OpenRA.Mods.Common; -using OpenRA.Mods.Common.Power; using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA; using OpenRA.Mods.RA.Buildings; diff --git a/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs index 8a6e27b557..a4c64fba71 100644 --- a/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs +++ b/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs @@ -11,15 +11,14 @@ using System; using System.Drawing; using System.Linq; -using OpenRA.Mods.RA; -using OpenRA.Mods.Common.Power; -using OpenRA.Mods.RA.Widgets; -using OpenRA.Mods.RA.Widgets.Logic; -using OpenRA.Mods.D2k.Widgets; -using OpenRA.Traits; -using OpenRA.Widgets; using OpenRA.Mods.Common.Widgets; using OpenRA.Mods.Common.Traits; +using OpenRA.Mods.D2k.Widgets; +using OpenRA.Mods.RA; +using OpenRA.Mods.RA.Widgets; +using OpenRA.Mods.RA.Widgets.Logic; +using OpenRA.Traits; +using OpenRA.Widgets; namespace OpenRA.Mods.D2k.Widgets.Logic { diff --git a/OpenRA.Mods.RA/AI/BaseBuilder.cs b/OpenRA.Mods.RA/AI/BaseBuilder.cs index bfca998600..a5600ca94c 100644 --- a/OpenRA.Mods.RA/AI/BaseBuilder.cs +++ b/OpenRA.Mods.RA/AI/BaseBuilder.cs @@ -11,7 +11,7 @@ using System; using System.Collections.Generic; using System.Linq; -using OpenRA.Mods.Common.Power; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Traits; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/AI/HackyAI.cs b/OpenRA.Mods.RA/AI/HackyAI.cs index 99c996b802..9540e623bc 100644 --- a/OpenRA.Mods.RA/AI/HackyAI.cs +++ b/OpenRA.Mods.RA/AI/HackyAI.cs @@ -13,11 +13,11 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Activities; -using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Buildings; +using OpenRA.Mods.RA.Traits; using OpenRA.Mods.RA.Move; -using OpenRA.Mods.Common.Power; using OpenRA.Primitives; using OpenRA.Support; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/AI/SupportPowerDecision.cs b/OpenRA.Mods.RA/AI/SupportPowerDecision.cs index 20cded50a2..30e6d93be4 100644 --- a/OpenRA.Mods.RA/AI/SupportPowerDecision.cs +++ b/OpenRA.Mods.RA/AI/SupportPowerDecision.cs @@ -13,7 +13,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using OpenRA; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.AI; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Activities/Air/TakeOff.cs b/OpenRA.Mods.RA/Activities/Air/TakeOff.cs index 85d53dbce3..060a33ae16 100644 --- a/OpenRA.Mods.RA/Activities/Air/TakeOff.cs +++ b/OpenRA.Mods.RA/Activities/Air/TakeOff.cs @@ -8,7 +8,7 @@ */ #endregion -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Traits; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Activities/FindResources.cs b/OpenRA.Mods.RA/Activities/FindResources.cs index f966c45086..6dff4d5751 100755 --- a/OpenRA.Mods.RA/Activities/FindResources.cs +++ b/OpenRA.Mods.RA/Activities/FindResources.cs @@ -13,6 +13,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Traits; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Activities/Repair.cs b/OpenRA.Mods.RA/Activities/Repair.cs index 0b76337cd3..fc02e9cdbd 100644 --- a/OpenRA.Mods.RA/Activities/Repair.cs +++ b/OpenRA.Mods.RA/Activities/Repair.cs @@ -9,7 +9,7 @@ #endregion using System; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Traits; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Activities/Sell.cs b/OpenRA.Mods.RA/Activities/Sell.cs index bf0428ef22..0e74983a9f 100755 --- a/OpenRA.Mods.RA/Activities/Sell.cs +++ b/OpenRA.Mods.RA/Activities/Sell.cs @@ -8,7 +8,7 @@ */ #endregion -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Effects; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Activities/Transform.cs b/OpenRA.Mods.RA/Activities/Transform.cs index 6c02c76b85..cfbe59a43a 100644 --- a/OpenRA.Mods.RA/Activities/Transform.cs +++ b/OpenRA.Mods.RA/Activities/Transform.cs @@ -9,7 +9,6 @@ #endregion using System.Linq; -using OpenRA.Mods.Common; using OpenRA.Mods.Common.Traits; using OpenRA.Primitives; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Armament.cs b/OpenRA.Mods.RA/Armament.cs index 2ab5798dc5..2f463560df 100644 --- a/OpenRA.Mods.RA/Armament.cs +++ b/OpenRA.Mods.RA/Armament.cs @@ -12,7 +12,7 @@ using System; using System.Collections.Generic; using System.Linq; using OpenRA.GameRules; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Primitives; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs b/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs index f1317dc115..87c80e1979 100644 --- a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs +++ b/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs @@ -10,7 +10,7 @@ using System.Linq; using OpenRA.GameRules; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Render; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Buildings/Building.cs b/OpenRA.Mods.RA/Buildings/Building.cs index 62ddf624d1..bb00c26577 100644 --- a/OpenRA.Mods.RA/Buildings/Building.cs +++ b/OpenRA.Mods.RA/Buildings/Building.cs @@ -11,10 +11,11 @@ using System; using System.Collections.Generic; using System.Linq; +using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; +using OpenRA.Mods.RA.Render; using OpenRA.Primitives; using OpenRA.Traits; -using OpenRA.Mods.Common; -using OpenRA.Mods.RA.Render; namespace OpenRA.Mods.RA.Buildings { diff --git a/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs b/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs index 96710080a6..d93256bc54 100755 --- a/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs +++ b/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs @@ -13,6 +13,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Effects; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Cargo.cs b/OpenRA.Mods.RA/Cargo.cs index a503d7fa26..dcee29aeea 100644 --- a/OpenRA.Mods.RA/Cargo.cs +++ b/OpenRA.Mods.RA/Cargo.cs @@ -13,10 +13,11 @@ using System.Linq; using System.Collections.Generic; using OpenRA.Traits; using OpenRA.Primitives; +using OpenRA.Mods.Common.Orders; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Traits; -using OpenRA.Mods.Common; -using OpenRA.Mods.Common.Orders; + namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs b/OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs index 8a74aabdfe..0ce20f8673 100644 --- a/OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs +++ b/OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs @@ -11,7 +11,7 @@ using System; using System.Collections.Generic; using System.Linq; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Move; using OpenRA.Primitives; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Crates/GrantUpgradeCrateAction.cs b/OpenRA.Mods.RA/Crates/GrantUpgradeCrateAction.cs index 6e69a8c362..b2163d3e99 100644 --- a/OpenRA.Mods.RA/Crates/GrantUpgradeCrateAction.cs +++ b/OpenRA.Mods.RA/Crates/GrantUpgradeCrateAction.cs @@ -9,7 +9,7 @@ #endregion using System.Linq; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.RA.Crates diff --git a/OpenRA.Mods.RA/DisableUpgrade.cs b/OpenRA.Mods.RA/DisableUpgrade.cs index a1814e6a92..3f1bfe77da 100644 --- a/OpenRA.Mods.RA/DisableUpgrade.cs +++ b/OpenRA.Mods.RA/DisableUpgrade.cs @@ -11,7 +11,7 @@ using System; using System.Collections.Generic; using OpenRA.GameRules; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.RA diff --git a/OpenRA.Mods.RA/EmitInfantryOnSell.cs b/OpenRA.Mods.RA/EmitInfantryOnSell.cs index 9853b4a5e3..cc8ad2fd70 100644 --- a/OpenRA.Mods.RA/EmitInfantryOnSell.cs +++ b/OpenRA.Mods.RA/EmitInfantryOnSell.cs @@ -9,7 +9,7 @@ #endregion using System.Linq; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Buildings; using OpenRA.Primitives; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/GainsExperience.cs b/OpenRA.Mods.RA/GainsExperience.cs index 57d746e6a5..e21d48db47 100644 --- a/OpenRA.Mods.RA/GainsExperience.cs +++ b/OpenRA.Mods.RA/GainsExperience.cs @@ -11,7 +11,7 @@ using System; using System.Collections.Generic; using System.Linq; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Effects; using OpenRA.Mods.RA.Effects; using OpenRA.Primitives; diff --git a/OpenRA.Mods.RA/GivesBounty.cs b/OpenRA.Mods.RA/GivesBounty.cs index fc680f4469..c65f38940e 100644 --- a/OpenRA.Mods.RA/GivesBounty.cs +++ b/OpenRA.Mods.RA/GivesBounty.cs @@ -9,7 +9,7 @@ #endregion using System.Linq; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Effects; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/GivesExperience.cs b/OpenRA.Mods.RA/GivesExperience.cs index d3bdc9dd31..d3cb6527ed 100644 --- a/OpenRA.Mods.RA/GivesExperience.cs +++ b/OpenRA.Mods.RA/GivesExperience.cs @@ -8,7 +8,7 @@ */ #endregion -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.RA diff --git a/OpenRA.Mods.RA/Infiltration/InfiltrateForPowerOutage.cs b/OpenRA.Mods.RA/Infiltration/InfiltrateForPowerOutage.cs index a710375cd3..927ee9c16a 100644 --- a/OpenRA.Mods.RA/Infiltration/InfiltrateForPowerOutage.cs +++ b/OpenRA.Mods.RA/Infiltration/InfiltrateForPowerOutage.cs @@ -9,7 +9,7 @@ #endregion using System.Linq; -using OpenRA.Mods.Common.Power; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.RA.Infiltration diff --git a/OpenRA.Mods.RA/InvulnerabilityUpgrade.cs b/OpenRA.Mods.RA/InvulnerabilityUpgrade.cs index 378f8e3a4f..2423e06e7a 100644 --- a/OpenRA.Mods.RA/InvulnerabilityUpgrade.cs +++ b/OpenRA.Mods.RA/InvulnerabilityUpgrade.cs @@ -11,7 +11,7 @@ using System; using System.Collections.Generic; using OpenRA.GameRules; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.RA diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 94f8d9665c..d588759330 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -431,7 +431,6 @@ - @@ -490,4 +489,4 @@ copy "FuzzyLogicLibrary.dll" "$(SolutionDir)" cd "$(SolutionDir)" - \ No newline at end of file + diff --git a/OpenRA.Mods.RA/Orders/GlobalButtonOrderGenerator.cs b/OpenRA.Mods.RA/Orders/GlobalButtonOrderGenerator.cs index 4ae4f941e2..f228f576e6 100755 --- a/OpenRA.Mods.RA/Orders/GlobalButtonOrderGenerator.cs +++ b/OpenRA.Mods.RA/Orders/GlobalButtonOrderGenerator.cs @@ -11,7 +11,7 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Graphics; -using OpenRA.Mods.Common.Power; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.RA.Orders diff --git a/OpenRA.Mods.RA/Player/BaseAttackNotifier.cs b/OpenRA.Mods.RA/Player/BaseAttackNotifier.cs index 5ffca4c8b0..d05f570cef 100644 --- a/OpenRA.Mods.RA/Player/BaseAttackNotifier.cs +++ b/OpenRA.Mods.RA/Player/BaseAttackNotifier.cs @@ -9,7 +9,7 @@ #endregion using System.Drawing; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Buildings; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Player/ClassicProductionQueue.cs b/OpenRA.Mods.RA/Player/ClassicProductionQueue.cs index 6e709072b0..12e4c7dd97 100644 --- a/OpenRA.Mods.RA/Player/ClassicProductionQueue.cs +++ b/OpenRA.Mods.RA/Player/ClassicProductionQueue.cs @@ -10,8 +10,6 @@ using System.Collections.Generic; using System.Linq; -using OpenRA.Mods.Common; -using OpenRA.Mods.Common.Power; using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Traits; diff --git a/OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs b/OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs index c05f2ff4ef..3b3e5e564f 100644 --- a/OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs +++ b/OpenRA.Mods.RA/Player/HarvesterAttackNotifier.cs @@ -9,7 +9,7 @@ #endregion using System.Drawing; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.RA.Traits diff --git a/OpenRA.Mods.RA/Player/PlaceBeacon.cs b/OpenRA.Mods.RA/Player/PlaceBeacon.cs index a06e1ff534..5263dd1325 100644 --- a/OpenRA.Mods.RA/Player/PlaceBeacon.cs +++ b/OpenRA.Mods.RA/Player/PlaceBeacon.cs @@ -8,7 +8,7 @@ */ #endregion -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Effects; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Player/PlayerStatistics.cs b/OpenRA.Mods.RA/Player/PlayerStatistics.cs index 6c2b8ac65b..82bfaa0bad 100644 --- a/OpenRA.Mods.RA/Player/PlayerStatistics.cs +++ b/OpenRA.Mods.RA/Player/PlayerStatistics.cs @@ -10,7 +10,7 @@ using System.Collections.Generic; using System.Linq; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Buildings; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Player/ProductionQueue.cs b/OpenRA.Mods.RA/Player/ProductionQueue.cs index 725272fd06..f9157e605b 100644 --- a/OpenRA.Mods.RA/Player/ProductionQueue.cs +++ b/OpenRA.Mods.RA/Player/ProductionQueue.cs @@ -12,7 +12,6 @@ using System; using System.Collections.Generic; using System.Linq; using OpenRA.Mods.Common; -using OpenRA.Mods.Common.Power; using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Buildings; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Production.cs b/OpenRA.Mods.RA/Production.cs index 94a9b3f573..95e807a713 100755 --- a/OpenRA.Mods.RA/Production.cs +++ b/OpenRA.Mods.RA/Production.cs @@ -11,7 +11,6 @@ using System; using System.Drawing; using System.Linq; -using OpenRA.Mods.Common; using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Traits; diff --git a/OpenRA.Mods.RA/Repairable.cs b/OpenRA.Mods.RA/Repairable.cs index 84023ed53f..07a6b3d606 100644 --- a/OpenRA.Mods.RA/Repairable.cs +++ b/OpenRA.Mods.RA/Repairable.cs @@ -11,11 +11,12 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; +using OpenRA.Mods.Common; using OpenRA.Mods.Common.Orders; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Buildings; using OpenRA.Traits; -using OpenRA.Mods.Common; namespace OpenRA.Mods.RA { diff --git a/OpenRA.Mods.RA/Scripting/Properties/ProductionProperties.cs b/OpenRA.Mods.RA/Scripting/Properties/ProductionProperties.cs index 4cb86ee74b..721365480c 100644 --- a/OpenRA.Mods.RA/Scripting/Properties/ProductionProperties.cs +++ b/OpenRA.Mods.RA/Scripting/Properties/ProductionProperties.cs @@ -12,7 +12,6 @@ using Eluant; using System; using System.Collections.Generic; using System.Linq; -using OpenRA.Mods.Common; using OpenRA.Mods.Common.Scripting; using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Activities; diff --git a/OpenRA.Mods.RA/SelfHealing.cs b/OpenRA.Mods.RA/SelfHealing.cs index 89f3a46ecc..e2a8a8f67d 100644 --- a/OpenRA.Mods.RA/SelfHealing.cs +++ b/OpenRA.Mods.RA/SelfHealing.cs @@ -10,7 +10,7 @@ using System; using System.Linq; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.RA diff --git a/OpenRA.Mods.RA/Sellable.cs b/OpenRA.Mods.RA/Sellable.cs index 85d6ed94ea..6301dae583 100644 --- a/OpenRA.Mods.RA/Sellable.cs +++ b/OpenRA.Mods.RA/Sellable.cs @@ -9,7 +9,7 @@ #endregion using System.Linq; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Render; diff --git a/OpenRA.Mods.RA/SpawnMPUnits.cs b/OpenRA.Mods.RA/SpawnMPUnits.cs index 15c42a0eb9..02fe55ecda 100644 --- a/OpenRA.Mods.RA/SpawnMPUnits.cs +++ b/OpenRA.Mods.RA/SpawnMPUnits.cs @@ -11,7 +11,7 @@ using System; using System.Linq; using OpenRA.Graphics; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Move; using OpenRA.Primitives; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/SupportPowers/GrantUpgradePower.cs b/OpenRA.Mods.RA/SupportPowers/GrantUpgradePower.cs index 1540718efd..ff4fb5618c 100644 --- a/OpenRA.Mods.RA/SupportPowers/GrantUpgradePower.cs +++ b/OpenRA.Mods.RA/SupportPowers/GrantUpgradePower.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.Graphics; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Render; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/SupportPowers/SupportPower.cs b/OpenRA.Mods.RA/SupportPowers/SupportPower.cs index c91c8d4ac0..93ac8d56ef 100755 --- a/OpenRA.Mods.RA/SupportPowers/SupportPower.cs +++ b/OpenRA.Mods.RA/SupportPowers/SupportPower.cs @@ -8,7 +8,7 @@ */ #endregion -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.RA diff --git a/OpenRA.Mods.RA/Traits/Cloak.cs b/OpenRA.Mods.RA/Traits/Cloak.cs index 859504536e..4a462cd3ac 100644 --- a/OpenRA.Mods.RA/Traits/Cloak.cs +++ b/OpenRA.Mods.RA/Traits/Cloak.cs @@ -13,7 +13,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.Graphics; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.RA.Traits diff --git a/OpenRA.Mods.RA/Traits/Harvester.cs b/OpenRA.Mods.RA/Traits/Harvester.cs index 0e47cfdd9e..0605553f6a 100644 --- a/OpenRA.Mods.RA/Traits/Harvester.cs +++ b/OpenRA.Mods.RA/Traits/Harvester.cs @@ -12,6 +12,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Orders; using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Move; diff --git a/OpenRA.Mods.RA/Traits/LeavesHusk.cs b/OpenRA.Mods.RA/Traits/LeavesHusk.cs index 9df010d4aa..4daf9ca877 100644 --- a/OpenRA.Mods.RA/Traits/LeavesHusk.cs +++ b/OpenRA.Mods.RA/Traits/LeavesHusk.cs @@ -9,7 +9,6 @@ #endregion using System.Linq; -using OpenRA.Mods.Common; using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Move; using OpenRA.Primitives; diff --git a/OpenRA.Mods.RA/UpgradeActorsNear.cs b/OpenRA.Mods.RA/UpgradeActorsNear.cs index 8346e2db18..d05397f487 100644 --- a/OpenRA.Mods.RA/UpgradeActorsNear.cs +++ b/OpenRA.Mods.RA/UpgradeActorsNear.cs @@ -11,7 +11,7 @@ using System; using System.Collections.Generic; using OpenRA.GameRules; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.RA diff --git a/OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs b/OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs index 1b81d68106..0b2b36988f 100644 --- a/OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs +++ b/OpenRA.Mods.RA/UtilityCommands/ActorStatsExport.cs @@ -13,7 +13,6 @@ using System.Collections.Generic; using System.Data; using System.Linq; using OpenRA.GameRules; -using OpenRA.Mods.Common; using OpenRA.Mods.Common.Traits; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Warheads/GrantUpgradeWarhead.cs b/OpenRA.Mods.RA/Warheads/GrantUpgradeWarhead.cs index 013db37dd6..c551eec29d 100644 --- a/OpenRA.Mods.RA/Warheads/GrantUpgradeWarhead.cs +++ b/OpenRA.Mods.RA/Warheads/GrantUpgradeWarhead.cs @@ -13,7 +13,7 @@ using System.Linq; using OpenRA.Effects; using OpenRA.GameRules; using OpenRA.Traits; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Effects; namespace OpenRA.Mods.RA diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs index 0eb901b1e5..afe3f0962e 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs @@ -10,7 +10,7 @@ using System.Drawing; using OpenRA.Mods.Common.Widgets; -using OpenRA.Mods.Common.Power; +using OpenRA.Mods.Common.Traits; using OpenRA.Widgets; namespace OpenRA.Mods.RA.Widgets.Logic diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs index c380058b19..7651ca9a64 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs @@ -10,7 +10,7 @@ using System.Drawing; using OpenRA.Mods.Common.Widgets; -using OpenRA.Mods.Common.Power; +using OpenRA.Mods.Common.Traits; using OpenRA.Widgets; namespace OpenRA.Mods.RA.Widgets.Logic diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index e662ed63fe..688a0ac7a5 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -14,7 +14,6 @@ using System.Drawing; using System.Linq; using System.Threading; using OpenRA.Graphics; -using OpenRA.Mods.Common; using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Widgets; using OpenRA.Network; diff --git a/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs index d55ad543bd..abaefd3eea 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs @@ -14,7 +14,7 @@ using System.Drawing; using System.Linq; using OpenRA.Graphics; using OpenRA.Mods.Common; -using OpenRA.Mods.Common.Power; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Traits; using OpenRA.Network; using OpenRA.Traits; diff --git a/OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs index d6d8fed731..a0c3ce7bbb 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs @@ -12,7 +12,6 @@ using System; using System.Drawing; using System.Linq; using OpenRA.Mods.Common; -using OpenRA.Mods.Common.Power; using OpenRA.Mods.Common.Traits; using OpenRA.Traits; using OpenRA.Widgets; diff --git a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs index c7c46c7dec..067c360a48 100644 --- a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs +++ b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs @@ -12,7 +12,7 @@ using System; using System.Drawing; using System.Linq; using OpenRA.Graphics; -using OpenRA.Mods.Common; +using OpenRA.Mods.Common.Traits; using OpenRA.Mods.RA.Traits; using OpenRA.Orders; using OpenRA.Primitives;