From 29e1b28f5bb59028097bc3a3fae6864089497b0a Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sun, 17 Apr 2011 04:36:56 +0300 Subject: [PATCH] Fix a few things regarding grabber swinging --- data/balanceVT.cfg | 8 ++++---- data/qcsrc/server/vore.qc | 10 +++++----- data/qcsrc/server/w_grabber.qc | 2 +- .../{grabber_melee.ogg => grabber_swing.ogg} | Bin 4 files changed, 10 insertions(+), 10 deletions(-) rename data/sound/weapons/{grabber_melee.ogg => grabber_swing.ogg} (100%) 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_swing.ogg similarity index 100% rename from data/sound/weapons/grabber_melee.ogg rename to data/sound/weapons/grabber_swing.ogg -- 2.39.2