X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fvore.qc;h=6c787ca3fa5ab3f6d222aedcea7f38fd7d1530e5;hp=dba7ca3233d70fbf078c9c731a412b213880abb0;hb=bc3e4294ed33bfc89b9b50ccd93d54c0fb64dee2;hpb=e5414bec45af080330844b747d639b5c9928ca19

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index dba7ca32..6c787ca3 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -249,7 +249,7 @@ void Vore_Swallow(entity e)
 
 void Vore_SwallowStep(entity e)
 {
-	if(!cvar("g_balance_vore_swallow_speed"))
+	if(!cvar("g_balance_vore_swallow_speed_fill"))
 	{
 		Vore_Swallow(e);
 		return;
@@ -257,7 +257,7 @@ void Vore_SwallowStep(entity e)
 
 	// increase the progress value until it reaches 1, then swallow the player
 	if(e.swallow_progress_prey < 1)
-		e.swallow_progress_prey += cvar("g_balance_vore_swallow_speed") * frametime;
+		e.swallow_progress_prey += cvar("g_balance_vore_swallow_speed_fill") * frametime;
 	else
 	{
 		Vore_Swallow(e);
@@ -636,6 +636,20 @@ void Vore()
 		}
 	}
 
+	// the swallow progress of prey and preds idly decrease by this amount
+	if(self.swallow_progress_pred)
+	{
+		self.swallow_progress_pred -= cvar("g_balance_vore_swallow_speed_decrease") * frametime;
+		if(self.swallow_progress_pred < 0)
+			self.swallow_progress_pred = 0;
+	}
+	if(self.swallow_progress_prey)
+	{
+		self.swallow_progress_prey -= cvar("g_balance_vore_swallow_speed_decrease") * frametime;
+		if(self.swallow_progress_prey < 0)
+			self.swallow_progress_prey = 0;
+	}
+
 	// apply delays and skip the vore system under some circumstances
 	if(time < game_starttime || (time < warmup && !inWarmupStage)) // don't allow vore before a round begins
 	{