Use _luma rather than _simple simple item colors for wpcolor

_simple colors seem to be used far less, and some of the colors are
quite dark, like the shotgun's "Cinnamon brown". This can make aiming
with it very difficult on some maps. _luma colors are used by more
people, are generally brighter, and better reflect the weapon's "true
color", so are the better option to use for wpcolor.

diff --git a/qcsrc/common/mutators/mutator/overkill/okhmg.qh b/qcsrc/common/mutators/mutator/overkill/okhmg.qh
index dc812be314497927ea0c8021249eefd82a8918d8..6b7024221090181a7aee6826e18d89c8b9830b27 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/okhmg.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okhmg.qh
@@ -8,7 +8,7 @@ CLASS(OverkillHeavyMachineGun, Weapon)
 /* impulse   */ ATTRIB(OverkillHeavyMachineGun, impulse, int, 3);
 /* flags     */ ATTRIB(OverkillHeavyMachineGun, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_SUPERWEAPON | WEP_FLAG_PENETRATEWALLS);
 /* rating    */ ATTRIB(OverkillHeavyMachineGun, bot_pickupbasevalue, float, 10000);
-/* color     */ ATTRIB(OverkillHeavyMachineGun, wpcolor, vector, '0.5 0.5 0');
+/* color     */ ATTRIB(OverkillHeavyMachineGun, wpcolor, vector, '0.992 0.471 0.396');
 /* modelname */ ATTRIB(OverkillHeavyMachineGun, mdl, string, "ok_hmg");
 #ifdef GAMEQC
 /* model     */ ATTRIB(OverkillHeavyMachineGun, m_model, Model, MDL_HMG_ITEM);

diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
index 742bc6076bde0c6ca936f6927d071eb57ff2f7d8..2573b1674c26f9930296a815625cc63a9cf7d197 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
@@ -6,7 +6,7 @@ CLASS(OverkillMachineGun, Weapon)
 /* impulse   */ ATTRIB(OverkillMachineGun, impulse, int, 3);
 /* flags     */ ATTRIB(OverkillMachineGun, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS | WEP_FLAG_MUTATORBLOCKED);
 /* rating    */ ATTRIB(OverkillMachineGun, bot_pickupbasevalue, float, 7000);
-/* color     */ ATTRIB(OverkillMachineGun, wpcolor, vector, '1 1 0');
+/* color     */ ATTRIB(OverkillMachineGun, wpcolor, vector, '0.506 0.945 0.239');
 /* modelname */ ATTRIB(OverkillMachineGun, mdl, string, "ok_mg");
 #ifdef GAMEQC
 /* model     */ ATTRIB(OverkillMachineGun, m_model, Model, MDL_OK_MG_ITEM);

diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qh b/qcsrc/common/mutators/mutator/overkill/oknex.qh
index 120f6d66dae8d7fcdbeeaae364ff0844b7bf9ab5..72d6cf1062d7aa1341d048f871e3cfa047d2a1fe 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/oknex.qh
+++ b/qcsrc/common/mutators/mutator/overkill/oknex.qh
@@ -6,7 +6,7 @@ CLASS(OverkillNex, Weapon)
 /* impulse   */ ATTRIB(OverkillNex, impulse, int, 7);
 /* flags     */ ATTRIB(OverkillNex, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED);
 /* rating    */ ATTRIB(OverkillNex, bot_pickupbasevalue, float, 8000);
-/* color     */ ATTRIB(OverkillNex, wpcolor, vector, '0.5 1 1');
+/* color     */ ATTRIB(OverkillNex, wpcolor, vector, '0.459 0.765 0.835');
 /* modelname */ ATTRIB(OverkillNex, mdl, string, "ok_sniper");
 #ifdef GAMEQC
 /* model     */ ATTRIB(OverkillNex, m_model, Model, MDL_OK_SNIPER_ITEM);

diff --git a/qcsrc/common/mutators/mutator/overkill/okrpc.qh b/qcsrc/common/mutators/mutator/overkill/okrpc.qh
index 2f4388d96d20ec53d575fd6ec153d7e5d8e875d1..be339972283d24233a08c1e4edac17518944b276 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/okrpc.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okrpc.qh
@@ -8,7 +8,7 @@ CLASS(OverkillRocketPropelledChainsaw, Weapon)
 /* impulse   */ ATTRIB(OverkillRocketPropelledChainsaw, impulse, int, 9);
 /* flags     */ ATTRIB(OverkillRocketPropelledChainsaw, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_CANCLIMB | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_SUPERWEAPON);
 /* rating    */ ATTRIB(OverkillRocketPropelledChainsaw, bot_pickupbasevalue, float, 10000);
-/* color     */ ATTRIB(OverkillRocketPropelledChainsaw, wpcolor, vector, '0.5 0.5 0');
+/* color     */ ATTRIB(OverkillRocketPropelledChainsaw, wpcolor, vector, '0.914 0.745 0.341');
 /* modelname */ ATTRIB(OverkillRocketPropelledChainsaw, mdl, string, "ok_rl");
 #ifdef GAMEQC
 /* model     */ ATTRIB(OverkillRocketPropelledChainsaw, m_model, Model, MDL_RPC_ITEM);

diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
index 7dd68a7317d85cda075887a2a647fbfccc8c3984..b4008d9b0e9797a298fb8ce5bed5e1a48596f4b1 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
@@ -6,7 +6,7 @@ CLASS(OverkillShotgun, Weapon)
 /* impulse   */ ATTRIB(OverkillShotgun, impulse, int, 2);
 /* flags     */ ATTRIB(OverkillShotgun, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED);
 /* rating    */ ATTRIB(OverkillShotgun, bot_pickupbasevalue, float, 6000);
-/* color     */ ATTRIB(OverkillShotgun, wpcolor, vector, '0.5 0.25 0');
+/* color     */ ATTRIB(OverkillShotgun, wpcolor, vector, '0.518 0.608 0.659');
 /* modelname */ ATTRIB(OverkillShotgun, mdl, string, "ok_shotgun");
 #ifdef GAMEQC
 /* model     */ ATTRIB(OverkillShotgun, m_model, Model, MDL_OK_SHOTGUN_ITEM);

diff --git a/qcsrc/common/weapons/weapon/arc.qh b/qcsrc/common/weapons/weapon/arc.qh
index caf874eb9def248ec5d52d1a57473740d149fdd9..0eb2e3fe9045636d04fed8b99a65a0998a7d5f2b 100644 (file)
--- a/qcsrc/common/weapons/weapon/arc.qh
+++ b/qcsrc/common/weapons/weapon/arc.qh
@@ -6,7 +6,7 @@ CLASS(Arc, Weapon)
 /* impulse   */ ATTRIB(Arc, impulse, int, 3);
 /* flags     */ ATTRIB(Arc, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_TYPE_HITSCAN);
 /* rating    */ ATTRIB(Arc, bot_pickupbasevalue, float, 8000);
-/* color     */ ATTRIB(Arc, wpcolor, vector, '1 1 1');
+/* color     */ ATTRIB(Arc, wpcolor, vector, '0.486 0.612 0.922');
 /* modelname */ ATTRIB(Arc, mdl, string, "arc");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Arc, m_model, Model, MDL_ARC_ITEM);

diff --git a/qcsrc/common/weapons/weapon/blaster.qh b/qcsrc/common/weapons/weapon/blaster.qh
index 27709310ead3b66bad7497a4e5f0f299d9bd3ea6..862bae7a1969a248435678370c6d21f58532fed6 100644 (file)
--- a/qcsrc/common/weapons/weapon/blaster.qh
+++ b/qcsrc/common/weapons/weapon/blaster.qh
@@ -6,7 +6,7 @@ CLASS(Blaster, Weapon)
 /* impulse   */ ATTRIB(Blaster, impulse, int, 1);
 /* flags     */ ATTRIB(Blaster, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Blaster, bot_pickupbasevalue, float, 0);
-/* color     */ ATTRIB(Blaster, wpcolor, vector, '1 0.5 0.5');
+/* color     */ ATTRIB(Blaster, wpcolor, vector, '0.969 0.443 0.482');
 /* modelname */ ATTRIB(Blaster, mdl, string, "laser");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Blaster, m_model, Model, MDL_BLASTER_ITEM);

diff --git a/qcsrc/common/weapons/weapon/crylink.qh b/qcsrc/common/weapons/weapon/crylink.qh
index 15b46ba721e06d4547bacfce65d688f9c20ab786..fdfcc62c0ff5b27f798a34f2676a3f9417950f30 100644 (file)
--- a/qcsrc/common/weapons/weapon/crylink.qh
+++ b/qcsrc/common/weapons/weapon/crylink.qh
@@ -6,7 +6,7 @@ CLASS(Crylink, Weapon)
 /* impulse   */ ATTRIB(Crylink, impulse, int, 6);
 /* flags     */ ATTRIB(Crylink, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_CANCLIMB);
 /* rating    */ ATTRIB(Crylink, bot_pickupbasevalue, float, 6000);
-/* color     */ ATTRIB(Crylink, wpcolor, vector, '1 0.5 1');
+/* color     */ ATTRIB(Crylink, wpcolor, vector, '0.918 0.435 0.976');
 /* modelname */ ATTRIB(Crylink, mdl, string, "crylink");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Crylink, m_model, Model, MDL_CRYLINK_ITEM);

diff --git a/qcsrc/common/weapons/weapon/devastator.qh b/qcsrc/common/weapons/weapon/devastator.qh
index 1d3261f429ae3716a033444f13bddf1576e22efb..50ace0fe5079e27ab90fd13b2f783100e0aad6c1 100644 (file)
--- a/qcsrc/common/weapons/weapon/devastator.qh
+++ b/qcsrc/common/weapons/weapon/devastator.qh
@@ -6,7 +6,7 @@ CLASS(Devastator, Weapon)
 /* impulse   */ ATTRIB(Devastator, impulse, int, 9);
 /* flags     */ ATTRIB(Devastator, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Devastator, bot_pickupbasevalue, float, 8000);
-/* color     */ ATTRIB(Devastator, wpcolor, vector, '1 1 0');
+/* color     */ ATTRIB(Devastator, wpcolor, vector, '0.914 0.745 0.341');
 /* modelname */ ATTRIB(Devastator, mdl, string, "rl");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Devastator, m_model, Model, MDL_DEVASTATOR_ITEM);

diff --git a/qcsrc/common/weapons/weapon/electro.qh b/qcsrc/common/weapons/weapon/electro.qh
index e7df4e039036a69e61f19c529d52a2fb44c5ff07..538ee0124b672e484fce35eee7bafc41dcc27cfd 100644 (file)
--- a/qcsrc/common/weapons/weapon/electro.qh
+++ b/qcsrc/common/weapons/weapon/electro.qh
@@ -6,7 +6,7 @@ CLASS(Electro, Weapon)
 /* impulse   */ ATTRIB(Electro, impulse, int, 5);
 /* flags     */ ATTRIB(Electro, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Electro, bot_pickupbasevalue, float, 5000);
-/* color     */ ATTRIB(Electro, wpcolor, vector, '0 0.5 1');
+/* color     */ ATTRIB(Electro, wpcolor, vector, '0.408 0.600 0.949');
 /* modelname */ ATTRIB(Electro, mdl, string, "electro");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Electro, m_model, Model, MDL_ELECTRO_ITEM);

diff --git a/qcsrc/common/weapons/weapon/fireball.qh b/qcsrc/common/weapons/weapon/fireball.qh
index 3ce41d9325a38fa9509dd400b6223c9a59e706dc..5cacbb695fec81cc303f882872c3f60a2fb77445 100644 (file)
--- a/qcsrc/common/weapons/weapon/fireball.qh
+++ b/qcsrc/common/weapons/weapon/fireball.qh
@@ -6,7 +6,7 @@ CLASS(Fireball, Weapon)
 /* impulse   */ ATTRIB(Fireball, impulse, int, 9);
 /* flags     */ ATTRIB(Fireball, spawnflags, int, WEP_FLAG_SUPERWEAPON | WEP_TYPE_SPLASH | WEP_FLAG_NODUAL);
 /* rating    */ ATTRIB(Fireball, bot_pickupbasevalue, float, 5000);
-/* color     */ ATTRIB(Fireball, wpcolor, vector, '1 0.5 0');
+/* color     */ ATTRIB(Fireball, wpcolor, vector, '0.941 0.522 0.373');
 /* modelname */ ATTRIB(Fireball, mdl, string, "fireball");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Fireball, m_model, Model, MDL_FIREBALL_ITEM);

diff --git a/qcsrc/common/weapons/weapon/hagar.qh b/qcsrc/common/weapons/weapon/hagar.qh
index 42e5cbd3e41db60fbe7cf7f6d2674fb7cdd6b9bb..648214c740debec95d8792f7b59a6049fe1c4648 100644 (file)
--- a/qcsrc/common/weapons/weapon/hagar.qh
+++ b/qcsrc/common/weapons/weapon/hagar.qh
@@ -6,7 +6,7 @@ CLASS(Hagar, Weapon)
 /* impulse   */ ATTRIB(Hagar, impulse, int, 8);
 /* flags     */ ATTRIB(Hagar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Hagar, bot_pickupbasevalue, float, 6000);
-/* color     */ ATTRIB(Hagar, wpcolor, vector, '1 1 0.5');
+/* color     */ ATTRIB(Hagar, wpcolor, vector, '0.890 0.569 0.376');
 /* modelname */ ATTRIB(Hagar, mdl, string, "hagar");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Hagar, m_model, Model, MDL_HAGAR_ITEM);

diff --git a/qcsrc/common/weapons/weapon/hlac.qh b/qcsrc/common/weapons/weapon/hlac.qh
index f954e7f5f26ec94c89d5b869130a4a6c9b590aab..a339a42f77f99111d4030a1f2b7b4e66e992f272 100644 (file)
--- a/qcsrc/common/weapons/weapon/hlac.qh
+++ b/qcsrc/common/weapons/weapon/hlac.qh
@@ -6,7 +6,7 @@ CLASS(HLAC, Weapon)
 /* impulse   */ ATTRIB(HLAC, impulse, int, 6);
 /* flags     */ ATTRIB(HLAC, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(HLAC, bot_pickupbasevalue, float, 4000);
-/* color     */ ATTRIB(HLAC, wpcolor, vector, '0 1 0');
+/* color     */ ATTRIB(HLAC, wpcolor, vector, '0.898 0.588 0.357');
 /* modelname */ ATTRIB(HLAC, mdl, string, "hlac");
 #ifdef GAMEQC
 /* model     */ ATTRIB(HLAC, m_model, Model, MDL_HLAC_ITEM);

diff --git a/qcsrc/common/weapons/weapon/hook.qh b/qcsrc/common/weapons/weapon/hook.qh
index 538351835779e8bd312ab221a12650240ea8e246..ba433cf46243c0610cffa306c647810106f52192 100644 (file)
--- a/qcsrc/common/weapons/weapon/hook.qh
+++ b/qcsrc/common/weapons/weapon/hook.qh
@@ -6,7 +6,7 @@ CLASS(Hook, Weapon)
 /* impulse   */ ATTRIB(Hook, impulse, int, 0);
 /* flags     */ ATTRIB(Hook, spawnflags, int, WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH | WEP_FLAG_NOTRUEAIM);
 /* rating    */ ATTRIB(Hook, bot_pickupbasevalue, float, 0);
-/* color     */ ATTRIB(Hook, wpcolor, vector, '0 0.5 0');
+/* color     */ ATTRIB(Hook, wpcolor, vector, '0.506 0.945 0.239');
 /* modelname */ ATTRIB(Hook, mdl, string, "hookgun");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Hook, m_model, Model, MDL_HOOK_ITEM);

diff --git a/qcsrc/common/weapons/weapon/machinegun.qh b/qcsrc/common/weapons/weapon/machinegun.qh
index 824ecc3d471e4a99b8467d746138d2fd9c96a504..0c302755ce8f48e3bb7ed30dec02d6ed3ec60747 100644 (file)
--- a/qcsrc/common/weapons/weapon/machinegun.qh
+++ b/qcsrc/common/weapons/weapon/machinegun.qh
@@ -6,7 +6,7 @@ CLASS(MachineGun, Weapon)
 /* impulse   */ ATTRIB(MachineGun, impulse, int, 3);
 /* flags     */ ATTRIB(MachineGun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS | WEP_FLAG_BLEED);
 /* rating    */ ATTRIB(MachineGun, bot_pickupbasevalue, float, 7000);
-/* color     */ ATTRIB(MachineGun, wpcolor, vector, '1 1 0');
+/* color     */ ATTRIB(MachineGun, wpcolor, vector, '0.506 0.945 0.239');
 /* modelname */ ATTRIB(MachineGun, mdl, string, "uzi");
 #ifdef GAMEQC
 /* model     */ ATTRIB(MachineGun, m_model, Model, MDL_MACHINEGUN_ITEM);

diff --git a/qcsrc/common/weapons/weapon/minelayer.qh b/qcsrc/common/weapons/weapon/minelayer.qh
index 11618fc65aac632ae3b06e1309b9f8b909a06761..62412fc4e42438ad3b64b0437eefcb128dbe6750 100644 (file)
--- a/qcsrc/common/weapons/weapon/minelayer.qh
+++ b/qcsrc/common/weapons/weapon/minelayer.qh
@@ -6,7 +6,7 @@ CLASS(MineLayer, Weapon)
 /* impulse   */ ATTRIB(MineLayer, impulse, int, 4);
 /* flags     */ ATTRIB(MineLayer, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(MineLayer, bot_pickupbasevalue, float, 7000);
-/* color     */ ATTRIB(MineLayer, wpcolor, vector, '0.75 1 0');
+/* color     */ ATTRIB(MineLayer, wpcolor, vector, '0.992 0.471 0.396');
 /* modelname */ ATTRIB(MineLayer, mdl, string, "minelayer");
 #ifdef GAMEQC
 /* model     */ ATTRIB(MineLayer, m_model, Model, MDL_MINELAYER_ITEM);

diff --git a/qcsrc/common/weapons/weapon/mortar.qh b/qcsrc/common/weapons/weapon/mortar.qh
index 880965022bf23364de7e18239445a6e80ae654bf..009fcd9dc3cb57fd5aaf5d72d400db2aeebbd8c9 100644 (file)
--- a/qcsrc/common/weapons/weapon/mortar.qh
+++ b/qcsrc/common/weapons/weapon/mortar.qh
@@ -6,7 +6,7 @@ CLASS(Mortar, Weapon)
 /* impulse   */ ATTRIB(Mortar, impulse, int, 4);
 /* flags     */ ATTRIB(Mortar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH | WEP_FLAG_NOTRUEAIM);
 /* rating    */ ATTRIB(Mortar, bot_pickupbasevalue, float, 7000);
-/* color     */ ATTRIB(Mortar, wpcolor, vector, '1 0 0');
+/* color     */ ATTRIB(Mortar, wpcolor, vector, '0.992 0.471 0.396');
 /* modelname */ ATTRIB(Mortar, mdl, string, "gl");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Mortar, m_model, Model, MDL_MORTAR_ITEM);

diff --git a/qcsrc/common/weapons/weapon/porto.qh b/qcsrc/common/weapons/weapon/porto.qh
index 75cd7474cd4f1c8053cd5505fb972aeb00f31127..cffb15f70be5909c678987fcbcd38a4eac04a354 100644 (file)
--- a/qcsrc/common/weapons/weapon/porto.qh
+++ b/qcsrc/common/weapons/weapon/porto.qh
@@ -6,7 +6,7 @@ CLASS(PortoLaunch, Weapon)
 /* impulse   */ ATTRIB(PortoLaunch, impulse, int, 0);
 /* flags     */ ATTRIB(PortoLaunch, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_SUPERWEAPON | WEP_FLAG_NODUAL | WEP_FLAG_NOTRUEAIM);
 /* rating    */ ATTRIB(PortoLaunch, bot_pickupbasevalue, float, 0);
-/* color     */ ATTRIB(PortoLaunch, wpcolor, vector, '0.5 0.5 0.5');
+/* color     */ ATTRIB(PortoLaunch, wpcolor, vector, '0.408 0.600 0.949');
 /* modelname */ ATTRIB(PortoLaunch, mdl, string, "porto");
 #ifdef GAMEQC
 /* model     */ ATTRIB(PortoLaunch, m_model, Model, MDL_PORTO_ITEM);

diff --git a/qcsrc/common/weapons/weapon/rifle.qh b/qcsrc/common/weapons/weapon/rifle.qh
index 56f24b8f0a4b84518f85de0f358dd3b38dd9ada2..f92e223ae6d2df267b373cc230a543e50d82610c 100644 (file)
--- a/qcsrc/common/weapons/weapon/rifle.qh
+++ b/qcsrc/common/weapons/weapon/rifle.qh
@@ -6,7 +6,7 @@ CLASS(Rifle, Weapon)
 /* impulse   */ ATTRIB(Rifle, impulse, int, 7);
 /* flags     */ ATTRIB(Rifle, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS);
 /* rating    */ ATTRIB(Rifle, bot_pickupbasevalue, float, 7000);
-/* color     */ ATTRIB(Rifle, wpcolor, vector, '0.5 1 0');
+/* color     */ ATTRIB(Rifle, wpcolor, vector, '0.890 0.569 0.376');
 /* modelname */ ATTRIB(Rifle, mdl, string, "campingrifle");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Rifle, m_model, Model, MDL_RIFLE_ITEM);

diff --git a/qcsrc/common/weapons/weapon/seeker.qh b/qcsrc/common/weapons/weapon/seeker.qh
index 053ed1a064d784408b5872bb6f20f50e0550732d..b603a61897fad02fc072e6cd34ca5ff992d706c1 100644 (file)
--- a/qcsrc/common/weapons/weapon/seeker.qh
+++ b/qcsrc/common/weapons/weapon/seeker.qh
@@ -6,7 +6,7 @@ CLASS(Seeker, Weapon)
 /* impulse   */ ATTRIB(Seeker, impulse, int, 8);
 /* flags     */ ATTRIB(Seeker, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Seeker, bot_pickupbasevalue, float, 5000);
-/* color     */ ATTRIB(Seeker, wpcolor, vector, '0.5 1 0');
+/* color     */ ATTRIB(Seeker, wpcolor, vector, '0.969 0.443 0.482');
 /* modelname */ ATTRIB(Seeker, mdl, string, "seeker");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Seeker, m_model, Model, MDL_SEEKER_ITEM);

diff --git a/qcsrc/common/weapons/weapon/shockwave.qh b/qcsrc/common/weapons/weapon/shockwave.qh
index fede776cbe145896e734af637a58e89938add29e..e62392638ad18bca6b0d1ed665c2e901616c17b0 100644 (file)
--- a/qcsrc/common/weapons/weapon/shockwave.qh
+++ b/qcsrc/common/weapons/weapon/shockwave.qh
@@ -6,7 +6,7 @@ CLASS(Shockwave, Weapon)
 /* impulse   */ ATTRIB(Shockwave, impulse, int, 2);
 /* flags     */ ATTRIB(Shockwave, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_TYPE_HITSCAN | WEP_FLAG_CANCLIMB | WEP_TYPE_MELEE_SEC);
 /* rating    */ ATTRIB(Shockwave, bot_pickupbasevalue, float, 3000);
-/* color     */ ATTRIB(Shockwave, wpcolor, vector, '0.5 0.25 0');
+/* color     */ ATTRIB(Shockwave, wpcolor, vector, '0.467 0.702 0.541');
 /* modelname */ ATTRIB(Shockwave, mdl, string, "shotgun");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Shockwave, m_model, Model, MDL_SHOCKWAVE_ITEM);

diff --git a/qcsrc/common/weapons/weapon/shotgun.qh b/qcsrc/common/weapons/weapon/shotgun.qh
index be6121690df3860d2f8638d9f030ed80501ba95e..4ef5f4bc8f3ea5a7e004bd05cd379b607ac40ee1 100644 (file)
--- a/qcsrc/common/weapons/weapon/shotgun.qh
+++ b/qcsrc/common/weapons/weapon/shotgun.qh
@@ -6,7 +6,7 @@ CLASS(Shotgun, Weapon)
 /* impulse   */ ATTRIB(Shotgun, impulse, int, 2);
 /* flags     */ ATTRIB(Shotgun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_TYPE_MELEE_SEC | WEP_FLAG_BLEED);
 /* rating    */ ATTRIB(Shotgun, bot_pickupbasevalue, float, 6000);
-/* color     */ ATTRIB(Shotgun, wpcolor, vector, '0.5 0.25 0');
+/* color     */ ATTRIB(Shotgun, wpcolor, vector, '0.518 0.608 0.659');
 /* modelname */ ATTRIB(Shotgun, mdl, string, "shotgun");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Shotgun, m_model, Model, MDL_SHOTGUN_ITEM);

diff --git a/qcsrc/common/weapons/weapon/tuba.qh b/qcsrc/common/weapons/weapon/tuba.qh
index 5de0b647b490905ccccfdf6ef3a202260e37333a..ba9e749c6b8621065554a867a3a9cf9cbb772e6f 100644 (file)
--- a/qcsrc/common/weapons/weapon/tuba.qh
+++ b/qcsrc/common/weapons/weapon/tuba.qh
@@ -5,7 +5,7 @@ CLASS(Tuba, Weapon)
 /* impulse   */ ATTRIB(Tuba, impulse, int, 1);
 /* flags     */ ATTRIB(Tuba, spawnflags, int, WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH | WEP_FLAG_NODUAL | WEP_FLAG_NOTRUEAIM);
 /* rating    */ ATTRIB(Tuba, bot_pickupbasevalue, float, 2000);
-/* color     */ ATTRIB(Tuba, wpcolor, vector, '0 1 0');
+/* color     */ ATTRIB(Tuba, wpcolor, vector, '0.914 0.745 0.341');
 /* modelname */ ATTRIB(Tuba, mdl, string, "tuba");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Tuba, m_model, Model, MDL_TUBA_ITEM);

diff --git a/qcsrc/common/weapons/weapon/vaporizer.qh b/qcsrc/common/weapons/weapon/vaporizer.qh
index 9f7b5710465604b7444cd0727e577d0b7f7fa80c..ae7cda2ff8fa8298eaa480877809f9757c9c78f1 100644 (file)
--- a/qcsrc/common/weapons/weapon/vaporizer.qh
+++ b/qcsrc/common/weapons/weapon/vaporizer.qh
@@ -6,7 +6,7 @@ CLASS(Vaporizer, Weapon)
 /* impulse   */ ATTRIB(Vaporizer, impulse, int, 7);
 /* flags     */ ATTRIB(Vaporizer, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN | WEP_FLAG_NODUAL);
 /* rating    */ ATTRIB(Vaporizer, bot_pickupbasevalue, float, 10000);
-/* color     */ ATTRIB(Vaporizer, wpcolor, vector, '0.5 1 1');
+/* color     */ ATTRIB(Vaporizer, wpcolor, vector, '0.592 0.557 0.824');
 /* modelname */ ATTRIB(Vaporizer, mdl, string, "minstanex");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Vaporizer, m_model, Model, MDL_VAPORIZER_ITEM);

diff --git a/qcsrc/common/weapons/weapon/vortex.qh b/qcsrc/common/weapons/weapon/vortex.qh
index 9914e3a7ae6f122e626540231a1b651be37713c0..6e874d642a217620595d49cd660215626c42cbcf 100644 (file)
--- a/qcsrc/common/weapons/weapon/vortex.qh
+++ b/qcsrc/common/weapons/weapon/vortex.qh
@@ -6,7 +6,7 @@ CLASS(Vortex, Weapon)
 /* impulse   */ ATTRIB(Vortex, impulse, int, 7);
 /* flags     */ ATTRIB(Vortex, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN);
 /* rating    */ ATTRIB(Vortex, bot_pickupbasevalue, float, 8000);
-/* color     */ ATTRIB(Vortex, wpcolor, vector, '0.5 1 1');
+/* color     */ ATTRIB(Vortex, wpcolor, vector, '0.459 0.765 0.835');
 /* modelname */ ATTRIB(Vortex, mdl, string, "nex");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Vortex, m_model, Model, MDL_VORTEX_ITEM);