From: otta8634 <k9wolf@pm.me>
Date: Thu, 12 Dec 2024 11:04:08 +0000 (+0800)
Subject: Swap hlac colors with mg+okmg colors
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=081cc43e992219b6e2355f90e257de931581ad30;p=xonotic%2Fxonotic-data.pk3dir.git

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 cb26a1657..3420d8d1c 100644
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 2208b8363..8796045e4 100644
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 5aee32ab5..d53b419bf 100644
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 0e938ad5f..08b708020 100644
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 8a05499b8..2324a9026 100644
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 2573b1674..81e63accb 100644
--- 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 a339a42f7..0ec84b7e1 100644
--- 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 0c302755c..f18f8d12e 100644
--- 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);