From 8260cbcffe52bb4e645c2cd7e54e8dfc594c4111 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 1 Oct 2018 16:03:02 +1000 Subject: [PATCH] Mark the overkill weapons as hidden so they don't appear in the create menu --- qcsrc/common/gamemodes/gamemode/duel/sv_duel.qc | 2 -- qcsrc/common/mutators/mutator/overkill/okmachinegun.qh | 2 +- qcsrc/common/mutators/mutator/overkill/oknex.qh | 2 +- qcsrc/common/mutators/mutator/overkill/okshotgun.qh | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qc b/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qc index c2f2c0508..ab01f64ee 100644 --- a/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qc +++ b/qcsrc/common/gamemodes/gamemode/duel/sv_duel.qc @@ -26,6 +26,4 @@ MUTATOR_HOOKFUNCTION(duel, FilterItemDefinition) { return !autocvar_g_duel_with_powerups; } - - return false; } diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh index 997b49de9..32176da90 100644 --- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh @@ -4,7 +4,7 @@ CLASS(OverkillMachineGun, Weapon) /* spawnfunc */ ATTRIB(OverkillMachineGun, m_canonical_spawnfunc, string, "weapon_okmachinegun"); /* ammotype */ ATTRIB(OverkillMachineGun, ammo_type, int, RESOURCE_BULLETS); /* impulse */ ATTRIB(OverkillMachineGun, impulse, int, 3); -/* flags */ ATTRIB(OverkillMachineGun, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS | WEP_FLAG_MUTATORBLOCKED); +/* 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'); /* modelname */ ATTRIB(OverkillMachineGun, mdl, string, "ok_mg"); diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qh b/qcsrc/common/mutators/mutator/overkill/oknex.qh index f38588e39..ec8ceeb39 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qh +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qh @@ -4,7 +4,7 @@ CLASS(OverkillNex, Weapon) /* spawnfunc */ ATTRIB(OverkillNex, m_canonical_spawnfunc, string, "weapon_oknex"); /* ammotype */ ATTRIB(OverkillNex, ammo_type, int, RESOURCE_CELLS); /* impulse */ ATTRIB(OverkillNex, impulse, int, 7); -/* flags */ ATTRIB(OverkillNex, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED); +/* 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'); /* modelname */ ATTRIB(OverkillNex, mdl, string, "ok_sniper"); diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh index a383c9d7a..1124baa68 100644 --- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh @@ -4,7 +4,7 @@ CLASS(OverkillShotgun, Weapon) /* spawnfunc */ ATTRIB(OverkillShotgun, m_canonical_spawnfunc, string, "weapon_okshotgun"); /* ammotype */ ATTRIB(OverkillShotgun, ammo_type, int, RESOURCE_SHELLS); /* impulse */ ATTRIB(OverkillShotgun, impulse, int, 2); -/* flags */ ATTRIB(OverkillShotgun, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED); +/* 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'); /* modelname */ ATTRIB(OverkillShotgun, mdl, string, "ok_shotgun"); -- 2.39.2