From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 17 Apr 2011 01:36:56 +0000 (+0300)
Subject: Fix a few things regarding grabber swinging
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=29e1b28f5bb59028097bc3a3fae6864089497b0a;p=voretournament%2Fvoretournament.git

Fix a few things regarding grabber swinging
---

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index b57345ba..5453b2c1 100644
--- 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
 set g_balance_grabber_secondary_radius 75
 set g_balance_grabber_secondary_recoil 4;
-set g_balance_grabber_melee_damage 15 // only used to boost stomach kicks
-set g_balance_grabber_melee_force 25 // only used to boost stomach kicks
-set g_balance_grabber_melee_refire 0.35 // only used to boost stomach kicks
-set g_balance_grabber_melee_recoil 2 // only used to boost stomach kicks
+set g_balance_grabber_kick_damage 15 // only used to boost stomach kicks
+set g_balance_grabber_kick_force 25 // only used to boost stomach kicks
+set g_balance_grabber_kick_refire 0.35 // only used to boost stomach kicks
+set g_balance_grabber_kick_recoil 2 // only used to boost stomach kicks
 set g_balance_grabber_reload_ammo 35
 set g_balance_grabber_reload_time 2
 // }}}
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 83694d8e..2a57bca5 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -404,12 +404,12 @@ void Vore_StomachKick()
 		if(self.weapon)
 		{
 			e = get_weaponinfo(self.weapon);
-			damage += cvar(strcat("g_balance_", e.netname, "_melee_damage"));
-			force += cvar(strcat("g_balance_", e.netname, "_melee_force"));
-			rekick += cvar(strcat("g_balance_", e.netname, "_melee_refire"));
+			damage += cvar(strcat("g_balance_", e.netname, "_kick_damage"));
+			force += cvar(strcat("g_balance_", e.netname, "_kick_force"));
+			rekick += cvar(strcat("g_balance_", e.netname, "_kick_refire"));
 			if (!g_norecoil)
-				self.punchangle_x -= cvar(strcat("g_balance_", e.netname, "_melee_recoil"));
-			sound (self, CHAN_WEAPON, "weapons/grabber_melee.wav", VOL_BASE, ATTN_NORM);
+				self.punchangle_x -= cvar(strcat("g_balance_", e.netname, "_kick_recoil"));
+			sound (self, CHAN_WEAPON, "weapons/grabber_swing.wav", VOL_BASE, ATTN_NORM);
 			weapon_thinkf(WFRAME_FIRE2, rekick, w_ready); // only intended to animate the gun, as damage is calculated above
 		}
 
diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 1de3ecfd..246bee84 100644
--- 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
 		precache_sound ("weapons/grabber_fire.wav");
 		precache_sound ("weapons/grabber_altfire.wav");
-		precache_sound ("weapons/grabber_melee.wav");
+		precache_sound ("weapons/grabber_swing.wav");
 		precache_sound ("weapons/reload.wav");
 	}
 	else if (req == WR_SETUP)
diff --git a/data/sound/weapons/grabber_melee.ogg b/data/sound/weapons/grabber_melee.ogg
deleted file mode 100644
index 0562b559..00000000
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
index 00000000..0562b559
Binary files /dev/null and b/data/sound/weapons/grabber_swing.ogg differ