diff --git a/Makefile b/Makefile index 5bb87d9fdb..e22d93f259 100644 --- a/Makefile +++ b/Makefile @@ -146,15 +146,6 @@ test_dll: $(test_dll_TARGET) STD_MOD_LIBS = $(game_TARGET) STD_MOD_DEPS = $(STD_MOD_LIBS) -# Red Alert -mod_ra_SRCS := $(shell find OpenRA.Mods.RA/ -iname '*.cs') -mod_ra_TARGET = mods/ra/OpenRA.Mods.RA.dll -mod_ra_KIND = library -mod_ra_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) -mod_ra_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) -PROGRAMS += mod_ra -mod_ra: $(mod_ra_TARGET) - # Command and Conquer mod_cnc_SRCS := $(shell find OpenRA.Mods.Cnc/ -iname '*.cs') mod_cnc_TARGET = mods/cnc/OpenRA.Mods.Cnc.dll @@ -196,9 +187,6 @@ check: utility mods @echo "Checking for code style violations in OpenRA.Mods.Common..." @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Common @echo - @echo "Checking for code style violations in OpenRA.Mods.RA..." - @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.RA - @echo @echo "Checking for code style violations in OpenRA.Mods.Cnc..." @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Cnc @echo @@ -313,7 +301,7 @@ tools: gamemonitor package: all-dependencies core tools docs version -mods: mod_common mod_ra mod_cnc mod_d2k +mods: mod_common mod_cnc mod_d2k all: dependencies core tools @@ -378,8 +366,6 @@ install-core: default @$(INSTALL_PROGRAM) $(mod_common_TARGET) "$(DATA_INSTALL_DIR)/mods/common" @$(CP_R) mods/cnc "$(DATA_INSTALL_DIR)/mods/" @$(INSTALL_PROGRAM) $(mod_cnc_TARGET) "$(DATA_INSTALL_DIR)/mods/cnc" - @$(CP_R) mods/ra "$(DATA_INSTALL_DIR)/mods/" - @$(INSTALL_PROGRAM) $(mod_ra_TARGET) "$(DATA_INSTALL_DIR)/mods/ra" @$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/" @$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k" @$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/" diff --git a/OpenRA.Mods.RA/Activities/Infiltrate.cs b/OpenRA.Mods.Cnc/Activities/Infiltrate.cs similarity index 97% rename from OpenRA.Mods.RA/Activities/Infiltrate.cs rename to OpenRA.Mods.Cnc/Activities/Infiltrate.cs index 44e139a5ff..f92124fd47 100644 --- a/OpenRA.Mods.RA/Activities/Infiltrate.cs +++ b/OpenRA.Mods.Cnc/Activities/Infiltrate.cs @@ -13,7 +13,7 @@ using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.Cnc.Activities { class Infiltrate : Enter { diff --git a/OpenRA.Mods.RA/Activities/LayMines.cs b/OpenRA.Mods.Cnc/Activities/LayMines.cs similarity index 97% rename from OpenRA.Mods.RA/Activities/LayMines.cs rename to OpenRA.Mods.Cnc/Activities/LayMines.cs index b179d89029..2fb4100d41 100644 --- a/OpenRA.Mods.RA/Activities/LayMines.cs +++ b/OpenRA.Mods.Cnc/Activities/LayMines.cs @@ -12,13 +12,13 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Activities; +using OpenRA.Mods.Cnc.Traits; using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Traits; -using OpenRA.Mods.RA.Traits; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.Cnc.Activities { // Assumes you have Minelayer on that unit public class LayMines : Activity diff --git a/OpenRA.Mods.RA/Activities/Leap.cs b/OpenRA.Mods.Cnc/Activities/Leap.cs similarity index 98% rename from OpenRA.Mods.RA/Activities/Leap.cs rename to OpenRA.Mods.Cnc/Activities/Leap.cs index 06cffc6e49..beb89645d8 100644 --- a/OpenRA.Mods.RA/Activities/Leap.cs +++ b/OpenRA.Mods.Cnc/Activities/Leap.cs @@ -17,7 +17,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits.Render; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.Cnc.Activities { class Leap : Activity { diff --git a/OpenRA.Mods.RA/Activities/Teleport.cs b/OpenRA.Mods.Cnc/Activities/Teleport.cs similarity index 98% rename from OpenRA.Mods.RA/Activities/Teleport.cs rename to OpenRA.Mods.Cnc/Activities/Teleport.cs index 8231350ee0..843f1ea43e 100644 --- a/OpenRA.Mods.RA/Activities/Teleport.cs +++ b/OpenRA.Mods.Cnc/Activities/Teleport.cs @@ -12,12 +12,12 @@ using System; using System.Linq; using OpenRA.Activities; +using OpenRA.Mods.Cnc.Traits; using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits.Render; -using OpenRA.Mods.RA.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Activities +namespace OpenRA.Mods.Cnc.Activities { public interface IPreventsTeleport { bool PreventsTeleport(Actor self); } diff --git a/OpenRA.Mods.RA/Effects/GpsDot.cs b/OpenRA.Mods.Cnc/Effects/GpsDot.cs similarity index 98% rename from OpenRA.Mods.RA/Effects/GpsDot.cs rename to OpenRA.Mods.Cnc/Effects/GpsDot.cs index 4066a75c0a..220eb0c659 100644 --- a/OpenRA.Mods.RA/Effects/GpsDot.cs +++ b/OpenRA.Mods.Cnc/Effects/GpsDot.cs @@ -13,12 +13,12 @@ using System; using System.Collections.Generic; using OpenRA.Effects; using OpenRA.Graphics; +using OpenRA.Mods.Cnc.Traits; using OpenRA.Mods.Common.Traits; -using OpenRA.Mods.RA.Traits; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Effects +namespace OpenRA.Mods.Cnc.Effects { [Desc("Attach this to actors to render pictograms while hidden.")] class GpsDotInfo : ITraitInfo diff --git a/OpenRA.Mods.RA/Effects/GpsSatellite.cs b/OpenRA.Mods.Cnc/Effects/GpsSatellite.cs similarity index 95% rename from OpenRA.Mods.RA/Effects/GpsSatellite.cs rename to OpenRA.Mods.Cnc/Effects/GpsSatellite.cs index 2d848551e1..7ef7efdb1d 100644 --- a/OpenRA.Mods.RA/Effects/GpsSatellite.cs +++ b/OpenRA.Mods.Cnc/Effects/GpsSatellite.cs @@ -12,9 +12,9 @@ using System.Collections.Generic; using OpenRA.Effects; using OpenRA.Graphics; -using OpenRA.Mods.RA.Traits; +using OpenRA.Mods.Cnc.Traits; -namespace OpenRA.Mods.RA.Effects +namespace OpenRA.Mods.Cnc.Effects { class GpsSatellite : IEffect { diff --git a/OpenRA.Mods.RA/Effects/SatelliteLaunch.cs b/OpenRA.Mods.Cnc/Effects/SatelliteLaunch.cs similarity index 96% rename from OpenRA.Mods.RA/Effects/SatelliteLaunch.cs rename to OpenRA.Mods.Cnc/Effects/SatelliteLaunch.cs index 68293e91c1..9afdaa88be 100644 --- a/OpenRA.Mods.RA/Effects/SatelliteLaunch.cs +++ b/OpenRA.Mods.Cnc/Effects/SatelliteLaunch.cs @@ -12,9 +12,9 @@ using System.Collections.Generic; using OpenRA.Effects; using OpenRA.Graphics; -using OpenRA.Mods.RA.Traits; +using OpenRA.Mods.Cnc.Traits; -namespace OpenRA.Mods.RA.Effects +namespace OpenRA.Mods.Cnc.Effects { class SatelliteLaunch : IEffect { diff --git a/OpenRA.Mods.RA/Graphics/TeslaZapRenderable.cs b/OpenRA.Mods.Cnc/Graphics/TeslaZapRenderable.cs similarity index 99% rename from OpenRA.Mods.RA/Graphics/TeslaZapRenderable.cs rename to OpenRA.Mods.Cnc/Graphics/TeslaZapRenderable.cs index 45becce24c..ac8698c700 100644 --- a/OpenRA.Mods.RA/Graphics/TeslaZapRenderable.cs +++ b/OpenRA.Mods.Cnc/Graphics/TeslaZapRenderable.cs @@ -15,7 +15,7 @@ using System.Drawing; using System.Linq; using OpenRA.Graphics; -namespace OpenRA.Mods.RA.Graphics +namespace OpenRA.Mods.Cnc.Graphics { struct TeslaZapRenderable : IRenderable, IFinalizedRenderable { diff --git a/OpenRA.Mods.RA/ImportRedAlertLegacyMapCommand.cs b/OpenRA.Mods.Cnc/ImportRedAlertLegacyMapCommand.cs similarity index 99% rename from OpenRA.Mods.RA/ImportRedAlertLegacyMapCommand.cs rename to OpenRA.Mods.Cnc/ImportRedAlertLegacyMapCommand.cs index c0a9c1e22a..c4f76aca0d 100644 --- a/OpenRA.Mods.RA/ImportRedAlertLegacyMapCommand.cs +++ b/OpenRA.Mods.Cnc/ImportRedAlertLegacyMapCommand.cs @@ -18,7 +18,7 @@ using OpenRA.Mods.Common.FileFormats; using OpenRA.Mods.Common.UtilityCommands; using OpenRA.Primitives; -namespace OpenRA.Mods.RA.UtilityCommands +namespace OpenRA.Mods.Cnc.UtilityCommands { class ImportRedAlertLegacyMapCommand : ImportLegacyMapCommand, IUtilityCommand { diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj index f1ec2a9372..55129da5df 100644 --- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj +++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj @@ -93,6 +93,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenRA.Mods.RA/Projectiles/TeslaZap.cs b/OpenRA.Mods.Cnc/Projectiles/TeslaZap.cs similarity index 96% rename from OpenRA.Mods.RA/Projectiles/TeslaZap.cs rename to OpenRA.Mods.Cnc/Projectiles/TeslaZap.cs index 486b8ce25b..a59682e907 100644 --- a/OpenRA.Mods.RA/Projectiles/TeslaZap.cs +++ b/OpenRA.Mods.Cnc/Projectiles/TeslaZap.cs @@ -13,10 +13,10 @@ using System.Collections.Generic; using OpenRA.Effects; using OpenRA.GameRules; using OpenRA.Graphics; -using OpenRA.Mods.RA.Graphics; +using OpenRA.Mods.Cnc.Graphics; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Projectiles +namespace OpenRA.Mods.Cnc.Projectiles { public class TeslaZapInfo : IProjectileInfo { diff --git a/OpenRA.Mods.RA/Scripting/Properties/ChronosphereProperties.cs b/OpenRA.Mods.Cnc/Scripting/Properties/ChronosphereProperties.cs similarity index 95% rename from OpenRA.Mods.RA/Scripting/Properties/ChronosphereProperties.cs rename to OpenRA.Mods.Cnc/Scripting/Properties/ChronosphereProperties.cs index e049352130..17f85b4f7f 100644 --- a/OpenRA.Mods.RA/Scripting/Properties/ChronosphereProperties.cs +++ b/OpenRA.Mods.Cnc/Scripting/Properties/ChronosphereProperties.cs @@ -10,11 +10,11 @@ #endregion using Eluant; -using OpenRA.Mods.RA.Traits; +using OpenRA.Mods.Cnc.Traits; using OpenRA.Scripting; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Scripting +namespace OpenRA.Mods.Cnc.Scripting { [ScriptPropertyGroup("Support Powers")] public class ChronsphereProperties : ScriptActorProperties, Requires diff --git a/OpenRA.Mods.RA/Scripting/Properties/DisguiseProperties.cs b/OpenRA.Mods.Cnc/Scripting/Properties/DisguiseProperties.cs similarity index 94% rename from OpenRA.Mods.RA/Scripting/Properties/DisguiseProperties.cs rename to OpenRA.Mods.Cnc/Scripting/Properties/DisguiseProperties.cs index ad7b252dab..517e1d2fb1 100644 --- a/OpenRA.Mods.RA/Scripting/Properties/DisguiseProperties.cs +++ b/OpenRA.Mods.Cnc/Scripting/Properties/DisguiseProperties.cs @@ -9,11 +9,11 @@ */ #endregion -using OpenRA.Mods.RA.Traits; +using OpenRA.Mods.Cnc.Traits; using OpenRA.Scripting; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Scripting +namespace OpenRA.Mods.Cnc.Scripting { [ScriptPropertyGroup("Ability")] public class DisguiseProperties : ScriptActorProperties, Requires diff --git a/OpenRA.Mods.RA/Scripting/Properties/InfiltrateProperties.cs b/OpenRA.Mods.Cnc/Scripting/Properties/InfiltrateProperties.cs similarity index 90% rename from OpenRA.Mods.RA/Scripting/Properties/InfiltrateProperties.cs rename to OpenRA.Mods.Cnc/Scripting/Properties/InfiltrateProperties.cs index 675a9b4a1b..1a64dd7194 100644 --- a/OpenRA.Mods.RA/Scripting/Properties/InfiltrateProperties.cs +++ b/OpenRA.Mods.Cnc/Scripting/Properties/InfiltrateProperties.cs @@ -9,12 +9,12 @@ */ #endregion -using OpenRA.Mods.RA.Activities; -using OpenRA.Mods.RA.Traits; +using OpenRA.Mods.Cnc.Activities; +using OpenRA.Mods.Cnc.Traits; using OpenRA.Scripting; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Scripting +namespace OpenRA.Mods.Cnc.Scripting { [ScriptPropertyGroup("Ability")] public class InfiltrateProperties : ScriptActorProperties, Requires diff --git a/OpenRA.Mods.RA/Traits/Attack/AttackLeap.cs b/OpenRA.Mods.Cnc/Traits/Attack/AttackLeap.cs similarity index 95% rename from OpenRA.Mods.RA/Traits/Attack/AttackLeap.cs rename to OpenRA.Mods.Cnc/Traits/Attack/AttackLeap.cs index d7e9078277..a8b6067b36 100644 --- a/OpenRA.Mods.RA/Traits/Attack/AttackLeap.cs +++ b/OpenRA.Mods.Cnc/Traits/Attack/AttackLeap.cs @@ -11,11 +11,11 @@ using System.Collections.Generic; using System.Linq; +using OpenRA.Mods.Cnc.Activities; using OpenRA.Mods.Common.Traits; -using OpenRA.Mods.RA.Activities; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("Dogs use this attack model.")] class AttackLeapInfo : AttackFrontalInfo diff --git a/OpenRA.Mods.RA/Traits/Buildings/ClonesProducedUnits.cs b/OpenRA.Mods.Cnc/Traits/Buildings/ClonesProducedUnits.cs similarity index 98% rename from OpenRA.Mods.RA/Traits/Buildings/ClonesProducedUnits.cs rename to OpenRA.Mods.Cnc/Traits/Buildings/ClonesProducedUnits.cs index a8ae2999d9..b3134f7420 100644 --- a/OpenRA.Mods.RA/Traits/Buildings/ClonesProducedUnits.cs +++ b/OpenRA.Mods.Cnc/Traits/Buildings/ClonesProducedUnits.cs @@ -14,7 +14,7 @@ using OpenRA.Mods.Common; using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("Creates a free duplicate of produced units.")] public class ClonesProducedUnitsInfo : ITraitInfo, Requires, Requires diff --git a/OpenRA.Mods.RA/Traits/Chronoshiftable.cs b/OpenRA.Mods.Cnc/Traits/Chronoshiftable.cs similarity index 98% rename from OpenRA.Mods.RA/Traits/Chronoshiftable.cs rename to OpenRA.Mods.Cnc/Traits/Chronoshiftable.cs index 044ad96b39..845a634018 100644 --- a/OpenRA.Mods.RA/Traits/Chronoshiftable.cs +++ b/OpenRA.Mods.Cnc/Traits/Chronoshiftable.cs @@ -10,12 +10,12 @@ #endregion using System.Drawing; +using OpenRA.Mods.Cnc.Activities; using OpenRA.Mods.Common.Traits; -using OpenRA.Mods.RA.Activities; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("Can be teleported via Chronoshift power.")] public class ChronoshiftableInfo : ITraitInfo diff --git a/OpenRA.Mods.RA/Traits/Cloneable.cs b/OpenRA.Mods.Cnc/Traits/Cloneable.cs similarity index 95% rename from OpenRA.Mods.RA/Traits/Cloneable.cs rename to OpenRA.Mods.Cnc/Traits/Cloneable.cs index c30335e110..53c954e579 100644 --- a/OpenRA.Mods.RA/Traits/Cloneable.cs +++ b/OpenRA.Mods.Cnc/Traits/Cloneable.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("Actors with the \"ClonesProducedUnits\" trait will produce a free duplicate of me.")] public class CloneableInfo : TraitInfo diff --git a/OpenRA.Mods.RA/Traits/Disguise.cs b/OpenRA.Mods.Cnc/Traits/Disguise.cs similarity index 99% rename from OpenRA.Mods.RA/Traits/Disguise.cs rename to OpenRA.Mods.Cnc/Traits/Disguise.cs index dd97345527..76686f7f10 100644 --- a/OpenRA.Mods.RA/Traits/Disguise.cs +++ b/OpenRA.Mods.Cnc/Traits/Disguise.cs @@ -18,7 +18,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits.Render; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("Overrides the default ToolTip when this actor is disguised (aids in deceiving enemy players).")] class DisguiseToolTipInfo : TooltipInfo, Requires diff --git a/OpenRA.Mods.RA/Traits/FrozenUnderFogUpdatedByGps.cs b/OpenRA.Mods.Cnc/Traits/FrozenUnderFogUpdatedByGps.cs similarity index 99% rename from OpenRA.Mods.RA/Traits/FrozenUnderFogUpdatedByGps.cs rename to OpenRA.Mods.Cnc/Traits/FrozenUnderFogUpdatedByGps.cs index f48cee1827..3ac4baa932 100644 --- a/OpenRA.Mods.RA/Traits/FrozenUnderFogUpdatedByGps.cs +++ b/OpenRA.Mods.Cnc/Traits/FrozenUnderFogUpdatedByGps.cs @@ -14,7 +14,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { using FrozenActorAction = Action; diff --git a/OpenRA.Mods.RA/Traits/GpsWatcher.cs b/OpenRA.Mods.Cnc/Traits/GpsWatcher.cs similarity index 97% rename from OpenRA.Mods.RA/Traits/GpsWatcher.cs rename to OpenRA.Mods.Cnc/Traits/GpsWatcher.cs index 3825442aa2..f715bff223 100644 --- a/OpenRA.Mods.RA/Traits/GpsWatcher.cs +++ b/OpenRA.Mods.Cnc/Traits/GpsWatcher.cs @@ -12,11 +12,11 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Effects; +using OpenRA.Mods.Cnc.Effects; using OpenRA.Mods.Common.Traits; -using OpenRA.Mods.RA.Effects; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("Required for `GpsPower`. Attach this to the player actor.")] class GpsWatcherInfo : ITraitInfo diff --git a/OpenRA.Mods.RA/Traits/HarvesterHuskModifier.cs b/OpenRA.Mods.Cnc/Traits/HarvesterHuskModifier.cs similarity index 97% rename from OpenRA.Mods.RA/Traits/HarvesterHuskModifier.cs rename to OpenRA.Mods.Cnc/Traits/HarvesterHuskModifier.cs index 6a716f4206..65aad6d2d8 100644 --- a/OpenRA.Mods.RA/Traits/HarvesterHuskModifier.cs +++ b/OpenRA.Mods.Cnc/Traits/HarvesterHuskModifier.cs @@ -12,7 +12,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { public class HarvesterHuskModifierInfo : ITraitInfo, Requires { diff --git a/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForCash.cs b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForCash.cs similarity index 98% rename from OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForCash.cs rename to OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForCash.cs index e038de1886..3709bc87c7 100644 --- a/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForCash.cs +++ b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForCash.cs @@ -14,7 +14,7 @@ using OpenRA.Mods.Common.Effects; using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("This structure can be infiltrated causing funds to be stolen.")] class InfiltrateForCashInfo : ITraitInfo diff --git a/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForDecoration.cs b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForDecoration.cs similarity index 97% rename from OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForDecoration.cs rename to OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForDecoration.cs index f50c016a33..af42b2d82d 100644 --- a/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForDecoration.cs +++ b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForDecoration.cs @@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits.Render; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("Reveals a decoration sprite to the indicated players when infiltrated.")] class InfiltrateForDecorationInfo : WithDecorationInfo diff --git a/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForExploration.cs b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForExploration.cs similarity index 96% rename from OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForExploration.cs rename to OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForExploration.cs index 1f5d4dfd31..f4b9ac0e8a 100644 --- a/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForExploration.cs +++ b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForExploration.cs @@ -12,7 +12,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("Steal and reset the owner's exploration.")] class InfiltrateForExplorationInfo : TraitInfo { } diff --git a/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForPowerOutage.cs b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForPowerOutage.cs similarity index 97% rename from OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForPowerOutage.cs rename to OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForPowerOutage.cs index f19eed9f1b..c0f7b2c884 100644 --- a/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForPowerOutage.cs +++ b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForPowerOutage.cs @@ -12,7 +12,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { class InfiltrateForPowerOutageInfo : ITraitInfo { diff --git a/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForSupportPower.cs b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForSupportPower.cs similarity index 97% rename from OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForSupportPower.cs rename to OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForSupportPower.cs index 4be14c669a..aa73249ac4 100644 --- a/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForSupportPower.cs +++ b/OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForSupportPower.cs @@ -13,7 +13,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { class InfiltrateForSupportPowerInfo : ITraitInfo { diff --git a/OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs b/OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs similarity index 98% rename from OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs rename to OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs index d0065fc7c9..1e45f834f8 100644 --- a/OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs +++ b/OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs @@ -12,14 +12,14 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; +using OpenRA.Mods.Cnc.Activities; using OpenRA.Mods.Common; using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Orders; using OpenRA.Mods.Common.Traits; -using OpenRA.Mods.RA.Activities; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { class InfiltratesInfo : ITraitInfo { diff --git a/OpenRA.Mods.RA/Traits/MadTank.cs b/OpenRA.Mods.Cnc/Traits/MadTank.cs similarity index 98% rename from OpenRA.Mods.RA/Traits/MadTank.cs rename to OpenRA.Mods.Cnc/Traits/MadTank.cs index d071fa4514..a4dca69d4f 100644 --- a/OpenRA.Mods.RA/Traits/MadTank.cs +++ b/OpenRA.Mods.Cnc/Traits/MadTank.cs @@ -14,16 +14,16 @@ using System.Drawing; using System.Linq; using OpenRA.Activities; using OpenRA.GameRules; +using OpenRA.Mods.Cnc.Activities; using OpenRA.Mods.Common; using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Orders; using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits.Render; -using OpenRA.Mods.RA.Activities; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { class MadTankInfo : ITraitInfo, IRulesetLoaded, Requires, Requires { diff --git a/OpenRA.Mods.RA/Traits/Mine.cs b/OpenRA.Mods.Cnc/Traits/Mine.cs similarity index 98% rename from OpenRA.Mods.RA/Traits/Mine.cs rename to OpenRA.Mods.Cnc/Traits/Mine.cs index 043a0f4a2d..1420d1303c 100644 --- a/OpenRA.Mods.RA/Traits/Mine.cs +++ b/OpenRA.Mods.Cnc/Traits/Mine.cs @@ -13,7 +13,7 @@ using System.Collections.Generic; using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { class MineInfo : ITraitInfo { diff --git a/OpenRA.Mods.RA/Traits/Minelayer.cs b/OpenRA.Mods.Cnc/Traits/Minelayer.cs similarity index 99% rename from OpenRA.Mods.RA/Traits/Minelayer.cs rename to OpenRA.Mods.Cnc/Traits/Minelayer.cs index 3e6b449727..0c7320dac8 100644 --- a/OpenRA.Mods.RA/Traits/Minelayer.cs +++ b/OpenRA.Mods.Cnc/Traits/Minelayer.cs @@ -13,11 +13,11 @@ using System; using System.Collections.Generic; using System.Linq; using OpenRA.Graphics; +using OpenRA.Mods.Cnc.Activities; using OpenRA.Mods.Common.Orders; -using OpenRA.Mods.RA.Activities; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { public class MinelayerInfo : ITraitInfo { diff --git a/OpenRA.Mods.RA/Traits/PaletteEffects/ChronoshiftPaletteEffect.cs b/OpenRA.Mods.Cnc/Traits/PaletteEffects/ChronoshiftPaletteEffect.cs similarity index 98% rename from OpenRA.Mods.RA/Traits/PaletteEffects/ChronoshiftPaletteEffect.cs rename to OpenRA.Mods.Cnc/Traits/PaletteEffects/ChronoshiftPaletteEffect.cs index edc1c8f53a..d54d4df3d8 100644 --- a/OpenRA.Mods.RA/Traits/PaletteEffects/ChronoshiftPaletteEffect.cs +++ b/OpenRA.Mods.Cnc/Traits/PaletteEffects/ChronoshiftPaletteEffect.cs @@ -13,7 +13,7 @@ using System.Drawing; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("Apply palette full screen rotations during chronoshifts. Add this to the world actor.")] public class ChronoshiftPaletteEffectInfo : ITraitInfo diff --git a/OpenRA.Mods.RA/Traits/PaletteEffects/LightPaletteRotator.cs b/OpenRA.Mods.Cnc/Traits/PaletteEffects/LightPaletteRotator.cs similarity index 97% rename from OpenRA.Mods.RA/Traits/PaletteEffects/LightPaletteRotator.cs rename to OpenRA.Mods.Cnc/Traits/PaletteEffects/LightPaletteRotator.cs index dc2c55b463..13ed8c21ad 100644 --- a/OpenRA.Mods.RA/Traits/PaletteEffects/LightPaletteRotator.cs +++ b/OpenRA.Mods.Cnc/Traits/PaletteEffects/LightPaletteRotator.cs @@ -13,7 +13,7 @@ using System.Collections.Generic; using OpenRA.Graphics; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("Palette effect used for blinking \"animations\" on actors.")] class LightPaletteRotatorInfo : ITraitInfo diff --git a/OpenRA.Mods.RA/Traits/PortableChrono.cs b/OpenRA.Mods.Cnc/Traits/PortableChrono.cs similarity index 98% rename from OpenRA.Mods.RA/Traits/PortableChrono.cs rename to OpenRA.Mods.Cnc/Traits/PortableChrono.cs index 285df02509..992b818e2b 100644 --- a/OpenRA.Mods.RA/Traits/PortableChrono.cs +++ b/OpenRA.Mods.Cnc/Traits/PortableChrono.cs @@ -12,12 +12,12 @@ using System.Collections.Generic; using System.Drawing; using OpenRA.Graphics; +using OpenRA.Mods.Cnc.Activities; using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Orders; -using OpenRA.Mods.RA.Activities; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { class PortableChronoInfo : ITraitInfo { diff --git a/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs b/OpenRA.Mods.Cnc/Traits/Render/RenderJammerCircle.cs similarity index 98% rename from OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs rename to OpenRA.Mods.Cnc/Traits/Render/RenderJammerCircle.cs index 27a86f150b..5e6b2b37b6 100644 --- a/OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs +++ b/OpenRA.Mods.Cnc/Traits/Render/RenderJammerCircle.cs @@ -17,7 +17,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits.Radar; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { // TODO: remove all the Render*Circle duplication class RenderJammerCircleInfo : TraitInfo, IPlaceBuildingDecorationInfo diff --git a/OpenRA.Mods.RA/Traits/Render/RenderShroudCircle.cs b/OpenRA.Mods.Cnc/Traits/Render/RenderShroudCircle.cs similarity index 98% rename from OpenRA.Mods.RA/Traits/Render/RenderShroudCircle.cs rename to OpenRA.Mods.Cnc/Traits/Render/RenderShroudCircle.cs index d0d11c5e60..c3bbd3f688 100644 --- a/OpenRA.Mods.RA/Traits/Render/RenderShroudCircle.cs +++ b/OpenRA.Mods.Cnc/Traits/Render/RenderShroudCircle.cs @@ -17,7 +17,7 @@ using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { class RenderShroudCircleInfo : TraitInfo, IPlaceBuildingDecorationInfo { diff --git a/OpenRA.Mods.RA/Traits/Render/WithDisguisingInfantryBody.cs b/OpenRA.Mods.Cnc/Traits/Render/WithDisguisingInfantryBody.cs similarity index 97% rename from OpenRA.Mods.RA/Traits/Render/WithDisguisingInfantryBody.cs rename to OpenRA.Mods.Cnc/Traits/Render/WithDisguisingInfantryBody.cs index 847c80f90f..c1fe39ab94 100644 --- a/OpenRA.Mods.RA/Traits/Render/WithDisguisingInfantryBody.cs +++ b/OpenRA.Mods.Cnc/Traits/Render/WithDisguisingInfantryBody.cs @@ -13,7 +13,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits.Render; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits.Render +namespace OpenRA.Mods.Cnc.Traits.Render { class WithDisguisingInfantryBodyInfo : WithInfantryBodyInfo, Requires { diff --git a/OpenRA.Mods.RA/Traits/Render/WithLandingCraftAnimation.cs b/OpenRA.Mods.Cnc/Traits/Render/WithLandingCraftAnimation.cs similarity index 98% rename from OpenRA.Mods.RA/Traits/Render/WithLandingCraftAnimation.cs rename to OpenRA.Mods.Cnc/Traits/Render/WithLandingCraftAnimation.cs index 3aad86fb27..5bcd8249a1 100644 --- a/OpenRA.Mods.RA/Traits/Render/WithLandingCraftAnimation.cs +++ b/OpenRA.Mods.Cnc/Traits/Render/WithLandingCraftAnimation.cs @@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits.Render; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits.Render +namespace OpenRA.Mods.Cnc.Traits.Render { public class WithLandingCraftAnimationInfo : ITraitInfo, Requires, Requires, Requires { diff --git a/OpenRA.Mods.RA/Traits/SupportPowers/ChronoshiftPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs similarity index 99% rename from OpenRA.Mods.RA/Traits/SupportPowers/ChronoshiftPower.cs rename to OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs index 64741ec2bf..8c2e8e41af 100644 --- a/OpenRA.Mods.RA/Traits/SupportPowers/ChronoshiftPower.cs +++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs @@ -13,12 +13,12 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.Graphics; +using OpenRA.Mods.Cnc.Activities; using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Traits; -using OpenRA.Mods.RA.Activities; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { class ChronoshiftPowerInfo : SupportPowerInfo { diff --git a/OpenRA.Mods.RA/Traits/SupportPowers/GpsPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/GpsPower.cs similarity index 98% rename from OpenRA.Mods.RA/Traits/SupportPowers/GpsPower.cs rename to OpenRA.Mods.Cnc/Traits/SupportPowers/GpsPower.cs index 0c8d87ec6c..b0570a57af 100644 --- a/OpenRA.Mods.RA/Traits/SupportPowers/GpsPower.cs +++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/GpsPower.cs @@ -12,12 +12,12 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Effects; +using OpenRA.Mods.Cnc.Effects; using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits.Radar; -using OpenRA.Mods.RA.Effects; using OpenRA.Traits; -namespace OpenRA.Mods.RA.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("Requires `GpsWatcher` on the player actor.")] class GpsPowerInfo : SupportPowerInfo diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj deleted file mode 100644 index 7829d003a3..0000000000 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ /dev/null @@ -1,161 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E} - Library - Properties - OpenRA.Mods.RA - OpenRA.Mods.RA - 512 - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - v4.5 - - - true - full - bin\Debug\ - DEBUG;TRACE - x86 - prompt - AllRules.ruleset - true - - - true - bin\Release\ - TRACE - true - pdbonly - x86 - prompt - AllRules.ruleset - true - - - - - - - ..\thirdparty\download\Eluant.dll - False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {0DFB103F-2962-400F-8C6D-E2C28CCBA633} - OpenRA.Game - False - - - {fe6c8cc0-2f07-442a-b29f-17617b3b7fc6} - OpenRA.Mods.Common - False - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - - - diff --git a/OpenRA.sln b/OpenRA.sln index 15bdff8635..490f3531a5 100644 --- a/OpenRA.sln +++ b/OpenRA.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Game", "OpenRA.Game\OpenRA.Game.csproj", "{0DFB103F-2962-400F-8C6D-E2C28CCBA633}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.RA", "OpenRA.Mods.RA\OpenRA.Mods.RA.csproj", "{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Cnc", "OpenRA.Mods.Cnc\OpenRA.Mods.Cnc.csproj", "{2881135D-4D62-493E-8F83-5EEE92CCC6BE}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Utility", "OpenRA.Utility\OpenRA.Utility.csproj", "{F33337BE-CB69-4B24-850F-07D23E408DDF}" @@ -138,10 +136,6 @@ Global {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|x86.Build.0 = Debug|x86 {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.ActiveCfg = Release|x86 {0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|x86.Build.0 = Release|x86 - {4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|x86.ActiveCfg = Debug|x86 - {4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|x86.Build.0 = Debug|x86 - {4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|x86.ActiveCfg = Release|x86 - {4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|x86.Build.0 = Release|x86 {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|x86.ActiveCfg = Debug|x86 {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|x86.Build.0 = Debug|x86 {2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|x86.ActiveCfg = Release|x86 diff --git a/make.ps1 b/make.ps1 index 036baa6ee1..cfde718c8b 100644 --- a/make.ps1 +++ b/make.ps1 @@ -137,8 +137,6 @@ function Check-Command { ./OpenRA.Utility.exe ra --check-code-style OpenRA.Game echo "Checking for code style violations in OpenRA.Mods.Common..." ./OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Common - echo "Checking for code style violations in OpenRA.Mods.RA..." - ./OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.RA echo "Checking for code style violations in OpenRA.Mods.Cnc..." ./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.Cnc echo "Checking for code style violations in OpenRA.Mods.D2k..." diff --git a/mods/all/mod.yaml b/mods/all/mod.yaml index ee08e83056..5a24940a90 100644 --- a/mods/all/mod.yaml +++ b/mods/all/mod.yaml @@ -16,7 +16,6 @@ Chrome: Assemblies: ./mods/common/OpenRA.Mods.Common.dll - ./mods/ra/OpenRA.Mods.RA.dll ./mods/d2k/OpenRA.Mods.D2k.dll ./mods/cnc/OpenRA.Mods.Cnc.dll diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index 908078c7c0..01fc4f2cce 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -80,7 +80,6 @@ Chrome: Assemblies: common|OpenRA.Mods.Common.dll - ra|OpenRA.Mods.RA.dll cnc|OpenRA.Mods.Cnc.dll ChromeLayout: diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index e51d479402..80142dcded 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -127,7 +127,6 @@ Chrome: Assemblies: common|OpenRA.Mods.Common.dll - ra|OpenRA.Mods.RA.dll cnc|OpenRA.Mods.Cnc.dll ChromeLayout: