From 98caae106faa6f3ea73c448324ae450c54a7f1fe Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 23 Apr 2021 21:27:34 +0100 Subject: [PATCH] Move Palette traits to their own directory. Also adds missing TraitLocation definitions. --- OpenRA.Mods.Cnc/UtilityCommands/RemapShpCommand.cs | 2 +- .../Traits/{World => Palettes}/ColorPickerPalette.cs | 1 - .../Traits/Palettes}/FixedColorPalette.cs | 4 +++- .../Traits/{World => Palettes}/IndexedPalette.cs | 2 +- .../Traits/{World => Palettes}/IndexedPlayerPalette.cs | 3 ++- .../{World => Palettes}/PaletteFromEmbeddedSpritePalette.cs | 1 + .../Traits/{World => Palettes}/PaletteFromFile.cs | 0 .../Traits/{World => Palettes}/PaletteFromGimpOrJascFile.cs | 0 .../Traits/{World => Palettes}/PaletteFromPaletteWithAlpha.cs | 0 .../{World => Palettes}/PaletteFromPlayerPaletteWithAlpha.cs | 0 .../Traits/{World => Palettes}/PaletteFromPng.cs | 0 .../Traits/{World => Palettes}/PaletteFromRGBA.cs | 0 .../Traits/Palettes}/PlayerColorPalette.cs | 3 ++- 13 files changed, 10 insertions(+), 6 deletions(-) rename OpenRA.Mods.Common/Traits/{World => Palettes}/ColorPickerPalette.cs (99%) rename {OpenRA.Game/Traits/World => OpenRA.Mods.Common/Traits/Palettes}/FixedColorPalette.cs (93%) rename OpenRA.Mods.Common/Traits/{World => Palettes}/IndexedPalette.cs (98%) rename OpenRA.Mods.Common/Traits/{World => Palettes}/IndexedPlayerPalette.cs (95%) rename OpenRA.Mods.Common/Traits/{World => Palettes}/PaletteFromEmbeddedSpritePalette.cs (97%) rename OpenRA.Mods.Common/Traits/{World => Palettes}/PaletteFromFile.cs (100%) rename OpenRA.Mods.Common/Traits/{World => Palettes}/PaletteFromGimpOrJascFile.cs (100%) rename OpenRA.Mods.Common/Traits/{World => Palettes}/PaletteFromPaletteWithAlpha.cs (100%) rename OpenRA.Mods.Common/Traits/{World => Palettes}/PaletteFromPlayerPaletteWithAlpha.cs (100%) rename OpenRA.Mods.Common/Traits/{World => Palettes}/PaletteFromPng.cs (100%) rename OpenRA.Mods.Common/Traits/{World => Palettes}/PaletteFromRGBA.cs (100%) rename {OpenRA.Game/Traits/Player => OpenRA.Mods.Common/Traits/Palettes}/PlayerColorPalette.cs (96%) diff --git a/OpenRA.Mods.Cnc/UtilityCommands/RemapShpCommand.cs b/OpenRA.Mods.Cnc/UtilityCommands/RemapShpCommand.cs index 8bdb7df3c5..4816bd379f 100644 --- a/OpenRA.Mods.Cnc/UtilityCommands/RemapShpCommand.cs +++ b/OpenRA.Mods.Cnc/UtilityCommands/RemapShpCommand.cs @@ -15,8 +15,8 @@ using System.IO; using System.Linq; using OpenRA.Graphics; using OpenRA.Mods.Cnc.SpriteLoaders; +using OpenRA.Mods.Common.Traits; using OpenRA.Primitives; -using OpenRA.Traits; namespace OpenRA.Mods.Cnc.UtilityCommands { diff --git a/OpenRA.Mods.Common/Traits/World/ColorPickerPalette.cs b/OpenRA.Mods.Common/Traits/Palettes/ColorPickerPalette.cs similarity index 99% rename from OpenRA.Mods.Common/Traits/World/ColorPickerPalette.cs rename to OpenRA.Mods.Common/Traits/Palettes/ColorPickerPalette.cs index 1f621db089..4b8dbcf6bb 100644 --- a/OpenRA.Mods.Common/Traits/World/ColorPickerPalette.cs +++ b/OpenRA.Mods.Common/Traits/Palettes/ColorPickerPalette.cs @@ -9,7 +9,6 @@ */ #endregion -using System; using System.Collections.Generic; using OpenRA.Graphics; using OpenRA.Primitives; diff --git a/OpenRA.Game/Traits/World/FixedColorPalette.cs b/OpenRA.Mods.Common/Traits/Palettes/FixedColorPalette.cs similarity index 93% rename from OpenRA.Game/Traits/World/FixedColorPalette.cs rename to OpenRA.Mods.Common/Traits/Palettes/FixedColorPalette.cs index 30a66915d1..b3f315951b 100644 --- a/OpenRA.Game/Traits/World/FixedColorPalette.cs +++ b/OpenRA.Mods.Common/Traits/Palettes/FixedColorPalette.cs @@ -11,9 +11,11 @@ using OpenRA.Graphics; using OpenRA.Primitives; +using OpenRA.Traits; -namespace OpenRA.Traits +namespace OpenRA.Mods.Common.Traits { + [TraitLocation(SystemActors.World | SystemActors.EditorWorld)] [Desc("Add this to the World actor definition.")] public class FixedColorPaletteInfo : TraitInfo { diff --git a/OpenRA.Mods.Common/Traits/World/IndexedPalette.cs b/OpenRA.Mods.Common/Traits/Palettes/IndexedPalette.cs similarity index 98% rename from OpenRA.Mods.Common/Traits/World/IndexedPalette.cs rename to OpenRA.Mods.Common/Traits/Palettes/IndexedPalette.cs index 0d6ce5824b..a1c5dfb82a 100644 --- a/OpenRA.Mods.Common/Traits/World/IndexedPalette.cs +++ b/OpenRA.Mods.Common/Traits/Palettes/IndexedPalette.cs @@ -15,7 +15,7 @@ using OpenRA.Graphics; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { [TraitLocation(SystemActors.World | SystemActors.EditorWorld)] [Desc("Define a palette by swapping palette indices.")] diff --git a/OpenRA.Mods.Common/Traits/World/IndexedPlayerPalette.cs b/OpenRA.Mods.Common/Traits/Palettes/IndexedPlayerPalette.cs similarity index 95% rename from OpenRA.Mods.Common/Traits/World/IndexedPlayerPalette.cs rename to OpenRA.Mods.Common/Traits/Palettes/IndexedPlayerPalette.cs index 699fffdeb2..6dc2f3dd23 100644 --- a/OpenRA.Mods.Common/Traits/World/IndexedPlayerPalette.cs +++ b/OpenRA.Mods.Common/Traits/Palettes/IndexedPlayerPalette.cs @@ -14,8 +14,9 @@ using OpenRA.Graphics; using OpenRA.Primitives; using OpenRA.Traits; -namespace OpenRA.Mods.Common +namespace OpenRA.Mods.Common.Traits { + [TraitLocation(SystemActors.World | SystemActors.EditorWorld)] [Desc("Define a player palette by swapping palette indices.")] public class IndexedPlayerPaletteInfo : TraitInfo, IRulesetLoaded { diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromEmbeddedSpritePalette.cs b/OpenRA.Mods.Common/Traits/Palettes/PaletteFromEmbeddedSpritePalette.cs similarity index 97% rename from OpenRA.Mods.Common/Traits/World/PaletteFromEmbeddedSpritePalette.cs rename to OpenRA.Mods.Common/Traits/Palettes/PaletteFromEmbeddedSpritePalette.cs index 4ba3538bee..d46e2f6336 100644 --- a/OpenRA.Mods.Common/Traits/World/PaletteFromEmbeddedSpritePalette.cs +++ b/OpenRA.Mods.Common/Traits/Palettes/PaletteFromEmbeddedSpritePalette.cs @@ -18,6 +18,7 @@ using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits { + [TraitLocation(SystemActors.World | SystemActors.EditorWorld)] public class PaletteFromEmbeddedSpritePaletteInfo : TraitInfo, IProvidesCursorPaletteInfo { [PaletteDefinition] diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs b/OpenRA.Mods.Common/Traits/Palettes/PaletteFromFile.cs similarity index 100% rename from OpenRA.Mods.Common/Traits/World/PaletteFromFile.cs rename to OpenRA.Mods.Common/Traits/Palettes/PaletteFromFile.cs diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromGimpOrJascFile.cs b/OpenRA.Mods.Common/Traits/Palettes/PaletteFromGimpOrJascFile.cs similarity index 100% rename from OpenRA.Mods.Common/Traits/World/PaletteFromGimpOrJascFile.cs rename to OpenRA.Mods.Common/Traits/Palettes/PaletteFromGimpOrJascFile.cs diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromPaletteWithAlpha.cs b/OpenRA.Mods.Common/Traits/Palettes/PaletteFromPaletteWithAlpha.cs similarity index 100% rename from OpenRA.Mods.Common/Traits/World/PaletteFromPaletteWithAlpha.cs rename to OpenRA.Mods.Common/Traits/Palettes/PaletteFromPaletteWithAlpha.cs diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromPlayerPaletteWithAlpha.cs b/OpenRA.Mods.Common/Traits/Palettes/PaletteFromPlayerPaletteWithAlpha.cs similarity index 100% rename from OpenRA.Mods.Common/Traits/World/PaletteFromPlayerPaletteWithAlpha.cs rename to OpenRA.Mods.Common/Traits/Palettes/PaletteFromPlayerPaletteWithAlpha.cs diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromPng.cs b/OpenRA.Mods.Common/Traits/Palettes/PaletteFromPng.cs similarity index 100% rename from OpenRA.Mods.Common/Traits/World/PaletteFromPng.cs rename to OpenRA.Mods.Common/Traits/Palettes/PaletteFromPng.cs diff --git a/OpenRA.Mods.Common/Traits/World/PaletteFromRGBA.cs b/OpenRA.Mods.Common/Traits/Palettes/PaletteFromRGBA.cs similarity index 100% rename from OpenRA.Mods.Common/Traits/World/PaletteFromRGBA.cs rename to OpenRA.Mods.Common/Traits/Palettes/PaletteFromRGBA.cs diff --git a/OpenRA.Game/Traits/Player/PlayerColorPalette.cs b/OpenRA.Mods.Common/Traits/Palettes/PlayerColorPalette.cs similarity index 96% rename from OpenRA.Game/Traits/Player/PlayerColorPalette.cs rename to OpenRA.Mods.Common/Traits/Palettes/PlayerColorPalette.cs index 583492856d..dbb0538fcc 100644 --- a/OpenRA.Game/Traits/Player/PlayerColorPalette.cs +++ b/OpenRA.Mods.Common/Traits/Palettes/PlayerColorPalette.cs @@ -11,8 +11,9 @@ using OpenRA.Graphics; using OpenRA.Primitives; +using OpenRA.Traits; -namespace OpenRA.Traits +namespace OpenRA.Mods.Common.Traits { [TraitLocation(SystemActors.World | SystemActors.EditorWorld)] [Desc("Add this to the World actor definition.")]