From: MirceaKitsune Date: Thu, 14 Jul 2011 12:10:49 +0000 (+0300) Subject: Fix the speedcap when stomach load is 0, and begin dividing it from the first prey X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ec98957e8242a6fb3dc983e78d78b3801ef9539e;p=voretournament%2Fvoretournament.git Fix the speedcap when stomach load is 0, and begin dividing it from the first prey --- diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg index b3a8490d..65d73b0b 100644 --- a/data/balanceVT.cfg +++ b/data/balanceVT.cfg @@ -198,7 +198,7 @@ set g_balance_vore_swallow_stealprey 0.7 "probability of stealing someone's prey set g_balance_vore_swallow_dropweapon 0.6 "probability of dropping your weapon when swallowed. 0 = never and 1 = always, does not apply to team mates" set g_balance_vore_swallow_punchangle 12 "your view gets tilted by this amount when swallowing someone" set g_balance_vore_regurgitate_damage 5 "predators take this amount of damage whenever regurgitating someone (influenced by player scale difference)" -set g_balance_vore_regurgitate_speedcap 3200 "when a predator is going faster than this, their prey is squeezed out of them, multiplied by stomach load" +set g_balance_vore_regurgitate_speedcap 3800 "when a predator is going faster than this, their prey is squeezed out of them, multiplied by stomach load" set g_balance_vore_regurgitate_swallowprogress 0.5 "regurgitated prey is given this amount of swallow progress, to simulate being more vulnerable (if slow swallowing is enabled)" set g_balance_vore_regurgitate_force 600 "regurgitated players rocket out at this speed, in the direction the predator is facing" set g_balance_vore_regurgitate_predatorforce 450 "players are pushed back by this amount when regurgitating someone, opposite of the direction they are facing" diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index bad5df0a..d3323401 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -36,7 +36,7 @@ float Swallow_condition_check(entity prey) if(prey.classname == "player" && !prey.stat_eaten && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach if(self.classname == "player" && !self.stat_eaten && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves if(!self.BUTTON_REGURGITATE && time > self.action_delay) - if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap") / self.stomach_load) + if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap") / (1 + self.stomach_load)) { string swallow_complain; if(teams_matter && prey.team == self.team && !cvar("g_vore_teamvore")) @@ -846,7 +846,7 @@ void Vore() if(self.predator.deadflag != DEAD_NO) Vore_Regurgitate(self); - else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_speedcap") / self.predator.stomach_load) + else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_speedcap") / (1 + self.predator.stomach_load)) Vore_Regurgitate(self); // apply delayed regurgitating if it was scheduled