Ring for stomach kicking

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 575ff08798eac7b426a157c7675a9b859356987f..18b16428bbc9725598cebaaa5ea7648b516fe4a3 100644 (file)
--- 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';\r
                        text1_msg = "Vore delay";\r
                        break;\r
                        ring1_color = '0.5 0.5 1';\r
                        text1_msg = "Vore delay";\r
                        break;\r

+               case 2:\r
+                       // ring shows stomach kick delay, empties with progress\r
+                       ring1_color = '1 1 0.5';\r
+                       text1_msg = "Kick delay";\r
+                       break;\r

                default:\r
                        print(strcat("^1Error:^7 Unknown ring type: ", ftos(getstati(STAT_SBRING1_TYPE)), "\n"));\r
                        break;\r
                default:\r
                        print(strcat("^1Error:^7 Unknown ring type: ", ftos(getstati(STAT_SBRING1_TYPE)), "\n"));\r
                        break;\r


@@ -2012,7 +2017,7 @@ void Sbar_Ring()
                        // ring disabled\r
                        break;\r
                case 1:\r
                        // ring disabled\r
                        break;\r
                case 1:\r

-                       // ring shows regurgitation delay, fills with progress\r
+                       // ring shows regurgitation preparing, fills with progress\r

                        ring2_color = '1 0.5 1';\r
                        text2_msg = "Regurgitating...";\r
                        break;\r
                        ring2_color = '1 0.5 1';\r
                        text2_msg = "Regurgitating...";\r
                        break;\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index a0a0a245a3dbe0bced72150a1e96f7bcc40d0082..29e01cdb39923eab27214a6eded2331fe704f868 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -434,20 +434,30 @@ void Vore_AutoTaunt()
 \r
 void Vore_SetSbarRings()\r
 {\r
 \r
 void Vore_SetSbarRings()\r
 {\r

-       // first set the ring stats to 0, then configure them if needed\r
+       // first clear the ring stats, 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
        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
+       if(self.stat_eaten)\r

        {\r
        {\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
+               if(time <= self.stomachkick_delay)\r
+               {\r
+                       self.stat_sbring1_type = 2; // ring shows stomach kick delay, empties with progress\r
+                       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);\r
+               }\r

        }\r
        }\r

-\r
-       if(time <= self.regurgitate_prepare)\r
+       else\r

        {\r
        {\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
+               if(time <= self.action_delay)\r
+               {\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
+               if(time <= self.regurgitate_prepare)\r
+               {\r
+                       self.stat_sbring2_type = 1; // ring shows regurgitation preparing, 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
 \r
        }\r
 }\r
 \r