From 1fafd70f33c693ddd95cc95869ab08dc0309dd71 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Mon, 4 Aug 2008 14:19:18 +0000
Subject: [PATCH] clearer colors by sev

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4021 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/defaultNexuiz.cfg         |   2 ++
 data/gfx/colormap_palette.base |  32 ++++++++++++++++----------------
 data/gfx/colormap_palette.lmp  | Bin 96 -> 804 bytes
 data/qcsrc/common/util.qc      |  30 +++++++++++++++---------------
 4 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg
index 3bfff4342..9af2c0fe3 100644
--- a/data/defaultNexuiz.cfg
+++ b/data/defaultNexuiz.cfg
@@ -1063,3 +1063,5 @@ sbar_font gfx/vera-sans
 prvm_leaktest_ignore_classnames "ctf_team dom_team tdm_team"
 
 sv_allowdownloads_inarchive 1 // for csprogs.dat
+
+set g_jump_grunt 0 // Do you make a grunting noise every time you jump? Is it the same grunting noise every time?
diff --git a/data/gfx/colormap_palette.base b/data/gfx/colormap_palette.base
index 44a7c3d1b..e5919c5d1 100644
--- a/data/gfx/colormap_palette.base
+++ b/data/gfx/colormap_palette.base
@@ -1,19 +1,19 @@
-bbbbbb
-73571f
-00BBBB
-00FF00
-FF0000
-0080ff
-cf8f2b
-b7876b
-c38baa
-FF00FF
-a3877b
-4f6357
-FFFF00
-0000FF
-ff8000
-e30074
+0.800000 0.800000 0.800000
+0.600000 0.400000 0.000000
+0.000000 1.000000 0.501961
+0.000000 1.000000 0.000000
+1.000000 0.000000 0.000000
+0.000000 0.501961 1.000000
+0.000000 1.000000 1.000000
+0.501961 1.000000 0.000000
+0.501961 0.000000 1.000000
+1.000000 0.000000 1.000000
+1.000000 0.000000 0.501961
+0.600000 0.600000 0.600000
+1.000000 1.000000 0.000000
+0.000000 0.000000 1.000000
+1.000000 0.501961 0.000000
+0.000000 0.000000 0.000000
 
 processing of player colors:
 :'<,'>!perl -pe '$_ = sprintf "\%s\n", unpack "H6", pack "CCC", map { $_ * 15/16 + 255/16 } unpack "CCC", pack "H6", $_'                     
diff --git a/data/gfx/colormap_palette.lmp b/data/gfx/colormap_palette.lmp
index 784646b74465c5138eb4ca3e1247746a443975e6..d4057b1e2fe8a38b7ea0a11facd3802178da50f9 100644
GIT binary patch
literal 804
zcmbu6Jr2V#2!;2af)iA<j(^e%^bXlfBo+_7|JDa~WOe9d27+bYmj`C{c+sh+BJD~^
zS&3DZN=Bu2^u$)t9r3X=;^u${zt9ei3sp<*nt_-X7vhrJw<Dg8fPvjy;Qt0g`y`Iz
ze?$Ocagc3&khnfbGK3a9fhM6XGZV7}iWQZFE7|J(McNx{JjPD@Ix`TlLgPXSv3B7=
q%nL)f6zLaH903DKkR-SU?UU#Rx{IT=HVinWyV%zUsq2Ht(jZ?ZHn;l#

literal 96
zcmdnLe}8qNF8}`h{QrTFpTGV8rD+zs`$~>YS`QRh(bpW6llUJb@&A82{}cY2=H})=
wTQP>_W`@lS%?u0-QJW{G$Th@!cP5r^X4qU5A7<`qyLmHEV)N!GhWQME0I!%Sk^lez

diff --git a/data/qcsrc/common/util.qc b/data/qcsrc/common/util.qc
index 886cf4172..fbdd1c0b6 100644
--- a/data/qcsrc/common/util.qc
+++ b/data/qcsrc/common/util.qc
@@ -230,21 +230,21 @@ vector colormapPaletteColor(float c, float isPants)
 {
 	switch(c)
 	{
-		case  0: return '0.733 0.733 0.733';
-		case  1: return '0.451 0.341 0.122';
-		case  2: return '0.000 0.733 0.733';
-		case  3: return '0.000 1.000 0.000';
-		case  4: return '1.000 0.000 0.000';
-		case  5: return '0.000 0.502 1.000';
-		case  6: return '0.812 0.561 0.169';
-		case  7: return '0.718 0.529 0.420';
-		case  8: return '0.765 0.545 0.667';
-		case  9: return '1.000 0.000 1.000';
-		case 10: return '0.639 0.529 0.482';
-		case 11: return '0.310 0.388 0.341';
-		case 12: return '1.000 1.000 0.000';
-		case 13: return '0.000 0.000 1.000';
-		case 14: return '1.000 0.502 0.000';
+		case  0: return '0.800000 0.800000 0.800000';
+		case  1: return '0.600000 0.400000 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.501961 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 12: return '1.000000 1.000000 0.000000';
+		case 13: return '0.000000 0.000000 1.000000';
+		case 14: return '1.000000 0.501961 0.000000';
 		case 15:
 			if(isPants)
 				return
-- 
2.39.2