}\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(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
+ if(self.swallow_progress_pred) // cut jumping based on swallow progress for preds\r
+ mjumpheight *= 1 - (self.swallow_progress_pred * cvar("g_balance_vore_swallow_speed_cutspd_pred"));\r
+\r
if (self.waterlevel >= WATERLEVEL_SWIMMING)\r
{\r
if (self.watertype == CONTENT_WATER)\r
if(speedclamp)\r
accelqw = -accelqw;\r
\r
- if(self.scale) // we are smaller or larger, so we run slower or faster\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(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
+ if(self.swallow_progress_pred) // cut speed based on swallow progress for preds\r
+ wishspeed *= 1 - (self.swallow_progress_pred * cvar("g_balance_vore_swallow_speed_cutspd_pred"));\r
\r
if(cvar("sv_gameplayfix_q2airaccelerate"))\r
wishspeed0 = wishspeed;\r
}\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
}\r
\r
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
swampspd_mod = 1;\r
\r
// if dead, behave differently\r
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
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
{\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