From 0aba211a4406e4b25a3f39c0c21b40862c720aa2 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sat, 9 Jul 2011 18:42:07 +0300 Subject: [PATCH] Balance the swallow progress movement cutting factor, and do some small tweaks --- data/balanceVT.cfg | 4 ++-- data/qcsrc/server/cl_physics.qc | 2 +- data/qcsrc/server/vore.qc | 23 +++++++++++++---------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg index 8522aedd..e2e1a226 100644 --- a/data/balanceVT.cfg +++ b/data/balanceVT.cfg @@ -188,8 +188,8 @@ set g_balance_grabber_reload_time 2 set g_balance_vore_swallow_range 100 "distance below which you can swallow another player when facing them" set g_balance_vore_swallow_limit 3 "how many players can fit in the stomach at a time, may range between 1 and 9" set g_balance_vore_swallow_speed_fill 2 "how long it takes to swallow a player, 0 is instant" -set g_balance_vore_swallow_speed_decrease 0.5 "how fast the swallow progress decreases, when the predator is no longer swallowing" -set g_balance_vore_swallow_speed_cutspd 1 "if enabled, prey walks slower the closer they are to being swallowed" +set g_balance_vore_swallow_speed_decrease 0.25 "how fast the swallow progress decreases, when the predator is no longer swallowing" +set g_balance_vore_swallow_speed_cutspd 0.5 "prey movement slows down by this amount the closer they are to being swallowed" set g_balance_vore_swallow_speed 1 "how long it takes to swallow a player" set g_balance_vore_swallow_stealprey 0.7 "probability of stealing someone's prey when eating them (when true their prey joins your stomach rather than popping out). 0 = never, 1 = always" 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" diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc index 3118cdb5..36c5f0b1 100644 --- a/data/qcsrc/server/cl_physics.qc +++ b/data/qcsrc/server/cl_physics.qc @@ -825,7 +825,7 @@ void SV_PlayerPhysics() if(cvar("g_balance_vore_weight_gravity") > 0) maxspd_mod *= 1 - bound(0, self.stomach_load * cvar("g_balance_vore_weight_speed"), 1); // apply stomach weight if(self.swallow_progress_prey && cvar("g_balance_vore_swallow_speed_cutspd")) - maxspd_mod *= 1 - self.swallow_progress_prey; // cut speed based on swallow progress + maxspd_mod *= 1 - (self.swallow_progress_prey * cvar("g_balance_vore_swallow_speed_cutspd")); // cut speed based on swallow progress swampspd_mod = 1; // if dead, behave differently diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 6c787ca3..d0abeb65 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -637,17 +637,20 @@ void Vore() } // the swallow progress of prey and preds idly decrease by this amount - if(self.swallow_progress_pred) + if(cvar("g_balance_vore_swallow_speed_decrease")) { - self.swallow_progress_pred -= cvar("g_balance_vore_swallow_speed_decrease") * frametime; - if(self.swallow_progress_pred < 0) - self.swallow_progress_pred = 0; - } - if(self.swallow_progress_prey) - { - self.swallow_progress_prey -= cvar("g_balance_vore_swallow_speed_decrease") * frametime; - if(self.swallow_progress_prey < 0) - self.swallow_progress_prey = 0; + if(self.swallow_progress_pred) + { + self.swallow_progress_pred -= cvar("g_balance_vore_swallow_speed_decrease") * frametime; + if(self.swallow_progress_pred < 0) + self.swallow_progress_pred = 0; + } + if(self.swallow_progress_prey) + { + self.swallow_progress_prey -= cvar("g_balance_vore_swallow_speed_decrease") * frametime; + if(self.swallow_progress_prey < 0) + self.swallow_progress_prey = 0; + } } // apply delays and skip the vore system under some circumstances -- 2.39.2