From 8cd6f05b717165629dcb4a4495f46d99551ead3f Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Fri, 20 Jun 2014 23:57:02 +1200
Subject: [PATCH] Use TS shroud artwork.

---
 OpenRA.Mods.TS/OpenRA.Mods.TS.csproj |   1 +
 OpenRA.Mods.TS/ShroudPalette.cs      |  46 +++++++++++++++++++++++++++
 mods/ts/bits/shadow.shp              | Bin 6687 -> 0 bytes
 mods/ts/rules/world.yaml             |   7 ++--
 mods/ts/sequences/misc.yaml          |   4 +--
 5 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 OpenRA.Mods.TS/ShroudPalette.cs
 delete mode 100644 mods/ts/bits/shadow.shp

diff --git a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj
index e989a749d9..f7054807f5 100644
--- a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj
+++ b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj
@@ -43,6 +43,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Widgets\Logic\TSInstallFromCDLogic.cs" />
+    <Compile Include="ShroudPalette.cs" />
   </ItemGroup>
   <!-- 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.
diff --git a/OpenRA.Mods.TS/ShroudPalette.cs b/OpenRA.Mods.TS/ShroudPalette.cs
new file mode 100644
index 0000000000..0a2a78b946
--- /dev/null
+++ b/OpenRA.Mods.TS/ShroudPalette.cs
@@ -0,0 +1,46 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 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;
+using System.Drawing;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.TS
+{
+	[Desc("Adds the hard-coded shroud palette to the game")]
+	class TSShroudPaletteInfo : ITraitInfo
+	{
+		[Desc("Internal palette name")]
+		public readonly string Name = "shroud";
+
+		public object Create(ActorInitializer init) { return new TSShroudPalette(this); }
+	}
+
+	class TSShroudPalette : IPalette
+	{
+		readonly TSShroudPaletteInfo info;
+
+		public TSShroudPalette(TSShroudPaletteInfo info) { this.info = info; }
+
+		public void InitPalette(WorldRenderer wr)
+		{
+			Func<int, uint> makeColor = i =>
+			{
+				if (i < 128)
+					return (uint)(int2.Lerp(255, 0, i, 127) << 24);
+				return 0;
+			};
+
+			wr.AddPalette(info.Name, new Palette(Exts.MakeArray(256, i => makeColor(i))), false);
+		}
+	}
+}
diff --git a/mods/ts/bits/shadow.shp b/mods/ts/bits/shadow.shp
deleted file mode 100644
index 8d7d7e76ca90c5430a45a6936924f8e41a09ec28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6687
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
NRLB4Q9QuEU{{sXehfDwf

diff --git a/mods/ts/rules/world.yaml b/mods/ts/rules/world.yaml
index a69133b65c..41128b36ab 100644
--- a/mods/ts/rules/world.yaml
+++ b/mods/ts/rules/world.yaml
@@ -68,14 +68,13 @@ World:
 		G: 0
 		B: 0
 		A: 180
-	ShroudPalette@shroud:
+	TSShroudPalette@shroud:
 		Type: Shroud
-	ShroudPalette@fog:
-		Name: fog
-		Fog: true
 	ShroudRenderer:
 		Index: 255, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 20, 40, 56, 65, 97, 130, 148, 194, 24, 33, 66, 132, 28, 41, 67, 134, 1, 2, 4, 8, 3, 6, 12, 9, 7, 14, 13, 11, 5, 10, 15, 255
 		UseExtendedIndex: true
+		ShroudPalette: shroud
+		FogPalette: shroud
 	VoxelNormalsPalette@normals:
 		Name: normals
 		Type: TiberianSun
diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml
index 2f73cc9c2c..45cf0b5c68 100644
--- a/mods/ts/sequences/misc.yaml
+++ b/mods/ts/sequences/misc.yaml
@@ -385,9 +385,9 @@ resources:
 		ShadowStart: 12
 
 shroud:
-	shroud: shadow #TODO: use shroud.shp
+	shroud: shroud
 		Length: *
-	fog: shadow
+	fog: fog
 		Length: *
 
 scorches: #TODO: make use of 07-12 as well