X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fcl_physics.qc;h=b0b04255c6f126e8c0e7a68135e4b76758627ce4;hp=9c2a82d6e3414b5cb89604368dd08c38c3655a86;hb=cd33ec46f8129097e145ac93d261e48947e35d0a;hpb=19b2166e669ed5315d9ff526c091c552bb741a37

diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc
index 9c2a82d6..b0b04255 100644
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -56,7 +56,12 @@ void PlayerJump (void)
 
 	mjumpheight = cvar("sv_jumpvelocity");
 	if(self.scale) // we are smaller or larger, so we jump lower or higher
-		mjumpheight *= (1 - cvar("g_healthsize_movementfactor")) + cvar("g_healthsize_movementfactor") * self.scale; 
+		mjumpheight *= (1 - cvar("g_healthsize_movementfactor")) + cvar("g_healthsize_movementfactor") * self.scale;
+	if(self.swallow_progress_prey) // cut jumping based on swallow progress for prey
+		mjumpheight *= 1 - (self.swallow_progress_prey * cvar("g_balance_vore_swallow_speed_cutspd_prey"));
+	if(self.swallow_progress_pred) // cut jumping based on swallow progress for preds
+		mjumpheight *= 1 - (self.swallow_progress_pred * cvar("g_balance_vore_swallow_speed_cutspd_pred"));
+
 	if (self.waterlevel >= WATERLEVEL_SWIMMING)
 	{
 		if (self.watertype == CONTENT_WATER)
@@ -502,8 +507,14 @@ void PM_Accelerate(vector wishdir, float wishspeed, float wishspeed0, float acce
 	if(speedclamp)
 		accelqw = -accelqw;
 
+	if(cvar("g_balance_vore_weight_gravity") > 0) // apply stomach weight
+		wishspeed *= 1 - bound(0, self.stomach_load * cvar("g_balance_vore_weight_speed"), 1);
 	if(self.scale) // we are smaller or larger, so we run slower or faster
 		wishspeed *= (1 - cvar("g_healthsize_movementfactor")) + cvar("g_healthsize_movementfactor") * self.scale; 
+	if(self.swallow_progress_prey) // cut speed based on swallow progress for prey
+		wishspeed *= 1 - (self.swallow_progress_prey * cvar("g_balance_vore_swallow_speed_cutspd_prey"));
+	if(self.swallow_progress_pred) // cut speed based on swallow progress for preds
+		wishspeed *= 1 - (self.swallow_progress_pred * cvar("g_balance_vore_swallow_speed_cutspd_pred"));
 
 	if(cvar("sv_gameplayfix_q2airaccelerate"))
 		wishspeed0 = wishspeed;
@@ -774,7 +785,7 @@ void SV_PlayerPhysics()
 		}
 	}
 
-	if(self.predator.classname == "player" || self.fakepredator.classname == "player")
+	if(self.stat_eaten)
 		return;
 
 	if (self.movetype == MOVETYPE_NONE)
@@ -822,8 +833,6 @@ void SV_PlayerPhysics()
 	}
 
 	maxspd_mod *= swampspd_mod; // only one common speed modder please!
-	if(cvar("g_balance_vore_weight_gravity") > 0)
-		maxspd_mod *= 1 - bound(0, self.stomach_load * cvar("g_balance_vore_weight_speed"), 1); // apply stomach weight
 	swampspd_mod = 1;
 
 	// if dead, behave differently
@@ -980,7 +989,7 @@ void SV_PlayerPhysics()
 			PM_Accelerate(wishdir, wishspeed, wishspeed, sv_accelerate*maxspd_mod, 1, 0);
 		}
 	}
-	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")
+	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)
 	{
 		//makevectors(self.v_angle_y * '0 1 0');
 		makevectors(self.v_angle);
@@ -1082,7 +1091,7 @@ void SV_PlayerPhysics()
 	else if (self.flags & FL_ONGROUND)
 	{
 		// we get here if we ran out of ammo
-		if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32) && self.predator.classname != "player")
+		if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32) && !self.stat_eaten)
 			sprint(self, "You don't have any fuel for the ^2Jetpack\n");
 
 		// walking
@@ -1143,7 +1152,7 @@ void SV_PlayerPhysics()
 	{
 		float wishspeed0;
 		// we get here if we ran out of ammo
-		if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32) && self.predator.classname != "player")
+		if((self.items & IT_JETPACK) && self.BUTTON_JETPACK && !(buttons_prev & 32) && !self.stat_eaten)
 			sprint(self, "You don't have any fuel for the ^2Jetpack\n");
 
 		if(maxspd_mod < 1)