Don't make shrinking dead players part of the vore function (only when digested)...

[voretournament/voretournament.git] / data / qcsrc / server / cl_physics.qc

diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc
index b0b04255c6f126e8c0e7a68135e4b76758627ce4..df1c3a458a88cf48de4c1fa80d17ab1530758b7e 100644 (file)
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -55,7 +55,7 @@ void PlayerJump (void)
        }\r
 \r
        mjumpheight = cvar("sv_jumpvelocity");\r
-       if(self.scale) // we are smaller or larger, so we jump lower or higher\r
+       if(cvar("g_healthsize")) // if we are smaller or larger, we jump lower or higher\r
                mjumpheight *= (1 - cvar("g_healthsize_movementfactor")) + cvar("g_healthsize_movementfactor") * self.scale;\r
        if(self.swallow_progress_prey) // cut jumping based on swallow progress for prey\r
                mjumpheight *= 1 - (self.swallow_progress_prey * cvar("g_balance_vore_swallow_speed_cutspd_prey"));\r
@@ -507,9 +507,9 @@ void PM_Accelerate(vector wishdir, float wishspeed, float wishspeed0, float acce
        if(speedclamp)\r
                accelqw = -accelqw;\r
 \r
-       if(cvar("g_balance_vore_weight_gravity") > 0) // apply stomach weight\r
-               wishspeed *= 1 - bound(0, self.stomach_load * cvar("g_balance_vore_weight_speed"), 1);\r
-       if(self.scale) // we are smaller or larger, so we run slower or faster\r
+       if(cvar("g_balance_vore_load_pred_weight") > 0) // apply stomach weight\r
+               wishspeed /= 1 + (self.stomach_load / self.stomach_maxload) * cvar("g_balance_vore_load_pred_speed");\r
+       if(cvar("g_healthsize")) // if we are smaller or larger, we run slower or faster\r
                wishspeed *= (1 - cvar("g_healthsize_movementfactor")) + cvar("g_healthsize_movementfactor") * self.scale; \r
        if(self.swallow_progress_prey) // cut speed based on swallow progress for prey\r
                wishspeed *= 1 - (self.swallow_progress_prey * cvar("g_balance_vore_swallow_speed_cutspd_prey"));\r