From 88d10861ac8f0fd4750a45c1505199e30c48522a Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 3 May 2011 23:06:56 +0300
Subject: [PATCH] Ring for stomach kicking

---
 data/qcsrc/client/sbar.qc |  7 ++++++-
 data/qcsrc/server/vore.qc | 26 ++++++++++++++++++--------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 575ff087..18b16428 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2002,6 +2002,11 @@ void Sbar_Ring()
 			ring1_color = '0.5 0.5 1';
 			text1_msg = "Vore delay";
 			break;
+		case 2:
+			// ring shows stomach kick delay, empties with progress
+			ring1_color = '1 1 0.5';
+			text1_msg = "Kick delay";
+			break;
 		default:
 			print(strcat("^1Error:^7 Unknown ring type: ", ftos(getstati(STAT_SBRING1_TYPE)), "\n"));
 			break;
@@ -2012,7 +2017,7 @@ void Sbar_Ring()
 			// ring disabled
 			break;
 		case 1:
-			// ring shows regurgitation delay, fills with progress
+			// ring shows regurgitation preparing, fills with progress
 			ring2_color = '1 0.5 1';
 			text2_msg = "Regurgitating...";
 			break;
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index a0a0a245..29e01cdb 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -434,20 +434,30 @@ void Vore_AutoTaunt()
 
 void Vore_SetSbarRings()
 {
-	// first set the ring stats to 0, then configure them if needed
+	// first clear the ring stats, 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)
+	if(self.stat_eaten)
 	{
-		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);
+		if(time <= self.stomachkick_delay)
+		{
+			self.stat_sbring1_type = 2; // ring shows stomach kick delay, empties with progress
+			self.stat_sbring1_clip = bound(0, (time / self.stomachkick_delay - 1) / ((self.stomachkick_delay - cvar("g_balance_vore_kick_delay")) / self.stomachkick_delay - 1), 1);
+		}
 	}
-
-	if(time <= self.regurgitate_prepare)
+	else
 	{
-		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);
+		if(time <= self.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);
+		}
+		if(time <= self.regurgitate_prepare)
+		{
+			self.stat_sbring2_type = 1; // ring shows regurgitation preparing, 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);
+		}
 	}
 }
 
-- 
2.39.2