diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index c2a949586b..f4846fecb7 100644
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -237,6 +237,7 @@
+
diff --git a/OpenRA.Game/Traits/Player/PlayerColorPalette.cs b/OpenRA.Game/Traits/Player/PlayerColorPalette.cs
index 3bbe190efe..646b2993c6 100644
--- a/OpenRA.Game/Traits/Player/PlayerColorPalette.cs
+++ b/OpenRA.Game/Traits/Player/PlayerColorPalette.cs
@@ -46,9 +46,6 @@ namespace OpenRA.Traits
{
var remap = new PlayerColorRemap(info.RemapIndex, owner.Color, info.Ramp);
wr.AddPalette(info.BaseName + owner.InternalName, new Palette(wr.Palette(info.BasePalette).Palette, remap), info.AllowModifiers);
-
- var argb = (uint)Color.FromArgb(128, owner.Color.RGB).ToArgb();
- wr.AddPalette("highlight" + owner.InternalName, new Palette(Exts.MakeArray(256, i => i == 0 ? 0 : argb)), false);
}
}
}
diff --git a/OpenRA.Game/Traits/Player/PlayerHighlightPalette.cs b/OpenRA.Game/Traits/Player/PlayerHighlightPalette.cs
new file mode 100644
index 0000000000..de516cc34a
--- /dev/null
+++ b/OpenRA.Game/Traits/Player/PlayerHighlightPalette.cs
@@ -0,0 +1,43 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2013 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. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Drawing;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+
+namespace OpenRA.Traits
+{
+ [Desc("Add this to the Player actor definition.")]
+ public class PlayerHighlightPaletteInfo : ITraitInfo
+ {
+ [Desc("The prefix for the resulting player palettes")]
+ public readonly string BaseName = "highlight";
+
+ public object Create(ActorInitializer init) { return new PlayerHighlightPalette(init.self.Owner, this); }
+ }
+
+ public class PlayerHighlightPalette : IPalette
+ {
+ readonly Player owner;
+ readonly PlayerHighlightPaletteInfo info;
+
+ public PlayerHighlightPalette(Player owner, PlayerHighlightPaletteInfo info)
+ {
+ this.owner = owner;
+ this.info = info;
+ }
+
+ public void InitPalette(WorldRenderer wr)
+ {
+ var argb = (uint)Color.FromArgb(128, owner.Color.RGB).ToArgb();
+ wr.AddPalette(info.BaseName + owner.InternalName, new Palette(Exts.MakeArray(256, i => i == 0 ? 0 : argb)), false);
+ }
+ }
+}
diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml
index 5bfd668932..4d1ce3e2da 100644
--- a/mods/cnc/rules/system.yaml
+++ b/mods/cnc/rules/system.yaml
@@ -199,6 +199,7 @@ Player:
PlayerColorPalette:
BasePalette: terrain
RemapIndex: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
+ PlayerHighlightPalette:
BaseAttackNotifier:
Shroud:
PlayerStatistics:
diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml
index 565c0a58c9..94d209e1dc 100644
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -349,6 +349,7 @@ Player:
PlayerColorPalette:
BasePalette: d2k
RemapIndex: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
+ PlayerHighlightPalette:
BaseAttackNotifier:
Shroud:
FrozenActorLayer:
diff --git a/mods/ra/rules/system.yaml b/mods/ra/rules/system.yaml
index f0b7cdf6d4..14f64b79c1 100644
--- a/mods/ra/rules/system.yaml
+++ b/mods/ra/rules/system.yaml
@@ -521,6 +521,7 @@ Player:
PlayerColorPalette:
BasePalette: player
RemapIndex: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
+ PlayerHighlightPalette:
GpsWatcher:
Shroud:
FrozenActorLayer:
diff --git a/mods/ts/rules/system.yaml b/mods/ts/rules/system.yaml
index dc0a924147..5a5bfdb1dd 100644
--- a/mods/ts/rules/system.yaml
+++ b/mods/ts/rules/system.yaml
@@ -35,6 +35,7 @@ Player:
PlayerColorPalette:
BasePalette: player
RemapIndex: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
+ PlayerHighlightPalette:
GpsWatcher:
Shroud:
BaseAttackNotifier: