From 006079e22f8ec05bee3644527c7b70698b173b6f Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 3 Jan 2012 14:21:36 +0100
Subject: [PATCH] try to fix some camouflagish colors

---
 gfx/colormap_palette.lmp | Bin 192 -> 48 bytes
 gfx/colormap_palette.pl  |  53 ++++++++++++++++++++++++---------------
 qcsrc/common/util.qc     |  10 ++++----
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/gfx/colormap_palette.lmp b/gfx/colormap_palette.lmp
index 5450eedccb108be6620d160edec6bedd08398144..0d581dea751ee3bdd5cc1f390d391e1305e802ed 100644
GIT binary patch
literal 48
qcmWlO0Sy2!48kNJadIYSQjpa5A)%1AWfC@+<OECne@R<0aOymQP8h)e

literal 192
zcmcJHI}yMz3`500bPAyuOu<99QpjisM$pMX49QVI^fWwu?$q7+kh3@v`3bXz%ExhK
fra)7xnGxYPP==C#S12ne9|v=H0he0M=%4>LMkP}p

diff --git a/gfx/colormap_palette.pl b/gfx/colormap_palette.pl
index 47986f9f3..9cd9a0d70 100644
--- a/gfx/colormap_palette.pl
+++ b/gfx/colormap_palette.pl
@@ -1,29 +1,43 @@
 use strict;
 use warnings;
 
+# Colors:
+#   red
+#   ORANGE1
+#   ORANGE2
+#   yellow
+#   yellowgreen
+#   green
+#   cyangreen
+#   cyan
+#   CYANBLUE1
+#   CYANBLUE2
+#   blue
+#   bluemagenta
+#   magenta
+#   redmagenta
+
 my @colors = (
-	'cccccc',
-	'996600',
-	'00ff80',
-	'00ff00',
-	'ff0000',
-	'00a8ff', # was: 0080ff, green increased
-	'00ffff',
-	'80ff00',
-	'8000ff',
-	'ff00ff',
-	'ff0080',
-	'999999',
-	'ffff00',
-	'0050ff', # was: 0000ff, green increased so the color is perceptively just as bright as red (for teamplay)
-	'ff8000',
-	'000000'
+	'cccccc', # white
+	'ff5500', # orange1
+	'00ff80', # cyangreen
+	'00ff00', # green
+	'ff0000', # red
+	'00aaff', # cyanblue2
+	'00ffff', # cyan
+	'80ff00', # yellowgreen
+	'8000ff', # redmagenta
+	'ff00ff', # magenta
+	'ff0080', # bluemagenta
+	'0000ff', # blue
+	'ffff00', # yellow
+	'0055ff', # cyanblue1
+	'ffaa00', # orange2
+	'000000' # unused
 );
 
 my $value_min = 0x0F;
 my $value_max = 0xFF;
-my $value_smin = 0x00;
-my $value_smax = 0xB3;
 
 my $i = 0;
 my $pal_colormap = "";
@@ -35,9 +49,8 @@ for(@colors)
 	my $g = hex $2;
 	my $b = hex $3;
 	$pal_colormap .= sprintf "%c%c%c", map { int(0.5 + $value_min + ($_ * 1.0 / 0xFF) * ($value_max - $value_min)) } $r, $g, $b;
-	$pal_scoreboard .= sprintf "%c%c%c", map { int(0.5 + $value_smin + ($_ * 1.0 / 0xFF) * ($value_smax - $value_smin)) } $r, $g, $b;
 	printf STDERR "\t\tcase %2d: return '%f %f %f';\n", $i, $r / 0xFF, $g / 0xFF, $b / 0xFF;
 	++$i;
 }
 
-print "$pal_colormap$pal_scoreboard$pal_colormap$pal_scoreboard";
+print "$pal_colormap";
diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 9daab8b4f..7e9d6d94f 100644
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -196,20 +196,20 @@ vector colormapPaletteColor(float c, float isPants)
 	switch(c)
 	{
 		case  0: return '0.800000 0.800000 0.800000';
-		case  1: return '0.600000 0.400000 0.000000';
+		case  1: return '1.000000 0.333333 0.000000';
 		case  2: return '0.000000 1.000000 0.501961';
 		case  3: return '0.000000 1.000000 0.000000';
 		case  4: return '1.000000 0.000000 0.000000';
-		case  5: return '0.000000 0.658824 1.000000';
+		case  5: return '0.000000 0.666667 1.000000';
 		case  6: return '0.000000 1.000000 1.000000';
 		case  7: return '0.501961 1.000000 0.000000';
 		case  8: return '0.501961 0.000000 1.000000';
 		case  9: return '1.000000 0.000000 1.000000';
 		case 10: return '1.000000 0.000000 0.501961';
-		case 11: return '0.600000 0.600000 0.600000';
+		case 11: return '0.000000 0.000000 1.000000';
 		case 12: return '1.000000 1.000000 0.000000';
-		case 13: return '0.000000 0.313725 1.000000';
-		case 14: return '1.000000 0.501961 0.000000';
+		case 13: return '0.000000 0.333333 1.000000';
+		case 14: return '1.000000 0.666667 0.000000';
 		case 15:
 			if(isPants)
 				return
-- 
2.39.2