From a4d4469bcccf9579eba7a5cd300d50242256df7d Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sun, 17 Apr 2011 14:12:04 +0300 Subject: [PATCH] Remove my idea of stomach kicking with the grabber for more damage. I don't like how it turned out, and it adds too much complexity for now. --- data/balanceVT.cfg | 4 ---- data/qcsrc/server/vore.qc | 24 +++--------------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg index 76d24667..9865e401 100644 --- a/data/balanceVT.cfg +++ b/data/balanceVT.cfg @@ -180,10 +180,6 @@ set g_balance_grabber_secondary_damage 75 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_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 b824895e..554b6151 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -392,35 +392,17 @@ void Vore_StomachKick() if(time > self.stomachkick_delay) { - float damage, force, rekick; - entity e; - + float damage; damage = ceil(random() * (cvar("g_balance_vore_kick_damage_max") - cvar("g_balance_vore_kick_damage_min")) + cvar("g_balance_vore_kick_damage_min")); - force = cvar("g_balance_vore_kick_force"); - rekick = time + cvar("g_balance_vore_kick_delay"); - - // 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, "_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, "_kick_recoil")); - sound (self, CHAN_WEAPON2, "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 - } - Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, v_forward * force); + 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; if(random() < cvar("g_balance_vore_kick_escapeprobability")) Vore_Regurgitate(self); - self.stomachkick_delay = rekick; + self.stomachkick_delay = time + cvar("g_balance_vore_kick_delay"); } } -- 2.39.2