Make luma weapon colors unique

Previously there were a few weapons which had an identical _luma simpleitems color:
- Electro and Porto-O-Launch
- Arc was very similar to the above two
- Mine Layer and Mortar
- Blaster and T.A.G. Seeker (these were also very similar to the above two)
- (New) HLAC and Grappling Hook
- Hagar and Rifle
- (New) MachineGun was very similar to the above two
- Devastator and Tuba
(I've excluded listing overkill weapons above since players shouldn't have those & others at once).
To address this, some duplicate colors were *slightly* modified:
1. Rifle is now more yellow. Chose to shift it in this direction since rifle bullet casings are often more yellow than orange
2. Hagar is now a more saturated orange. This may help distinguish it from (new) MachineGun a bit
3. Port-O-Launch (and thus Ball Stealer) are now a more saturated blue, to distinguish it from Electro
4. Arc is now a paler (whiter) blue to distinguish it from Electro. They have similar secondaries, but the Arc primary fire is quite white, so shifting the color in this direction made the most sense
5. Grappling Hook is now a bit more blue, to distinguish it from the green (new) HLAC
6. Mortar is now more red and a bit more saturated
7. Mine Layer is now a bit more orange
8. T.A.G. Seeker is now more pink to distinguish it from the Blaster and other similarly colored weapons
9. Tuba is now a brighter (whiter) yellow, to distinguish it from the Devastator

diff --git a/gfx/hud/luma/weaponarc.tga b/gfx/hud/luma/weaponarc.tga
index adaeff5317e3badd8e18e0ad88071d35b9f54a32..fe070beef39292af3740542f62cb245dd22df15a 100644 (file)
Binary files a/gfx/hud/luma/weaponarc.tga and b/gfx/hud/luma/weaponarc.tga differ

diff --git a/gfx/hud/luma/weapongrenadelauncher.tga b/gfx/hud/luma/weapongrenadelauncher.tga
index 9cb32288b0ef2d96907158987093d4c944fa41b1..e8c2b8f70d59794d533a6b2f615bb3142992fd79 100644 (file)
Binary files a/gfx/hud/luma/weapongrenadelauncher.tga and b/gfx/hud/luma/weapongrenadelauncher.tga differ

diff --git a/gfx/hud/luma/weaponhagar.tga b/gfx/hud/luma/weaponhagar.tga
index 63a8b608d811dd402c34a4fc7e52852352357782..788371d27787fe2acf529bb634013710f308f8db 100644 (file)
Binary files a/gfx/hud/luma/weaponhagar.tga and b/gfx/hud/luma/weaponhagar.tga differ

diff --git a/gfx/hud/luma/weaponhook.tga b/gfx/hud/luma/weaponhook.tga
index a3d2b886d9c4acc2216225fd55051ead969787d2..fe7725df66a24d47d069557bd427cf04f0eea4d7 100644 (file)
Binary files a/gfx/hud/luma/weaponhook.tga and b/gfx/hud/luma/weaponhook.tga differ

diff --git a/gfx/hud/luma/weaponminelayer.tga b/gfx/hud/luma/weaponminelayer.tga
index 0f0069d3af8a25c6e5f28211a54ab8f1240dff79..199d93e081f67354a8f72714d10c84eadfc50bea 100644 (file)
Binary files a/gfx/hud/luma/weaponminelayer.tga and b/gfx/hud/luma/weaponminelayer.tga differ

diff --git a/gfx/hud/luma/weaponporto.tga b/gfx/hud/luma/weaponporto.tga
index 5ee816970a4dad48453d9076856a78702697512c..35eae3530e8b447bac6b104379170837c3c03bd4 100644 (file)
Binary files a/gfx/hud/luma/weaponporto.tga and b/gfx/hud/luma/weaponporto.tga differ

diff --git a/gfx/hud/luma/weaponrifle.tga b/gfx/hud/luma/weaponrifle.tga
index 036845c47e85d8aa5e24afceb8bd22fa0a198992..6b6bc05908694133e0d58c233cde449d85dcd6fe 100644 (file)
Binary files a/gfx/hud/luma/weaponrifle.tga and b/gfx/hud/luma/weaponrifle.tga differ

diff --git a/gfx/hud/luma/weaponseeker.tga b/gfx/hud/luma/weaponseeker.tga
index 17645a67443fefc689f5ea2ef6c471ec4895d305..a7f6621f3d51a35d68a56c2155795d89db4cbbe2 100644 (file)
Binary files a/gfx/hud/luma/weaponseeker.tga and b/gfx/hud/luma/weaponseeker.tga differ

diff --git a/gfx/hud/luma/weapontuba.tga b/gfx/hud/luma/weapontuba.tga
index 47acf244f2a5fb37b1f460a1755ed1db27f2993c..4a5b57ac0744ad10fdef417948b6daf6be2ee6d1 100644 (file)
Binary files a/gfx/hud/luma/weapontuba.tga and b/gfx/hud/luma/weapontuba.tga differ

diff --git a/models/weapons/g_arc_luma.tga b/models/weapons/g_arc_luma.tga
index b899eda9a32d42c17c8f51322f3f5b0b04e68375..ff9b58d77800a60b4465ceebcde722c12c242632 100644 (file)
Binary files a/models/weapons/g_arc_luma.tga and b/models/weapons/g_arc_luma.tga differ

diff --git a/models/weapons/g_campingrifle_luma.tga b/models/weapons/g_campingrifle_luma.tga
index 5f8e13548860ecb9679a526c8db5e0023bda467f..23356ba65f03e53c25d983d2fcf669ae470dbe3d 100644 (file)
Binary files a/models/weapons/g_campingrifle_luma.tga and b/models/weapons/g_campingrifle_luma.tga differ

diff --git a/models/weapons/g_gl_luma.tga b/models/weapons/g_gl_luma.tga
index 4e0ac91a375d16dcbcdee5f1eb5a17c640b31d08..cf4840e0571377d80716fa016f728705d70f99db 100644 (file)
Binary files a/models/weapons/g_gl_luma.tga and b/models/weapons/g_gl_luma.tga differ

diff --git a/models/weapons/g_hagar_luma.tga b/models/weapons/g_hagar_luma.tga
index 1a980606a95960379f12e0963cd88b91e47fc2cb..cd180c62ae70f5ab8e1d3f15a769157c0e114b3c 100644 (file)
Binary files a/models/weapons/g_hagar_luma.tga and b/models/weapons/g_hagar_luma.tga differ

diff --git a/models/weapons/g_hookgun_luma.tga b/models/weapons/g_hookgun_luma.tga
index 4ce22fb313c76aac812595f4ec445488f63f8106..d6d2ba00058c09578aa0674c8efb4815d55bd066 100644 (file)
Binary files a/models/weapons/g_hookgun_luma.tga and b/models/weapons/g_hookgun_luma.tga differ

diff --git a/models/weapons/g_minelayer_luma.tga b/models/weapons/g_minelayer_luma.tga
index ff1e667c10889d016f5b153bea7ca7ac2ffba443..4c10edd117621633b8dfef3c102f7208c27f0c21 100644 (file)
Binary files a/models/weapons/g_minelayer_luma.tga and b/models/weapons/g_minelayer_luma.tga differ

diff --git a/models/weapons/g_porto_luma.tga b/models/weapons/g_porto_luma.tga
index 93bef14a1a73928424a0809bc48ade80450821f4..dc587505c98f9f7dd49d03ee2c1239c16da39be7 100644 (file)
Binary files a/models/weapons/g_porto_luma.tga and b/models/weapons/g_porto_luma.tga differ

diff --git a/models/weapons/g_seeker_luma.tga b/models/weapons/g_seeker_luma.tga
index 12405eed9ffe419d86618dc4d7d0f818154fe70e..a82789b93c8f8ca1cb90cd4dc95b80063ee471e4 100644 (file)
Binary files a/models/weapons/g_seeker_luma.tga and b/models/weapons/g_seeker_luma.tga differ

diff --git a/models/weapons/g_tuba_luma.tga b/models/weapons/g_tuba_luma.tga
index 82785e6f488f714b4377d7d7f1caf0da7e3cc270..a4d0b4a78003d29775484a55f6a57b7b3a20603a 100644 (file)
Binary files a/models/weapons/g_tuba_luma.tga and b/models/weapons/g_tuba_luma.tga differ

diff --git a/qcsrc/common/weapons/weapon/arc.qh b/qcsrc/common/weapons/weapon/arc.qh
index 0eb2e3fe9045636d04fed8b99a65a0998a7d5f2b..9a59f0675189fddfa7adfeb24c433c0d09528597 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, '0.486 0.612 0.922');
+/* color     */ ATTRIB(Arc, wpcolor, vector, '0.463 0.612 0.886');
 /* modelname */ ATTRIB(Arc, mdl, string, "arc");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Arc, m_model, Model, MDL_ARC_ITEM);

diff --git a/qcsrc/common/weapons/weapon/hagar.qh b/qcsrc/common/weapons/weapon/hagar.qh
index 648214c740debec95d8792f7b59a6049fe1c4648..9ca7d0b853430d973142e991bd2a1fba0d6d041d 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, '0.890 0.569 0.376');
+/* color     */ ATTRIB(Hagar, wpcolor, vector, '0.886 0.545 0.345');
 /* modelname */ ATTRIB(Hagar, mdl, string, "hagar");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Hagar, m_model, Model, MDL_HAGAR_ITEM);

diff --git a/qcsrc/common/weapons/weapon/hook.qh b/qcsrc/common/weapons/weapon/hook.qh
index ba433cf46243c0610cffa306c647810106f52192..ba1a56fb197d52ec75212e900cc6ea915100c18a 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.506 0.945 0.239');
+/* color     */ ATTRIB(Hook, wpcolor, vector, '0.471 0.817 0.392');
 /* modelname */ ATTRIB(Hook, mdl, string, "hookgun");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Hook, m_model, Model, MDL_HOOK_ITEM);

diff --git a/qcsrc/common/weapons/weapon/minelayer.qh b/qcsrc/common/weapons/weapon/minelayer.qh
index 62412fc4e42438ad3b64b0437eefcb128dbe6750..13ed47cdbe6851f2da0c20ef36de7e26eb1c9e6b 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.992 0.471 0.396');
+/* color     */ ATTRIB(MineLayer, wpcolor, vector, '0.988 0.514 0.392');
 /* 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 009fcd9dc3cb57fd5aaf5d72d400db2aeebbd8c9..b11a7563a4d45ab44e02bc681081c017a755c41b 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, '0.992 0.471 0.396');
+/* color     */ ATTRIB(Mortar, wpcolor, vector, '0.988 0.392 0.314');
 /* 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 cffb15f70be5909c678987fcbcd38a4eac04a354..dd3a7a76a77fb5c956c02197a1fdbceb49b883d9 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.408 0.600 0.949');
+/* color     */ ATTRIB(PortoLaunch, wpcolor, vector, '0.404 0.545 0.937');
 /* 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 f92e223ae6d2df267b373cc230a543e50d82610c..d1fe0be3b34f3f6acf8520b9115a8fb5c0187d0e 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.890 0.569 0.376');
+/* color     */ ATTRIB(Rifle, wpcolor, vector, '0.886 0.620 0.353');
 /* 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 b603a61897fad02fc072e6cd34ca5ff992d706c1..0808c634318cf4c861eb087181a96e8c0195a8ad 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.969 0.443 0.482');
+/* color     */ ATTRIB(Seeker, wpcolor, vector, '0.957 0.439 0.533');
 /* modelname */ ATTRIB(Seeker, mdl, string, "seeker");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Seeker, m_model, Model, MDL_SEEKER_ITEM);

diff --git a/qcsrc/common/weapons/weapon/tuba.qh b/qcsrc/common/weapons/weapon/tuba.qh
index ba9e749c6b8621065554a867a3a9cf9cbb772e6f..5326bef44fd650e4ad8273304c321a403364a9d6 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.914 0.745 0.341');
+/* color     */ ATTRIB(Tuba, wpcolor, vector, '0.909 0.816 0.345');
 /* modelname */ ATTRIB(Tuba, mdl, string, "tuba");
 #ifdef GAMEQC
 /* model     */ ATTRIB(Tuba, m_model, Model, MDL_TUBA_ITEM);