From fcd85abb425ce20d629587866b740a7082a4b977 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sun, 17 Apr 2011 03:09:09 +0300 Subject: [PATCH] When stomach kicking with a weapon, do more damage! Makes sense and should be even more fun :) --- data/balanceVT.cfg | 4 ++++ data/qcsrc/server/vore.qc | 28 +++++++++++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg index 75f65338..0aa58586 100644 --- a/data/balanceVT.cfg +++ b/data/balanceVT.cfg @@ -180,6 +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 10 // only used to boost stomach kicks +set g_balance_grabber_melee_force 15 // only used to boost stomach kicks +set g_balance_grabber_melee_refire 0.25 // only used to boost stomach kicks +set g_balance_grabber_melee_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 b630d6db..83694d8e 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -392,21 +392,35 @@ void Vore_StomachKick() if(time > self.stomachkick_delay) { - float damage; + float damage, force, rekick; + entity e; + damage = ceil(random() * (cvar("g_balance_vore_kick_damage_max") - cvar("g_balance_vore_kick_damage_min")) + cvar("g_balance_vore_kick_damage_min")); - Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, v_forward * cvar("g_balance_vore_kick_force")); - sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.wav", VOL_BASE, ATTN_NORM); - self.predator.punchangle_x -= self.predator.cvar_cl_vore_kick_punchangle; + force = cvar("g_balance_vore_kick_force"); + rekick = time + cvar("g_balance_vore_kick_delay"); - // if we still have a weapon, play the melee animation and sound - weapon_thinkf(WFRAME_FIRE2, time + cvar("g_balance_vore_kick_delay"), w_ready); // only intended to animate the gun, does not do any damage + // if we still have a weapon, we use that to kick for more damage + // stomach kicking with a weapon does nothing more than boosting existing damage 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")); + 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); + weapon_thinkf(WFRAME_FIRE2, rekick, w_ready); // only intended to animate the gun, as damage is calculated above + } + + Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, v_forward * force); + sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.wav", VOL_BASE, ATTN_NORM); + self.predator.punchangle_x -= self.predator.cvar_cl_vore_kick_punchangle; if(random() < cvar("g_balance_vore_kick_escapeprobability")) Vore_Regurgitate(self); - self.stomachkick_delay = time + cvar("g_balance_vore_kick_delay"); + self.stomachkick_delay = rekick; } } -- 2.39.2