X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gfx%2Fcolormap_palette.pl;h=07ad2de1142c640f30c387b969c2f97d86523c5e;hb=9a2bcac8d6b0967c9b43f5a91cea80468f1cb8dd;hp=47986f9f30a2b6208967448f2373ec5f9be112ab;hpb=0e7ed909bffb4ff21f0c68d163edfc17487e380a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/gfx/colormap_palette.pl b/gfx/colormap_palette.pl
index 47986f9f3..07ad2de11 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'
+	'ffffff', # white
+	'ff5500', # orange1
+	'00ff80', # cyangreen
+	'00ff00', # green
+	'ff0000', # red
+	'00aaff', # cyanblue1
+	'00ffff', # cyan
+	'80ff00', # yellowgreen
+	'8000ff', # bluemagenta
+	'ff00ff', # magenta
+	'ff0080', # redmagenta
+	'0000ff', # blue
+	'ffff00', # yellow
+	'0055ff', # cyanblue2
+	'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$pal_colormap$pal_colormap$pal_colormap";