no more remap files. just specify what you want in the yaml.

2010-02-28 09:45:39 +13:00
parent ae77b596d3
commit 48d12a55f0
31 changed files with 146 additions and 556 deletions
--- a/OpenRA.FileFormats/PlayerColorRemap.cs
+++ b/OpenRA.FileFormats/PlayerColorRemap.cs
@@ -29,17 +29,25 @@ namespace OpenRA.FileFormats
 	{
 		Dictionary<int, Color> remapColors;

-		public PlayerColorRemap(Stream s)
+		public PlayerColorRemap(Color c1, Color c2, bool useSplitRamp)
 		{
-			var yaml = MiniYaml.FromStream(s);
-			remapColors = yaml.ToDictionary(
-				y => int.Parse(y.Key),
-				y => ArrayToColor((int[])FieldLoader.GetValue(
-					typeof(int[]), y.Value.Value.Trim())));
+			var baseIndex = useSplitRamp ? 0xb0 : 80;
+			var ramp = useSplitRamp
+				? new[] { 0, 2, 4, 6, 8, 10, 13, 15, 1, 3, 5, 7, 9, 11, 12, 14 }
+				: new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+
+			remapColors = ramp.Select((x, i) => Pair.New(baseIndex + i, ColorLerp(x / 16f, c1, c2)))
+				.ToDictionary(u => u.First, u => u.Second);
 		}

-		static Color ArrayToColor(int[] x) { return Color.FromArgb(x[0], x[1], x[2], x[3]); }
-
+		static Color ColorLerp(float t, Color c1, Color c2)
+		{
+			return Color.FromArgb(255,
+				(int)(t * c2.R + (1 - t) * c1.R),
+				(int)(t * c2.G + (1 - t) * c1.G),
+				(int)(t * c2.B + (1 - t) * c1.B));
+		}
+		
 		public Color GetRemappedColor(Color original, int index)
 		{
 			Color c;
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -212,7 +212,6 @@
    <Compile Include="Traits\LimitedAmmo.cs" />
    <Compile Include="Traits\SupportPowers\NukePower.cs" />
    <Compile Include="Traits\World\PaletteFromFile.cs" />
-    <Compile Include="Traits\World\PaletteFromRemap.cs" />
    <Compile Include="Traits\World\PaletteFromRGBA.cs" />
    <Compile Include="Traits\Passenger.cs" />
    <Compile Include="Traits\Player\PlaceBuilding.cs" />
--- a/OpenRA.Game/Traits/World/PaletteFromRemap.cs
+++ b/OpenRA.Game/Traits/World/PaletteFromRemap.cs
@@ -1,49 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it 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.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using OpenRA.FileFormats;
-
-namespace OpenRA.Traits
-{
-	class PaletteFromRemapInfo : ITraitInfo
-	{
-		public readonly string Name = null;
-		public readonly string Theatre = null;
-		public readonly string BasePalette = null;
-		public readonly string Remap = null;
-		public object Create(Actor self) { return new PaletteFromRemap(self, this); }
-	}
-
-	class PaletteFromRemap
-	{
-		public PaletteFromRemap(Actor self, PaletteFromRemapInfo info)
-		{
-			if (info.Theatre == null ||
-				info.Theatre.ToLowerInvariant() == self.World.Map.Theater.ToLowerInvariant())
-			{
-				Log.Write("Loading palette {0} from theatre {1} with remap {2}", info.Name, info.BasePalette, info.Remap);
-				var wr = self.World.WorldRenderer;
-				var pal = wr.GetPalette(info.BasePalette);
-				var newpal = (info.Remap == null) ? pal : new Palette(pal, new PlayerColorRemap(FileSystem.Open(info.Remap)));
-				wr.AddPalette(info.Name, newpal);
-			}
-		}
-	}
-}
--- a/OpenRA.Game/Traits/World/PlayerColorPalette.cs
+++ b/OpenRA.Game/Traits/World/PlayerColorPalette.cs
@@ -28,7 +28,11 @@ namespace OpenRA.Traits
 		public readonly string Name = null;
 		public readonly string DisplayName = null;
 		public readonly string BasePalette = null;
-		public readonly string Remap = null;
+
+		public readonly int[] Color1 = { 255, 255, 255 };
+		public readonly int[] Color2 = { 0, 0, 0 };
+		public readonly bool SplitRamp = false;
+
 		public readonly int[] DisplayColor = null;
 		public object Create(Actor self) { return new PlayerColorPalette(self, this); }
 	}
@@ -39,9 +43,17 @@ namespace OpenRA.Traits
 		{
 			var wr = self.World.WorldRenderer;
 			var pal = wr.GetPalette(info.BasePalette);
-			var newpal = (info.Remap == null) ? pal : new Palette(pal, new PlayerColorRemap(FileSystem.Open(info.Remap)));
+			var newpal = new Palette(pal, new PlayerColorRemap(
+						ArrayToColor(info.Color1), 
+						ArrayToColor(info.Color2), 
+						info.SplitRamp));
+			
 			wr.AddPalette(info.Name, newpal);
-			Player.RegisterPlayerColor(info.Name, info.DisplayName, Color.FromArgb(info.DisplayColor[0], info.DisplayColor[1], info.DisplayColor[2]));
+
+			Player.RegisterPlayerColor(info.Name, info.DisplayName,
+				ArrayToColor(info.DisplayColor));
 		}
+
+		static Color ArrayToColor(int[] x) { return Color.FromArgb(x[0], x[1], x[2]); }
 	}
 }
--- a/OpenRA.sln
+++ b/OpenRA.sln
@@ -17,49 +17,77 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Cnc", "OpenRA.M
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Gl", "OpenRA.Gl\OpenRA.Gl.csproj", "{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mkremap", "mkremap\mkremap.csproj", "{3A2C18E7-0379-4D72-8A56-B850CB765197}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.Build.0 = Debug|x86
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.ActiveCfg = Release|x86
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Mixed Platforms.Build.0 = Release|x86
 		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{230F65CE-A6DE-4235-8B38-13A3D606C7F7}.Release|Mixed Platforms.Build.0 = Release|x86
 		{76F621A1-3D8E-4A99-9F7E-B071EB657817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{76F621A1-3D8E-4A99-9F7E-B071EB657817}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76F621A1-3D8E-4A99-9F7E-B071EB657817}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{76F621A1-3D8E-4A99-9F7E-B071EB657817}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{76F621A1-3D8E-4A99-9F7E-B071EB657817}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2E1F8D8B-AEF5-4BCE-A95C-50223A0C7331}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E1F8D8B-AEF5-4BCE-A95C-50223A0C7331}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E1F8D8B-AEF5-4BCE-A95C-50223A0C7331}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2E1F8D8B-AEF5-4BCE-A95C-50223A0C7331}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{2E1F8D8B-AEF5-4BCE-A95C-50223A0C7331}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E1F8D8B-AEF5-4BCE-A95C-50223A0C7331}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E1F8D8B-AEF5-4BCE-A95C-50223A0C7331}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2E1F8D8B-AEF5-4BCE-A95C-50223A0C7331}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2881135D-4D62-493E-8F83-5EEE92CCC6BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A2C18E7-0379-4D72-8A56-B850CB765197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A2C18E7-0379-4D72-8A56-B850CB765197}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A2C18E7-0379-4D72-8A56-B850CB765197}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A2C18E7-0379-4D72-8A56-B850CB765197}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/SequenceEditor/SequenceEditor.csproj
+++ b/SequenceEditor/SequenceEditor.csproj
@@ -30,6 +30,10 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
    <Reference Include="System.Core">
--- a/mkremap/Program.cs
+++ b/mkremap/Program.cs
@@ -1,60 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
- * This file is part of OpenRA.
- * 
- *  OpenRA is free software: you can redistribute it and/or modify
- *  it 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.
- * 
- *  OpenRA is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
- */
-#endregion
-
-using System;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-
-namespace mkremap
-{
-	class Program
-	{
-		static void Main(string[] args)
-		{
-			if (args.Length != 8)
-			{
-				Console.WriteLine("Usage: mkremap cnc|ra dest c1.r c1.g c1.b c2.r c2.g c2.b");
-				return;
-			}
-
-			var c1 = Color.FromArgb(255, int.Parse(args[2]), int.Parse(args[3]), int.Parse(args[4]));
-			var c2 = Color.FromArgb(255, int.Parse(args[5]), int.Parse(args[6]), int.Parse(args[7]));
-
-			var baseIndex = args[0] == "ra" ? 80 : 0xb0;
-			var fracs = args[0] == "ra"
-				? new[] { 0, 1 / 16f, 2 / 16f, 3 / 16f, 4 / 16f, 5 / 16f, 6 / 16f, 7 / 16f, 8 / 16f, 9 / 16f, 10 / 16f, 11 / 16f, 12 / 16f, 13 / 16f, 14 / 16f, 15 / 16f }
-				: new[] { 0, 2 / 16f, 4 / 16f, 6 / 16f, 8 / 16f, 10 / 16f, 13 / 16f, 15 / 16f, 1 / 16f, 3 / 16f, 5 / 16f, 7 / 16f, 9 / 16f, 11 / 16f, 12 / 16f, 14 / 16f };
-
-			File.WriteAllLines( args[1],
-				fracs.Select(x => ColorLerp(x, c1, c2))
-					.Select((x, i) => string.Format("{0}: 255,{1},{2},{3}", baseIndex + i, x.R, x.G, x.B))
-					.ToArray());
-		}
-
-		static Color ColorLerp(float t, Color c1, Color c2)
-		{
-			return Color.FromArgb(255,
-				(int)(t * c2.R + (1 - t) * c1.R),
-				(int)(t * c2.G + (1 - t) * c1.G),
-				(int)(t * c2.B + (1 - t) * c1.B));
-		}
-	}
-}
--- a/mkremap/Properties/AssemblyInfo.cs
+++ b/mkremap/Properties/AssemblyInfo.cs
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("mkremap")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("mkremap")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("4a15844e-bfdf-4da6-91f4-2ca6fe949fcb")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/mkremap/mkremap.csproj
+++ b/mkremap/mkremap.csproj
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3A2C18E7-0379-4D72-8A56-B850CB765197}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>mkremap</RootNamespace>
-    <AssemblyName>mkremap</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
--- a/mkremap/mkremap.sln
+++ b/mkremap/mkremap.sln
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mkremap", "mkremap.csproj", "{3A2C18E7-0379-4D72-8A56-B850CB765197}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3A2C18E7-0379-4D72-8A56-B850CB765197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A2C18E7-0379-4D72-8A56-B850CB765197}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A2C18E7-0379-4D72-8A56-B850CB765197}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A2C18E7-0379-4D72-8A56-B850CB765197}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/mods/cnc/black.rem
+++ b/mods/cnc/black.rem
@@ -1,16 +0,0 @@
-176: 255,80,80,80
-177: 255,70,70,70
-178: 255,60,60,60
-179: 255,50,50,50
-180: 255,40,40,40
-181: 255,30,30,30
-182: 255,15,15,15
-183: 255,5,5,5
-184: 255,75,75,75
-185: 255,65,65,65
-186: 255,55,55,55
-187: 255,45,45,45
-188: 255,35,35,35
-189: 255,25,25,25
-190: 255,20,20,20
-191: 255,10,10,10
--- a/mods/cnc/blue-orig.rem
+++ b/mods/cnc/blue-orig.rem
@@ -1,16 +0,0 @@
-176: 255,216,252,252
-177: 255,220,220,228
-178: 255,192,192,208
-179: 255,164,164,188
-180: 255,100,100,124
-181: 255,72,72,92
-182: 255,44,44,60
-183: 255,0,0,0
-184: 255,192,192,208
-185: 255,164,164,188
-186: 255,132,132,156
-187: 255,100,100,124
-188: 255,72,72,92
-189: 255,56,72,76
-190: 255,52,52,52
-191: 255,36,44,52
--- a/mods/cnc/blue.rem
+++ b/mods/cnc/blue.rem
@@ -1,16 +0,0 @@
-176: 255,85,130,204
-177: 255,75,116,185
-178: 255,65,102,166
-179: 255,56,88,147
-180: 255,46,75,128
-181: 255,36,61,109
-182: 255,22,40,80
-183: 255,12,26,61
-184: 255,80,123,194
-185: 255,70,109,175
-186: 255,60,95,156
-187: 255,51,81,137
-188: 255,41,68,118
-189: 255,32,54,99
-190: 255,27,47,90
-191: 255,17,33,71
--- a/mods/cnc/green.rem
+++ b/mods/cnc/green.rem
@@ -1,16 +0,0 @@
-176: 255,255,230,149
-177: 255,225,203,132
-178: 255,196,177,116
-179: 255,166,151,100
-180: 255,137,125,84
-181: 255,108,98,68
-182: 255,64,59,44
-183: 255,34,33,28
-184: 255,240,216,140
-185: 255,210,190,124
-186: 255,181,164,108
-187: 255,152,138,92
-188: 255,122,111,76
-189: 255,93,85,60
-190: 255,78,72,52
-191: 255,49,46,36
--- a/mods/cnc/orange.rem
+++ b/mods/cnc/orange.rem
@@ -1,16 +0,0 @@
-176: 255,236,172,72
-177: 255,228,148,48
-178: 255,212,120,16
-179: 255,196,96,0
-180: 255,164,56,0
-181: 255,136,24,0
-182: 255,96,8,0
-183: 255,16,0,0
-184: 255,212,120,16
-185: 255,196,96,0
-186: 255,180,72,0
-187: 255,164,56,0
-188: 255,152,40,0
-189: 255,136,24,0
-190: 255,112,8,0
-191: 255,16,0,0
--- a/mods/cnc/red.rem
+++ b/mods/cnc/red.rem
@@ -1,16 +0,0 @@
-176: 255,244,0,0
-177: 255,220,20,8
-178: 255,196,40,20
-179: 255,172,52,28
-180: 255,120,48,36
-181: 255,96,8,0
-182: 255,56,32,20
-183: 255,16,0,0
-184: 255,196,40,20
-185: 255,172,52,28
-186: 255,152,48,36
-187: 255,120,48,36
-188: 255,112,24,0
-189: 255,88,44,28
-190: 255,56,32,20
-191: 255,56,32,20
--- a/mods/cnc/salmon.rem
+++ b/mods/cnc/salmon.rem
@@ -1,16 +0,0 @@
-176: 255,210,153,125
-177: 255,190,133,109
-178: 255,171,114,93
-179: 255,152,95,78
-180: 255,133,76,62
-181: 255,113,57,46
-182: 255,84,28,23
-183: 255,65,9,7
-184: 255,200,143,117
-185: 255,181,124,101
-186: 255,161,105,85
-187: 255,142,86,70
-188: 255,123,66,54
-189: 255,104,47,39
-190: 255,94,38,31
-191: 255,75,19,15
--- a/mods/cnc/system.yaml
+++ b/mods/cnc/system.yaml
@@ -50,30 +50,81 @@ World:
 		DisplayName: Gold
 		BasePalette: player
 		DisplayColor: 228, 200, 112
+		Color1: 246,214,121
+		Color2: 40,32,8
+		SplitRamp: yes
 	PlayerColorPalette@player1:
 		Name: player1
 		DisplayName: Blue
 		BasePalette: player
-		Remap: blue.rem
 		DisplayColor: 56, 72, 125
+		Color1: 85,130,204
+		Color2: 17,33,71
+		SplitRamp: yes
 	PlayerColorPalette@player2:
 		Name: player2
 		DisplayName: Red
 		BasePalette: player
-		Remap: red.rem
-		DisplayColor: 238, 0, 0
+		DisplayColor: 238,0,0
+		Color1: 255,20,0
+		Color2: 56,0,0
+		SplitRamp: yes
 	PlayerColorPalette@player3:
 		Name: player3
 		DisplayName: Orange
 		BasePalette: player
-		Remap: orange.rem
 		DisplayColor: 198,97,0
+		Color1: 255,107,0
+		Color2: 56,0,0
+		SplitRamp: yes
 	PlayerColorPalette@player4:
 		Name: player4
 		DisplayName: Teal
 		BasePalette: player
-		Remap: teal.rem
 		DisplayColor: 28,109,97
+		Color1: 93,194,165
+		Color2: 0,32,32
+		SplitRamp: yes
+	PlayerColorPalette@player5:
+		Name: player5
+		DisplayName: Salmon
+		BasePalette: player
+		DisplayColor: 153,76,53
+		Color1: 210,153,125
+		Color2: 56,0,0
+		SplitRamp: yes
+	PlayerColorPalette@player6:
+		Name: player6
+		DisplayName: Green
+		BasePalette: player
+		DisplayColor: 76,101,60
+		Color1: 160,240,140
+		Color2: 20,20,20
+		SplitRamp: yes
+	PlayerColorPalette@player7:
+		Name: player7
+		DisplayName: Gray
+		BasePalette: player
+		DisplayColor: 133,113,101
+		Color1: 238,238,238
+		Color2: 44,28,24
+		SplitRamp: yes
+	PlayerColorPalette@player8:
+		Name: player8
+		DisplayName: White
+		BasePalette: player
+		DisplayColor: 255,255,255
+		Color1: 255,255,255
+		Color2: 75,75,75
+		SplitRamp: yes
+	PlayerColorPalette@player9:
+		Name: player9
+		DisplayName: Black
+		BasePalette: player
+		DisplayColor: 30,30,30
+		Color1: 80,80,80
+		Color2: 5,5,5
+		SplitRamp: yes
 	PaletteFromFile@chrome:
 		Name: chrome
 		Filename: temperat.pal
--- a/mods/cnc/teal.rem
+++ b/mods/cnc/teal.rem
@@ -1,16 +0,0 @@
-176: 255,0,168,168
-177: 255,116,148,156
-178: 255,100,128,136
-179: 255,0,112,112
-180: 255,4,92,100
-181: 255,20,52,72
-182: 255,4,4,8
-183: 255,0,0,0
-184: 255,100,128,136
-185: 255,0,112,112
-186: 255,4,92,100
-187: 255,8,76,92
-188: 255,16,60,80
-189: 255,20,52,72
-190: 255,36,44,52
-191: 255,4,4,8
--- a/mods/cnc/white.rem
+++ b/mods/cnc/white.rem
@@ -1,16 +0,0 @@
-176: 255,255,255,255
-177: 255,231,231,231
-178: 255,207,207,207
-179: 255,183,183,183
-180: 255,159,159,159
-181: 255,135,135,135
-182: 255,99,99,99
-183: 255,75,75,75
-184: 255,243,243,243
-185: 255,219,219,219
-186: 255,195,195,195
-187: 255,171,171,171
-188: 255,147,147,147
-189: 255,123,123,123
-190: 255,111,111,111
-191: 255,87,87,87
--- a/mods/ra/black.rem
+++ b/mods/ra/black.rem
@@ -1,16 +0,0 @@
-80: 255,80,80,80
-81: 255,75,75,75
-82: 255,70,70,70
-83: 255,65,65,65
-84: 255,60,60,60
-85: 255,55,55,55
-86: 255,50,50,50
-87: 255,45,45,45
-88: 255,40,40,40
-89: 255,35,35,35
-90: 255,30,30,30
-91: 255,25,25,25
-92: 255,20,20,20
-93: 255,15,15,15
-94: 255,10,10,10
-95: 255,5,5,5
--- a/mods/ra/blue.rem
+++ b/mods/ra/blue.rem
@@ -1,16 +0,0 @@
-80: 255,226,230,246
-81: 255,206,210,234
-82: 255,182,190,222
-83: 255,161,170,202
-84: 255,141,149,186
-85: 255,125,133,174
-86: 255,105,117,161
-87: 255,89,105,149
-88: 255,68,85,137
-89: 255,56,72,125
-90: 255,48,64,117
-91: 255,40,56,109
-92: 255,32,44,97
-93: 255,24,44,85
-94: 255,12,32,68
-95: 255,8,20,52
--- a/mods/ra/gold.rem
+++ b/mods/ra/gold.rem
@@ -1,16 +0,0 @@
-80: 255,246,214,121
-81: 255,230,202,113
-82: 255,214,190,105
-83: 255,198,178,97
-84: 255,182,165,89
-85: 255,170,153,85
-86: 255,145,137,76
-87: 255,145,117,64
-88: 255,133,113,56
-89: 255,109,101,56
-90: 255,89,85,44
-91: 255,85,76,36
-92: 255,72,68,32
-93: 255,56,52,28
-94: 255,52,44,20
-95: 255,40,32,8
--- a/mods/ra/gray.rem
+++ b/mods/ra/gray.rem
@@ -1,16 +0,0 @@
-80: 255,238,238,238
-81: 255,238,226,218
-82: 255,222,206,198
-83: 255,206,186,178
-84: 255,186,165,153
-85: 255,165,145,133
-86: 255,149,125,113
-87: 255,133,113,101
-88: 255,113,89,80
-89: 255,93,72,64
-90: 255,80,60,52
-91: 255,80,60,52
-92: 255,60,44,40
-93: 255,60,44,40
-94: 255,44,28,24
-95: 255,44,28,24
--- a/mods/ra/green.rem
+++ b/mods/ra/green.rem
@@ -1,16 +0,0 @@
-80: 255,255,230,149
-81: 255,255,230,149
-82: 255,198,230,133
-83: 255,178,210,125
-84: 255,157,190,117
-85: 255,137,174,109
-86: 255,121,153,101
-87: 255,105,137,93
-88: 255,89,117,76
-89: 255,76,101,60
-90: 255,60,85,48
-91: 255,48,68,36
-92: 255,36,52,24
-93: 255,36,52,24
-94: 255,24,36,16
-95: 255,20,20,20
--- a/mods/ra/orange.rem
+++ b/mods/ra/orange.rem
@@ -1,16 +0,0 @@
-80: 255,255,230,149
-81: 255,255,214,125
-82: 255,246,198,113
-83: 255,238,174,85
-84: 255,234,161,64
-85: 255,230,145,40
-86: 255,214,121,16
-87: 255,198,97,0
-88: 255,182,72,0
-89: 255,165,56,0
-90: 255,153,40,0
-91: 255,133,32,0
-92: 255,109,16,0
-93: 255,93,8,0
-94: 255,76,0,0
-95: 255,56,0,0
--- a/mods/ra/red.rem
+++ b/mods/ra/red.rem
@@ -1,16 +0,0 @@
-80: 255,255,93,0
-81: 255,255,0,0
-82: 255,238,0,0
-83: 255,218,0,0
-84: 255,206,0,0
-85: 255,190,0,0
-86: 255,178,0,0
-87: 255,170,0,0
-88: 255,149,0,0
-89: 255,133,0,0
-90: 255,117,0,0
-91: 255,101,0,0
-92: 255,93,8,0
-93: 255,76,0,0
-94: 255,60,0,0
-95: 255,56,0,0
--- a/mods/ra/rules.yaml
+++ b/mods/ra/rules.yaml
@@ -85,60 +85,71 @@ World:
 		DisplayName: Gold
 		BasePalette: terrain
 		DisplayColor: 228, 200, 112
+		Color1: 246,214,121
+		Color2: 40,32,8
 	PlayerColorPalette@player1:
 		Name: player1
 		DisplayName: Blue
 		BasePalette: terrain
-		Remap: blue.rem
 		DisplayColor: 56, 72, 125
+		Color1: 226,230,246
+		Color2: 8,20,52
 	PlayerColorPalette@player2:
 		Name: player2
 		DisplayName: Red
 		BasePalette: terrain
-		Remap: red.rem
-		DisplayColor: 238, 0, 0
+		DisplayColor: 238,0,0
+		Color1: 255,20,0
+		Color2: 56,0,0
 	PlayerColorPalette@player3:
 		Name: player3
 		DisplayName: Orange
 		BasePalette: terrain
-		Remap: orange.rem
 		DisplayColor: 198,97,0
+		Color1: 255,230,149
+		Color2: 56,0,0
 	PlayerColorPalette@player4:
 		Name: player4
 		DisplayName: Teal
 		BasePalette: terrain
-		Remap: teal.rem
 		DisplayColor: 28,109,97
+		Color1: 93,194,165
+		Color2: 0,32,32
 	PlayerColorPalette@player5:
 		Name: player5
 		DisplayName: Salmon
 		BasePalette: terrain
-		Remap: salmon.rem
 		DisplayColor: 153,76,53
+		Color1: 210,153,125
+		Color2: 56,0,0
 	PlayerColorPalette@player6:
 		Name: player6
 		DisplayName: Green
 		BasePalette: terrain
-		Remap: green.rem
 		DisplayColor: 76,101,60
+		Color1: 160,240,140
+		Color2: 20,20,20
 	PlayerColorPalette@player7:
 		Name: player7
 		DisplayName: Gray
 		BasePalette: terrain
-		Remap: gray.rem
 		DisplayColor: 133,113,101
+		Color1: 238,238,238
+		Color2: 44,28,24
 	PlayerColorPalette@player8:
 		Name: player8
 		DisplayName: White
 		BasePalette: terrain
-		Remap: white.rem
 		DisplayColor: 255,255,255
+		Color1: 255,255,255
+		Color2: 75,75,75
 	PlayerColorPalette@player9:
 		Name: player9
 		DisplayName: Black
 		BasePalette: terrain
-		Remap: black.rem
 		DisplayColor: 30,30,30
+		Color1: 80,80,80
+		Color2: 5,5,5
 	PaletteFromFile@chrome:
 		Name: chrome
 		Filename: temperat.pal
--- a/mods/ra/salmon.rem
+++ b/mods/ra/salmon.rem
@@ -1,16 +0,0 @@
-80: 255,210,153,125
-81: 255,210,153,125
-82: 255,194,137,105
-83: 255,182,113,85
-84: 255,174,93,68
-85: 255,174,93,68
-86: 255,153,76,56
-87: 255,133,64,48
-88: 255,133,44,36
-89: 255,113,44,36
-90: 255,97,36,28
-91: 255,93,8,0
-92: 255,76,0,0
-93: 255,76,0,0
-94: 255,56,0,0
-95: 255,56,0,0
--- a/mods/ra/teal.rem
+++ b/mods/ra/teal.rem
@@ -1,16 +0,0 @@
-80: 255,93,194,165
-81: 255,93,194,165
-82: 255,85,178,153
-83: 255,85,178,153
-84: 255,76,161,137
-85: 255,68,145,125
-86: 255,64,133,117
-87: 255,56,117,109
-88: 255,28,109,97
-89: 255,24,89,76
-90: 255,24,89,76
-91: 255,28,64,64
-92: 255,12,52,52
-93: 255,12,52,52
-94: 255,0,32,32
-95: 255,0,32,32
--- a/mods/ra/white.rem
+++ b/mods/ra/white.rem
@@ -1,16 +0,0 @@
-80: 255,255,255,255
-81: 255,243,243,243
-82: 255,231,231,231
-83: 255,219,219,219
-84: 255,207,207,207
-85: 255,195,195,195
-86: 255,183,183,183
-87: 255,171,171,171
-88: 255,159,159,159
-89: 255,147,147,147
-90: 255,135,135,135
-91: 255,123,123,123
-92: 255,111,111,111
-93: 255,99,99,99
-94: 255,87,87,87
-95: 255,75,75,75