From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 9 Jul 2011 16:22:42 +0000 (+0300)
Subject: Fill rate depends on predator size
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=5a811edf50c9413cbb640739f647e7915c9731a4

Fill rate depends on predator size
---

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 78d45239..3c87d12e 100644
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -188,6 +188,7 @@ set g_balance_grabber_reload_time 2
 set g_balance_vore_swallow_range 100 "distance below which you can swallow another player when facing them"
 set g_balance_vore_swallow_limit 3 "how many players can fit in the stomach at a time, may range between 1 and 9"
 set g_balance_vore_swallow_speed_fill 3 "how long it takes to swallow a player, 0 is instant"
+set g_balance_vore_swallow_speed_fill_healthsize 1 "fill rate depends on predator size"
 set g_balance_vore_swallow_speed_decrease 0.2 "how fast the swallow progress decreases, when the predator is no longer swallowing"
 set g_balance_vore_swallow_speed_cutspd 0.5 "prey movement slows down by this amount the closer they are to being swallowed"
 set g_balance_vore_swallow_speed 1 "how long it takes to swallow a player"
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 557b2e1b..511af9c5 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -257,7 +257,14 @@ 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_fill") * frametime;
+	{
+		float fill;
+		fill = cvar("g_balance_vore_swallow_speed_fill") * frametime;
+		if(cvar("g_balance_vore_swallow_speed_fill_healthsize")) // fill rate depends on predator size
+			fill *= self.scale;
+
+		e.swallow_progress_prey += fill;
+	}
 	else
 	{
 		Vore_Swallow(e);