Fix a few things regarding grabber swinging

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index b57345bac2cbb4ca7da2e6a12a4a2f7939210b91..5453b2c1ef14b1055559b946e3769cdaf592424b 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -180,10 +180,10 @@ set g_balance_grabber_secondary_damage 45
 set g_balance_grabber_secondary_force 175\r
 set g_balance_grabber_secondary_radius 75\r
 set g_balance_grabber_secondary_recoil 4;\r
-set g_balance_grabber_melee_damage 15 // only used to boost stomach kicks\r
-set g_balance_grabber_melee_force 25 // only used to boost stomach kicks\r
-set g_balance_grabber_melee_refire 0.35 // only used to boost stomach kicks\r
-set g_balance_grabber_melee_recoil 2 // only used to boost stomach kicks\r
+set g_balance_grabber_kick_damage 15 // only used to boost stomach kicks\r
+set g_balance_grabber_kick_force 25 // only used to boost stomach kicks\r
+set g_balance_grabber_kick_refire 0.35 // only used to boost stomach kicks\r
+set g_balance_grabber_kick_recoil 2 // only used to boost stomach kicks\r
 set g_balance_grabber_reload_ammo 35\r
 set g_balance_grabber_reload_time 2\r
 // }}}\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 83694d8e42cca124f3ab9a8cbe1768fd2274ae6d..2a57bca5f30e9f19932334b109753e9733bf7c89 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -404,12 +404,12 @@ void Vore_StomachKick()
                if(self.weapon)\r
                {\r
                        e = get_weaponinfo(self.weapon);\r
-                       damage += cvar(strcat("g_balance_", e.netname, "_melee_damage"));\r
-                       force += cvar(strcat("g_balance_", e.netname, "_melee_force"));\r
-                       rekick += cvar(strcat("g_balance_", e.netname, "_melee_refire"));\r
+                       damage += cvar(strcat("g_balance_", e.netname, "_kick_damage"));\r
+                       force += cvar(strcat("g_balance_", e.netname, "_kick_force"));\r
+                       rekick += cvar(strcat("g_balance_", e.netname, "_kick_refire"));\r
                        if (!g_norecoil)\r
-                               self.punchangle_x -= cvar(strcat("g_balance_", e.netname, "_melee_recoil"));\r
-                       sound (self, CHAN_WEAPON, "weapons/grabber_melee.wav", VOL_BASE, ATTN_NORM);\r
+                               self.punchangle_x -= cvar(strcat("g_balance_", e.netname, "_kick_recoil"));\r
+                       sound (self, CHAN_WEAPON, "weapons/grabber_swing.wav", VOL_BASE, ATTN_NORM);\r
                        weapon_thinkf(WFRAME_FIRE2, rekick, w_ready); // only intended to animate the gun, as damage is calculated above\r
                }\r
 \r

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 1de3ecfde37b3e0148c8774e0bdb3c1ace946147..246bee842d3ff3943631d5088cd2a0ad6e810314 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -195,7 +195,7 @@ float w_grabber(float req)
                precache_sound ("weapons/grabber_impact.wav"); // done by g_grabber.qc\r
                precache_sound ("weapons/grabber_fire.wav");\r
                precache_sound ("weapons/grabber_altfire.wav");\r
-               precache_sound ("weapons/grabber_melee.wav");\r
+               precache_sound ("weapons/grabber_swing.wav");\r
                precache_sound ("weapons/reload.wav");\r
        }\r
        else if (req == WR_SETUP)\r

diff --git a/data/sound/weapons/grabber_melee.ogg b/data/sound/weapons/grabber_melee.ogg
deleted file mode 100644 (file)
index 0562b55..0000000
Binary files a/data/sound/weapons/grabber_melee.ogg and /dev/null differ

diff --git a/data/sound/weapons/grabber_swing.ogg b/data/sound/weapons/grabber_swing.ogg
new file mode 100644 (file)
index 0000000..0562b55
Binary files /dev/null and b/data/sound/weapons/grabber_swing.ogg differ