Sbar ring for regurgitation delay

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 6e6fe0af204d5082d307f5cc8b01e20c93bdd5d6..575ff08798eac7b426a157c7675a9b859356987f 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -1995,17 +1995,33 @@ void Sbar_Ring()
        switch(getstati(STAT_SBRING1_TYPE))\r
        {\r
                case 0:\r
+                       // ring disabled\r
                        break;\r
                case 1:\r
-                       // ring shows vore system delay\r
+                       // ring shows vore system delay, empties with progress\r
                        ring1_color = '0.5 0.5 1';\r
-                       ring1_clip = getstatf(STAT_SBRING1_CLIP);\r
-                       text1_msg = "vore delay";\r
+                       text1_msg = "Vore delay";\r
                        break;\r
                default:\r
                        print(strcat("^1Error:^7 Unknown ring type: ", ftos(getstati(STAT_SBRING1_TYPE)), "\n"));\r
                        break;\r
        }\r
+       switch(getstati(STAT_SBRING2_TYPE))\r
+       {\r
+               case 0:\r
+                       // ring disabled\r
+                       break;\r
+               case 1:\r
+                       // ring shows regurgitation delay, fills with progress\r
+                       ring2_color = '1 0.5 1';\r
+                       text2_msg = "Regurgitating...";\r
+                       break;\r
+               default:\r
+                       print(strcat("^1Error:^7 Unknown ring type: ", ftos(getstati(STAT_SBRING1_TYPE)), "\n"));\r
+                       break;\r
+       }\r
+       ring1_clip = getstatf(STAT_SBRING1_CLIP);\r
+       ring2_clip = getstatf(STAT_SBRING2_CLIP);\r
 \r
        if(text1_msg != "")\r
        {\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 154817c831ed28b961979050e5ef1ca255b62aec..a0a0a245a3dbe0bced72150a1e96f7bcc40d0082 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -434,15 +434,20 @@ void Vore_AutoTaunt()
 \r
 void Vore_SetSbarRings()\r
 {\r
+       // first set the ring stats to 0, then configure them if needed\r
+       self.stat_sbring1_type = self.stat_sbring1_clip = 0;\r
+       self.stat_sbring2_type = self.stat_sbring2_clip = 0;\r
+\r
        if(time <= self.action_delay)\r
        {\r
-               self.stat_sbring1_type = 1; // ring shows vore action delay\r
+               self.stat_sbring1_type = 1; // ring shows vore action delay, empties with progress\r
                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);\r
        }\r
-       else\r
+\r
+       if(time <= self.regurgitate_prepare)\r
        {\r
-               self.stat_sbring1_type = 0;\r
-               self.stat_sbring1_clip = 0;\r
+               self.stat_sbring2_type = 1; // ring shows regurgitation delay, fills with progress\r
+               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);\r
        }\r
 }\r
 \r