diff --git a/Makefile b/Makefile index fa23470aaf..5e5cca3568 100644 --- a/Makefile +++ b/Makefile @@ -173,15 +173,6 @@ mod_d2k_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) PROGRAMS += mod_d2k mod_d2k: $(mod_d2k_TARGET) -# Tiberian Sun -mod_ts_SRCS := $(shell find OpenRA.Mods.TS/ -iname '*.cs') -mod_ts_TARGET = mods/ts/OpenRA.Mods.TS.dll -mod_ts_KIND = library -mod_ts_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET) -mod_ts_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET) -PROGRAMS += mod_ts -mod_ts: $(mod_ts_TARGET) - check-scripts: @echo @echo "Checking for Lua syntax errors..." @@ -214,9 +205,6 @@ check: utility mods @echo "Checking for code style violations in OpenRA.Mods.D2k..." @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.D2k @echo - @echo "Checking for code style violations in OpenRA.Mods.TS..." - @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.TS - @echo @echo "Checking for code style violations in OpenRA.Utility..." @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Utility @echo @@ -325,7 +313,7 @@ tools: gamemonitor package: all-dependencies core tools docs version -mods: mod_common mod_ra mod_cnc mod_d2k mod_ts +mods: mod_common mod_ra mod_cnc mod_d2k all: dependencies core tools diff --git a/OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs b/OpenRA.Mods.Cnc/Activities/VoxelHarvesterDockSequence.cs similarity index 96% rename from OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs rename to OpenRA.Mods.Cnc/Activities/VoxelHarvesterDockSequence.cs index e96c7dd0e0..704a7ca874 100644 --- a/OpenRA.Mods.TS/Activities/VoxelHarvesterDockSequence.cs +++ b/OpenRA.Mods.Cnc/Activities/VoxelHarvesterDockSequence.cs @@ -10,10 +10,10 @@ #endregion using OpenRA.Activities; +using OpenRA.Mods.Cnc.Traits.Render; using OpenRA.Mods.Common.Activities; -using OpenRA.Mods.TS.Traits.Render; -namespace OpenRA.Mods.TS.Activities +namespace OpenRA.Mods.Cnc.Activities { public class VoxelHarvesterDockSequence : HarvesterDockSequence { diff --git a/OpenRA.Mods.TS/Effects/AnimatedBeacon.cs b/OpenRA.Mods.Cnc/Effects/AnimatedBeacon.cs similarity index 93% rename from OpenRA.Mods.TS/Effects/AnimatedBeacon.cs rename to OpenRA.Mods.Cnc/Effects/AnimatedBeacon.cs index 2a370c796e..5a8aba3489 100644 --- a/OpenRA.Mods.TS/Effects/AnimatedBeacon.cs +++ b/OpenRA.Mods.Cnc/Effects/AnimatedBeacon.cs @@ -16,7 +16,7 @@ using OpenRA.Effects; using OpenRA.Graphics; using OpenRA.Scripting; -namespace OpenRA.Mods.TS.Effects +namespace OpenRA.Mods.Cnc.Effects { public class AnimatedBeacon : IEffect, IEffectAboveShroud { @@ -44,9 +44,6 @@ namespace OpenRA.Mods.TS.Effects beacon = new Animation(owner.World, beaconImage); beacon.PlayRepeating(beaconSequence); } - - if (duration > 0) - owner.World.Add(new DelayedAction(duration, () => owner.World.Remove(this))); } void IEffect.Tick(World world) diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj index 3a99e74eb0..8be3ae3637 100644 --- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj +++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj @@ -74,6 +74,22 @@ + + + + + + + + + + + + + + + + diff --git a/OpenRA.Mods.TS/Player/PlaceSimpleBeacon.cs b/OpenRA.Mods.Cnc/Player/PlaceSimpleBeacon.cs similarity index 97% rename from OpenRA.Mods.TS/Player/PlaceSimpleBeacon.cs rename to OpenRA.Mods.Cnc/Player/PlaceSimpleBeacon.cs index 58abb2cbe6..a4d7ba587f 100644 --- a/OpenRA.Mods.TS/Player/PlaceSimpleBeacon.cs +++ b/OpenRA.Mods.Cnc/Player/PlaceSimpleBeacon.cs @@ -9,11 +9,11 @@ */ #endregion +using OpenRA.Mods.Cnc.Effects; using OpenRA.Mods.Common.Traits; -using OpenRA.Mods.TS.Effects; using OpenRA.Traits; -namespace OpenRA.Mods.TS.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("A beacon that consists of a single sprite that can be animated.")] public class PlaceSimpleBeaconInfo : ITraitInfo diff --git a/OpenRA.Mods.TS/SpriteLoaders/TmpTSLoader.cs b/OpenRA.Mods.Cnc/SpriteLoaders/TmpTSLoader.cs similarity index 99% rename from OpenRA.Mods.TS/SpriteLoaders/TmpTSLoader.cs rename to OpenRA.Mods.Cnc/SpriteLoaders/TmpTSLoader.cs index f18885287c..ace1f5b0c5 100644 --- a/OpenRA.Mods.TS/SpriteLoaders/TmpTSLoader.cs +++ b/OpenRA.Mods.Cnc/SpriteLoaders/TmpTSLoader.cs @@ -13,7 +13,7 @@ using System.Drawing; using System.IO; using OpenRA.Graphics; -namespace OpenRA.Mods.TS.SpriteLoaders +namespace OpenRA.Mods.Cnc.SpriteLoaders { public class TmpTSLoader : ISpriteLoader { diff --git a/OpenRA.Mods.TS/Traits/Buildings/TiberianSunRefinery.cs b/OpenRA.Mods.Cnc/Traits/Buildings/TiberianSunRefinery.cs similarity index 93% rename from OpenRA.Mods.TS/Traits/Buildings/TiberianSunRefinery.cs rename to OpenRA.Mods.Cnc/Traits/Buildings/TiberianSunRefinery.cs index 98bcd83cda..b43f769348 100644 --- a/OpenRA.Mods.TS/Traits/Buildings/TiberianSunRefinery.cs +++ b/OpenRA.Mods.Cnc/Traits/Buildings/TiberianSunRefinery.cs @@ -10,10 +10,10 @@ #endregion using OpenRA.Activities; +using OpenRA.Mods.Cnc.Activities; using OpenRA.Mods.Common.Traits; -using OpenRA.Mods.TS.Activities; -namespace OpenRA.Mods.TS.Traits +namespace OpenRA.Mods.Cnc.Traits { public class TiberianSunRefineryInfo : RefineryInfo { diff --git a/OpenRA.Mods.TS/Traits/Render/WithDockingOverlay.cs b/OpenRA.Mods.Cnc/Traits/Render/WithDockingOverlay.cs similarity index 97% rename from OpenRA.Mods.TS/Traits/Render/WithDockingOverlay.cs rename to OpenRA.Mods.Cnc/Traits/Render/WithDockingOverlay.cs index f33adba12c..60c805d265 100644 --- a/OpenRA.Mods.TS/Traits/Render/WithDockingOverlay.cs +++ b/OpenRA.Mods.Cnc/Traits/Render/WithDockingOverlay.cs @@ -14,7 +14,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits.Render; using OpenRA.Traits; -namespace OpenRA.Mods.TS.Traits.Render +namespace OpenRA.Mods.Cnc.Traits.Render { [Desc("Rendered on the refinery when a voxel harvester is docking and undocking.")] public class WithDockingOverlayInfo : ITraitInfo, Requires, Requires diff --git a/OpenRA.Mods.TS/Traits/Render/WithPermanentInjury.cs b/OpenRA.Mods.Cnc/Traits/Render/WithPermanentInjury.cs similarity index 97% rename from OpenRA.Mods.TS/Traits/Render/WithPermanentInjury.cs rename to OpenRA.Mods.Cnc/Traits/Render/WithPermanentInjury.cs index 93afe62b19..aed30c1814 100644 --- a/OpenRA.Mods.TS/Traits/Render/WithPermanentInjury.cs +++ b/OpenRA.Mods.Cnc/Traits/Render/WithPermanentInjury.cs @@ -12,7 +12,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.TS.Traits.Render +namespace OpenRA.Mods.Cnc.Traits.Render { [Desc("Change the sprite after a certain amount of damage is taken, even when the hitpoints are regenerated.")] public class WithPermanentInjuryInfo : ITraitInfo diff --git a/OpenRA.Mods.TS/Traits/Render/WithVoxelUnloadBody.cs b/OpenRA.Mods.Cnc/Traits/Render/WithVoxelUnloadBody.cs similarity index 98% rename from OpenRA.Mods.TS/Traits/Render/WithVoxelUnloadBody.cs rename to OpenRA.Mods.Cnc/Traits/Render/WithVoxelUnloadBody.cs index c1293704e6..e84e213691 100644 --- a/OpenRA.Mods.TS/Traits/Render/WithVoxelUnloadBody.cs +++ b/OpenRA.Mods.Cnc/Traits/Render/WithVoxelUnloadBody.cs @@ -18,7 +18,7 @@ using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits.Render; using OpenRA.Traits; -namespace OpenRA.Mods.TS.Traits.Render +namespace OpenRA.Mods.Cnc.Traits.Render { public class WithVoxelUnloadBodyInfo : ITraitInfo, IRenderActorPreviewVoxelsInfo, Requires { diff --git a/OpenRA.Mods.TS/Traits/Render/WithVoxelWalkerBody.cs b/OpenRA.Mods.Cnc/Traits/Render/WithVoxelWalkerBody.cs similarity index 98% rename from OpenRA.Mods.TS/Traits/Render/WithVoxelWalkerBody.cs rename to OpenRA.Mods.Cnc/Traits/Render/WithVoxelWalkerBody.cs index 235d7e7428..4ec6be8199 100644 --- a/OpenRA.Mods.TS/Traits/Render/WithVoxelWalkerBody.cs +++ b/OpenRA.Mods.Cnc/Traits/Render/WithVoxelWalkerBody.cs @@ -20,7 +20,7 @@ using OpenRA.Mods.Common.Traits.Render; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.TS.Traits.Render +namespace OpenRA.Mods.Cnc.Traits.Render { public class WithVoxelWalkerBodyInfo : ITraitInfo, IRenderActorPreviewVoxelsInfo, Requires, Requires, Requires { diff --git a/OpenRA.Mods.TS/Traits/SupportPowers/AttackOrderPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/AttackOrderPower.cs similarity index 99% rename from OpenRA.Mods.TS/Traits/SupportPowers/AttackOrderPower.cs rename to OpenRA.Mods.Cnc/Traits/SupportPowers/AttackOrderPower.cs index 724d284023..10ed146951 100644 --- a/OpenRA.Mods.TS/Traits/SupportPowers/AttackOrderPower.cs +++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/AttackOrderPower.cs @@ -17,7 +17,7 @@ using OpenRA.Mods.Common.Graphics; using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.TS.Traits +namespace OpenRA.Mods.Cnc.Traits { class AttackOrderPowerInfo : SupportPowerInfo, Requires { diff --git a/OpenRA.Mods.TS/Traits/World/TSShroudPalette.cs b/OpenRA.Mods.Cnc/Traits/World/TSShroudPalette.cs similarity index 97% rename from OpenRA.Mods.TS/Traits/World/TSShroudPalette.cs rename to OpenRA.Mods.Cnc/Traits/World/TSShroudPalette.cs index eb69a4a429..9002595964 100644 --- a/OpenRA.Mods.TS/Traits/World/TSShroudPalette.cs +++ b/OpenRA.Mods.Cnc/Traits/World/TSShroudPalette.cs @@ -16,7 +16,7 @@ using OpenRA.Graphics; using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.TS.Traits +namespace OpenRA.Mods.Cnc.Traits { [Desc("Adds the hard-coded shroud palette to the game")] class TSShroudPaletteInfo : ITraitInfo diff --git a/OpenRA.Mods.TS/UtilityCommands/ImportTSMapCommand.cs b/OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs similarity index 99% rename from OpenRA.Mods.TS/UtilityCommands/ImportTSMapCommand.cs rename to OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs index 11f4c98afc..1cdfa27a29 100644 --- a/OpenRA.Mods.TS/UtilityCommands/ImportTSMapCommand.cs +++ b/OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs @@ -20,7 +20,7 @@ using OpenRA.Mods.Common.FileFormats; using OpenRA.Mods.Common.Traits; using OpenRA.Traits; -namespace OpenRA.Mods.TS.UtilityCommands +namespace OpenRA.Mods.Cnc.UtilityCommands { class ImportTSMapCommand : IUtilityCommand { diff --git a/OpenRA.Mods.TS/UtilityCommands/LegacyRulesImporter.cs b/OpenRA.Mods.Cnc/UtilityCommands/LegacyRulesImporter.cs similarity index 99% rename from OpenRA.Mods.TS/UtilityCommands/LegacyRulesImporter.cs rename to OpenRA.Mods.Cnc/UtilityCommands/LegacyRulesImporter.cs index d562fb7a6e..16f9c5f8e6 100644 --- a/OpenRA.Mods.TS/UtilityCommands/LegacyRulesImporter.cs +++ b/OpenRA.Mods.Cnc/UtilityCommands/LegacyRulesImporter.cs @@ -16,7 +16,7 @@ using System.Linq; using OpenRA.Mods.Common.FileFormats; using OpenRA.Mods.Common.Traits; -namespace OpenRA.Mods.TS.UtilityCommands +namespace OpenRA.Mods.Cnc.UtilityCommands { class LegacyRulesImporter : IUtilityCommand { diff --git a/OpenRA.Mods.TS/UtilityCommands/LegacySequenceImporter.cs b/OpenRA.Mods.Cnc/UtilityCommands/LegacySequenceImporter.cs similarity index 99% rename from OpenRA.Mods.TS/UtilityCommands/LegacySequenceImporter.cs rename to OpenRA.Mods.Cnc/UtilityCommands/LegacySequenceImporter.cs index 238f60f38a..f15b87da18 100644 --- a/OpenRA.Mods.TS/UtilityCommands/LegacySequenceImporter.cs +++ b/OpenRA.Mods.Cnc/UtilityCommands/LegacySequenceImporter.cs @@ -15,7 +15,7 @@ using System.IO; using System.Linq; using OpenRA.Mods.Common.FileFormats; -namespace OpenRA.Mods.TS.UtilityCommands +namespace OpenRA.Mods.Cnc.UtilityCommands { class ImportLegacySequenceCommand : IUtilityCommand { diff --git a/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs b/OpenRA.Mods.Cnc/UtilityCommands/LegacyTilesetImporter.cs similarity index 99% rename from OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs rename to OpenRA.Mods.Cnc/UtilityCommands/LegacyTilesetImporter.cs index eefd8469d5..e47b3ed4dd 100644 --- a/OpenRA.Mods.TS/UtilityCommands/LegacyTilesetImporter.cs +++ b/OpenRA.Mods.Cnc/UtilityCommands/LegacyTilesetImporter.cs @@ -16,7 +16,7 @@ using System.Linq; using System.Text; using OpenRA.Mods.Common.FileFormats; -namespace OpenRA.Mods.TS.UtilityCommands +namespace OpenRA.Mods.Cnc.UtilityCommands { class ImportLegacyTilesetCommand : IUtilityCommand { diff --git a/OpenRA.Mods.TS/Widgets/Logic/PreReleaseWarningPrompt.cs b/OpenRA.Mods.Cnc/Widgets/Logic/PreReleaseWarningPrompt.cs similarity index 96% rename from OpenRA.Mods.TS/Widgets/Logic/PreReleaseWarningPrompt.cs rename to OpenRA.Mods.Cnc/Widgets/Logic/PreReleaseWarningPrompt.cs index bbf8c60f24..28f141b833 100644 --- a/OpenRA.Mods.TS/Widgets/Logic/PreReleaseWarningPrompt.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/PreReleaseWarningPrompt.cs @@ -12,7 +12,7 @@ using OpenRA.Mods.Common.Widgets; using OpenRA.Widgets; -namespace OpenRA.Mods.TS.Widgets.Logic +namespace OpenRA.Mods.Cnc.Widgets.Logic { public class PreReleaseWarningPrompt : ChromeLogic { diff --git a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj deleted file mode 100644 index 7bb2cea30b..0000000000 --- a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj +++ /dev/null @@ -1,100 +0,0 @@ - - - - Debug - AnyCPU - 10.0.0 - 2.0 - {5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D} - Library - OpenRA.Mods.TS - OpenRA.Mods.TS - v4.5 - - - true - bin\Debug\ - TRACE;DEBUG - x86 - prompt - AllRules.ruleset - full - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OpenRA.sln b/OpenRA.sln index 6770938a14..15bdff8635 100644 --- a/OpenRA.sln +++ b/OpenRA.sln @@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Server", "OpenRA.Ser EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.D2k", "OpenRA.Mods.D2k\OpenRA.Mods.D2k.csproj", "{C0B0465C-6BE2-409C-8770-3A9BF64C4344}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.TS", "OpenRA.Mods.TS\OpenRA.Mods.TS.csproj", "{5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Platforms.Default", "OpenRA.Platforms.Default\OpenRA.Platforms.Default.csproj", "{33D03738-C154-4028-8EA8-63A3C488A651}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Common", "OpenRA.Mods.Common\OpenRA.Mods.Common.csproj", "{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}" @@ -160,10 +158,6 @@ Global {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|x86.Build.0 = Debug|x86 {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|x86.ActiveCfg = Release|x86 {C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|x86.Build.0 = Release|x86 - {5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Debug|x86.ActiveCfg = Debug|x86 - {5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Debug|x86.Build.0 = Debug|x86 - {5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Release|x86.ActiveCfg = Release|x86 - {5457CBF5-4CE4-421E-A8BF-9FD6C9732E1D}.Release|x86.Build.0 = Release|x86 {33D03738-C154-4028-8EA8-63A3C488A651}.Debug|x86.ActiveCfg = Debug|x86 {33D03738-C154-4028-8EA8-63A3C488A651}.Debug|x86.Build.0 = Debug|x86 {33D03738-C154-4028-8EA8-63A3C488A651}.Release|x86.ActiveCfg = Release|x86 diff --git a/make.ps1 b/make.ps1 index a4d8531446..036baa6ee1 100644 --- a/make.ps1 +++ b/make.ps1 @@ -143,8 +143,6 @@ function Check-Command { ./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.Cnc echo "Checking for code style violations in OpenRA.Mods.D2k..." ./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.D2k - echo "Checking for code style violations in OpenRA.Mods.TS..." - ./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.TS echo "Checking for code style violations in OpenRA.Utility..." ./OpenRA.Utility.exe cnc --check-code-style OpenRA.Utility echo "Checking for code style violations in OpenRA.Test..." diff --git a/mods/all/mod.yaml b/mods/all/mod.yaml index b45aa40a12..ee08e83056 100644 --- a/mods/all/mod.yaml +++ b/mods/all/mod.yaml @@ -19,7 +19,6 @@ Assemblies: ./mods/ra/OpenRA.Mods.RA.dll ./mods/d2k/OpenRA.Mods.D2k.dll ./mods/cnc/OpenRA.Mods.Cnc.dll - ./mods/ts/OpenRA.Mods.TS.dll ChromeLayout: diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 2703ec353e..e51d479402 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -129,7 +129,6 @@ Assemblies: common|OpenRA.Mods.Common.dll ra|OpenRA.Mods.RA.dll cnc|OpenRA.Mods.Cnc.dll - ts|OpenRA.Mods.TS.dll ChromeLayout: ra|chrome/ingame.yaml