From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 9 Jul 2011 13:43:08 +0000 (+0300)
Subject: sbar rings for swallowing and being swallowed (what those rings were initially intend... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e5414bec45af080330844b747d639b5c9928ca19;p=voretournament%2Fvoretournament.git

sbar rings for swallowing and being swallowed (what those rings were initially intended for also)
---

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index ffcedac4..60986e15 100644
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1194,11 +1194,13 @@ seta sbar_ring1_text_scale 12 "scale of the text on the first HUD ring"
 seta sbar_ring1_alpha 0.75 "alpha of the first HUD ring"
 seta sbar_ring1_info_voredelay 1 "show the first HUD ring for indicating vore delay"
 seta sbar_ring1_info_kickdelay 1 "show the first HUD ring for indicating kick delay"
+seta sbar_ring1_info_swallowprogress_pred 1 "show the first HUD ring for indicating predator swallow progress"
 seta sbar_ring2 1 "enables the second HUD ring"
 seta sbar_ring2_scale 40 "scale of the second HUD ring"
 seta sbar_ring2_text_scale 10 "scale of the text on the second HUD ring"
 seta sbar_ring2_alpha 0.75 "alpha of the second HUD ring"
 seta sbar_ring2_info_regurgitateprepare 1 "show the second HUD ring for indicating regurgitation preparing"
+seta sbar_ring2_info_swallowprogress_prey 1 "show the first HUD ring for indicating prey swallow progress"
 seta sbar_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"
 
 // for menu server list (eventually make them have engine support?)
diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index e797c188..7785aa85 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2000,13 +2000,20 @@ void Sbar_Ring()
 			// ring disabled
 			break;
 		case 1:
+			// ring shows predator swallow progress, fills with progress
+			if not(cvar("sbar_ring1_info_swallowprogress_pred"))
+				break;
+			ring1_color = '0.5 1 0.5';
+			text1_msg = "Swallowing...";
+			break;
+		case 2:
 			// ring shows vore system delay, empties with progress
 			if not(cvar("sbar_ring1_info_voredelay"))
 				break;
 			ring1_color = '0.5 0.5 1';
 			text1_msg = "Vore delay";
 			break;
-		case 2:
+		case 3:
 			// ring shows stomach kick delay, empties with progress
 			if not(cvar("sbar_ring1_info_kickdelay"))
 				break;
@@ -2023,6 +2030,13 @@ void Sbar_Ring()
 			// ring disabled
 			break;
 		case 1:
+			// ring shows prey swallow progress, fills with progress
+			if not(cvar("sbar_ring2_info_swallowprogress_prey"))
+				break;
+			ring2_color = '1 0.5 0.5';
+			text2_msg = "Being swallowed...";
+			break;
+		case 2:
 			// ring shows regurgitation preparing, fills with progress
 			if not(cvar("sbar_ring2_info_regurgitateprepare"))
 				break;
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 6c66cddd..dba7ca32 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -535,20 +535,31 @@ void Vore_SetSbarRings()
 	{
 		if(time <= self.stomachkick_delay)
 		{
-			self.stat_sbring1_type = 2; // ring shows stomach kick delay, empties with progress
+			self.stat_sbring1_type = 3; // 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);
 		}
 	}
 	else
 	{
-		if(time <= self.action_delay)
+		if(self.swallow_progress_pred)
 		{
-			self.stat_sbring1_type = 1; // ring shows vore action delay, empties with progress
+			self.stat_sbring1_type = 1; // ring shows predator swallow progress, fills with progress
+			self.stat_sbring1_clip = bound(0, self.swallow_progress_pred, 1);
+		}
+		else if(time <= self.action_delay)
+		{
+			self.stat_sbring1_type = 2; // 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)
+
+		if(self.swallow_progress_prey)
+		{
+			self.stat_sbring2_type = 1; // ring shows prey swallow progress, fills with progress
+			self.stat_sbring2_clip = bound(0, self.swallow_progress_prey, 1);
+		}
+		else if(time <= self.regurgitate_prepare)
 		{
-			self.stat_sbring2_type = 1; // ring shows regurgitation preparing, fills with progress
+			self.stat_sbring2_type = 2; // 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);
 		}
 	}