From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 11 Jun 2013 13:49:33 +0000 (+0300)
Subject: Predator progress causes your prey progress to drop more quickly and the other way... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5b7cb9e2753bba21b4488c7bc78da0833dc35380;p=voretournament%2Fvoretournament.git

Predator progress causes your prey progress to drop more quickly and the other way around
---

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index a608a42f..00c5942c 100644
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -210,6 +210,7 @@ set g_balance_vore_swallow_speed_fill_scalediff_player 0.5 "fill rate depends on
 set g_balance_vore_swallow_speed_fill_scalediff_item 0.75 "fill rate depends on predator health compared to item health by this amount"
 set g_balance_vore_swallow_speed_fill_stomachload 1 "fill rate is influenced by the prey's stomach load by this amount"
 set g_balance_vore_swallow_speed_decrease 0.5 "how fast the swallow progress decreases, when the predator is no longer swallowing"
+set g_balance_vore_swallow_speed_decrease_even 0.5 "predator progress causes your prey progress to drop more quickly and the other way around"
 set g_balance_vore_swallow_speed_cutspd_prey 1 "prey movement slows down by this amount the closer they are to being swallowed"
 set g_balance_vore_swallow_speed_cutspd_pred 0.5 "predator movement slows down by this amount the closer they are to finishing swallowing"
 set g_balance_vore_swallow_dropweapon 0.6 "probability of dropping your weapon when swallowed. 0 = never and 1 = always, does not apply to team mates"
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 195b5ce1..9e71f036 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -777,9 +777,19 @@ void Vore()
 	if(cvar("g_balance_vore_swallow_speed_decrease"))
 	{
 		if(self.swallow_progress_pred)
-			self.swallow_progress_pred = max(0, self.swallow_progress_pred - cvar("g_balance_vore_swallow_speed_decrease") * frametime);
+		{
+			float speed = cvar("g_balance_vore_swallow_speed_decrease");
+			if(cvar("g_balance_vore_swallow_speed_decrease_even"))
+				speed += self.swallow_progress_prey * cvar("g_balance_vore_swallow_speed_decrease_even");
+			self.swallow_progress_pred = max(0, self.swallow_progress_pred - speed * frametime);
+		}
 		if(self.swallow_progress_prey)
+		{
+			float speed = cvar("g_balance_vore_swallow_speed_decrease");
+			if(cvar("g_balance_vore_swallow_speed_decrease_even"))
+				speed += self.swallow_progress_pred * cvar("g_balance_vore_swallow_speed_decrease_even");
 			self.swallow_progress_prey = max(0, self.swallow_progress_prey - cvar("g_balance_vore_swallow_speed_decrease") * frametime);
+		}
 	}
 
 	// set the predator's stomach load and capacity