From: otta8634 Date: Wed, 25 Dec 2024 16:04:23 +0000 (+0800) Subject: Make luma weapon colors unique X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a228529b33327630f6a3eb442aa1b6e625657d7f;p=xonotic%2Fxonotic-data.pk3dir.git 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 adaeff531..fe070beef 100644 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 9cb32288b..e8c2b8f70 100644 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 63a8b608d..788371d27 100644 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 a3d2b886d..fe7725df6 100644 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 0f0069d3a..199d93e08 100644 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 5ee816970..35eae3530 100644 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 036845c47..6b6bc0590 100644 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 17645a674..a7f6621f3 100644 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 47acf244f..4a5b57ac0 100644 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 b899eda9a..ff9b58d77 100644 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 5f8e13548..23356ba65 100644 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 4e0ac91a3..cf4840e05 100644 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 1a980606a..cd180c62a 100644 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 4ce22fb31..d6d2ba000 100644 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 ff1e667c1..4c10edd11 100644 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 93bef14a1..dc587505c 100644 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 12405eed9..a82789b93 100644 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 82785e6f4..a4d0b4a78 100644 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 0eb2e3fe9..9a59f0675 100644 --- 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 648214c74..9ca7d0b85 100644 --- 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 ba433cf46..ba1a56fb1 100644 --- 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 62412fc4e..13ed47cdb 100644 --- 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 009fcd9dc..b11a7563a 100644 --- 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 cffb15f70..dd3a7a76a 100644 --- 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 f92e223ae..d1fe0be3b 100644 --- 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 b603a6189..0808c6343 100644 --- 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 ba9e749c6..5326bef44 100644 --- 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);