From 3dc2311ca59e4db3d0c8b29f14d0a7093796f9f8 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 31 May 2018 16:04:00 +1000 Subject: [PATCH] Sanity check --- qcsrc/common/mutators/mutator/overkill/okhmg.qh | 4 ++-- .../common/mutators/mutator/overkill/okmachinegun.qh | 4 ++-- qcsrc/common/mutators/mutator/overkill/oknex.qh | 4 ++-- qcsrc/common/mutators/mutator/overkill/okrpc.qh | 4 ++-- qcsrc/common/mutators/mutator/overkill/okshotgun.qh | 4 ++-- .../common/mutators/mutator/overkill/sv_overkill.qc | 12 ++++++++++-- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/qcsrc/common/mutators/mutator/overkill/okhmg.qh b/qcsrc/common/mutators/mutator/overkill/okhmg.qh index ecad050ed..b3c266440 100644 --- a/qcsrc/common/mutators/mutator/overkill/okhmg.qh +++ b/qcsrc/common/mutators/mutator/overkill/okhmg.qh @@ -57,5 +57,5 @@ CLASS(OverkillHeavyMachineGun, Weapon) ENDCLASS(OverkillHeavyMachineGun) REGISTER_WEAPON(OVERKILL_HMG, okhmg, NEW(OverkillHeavyMachineGun)); -SPAWNFUNC_WEAPON(weapon_okhmg, WEP_OVERKILL_HMG) -SPAWNFUNC_WEAPON(weapon_hmg, WEP_OVERKILL_HMG) +//SPAWNFUNC_WEAPON(weapon_okhmg, WEP_OVERKILL_HMG) +//SPAWNFUNC_WEAPON(weapon_hmg, WEP_OVERKILL_HMG) diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh index ca52a77a4..5ff4c8689 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); +/* flags */ ATTRIB(OverkillMachineGun, spawnflags, int, 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"); @@ -54,4 +54,4 @@ CLASS(OverkillMachineGun, Weapon) ENDCLASS(OverkillMachineGun) REGISTER_WEAPON(OVERKILL_MACHINEGUN, okmachinegun, NEW(OverkillMachineGun)); -SPAWNFUNC_WEAPON(weapon_okmachinegun, WEP_OVERKILL_MACHINEGUN) +//SPAWNFUNC_WEAPON(weapon_okmachinegun, WEP_OVERKILL_MACHINEGUN) diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qh b/qcsrc/common/mutators/mutator/overkill/oknex.qh index 762a299fc..1284dced1 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); +/* flags */ ATTRIB(OverkillNex, spawnflags, int, 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"); @@ -74,4 +74,4 @@ ENDCLASS(OverkillNex) REGISTER_WEAPON(OVERKILL_NEX, oknex, NEW(OverkillNex)); -SPAWNFUNC_WEAPON(weapon_oknex, WEP_OVERKILL_NEX) +//SPAWNFUNC_WEAPON(weapon_oknex, WEP_OVERKILL_NEX) diff --git a/qcsrc/common/mutators/mutator/overkill/okrpc.qh b/qcsrc/common/mutators/mutator/overkill/okrpc.qh index cf2194825..4f9bfe7b9 100644 --- a/qcsrc/common/mutators/mutator/overkill/okrpc.qh +++ b/qcsrc/common/mutators/mutator/overkill/okrpc.qh @@ -62,5 +62,5 @@ CLASS(OverkillRocketPropelledChainsaw, Weapon) ENDCLASS(OverkillRocketPropelledChainsaw) REGISTER_WEAPON(OVERKILL_RPC, okrpc, NEW(OverkillRocketPropelledChainsaw)); -SPAWNFUNC_WEAPON(weapon_okrpc, WEP_OVERKILL_RPC) -SPAWNFUNC_WEAPON(weapon_rpc, WEP_OVERKILL_RPC) +//SPAWNFUNC_WEAPON(weapon_okrpc, WEP_OVERKILL_RPC) +//SPAWNFUNC_WEAPON(weapon_rpc, WEP_OVERKILL_RPC) diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh index b0feadda0..a0b5ec120 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); +/* flags */ ATTRIB(OverkillShotgun, spawnflags, int, 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"); @@ -55,4 +55,4 @@ CLASS(OverkillShotgun, Weapon) ENDCLASS(OverkillShotgun) REGISTER_WEAPON(OVERKILL_SHOTGUN, okshotgun, NEW(OverkillShotgun)); -SPAWNFUNC_WEAPON(weapon_okshotgun, WEP_OVERKILL_SHOTGUN) +//SPAWNFUNC_WEAPON(weapon_okshotgun, WEP_OVERKILL_SHOTGUN) diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc index 510b9213a..33deb64fc 100644 --- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc +++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc @@ -38,6 +38,10 @@ REGISTER_MUTATOR(ok, expr_evaluate(autocvar_g_overkill) && !autocvar_g_instagib WEP_OVERKILL_RPC.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED; WEP_OVERKILL_HMG.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED; + WEP_OVERKILL_SHOTGUN.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED; + WEP_OVERKILL_MACHINEGUN.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED; + WEP_OVERKILL_NEX.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED; + //WEP_SHOTGUN.mdl = "ok_shotgun"; //WEP_MACHINEGUN.mdl = "ok_mg"; //WEP_VORTEX.mdl = "ok_sniper"; @@ -52,6 +56,10 @@ REGISTER_MUTATOR(ok, expr_evaluate(autocvar_g_overkill) && !autocvar_g_instagib WEP_OVERKILL_RPC.spawnflags |= WEP_FLAG_MUTATORBLOCKED; WEP_OVERKILL_HMG.spawnflags |= WEP_FLAG_MUTATORBLOCKED; + + WEP_OVERKILL_SHOTGUN.spawnflags |= WEP_FLAG_MUTATORBLOCKED; + WEP_OVERKILL_MACHINEGUN.spawnflags |= WEP_FLAG_MUTATORBLOCKED; + WEP_OVERKILL_NEX.spawnflags |= WEP_FLAG_MUTATORBLOCKED; } } @@ -236,7 +244,7 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem) wep.respawntime = g_pickup_respawntime_superweapon; wep.pickup_anyway = true; wep.spawnfunc_checked = true; - Item_Initialize(wep, "weapon_okhmg"); + Item_Initialize(wep, "weapon_okhmg"); // doesn't actually use spawnfunc return true; } else if (item.classname == "item_shield") @@ -250,7 +258,7 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem) wep.respawntime = g_pickup_respawntime_superweapon; wep.pickup_anyway = true; wep.spawnfunc_checked = true; - Item_Initialize(wep, "weapon_okrpc"); + Item_Initialize(wep, "weapon_okrpc"); // doesn't actually use spawnfunc return true; } return true; -- 2.39.2