From: Mario <zacjardine@y7mail.com>
Date: Thu, 27 Nov 2014 04:47:45 +0000 (+1100)
Subject: Disable shockwave weaponstart
X-Git-Tag: xonotic-v0.8.0~122^2~36
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fd90ebcdd4be1f895dec5915c564b5f4e3b72191;p=xonotic%2Fxonotic-data.pk3dir.git

Disable shockwave weaponstart
---

diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg
index 15f25a7ba..38f85857c 100644
--- 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 0d4bf49e0..87b9f3b7b 100644
--- 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 0d4bf49e0..87b9f3b7b 100644
--- 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 5e9e0d7f6..3e41c42fe 100644
--- 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;