Swap hlac colors with mg+okmg colors

Once again there are many reasons to make this change:
- All those listed in d12dc1c164 (better that only one of the two weapons uses an identical color rather than both),
- Hlac now shoots green bullets due to d12dc1c164,
- Machinegun bullet trails are yellow-orange,
- Machinegun bullet casings are yellow-ish,
- The wpcolor of Machinegun is already yellow,
- ... meaning the crosshair with `crosshair_color_special 1` is already yellow,
- The _simple simpleitems color for machinegun is already yellow,
- Making Overkill Machinegun orangey brings it closer to the Overkill Heavy Machinegun's color,
- Etc.
This will have to be followed up with a mediasource MR.

diff --git a/gfx/hud/luma/ok_weapon_smg.tga b/gfx/hud/luma/ok_weapon_smg.tga
index cb26a1657dd0f04c2775e9d9323327885a5cc918..3420d8d1c5bddc3489d29c8dfa676eea19ed7dd1 100644 (file)
Binary files a/gfx/hud/luma/ok_weapon_smg.tga and b/gfx/hud/luma/ok_weapon_smg.tga differ

diff --git a/gfx/hud/luma/weaponhlac.tga b/gfx/hud/luma/weaponhlac.tga
index 2208b8363f5f5e03e104c0b62219f4cfc2893607..8796045e4bf7a938d81b64aa1d3df9bb8f2ddbff 100644 (file)
Binary files a/gfx/hud/luma/weaponhlac.tga and b/gfx/hud/luma/weaponhlac.tga differ

diff --git a/gfx/hud/luma/weaponuzi.tga b/gfx/hud/luma/weaponuzi.tga
index 5aee32ab545a47884f50cd00ce4248e8cb35ab3c..d53b419bf73fd4aca9c1e0b3b77b840ca096e5ed 100644 (file)
Binary files a/gfx/hud/luma/weaponuzi.tga and b/gfx/hud/luma/weaponuzi.tga differ

diff --git a/models/weapons/g_hlac_luma.tga b/models/weapons/g_hlac_luma.tga
index 0e938ad5f5d21e6f4456a9bf70506421117f3290..08b708020b3a08ed43004ec63994c585dbb82364 100644 (file)
Binary files a/models/weapons/g_hlac_luma.tga and b/models/weapons/g_hlac_luma.tga differ

diff --git a/models/weapons/g_uzi_luma.tga b/models/weapons/g_uzi_luma.tga
index 8a05499b825f4b4682334370abde78e07134a562..2324a90263bf0912d8b55d252f39b2591c3990a0 100644 (file)
Binary files a/models/weapons/g_uzi_luma.tga and b/models/weapons/g_uzi_luma.tga differ

diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh
index 2573b1674c26f9930296a815625cc63a9cf7d197..81e63accb9af70058dd987548e32bd67abb5f5ce 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, '0.506 0.945 0.239');
+/* color     */ ATTRIB(OverkillMachineGun, wpcolor, vector, '0.898 0.588 0.357');
 /* modelname */ ATTRIB(OverkillMachineGun, mdl, string, "ok_mg");
 #ifdef GAMEQC
 /* model     */ ATTRIB(OverkillMachineGun, m_model, Model, MDL_OK_MG_ITEM);

diff --git a/qcsrc/common/weapons/weapon/hlac.qh b/qcsrc/common/weapons/weapon/hlac.qh
index a339a42f77f99111d4030a1f2b7b4e66e992f272..0ec84b7e15ddaba01c155aabd406000e342928d2 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.898 0.588 0.357');
+/* color     */ ATTRIB(HLAC, wpcolor, vector, '0.506 0.945 0.239');
 /* modelname */ ATTRIB(HLAC, mdl, string, "hlac");
 #ifdef GAMEQC
 /* model     */ ATTRIB(HLAC, m_model, Model, MDL_HLAC_ITEM);

diff --git a/qcsrc/common/weapons/weapon/machinegun.qh b/qcsrc/common/weapons/weapon/machinegun.qh
index 0c302755ce8f48e3bb7ed30dec02d6ed3ec60747..f18f8d12e1f2a81cc9cfcef488d1b9afc85e70a5 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, '0.506 0.945 0.239');
+/* color     */ ATTRIB(MachineGun, wpcolor, vector, '0.898 0.588 0.357');
 /* modelname */ ATTRIB(MachineGun, mdl, string, "uzi");
 #ifdef GAMEQC
 /* model     */ ATTRIB(MachineGun, m_model, Model, MDL_MACHINEGUN_ITEM);