From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 14 Jul 2011 00:06:04 +0000 (+0300)
Subject: Regurgitation speedcap is now based on stomach load. The more prey you have, the... 
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=92994be7374b1e9fb5e03b988485eb50de9a0fde

Regurgitation speedcap is now based on stomach load. The more prey you have, the less speed you can have without regurgitating.
---

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index d56fa3c9..cd9b0dc9 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 1400 "when a predator is going faster than this, their prey is squeezed out of them"
+set g_balance_vore_regurgitate_speedcap 3400 "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 506d227e..bad5df0a 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"))
+	if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap") / 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"))
+	else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_speedcap") / self.predator.stomach_load)
 		Vore_Regurgitate(self);
 
 	// apply delayed regurgitating if it was scheduled