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 b3a8490d94903733f0d9e3fb0feddf87e182e3dc..65d73b0b24bde61162fdbae2f2a6e3683f4408e1 100644 (file)
--- 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"\r
 set g_balance_vore_swallow_punchangle 12 "your view gets tilted by this amount when swallowing someone"\r
 set g_balance_vore_regurgitate_damage 5 "predators take this amount of damage whenever regurgitating someone (influenced by player scale difference)"\r
-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"\r
+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"\r
 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)"\r
 set g_balance_vore_regurgitate_force 600 "regurgitated players rocket out at this speed, in the direction the predator is facing"\r
 set g_balance_vore_regurgitate_predatorforce 450 "players are pushed back by this amount when regurgitating someone, opposite of the direction they are facing"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index bad5df0afa57a618c5c4cc140ded404ebf3a5a3c..d33234013c65d5c86b3350872f193387a7459a2a 100644 (file)
--- 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\r
        if(self.classname == "player" && !self.stat_eaten && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves\r
        if(!self.BUTTON_REGURGITATE && time > self.action_delay)\r
-       if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap") / self.stomach_load)\r
+       if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap") / (1 + self.stomach_load))\r
        {\r
                string swallow_complain;\r
                if(teams_matter && prey.team == self.team && !cvar("g_vore_teamvore"))\r
@@ -846,7 +846,7 @@ void Vore()
 \r
        if(self.predator.deadflag != DEAD_NO)\r
                Vore_Regurgitate(self);\r
-       else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_speedcap") / self.predator.stomach_load)\r
+       else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_speedcap") / (1 + self.predator.stomach_load))\r
                Vore_Regurgitate(self);\r
 \r
        // apply delayed regurgitating if it was scheduled\r