From: MirceaKitsune Date: Sat, 19 Nov 2011 14:01:21 +0000 (+0200) Subject: Remove the stealprey feature. It's hard to test and maintain it, and I don't see... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1812b496df59cb6681e81131ed03acd814bb87ed;p=voretournament%2Fvoretournament.git Remove the stealprey feature. It's hard to test and maintain it, and I don't see the point either. Prey always pops out now when someone eats the predator (same for consumable items) --- diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg index d92909c2..4e8572e4 100644 --- a/data/balanceVT.cfg +++ b/data/balanceVT.cfg @@ -204,7 +204,6 @@ set g_balance_vore_swallow_speed_decrease 0.5 "how fast the swallow progress dec set g_balance_vore_swallow_speed_cutspd_prey 1 "prey movement slows down by this amount the closer they are to being swallowed" set g_balance_vore_swallow_speed_cutspd_pred 0.5 "predator movement slows down by this amount the closer they are to finishing swallowing" 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" set g_balance_vore_swallow_predator_punchangle 12 "your view gets tilted by this amount when swallowing someone" set g_balance_vore_swallow_predator_punchangle_item 6 "your view gets tilted by this amount when swallowing an item" diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 678aa901..5870a694 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -700,26 +700,8 @@ void Vore() // prevent this by checking if such has happened, and taking the proper measures // this code has a high priority and must not be stopped by any delay, so run it here if(self.predator.stat_eaten) - { - entity target_predator, target_predator_predator, oldself; - target_predator = self.predator; - target_predator_predator = self.predator.predator; - Vore_Regurgitate(self); - // now steal our prey's prey if this probability applies - if(random() < cvar("g_balance_vore_swallow_stealprey")) - { - oldself = self; - self = target_predator_predator; - if(Swallow_condition_check(oldself)) - if not(teams_matter && self.team == target_predator.team) // don't steal a team mate's prey - if not(teams_matter && self.team == oldself.team) // if the prey we would be stealing is a team mate, don't do it - Vore_Swallow(oldself); - self = oldself; - } - } - // the swallow progress of prey and preds idly decrease by this amount if(cvar("g_balance_vore_swallow_speed_decrease")) {