From 04082cc7d550a9e63483af2dbff8a81f21f46c47 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 6 Nov 2014 19:56:10 +1100 Subject: [PATCH] Bring back old start weapons, and make shockwave a mutator blocked weapon --- bal-wep-xonotic.cfg | 4 ++-- qcsrc/common/weapons/all.qh | 6 +++--- qcsrc/common/weapons/w_shockwave.qc | 2 +- qcsrc/common/weapons/w_shotgun.qc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg index db8d41dd2..49ca11574 100644 --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@ -107,7 +107,7 @@ set g_balance_machinegun_sustained_refire 0.1 set g_balance_machinegun_sustained_spread 0.03 set g_balance_machinegun_switchdelay_drop 0.2 set g_balance_machinegun_switchdelay_raise 0.2 -set g_balance_machinegun_weaponreplace "arc" +set g_balance_machinegun_weaponreplace "" set g_balance_machinegun_weaponstart 0 set g_balance_machinegun_weaponstartoverride -1 set g_balance_machinegun_weaponthrowable 1 @@ -745,7 +745,7 @@ set g_balance_shotgun_secondary_refire 1.25 set g_balance_shotgun_switchdelay_drop 0.2 set g_balance_shotgun_switchdelay_raise 0.2 set g_balance_shotgun_weaponreplace "" -set g_balance_shotgun_weaponstart 0 +set g_balance_shotgun_weaponstart 1 set g_balance_shotgun_weaponstartoverride -1 set g_balance_shotgun_weaponthrowable 1 // }}} diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index f0133ec6c..a40488f83 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -4,12 +4,11 @@ // core weapons #include "w_blaster.qc" -#include "w_shockwave.qc" +#include "w_shotgun.qc" #include "w_machinegun.qc" #include "w_mortar.qc" #include "w_minelayer.qc" #include "w_electro.qc" -#include "w_arc.qc" #include "w_crylink.qc" #include "w_vortex.qc" #include "w_hagar.qc" @@ -24,4 +23,5 @@ #include "w_rifle.qc" #include "w_fireball.qc" #include "w_seeker.qc" -#include "w_shotgun.qc" +#include "w_shockwave.qc" +#include "w_arc.qc" diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc index c8fe77c58..60e8d8436 100644 --- a/qcsrc/common/weapons/w_shockwave.qc +++ b/qcsrc/common/weapons/w_shockwave.qc @@ -4,7 +4,7 @@ REGISTER_WEAPON( /* function */ W_Shockwave, /* ammotype */ ammo_none, /* impulse */ 2, -/* flags */ WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN, +/* flags */ WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED, /* rating */ BOT_PICKUP_RATING_LOW, /* color */ '0.5 0.25 0', /* modelname */ "shotgun", diff --git a/qcsrc/common/weapons/w_shotgun.qc b/qcsrc/common/weapons/w_shotgun.qc index eec7f649c..6e500dff2 100644 --- a/qcsrc/common/weapons/w_shotgun.qc +++ b/qcsrc/common/weapons/w_shotgun.qc @@ -4,7 +4,7 @@ REGISTER_WEAPON( /* function */ W_Shotgun, /* ammotype */ ammo_none, /* impulse */ 2, -/* flags */ WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED, +/* flags */ WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN, /* rating */ BOT_PICKUP_RATING_LOW, /* color */ '0.5 0.25 0', /* modelname */ "shotgun", -- 2.39.2