Actually fix the speedcap

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index a444577f217fcbc2d256cd8dd1511c68682c6b6d..f929e83a2d50bd78047f1215b00949f974d10830 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -188,7 +188,7 @@ set g_balance_grabber_reload_time 2
 set g_balance_vore_load_pred_capacity 100 "capacity percent a player's stomach has, influenced by player size"\r
 set g_balance_vore_load_pred_weight 1 "you get this heavier the more you eat, at 1 each meal makes you two times heavier"\r
 set g_balance_vore_load_pred_speed 0.0015 "you get this slower the more you eat, at 0.5 each meal makes you two times slower"\r
-set g_balance_vore_load_pred_speedcap 400 "when a predator is going faster than this (at full stomach capacity), their prey is squeezed out of them"\r
+set g_balance_vore_load_pred_speedcap 800 "when a predator is going faster than this (at full stomach capacity), their prey is squeezed out of them"\r
 set g_balance_vore_load_prey_mass 30 "prey mass, influenced by player size"\r
 set g_balance_vore_swallow_range 140 "distance below which you can swallow another player when facing them"\r
 set g_balance_vore_swallow_speed_fill 2.5 "how long it takes to swallow a player, 0 is instant"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 771203bd47b67b6470d03ebdcb663266043dcd74..d540bedac5842238d3c93bbfae010a4f31a8741d 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -40,7 +40,6 @@ 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(cvar("g_balance_vore_load_pred_speedcap") && vlen(self.velocity) >= (self.stomach_load / self.stomach_maxload) / cvar("g_balance_vore_load_pred_speedcap"))\r
        {\r
                string swallow_complain;\r
                if(teams_matter && prey.team == self.team && !cvar("g_vore_teamvore"))\r
@@ -884,7 +883,7 @@ void Vore()
 \r
        if(self.predator.deadflag != DEAD_NO)\r
                Vore_Regurgitate(self);\r
-       else if(cvar("g_balance_vore_load_pred_speedcap") && vlen(self.velocity) >= (self.stomach_load / self.stomach_maxload) / cvar("g_balance_vore_load_pred_speedcap"))\r
+       else if(cvar("g_balance_vore_load_pred_speedcap") && vlen(self.predator.velocity) >= cvar("g_balance_vore_load_pred_speedcap") / (self.predator.stomach_load / self.predator.stomach_maxload))\r
                Vore_Regurgitate(self);\r
 \r
        // apply delayed regurgitating if it was scheduled\r