Move Palette traits to their own directory.

Also adds missing TraitLocation definitions.

OpenRA.Mods.Common/Traits/Palettes/ColorPickerPalette.cs

@@ -9,7 +9,6 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Primitives;

OpenRA.Mods.Common/Traits/Palettes/FixedColorPalette.cs

@@ -0,0 +1,59 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using OpenRA.Graphics;
+using OpenRA.Primitives;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[TraitLocation(SystemActors.World | SystemActors.EditorWorld)]
+	[Desc("Add this to the World actor definition.")]
+	public class FixedColorPaletteInfo : TraitInfo
+	{
+		[PaletteReference]
+		[Desc("The name of the palette to base off.")]
+		public readonly string Base = TileSet.TerrainPaletteInternalName;
+
+		[PaletteDefinition]
+		[Desc("The name of the resulting palette")]
+		public readonly string Name = "resources";
+
+		[Desc("Remap these indices to pre-defined colors.")]
+		public readonly int[] RemapIndex = { };
+
+		[Desc("The fixed color to remap.")]
+		public readonly Color Color;
+
+		[Desc("Allow palette modifiers to change the palette.")]
+		public readonly bool AllowModifiers = true;
+
+		public override object Create(ActorInitializer init) { return new FixedColorPalette(this); }
+	}
+
+	public class FixedColorPalette : ILoadsPalettes
+	{
+		readonly FixedColorPaletteInfo info;
+
+		public FixedColorPalette(FixedColorPaletteInfo info)
+		{
+			this.info = info;
+		}
+
+		public void LoadPalettes(WorldRenderer wr)
+		{
+			var (_, h, s, _) = info.Color.ToAhsv();
+
+			var remap = new PlayerColorRemap(info.RemapIndex, h, s);
+			wr.AddPalette(info.Name, new ImmutablePalette(wr.Palette(info.Base).Palette, remap), info.AllowModifiers);
+		}
+	}
+}

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.")]

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
 	{

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]

OpenRA.Mods.Common/Traits/Palettes/PlayerColorPalette.cs

@@ -0,0 +1,57 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using OpenRA.Graphics;
+using OpenRA.Primitives;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[TraitLocation(SystemActors.World | SystemActors.EditorWorld)]
+	[Desc("Add this to the World actor definition.")]
+	public class PlayerColorPaletteInfo : TraitInfo
+	{
+		[PaletteReference]
+		[Desc("The name of the palette to base off.")]
+		public readonly string BasePalette = null;
+
+		[PaletteDefinition(true)]
+		[Desc("The prefix for the resulting player palettes")]
+		public readonly string BaseName = "player";
+
+		[Desc("Remap these indices to player colors.")]
+		public readonly int[] RemapIndex = { };
+
+		[Desc("Allow palette modifiers to change the palette.")]
+		public readonly bool AllowModifiers = true;
+
+		public override object Create(ActorInitializer init) { return new PlayerColorPalette(this); }
+	}
+
+	public class PlayerColorPalette : ILoadsPlayerPalettes
+	{
+		readonly PlayerColorPaletteInfo info;
+
+		public PlayerColorPalette(PlayerColorPaletteInfo info)
+		{
+			this.info = info;
+		}
+
+		public void LoadPlayerPalettes(WorldRenderer wr, string playerName, Color color, bool replaceExisting)
+		{
+			var (_, h, s, _) = color.ToAhsv();
+
+			var remap = new PlayerColorRemap(info.RemapIndex, h, s);
+			var pal = new ImmutablePalette(wr.Palette(info.BasePalette).Palette, remap);
+			wr.AddPalette(info.BaseName + playerName, pal, info.AllowModifiers, replaceExisting);
+		}
+	}
+}