Disable shockwave weaponstart

diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg
index 15f25a7bab148ae3afe1aa6b2e7258dee3239a9f..38f85857c0a2061e15f255694c38906bb92b4eb5 100644 (file)
--- a/bal-wep-xdf.cfg
+++ b/bal-wep-xdf.cfg
@@ -717,7 +717,7 @@ set g_balance_shockwave_melee_traces 10
 set g_balance_shockwave_switchdelay_drop 0
 set g_balance_shockwave_switchdelay_raise 0
 set g_balance_shockwave_weaponreplace ""
-set g_balance_shockwave_weaponstart 1
+set g_balance_shockwave_weaponstart 0
 set g_balance_shockwave_weaponstartoverride -1
 set g_balance_shockwave_weaponthrowable 0
 // }}}

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 0d4bf49e0555223ec6e25c10448cac769f7ce6be..87b9f3b7bd4783cd05e0f4708b60a88085955c0e 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -717,7 +717,7 @@ set g_balance_shockwave_melee_traces 10
 set g_balance_shockwave_switchdelay_drop 0.2
 set g_balance_shockwave_switchdelay_raise 0.2
 set g_balance_shockwave_weaponreplace ""
-set g_balance_shockwave_weaponstart 1
+set g_balance_shockwave_weaponstart 0
 set g_balance_shockwave_weaponstartoverride -1
 set g_balance_shockwave_weaponthrowable 0
 // }}}

diff --git a/bal-wep-xpm.cfg b/bal-wep-xpm.cfg
index 0d4bf49e0555223ec6e25c10448cac769f7ce6be..87b9f3b7bd4783cd05e0f4708b60a88085955c0e 100644 (file)
--- a/bal-wep-xpm.cfg
+++ b/bal-wep-xpm.cfg
@@ -717,7 +717,7 @@ set g_balance_shockwave_melee_traces 10
 set g_balance_shockwave_switchdelay_drop 0.2
 set g_balance_shockwave_switchdelay_raise 0.2
 set g_balance_shockwave_weaponreplace ""
-set g_balance_shockwave_weaponstart 1
+set g_balance_shockwave_weaponstart 0
 set g_balance_shockwave_weaponstartoverride -1
 set g_balance_shockwave_weaponthrowable 0
 // }}}

diff --git a/qcsrc/server/mutators/mutator_new_toys.qc b/qcsrc/server/mutators/mutator_new_toys.qc
index 5e9e0d7f6915bd7bb2845bf996fcaa3425b0782e..3e41c42fe022215ae6152a92b0eb7a7a0ff48065 100644 (file)
--- a/qcsrc/server/mutators/mutator_new_toys.qc
+++ b/qcsrc/server/mutators/mutator_new_toys.qc
@@ -99,8 +99,8 @@ string nt_GetFullReplacement(string w)
        switch(w)
        {
                case "hagar": return "seeker";
-               case "rocketlauncher": return "minelayer";
-               case "uzi": return "hlac";
+               case "devastator": return "minelayer";
+               case "machinegun": return "hlac";
                case "vortex": return "rifle";
                case "shotgun": return "shockwave";
                default: return string_null;