prey now walks slower the closer they are to being swallowed

[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 e2993af36167336b9d4bff021679cfaf4860a12f..3118cdb556a3899e8fcbec2fb964f704ece45ec0 100644 (file)
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -32,6 +32,7 @@ float sv_warsowbunny_backtosideratio;
 .float multijump_count;\r
 .float multijump_ready;\r
 .float prevjumpbutton;\r
+.float prevlastteleporttime;\r
 \r
 /*\r
 =============\r
@@ -54,6 +55,8 @@ 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
+               mjumpheight *= (1 - cvar("g_healthsize_movementfactor")) + cvar("g_healthsize_movementfactor") * self.scale; \r
        if (self.waterlevel >= WATERLEVEL_SWIMMING)\r
        {\r
                if (self.watertype == CONTENT_WATER)\r
@@ -68,7 +71,14 @@ void PlayerJump (void)
 \r
        if (cvar("g_multijump"))\r
        {\r
-               if (self.prevjumpbutton == FALSE && !(self.flags & FL_ONGROUND)) // jump button pressed this frame and we are in midair\r
+               if(self.prevlastteleporttime != self.lastteleporttime)\r
+               {\r
+                       // if we teleported above the ground, require touching the ground again to multi-jump\r
+                       self.multijump_ready = FALSE;\r
+                       if(self.flags & FL_ONGROUND)\r
+                               self.prevlastteleporttime = self.lastteleporttime;\r
+               }\r
+               else if (self.prevjumpbutton == FALSE && !(self.flags & FL_ONGROUND)) // jump button pressed this frame and we are in midair\r
                        self.multijump_ready = TRUE;  // this is necessary to check that we released the jump button and pressed it again\r
                else\r
                        self.multijump_ready = FALSE;\r
@@ -77,7 +87,7 @@ void PlayerJump (void)
        if(!doublejump && self.multijump_ready && self.multijump_count < cvar("g_multijump") && self.velocity_z > cvar("g_multijump_speed"))\r
        {\r
                // doublejump = FALSE; // checked above in the if\r
-               if (cvar("g_multijump") > 0)\r
+               if (cvar("g_multijump"))\r
                {\r
                        if (cvar("g_multijump_add") == 0) // in this case we make the z velocity == jumpvelocity\r
                        {\r
@@ -109,7 +119,8 @@ void PlayerJump (void)
                                        self.velocity_y = wishdir_y * curspeed;\r
                                        // keep velocity_z unchanged!\r
                                }\r
-                               self.multijump_count += 1;\r
+                               if (cvar("g_multijump") > 0)\r
+                                       self.multijump_count += 1;\r
                        }\r
                }\r
                self.multijump_ready = FALSE; // require releasing and pressing the jump button again for the next jump\r
@@ -491,6 +502,9 @@ void PM_Accelerate(vector wishdir, float wishspeed, float wishspeed0, float acce
        if(speedclamp)\r
                accelqw = -accelqw;\r
 \r
+       if(self.scale) // we are smaller or larger, so we run slower or faster\r
+               wishspeed *= (1 - cvar("g_healthsize_movementfactor")) + cvar("g_healthsize_movementfactor") * self.scale; \r
+\r
        if(cvar("sv_gameplayfix_q2airaccelerate"))\r
                wishspeed0 = wishspeed;\r
 \r
@@ -760,7 +774,7 @@ void SV_PlayerPhysics()
                }\r
        }\r
 \r
-       if(self.predator.classname == "player" || self.fakepredator.classname == "player")\r
+       if(self.stat_eaten)\r
                return;\r
 \r
        if (self.movetype == MOVETYPE_NONE)\r
@@ -810,6 +824,8 @@ void SV_PlayerPhysics()
        maxspd_mod *= swampspd_mod; // only one common speed modder please!\r
        if(cvar("g_balance_vore_weight_gravity") > 0)\r
                maxspd_mod *= 1 - bound(0, self.stomach_load * cvar("g_balance_vore_weight_speed"), 1); // apply stomach weight\r
+       if(self.swallow_progress_prey && cvar("g_balance_vore_swallow_speed_cutspd"))\r
+               maxspd_mod *= 1 - self.swallow_progress_prey; // cut speed based on swallow progress\r
        swampspd_mod = 1;\r
 \r
        // if dead, behave differently\r
@@ -865,6 +881,7 @@ void SV_PlayerPhysics()
 \r
                if (self.waterlevel == WATERLEVEL_SWIMMING)\r
                        CheckWaterJump ();\r
+               self.prevjumpbutton = self.BUTTON_JUMP;\r
        }\r
 \r
        if (self.flags & FL_WATERJUMP )\r
@@ -965,7 +982,7 @@ void SV_PlayerPhysics()
                        PM_Accelerate(wishdir, wishspeed, wishspeed, sv_accelerate*maxspd_mod, 1, 0);\r
                }\r
        }\r
-       else if ((self.items & IT_JETPACK) && self.BUTTON_JETPACK && (!cvar("g_jetpack_fuel") || self.ammo_fuel >= 0.01 || self.items & IT_UNLIMITED_WEAPON_AMMO) && self.predator.classname != "player")\r
+       else if ((self.items & IT_JETPACK) && self.BUTTON_JETPACK && (!cvar("g_jetpack_fuel") || self.ammo_fuel >= 0.01 || self.items & IT_UNLIMITED_WEAPON_AMMO) && !self.stat_eaten)\r
        {\r
                //makevectors(self.v_angle_y * '0 1 0');\r
                makevectors(self.v_angle);\r
@@ -1067,7 +1084,7 @@ void SV_PlayerPhysics()
        else if (self.flags & FL_ONGROUND)\r
        {\r
                // we get here if we ran out of ammo\r
-               if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32) && self.predator.classname != "player")\r
+               if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32) && !self.stat_eaten)\r
                        sprint(self, "You don't have any fuel for the ^2Jetpack\n");\r
 \r
                // walking\r
@@ -1128,7 +1145,7 @@ void SV_PlayerPhysics()
        {\r
                float wishspeed0;\r
                // we get here if we ran out of ammo\r
-               if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32) && self.predator.classname != "player")\r
+               if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32) && !self.stat_eaten)\r
                        sprint(self, "You don't have any fuel for the ^2Jetpack\n");\r
 \r
                if(maxspd_mod < 1)\r