sbar rings for swallowing and being swallowed (what those rings were initially intend...

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index ffcedac42a0d95a2755366a0d95cc5b78091ab68..60986e1598e62f4bb563a23ac3189408caa93794 100644 (file)
--- 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"\r
 seta sbar_ring1_info_voredelay 1 "show the first HUD ring for indicating vore delay"\r
 seta sbar_ring1_info_kickdelay 1 "show the first HUD ring for indicating kick delay"\r
+seta sbar_ring1_info_swallowprogress_pred 1 "show the first HUD ring for indicating predator swallow progress"\r
 seta sbar_ring2 1 "enables the second HUD ring"\r
 seta sbar_ring2_scale 40 "scale of the second HUD ring"\r
 seta sbar_ring2_text_scale 10 "scale of the text on the second HUD ring"\r
 seta sbar_ring2_alpha 0.75 "alpha of the second HUD ring"\r
 seta sbar_ring2_info_regurgitateprepare 1 "show the second HUD ring for indicating regurgitation preparing"\r
+seta sbar_ring2_info_swallowprogress_prey 1 "show the first HUD ring for indicating prey swallow progress"\r
 seta sbar_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"\r
 \r
 // for menu server list (eventually make them have engine support?)\r

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index e797c188b1511cf8f1c3a31b7b31d991d74299d6..7785aa8540b99692ef885b0adfb3499987f6271f 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2000,13 +2000,20 @@ void Sbar_Ring()
                        // ring disabled\r
                        break;\r
                case 1:\r
+                       // ring shows predator swallow progress, fills with progress\r
+                       if not(cvar("sbar_ring1_info_swallowprogress_pred"))\r
+                               break;\r
+                       ring1_color = '0.5 1 0.5';\r
+                       text1_msg = "Swallowing...";\r
+                       break;\r
+               case 2:\r
                        // ring shows vore system delay, empties with progress\r
                        if not(cvar("sbar_ring1_info_voredelay"))\r
                                break;\r
                        ring1_color = '0.5 0.5 1';\r
                        text1_msg = "Vore delay";\r
                        break;\r
-               case 2:\r
+               case 3:\r
                        // ring shows stomach kick delay, empties with progress\r
                        if not(cvar("sbar_ring1_info_kickdelay"))\r
                                break;\r
@@ -2023,6 +2030,13 @@ void Sbar_Ring()
                        // ring disabled\r
                        break;\r
                case 1:\r
+                       // ring shows prey swallow progress, fills with progress\r
+                       if not(cvar("sbar_ring2_info_swallowprogress_prey"))\r
+                               break;\r
+                       ring2_color = '1 0.5 0.5';\r
+                       text2_msg = "Being swallowed...";\r
+                       break;\r
+               case 2:\r
                        // ring shows regurgitation preparing, fills with progress\r
                        if not(cvar("sbar_ring2_info_regurgitateprepare"))\r
                                break;\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 6c66cdddea0e1fb0318c5528588c2d825431c500..dba7ca3233d70fbf078c9c731a412b213880abb0 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -535,20 +535,31 @@ void Vore_SetSbarRings()
        {\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_type = 3; // 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
        else\r
        {\r
-               if(time <= self.action_delay)\r
+               if(self.swallow_progress_pred)\r
                {\r
-                       self.stat_sbring1_type = 1; // ring shows vore action delay, empties with progress\r
+                       self.stat_sbring1_type = 1; // ring shows predator swallow progress, fills with progress\r
+                       self.stat_sbring1_clip = bound(0, self.swallow_progress_pred, 1);\r
+               }\r
+               else if(time <= self.action_delay)\r
+               {\r
+                       self.stat_sbring1_type = 2; // 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
+               if(self.swallow_progress_prey)\r
+               {\r
+                       self.stat_sbring2_type = 1; // ring shows prey swallow progress, fills with progress\r
+                       self.stat_sbring2_clip = bound(0, self.swallow_progress_prey, 1);\r
+               }\r
+               else if(time <= self.regurgitate_prepare)\r
                {\r
-                       self.stat_sbring2_type = 1; // ring shows regurgitation preparing, fills with progress\r
+                       self.stat_sbring2_type = 2; // 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