From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 3 May 2011 19:50:52 +0000 (+0300)
Subject: Sbar ring for regurgitation delay
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=bb1adaefd29ef5b649fd8e31ea727be6125345d7;ds=sidebyside

Sbar ring for regurgitation delay
---

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 6e6fe0af..575ff087 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -1995,17 +1995,33 @@ void Sbar_Ring()
 	switch(getstati(STAT_SBRING1_TYPE))
 	{
 		case 0:
+			// ring disabled
 			break;
 		case 1:
-			// ring shows vore system delay
+			// ring shows vore system delay, empties with progress
 			ring1_color = '0.5 0.5 1';
-			ring1_clip = getstatf(STAT_SBRING1_CLIP);
-			text1_msg = "vore delay";
+			text1_msg = "Vore delay";
 			break;
 		default:
 			print(strcat("^1Error:^7 Unknown ring type: ", ftos(getstati(STAT_SBRING1_TYPE)), "\n"));
 			break;
 	}
+	switch(getstati(STAT_SBRING2_TYPE))
+	{
+		case 0:
+			// ring disabled
+			break;
+		case 1:
+			// ring shows regurgitation delay, fills with progress
+			ring2_color = '1 0.5 1';
+			text2_msg = "Regurgitating...";
+			break;
+		default:
+			print(strcat("^1Error:^7 Unknown ring type: ", ftos(getstati(STAT_SBRING1_TYPE)), "\n"));
+			break;
+	}
+	ring1_clip = getstatf(STAT_SBRING1_CLIP);
+	ring2_clip = getstatf(STAT_SBRING2_CLIP);
 
 	if(text1_msg != "")
 	{
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 154817c8..a0a0a245 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -434,15 +434,20 @@ void Vore_AutoTaunt()
 
 void Vore_SetSbarRings()
 {
+	// first set the ring stats to 0, then configure them if needed
+	self.stat_sbring1_type = self.stat_sbring1_clip = 0;
+	self.stat_sbring2_type = self.stat_sbring2_clip = 0;
+
 	if(time <= self.action_delay)
 	{
-		self.stat_sbring1_type = 1; // ring shows vore action delay
+		self.stat_sbring1_type = 1; // ring shows vore action delay, empties with progress
 		self.stat_sbring1_clip = bound(0, (time / self.action_delay - 1) / ((self.action_delay - cvar("g_balance_vore_action_delay")) / self.action_delay - 1), 1);
 	}
-	else
+
+	if(time <= self.regurgitate_prepare)
 	{
-		self.stat_sbring1_type = 0;
-		self.stat_sbring1_clip = 0;
+		self.stat_sbring2_type = 1; // ring shows regurgitation delay, fills with progress
+		self.stat_sbring2_clip = 1 - bound(0, (time / self.regurgitate_prepare - 1) / ((self.regurgitate_prepare - cvar("g_balance_vore_regurgitate_delay")) / self.regurgitate_prepare - 1), 1);
 	}
 }