Change "Being swallowed..." to "Swallowed..." on the HUD ring.

[voretournament/voretournament.git] / data / qcsrc / client / sbar.qc

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 1b9c6f3315e55d4ad6964c4750a585107a2bb22a..f8d7eefc002920842e0e5a6e91d46bc9e10bc9e6 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -1980,24 +1980,90 @@ void Sbar_Timer()
 \r
 void Sbar_Ring()\r
 {\r
-       vector pos, text_pos, text_size;\r
-       float sz1, sz2;\r
-       pos_x = vid_conwidth / 2;\r
-       pos_y = vid_conheight / 1.375;\r
-       pos_z = 0;\r
-       sz1 = 60;\r
-       sz2 = 40;\r
-       text_size = '10 10 0';\r
-\r
-       DrawCircleClippedPic(pos, sz1, "gfx/hud/sb_ring.tga", 0.85, '1 1 1', 1 * sbar_alpha_fg, DRAWFLAG_ADDITIVE);\r
-       text_pos_x = pos_x - stringwidth("Text 1 ssdfsdfdsfsdf", FALSE, text_size) / 2;\r
-       text_pos_y = pos_y - sz1 / 2 - vlen(text_size);\r
-       drawstring(text_pos, "Text 1 ssdfsdfdsfsdf", text_size, '1 1 1', 1 * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
-\r
-       DrawCircleClippedPic(pos, sz2, "gfx/hud/sb_ring.tga", 0.75, '1 1 1', 1 * sbar_alpha_fg, DRAWFLAG_ADDITIVE);\r
-       text_pos_x = pos_x - stringwidth("Text 2 3453rf234f", FALSE, text_size) / 2;\r
-       text_pos_y = pos_y + sz1 / 2 + vlen(text_size);\r
-       drawstring(text_pos, "Text 2 3453rf234f", text_size, '1 1 1', 1 * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+       vector ring_pos, ring1_color, ring2_color;\r
+       vector text_pos, text1_size, text2_size;\r
+       float ring1_alpha, ring2_alpha, ring1_size, ring1_clip, ring2_size, ring2_clip;\r
+       string text1_msg, text2_msg;\r
+\r
+       ring_pos_x = vid_conwidth / 2;\r
+       ring_pos_y = vid_conheight / 1.375;\r
+       ring1_size = cvar("sbar_ring1_scale");\r
+       ring2_size = cvar("sbar_ring2_scale");\r
+       ring1_alpha = sbar_alpha_fg * cvar("sbar_ring1_alpha");\r
+       ring2_alpha = sbar_alpha_fg * cvar("sbar_ring2_alpha");\r
+       text1_size = '1 1 0' * cvar("sbar_ring1_text_scale");\r
+       text2_size = '1 1 0' * cvar("sbar_ring2_text_scale");\r
+\r
+       switch(getstati(STAT_SBRING1_TYPE))\r
+       {\r
+               case 0:\r
+                       // 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 3:\r
+                       // ring shows stomach kick delay, empties with progress\r
+                       if not(cvar("sbar_ring1_info_kickdelay"))\r
+                               break;\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
+       }\r
+       switch(getstati(STAT_SBRING2_TYPE))\r
+       {\r
+               case 0:\r
+                       // 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 = "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
+                       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 != "" && cvar("sbar_ring1"))\r
+       {\r
+               DrawCircleClippedPic(ring_pos, ring1_size, "gfx/hud/sb_ring.tga", ring1_clip, ring1_color, ring1_alpha, DRAWFLAG_ADDITIVE);\r
+               text_pos_x = ring_pos_x - stringwidth(text1_msg, FALSE, text1_size) / 2;\r
+               text_pos_y = ring_pos_y - ring1_size / 2;\r
+               drawstring(text_pos, text1_msg, text1_size, ring1_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+       }\r
+       if(text2_msg != "" && cvar("sbar_ring2"))\r
+       {\r
+               DrawCircleClippedPic(ring_pos, ring2_size, "gfx/hud/sb_ring.tga", ring2_clip, ring2_color, ring2_alpha, DRAWFLAG_ADDITIVE);\r
+               text_pos_x = ring_pos_x - stringwidth(text2_msg, FALSE, text2_size) / 2;\r
+               text_pos_y = ring_pos_y + ring1_size / 2;\r
+               drawstring(text_pos, text2_msg, text2_size, ring2_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+       }\r
 }\r
 \r
 void CSQC_Strength_Timer() {\r
@@ -2606,8 +2672,13 @@ string GetAmmoPicture(float i)
 {\r
        switch(i)\r
        {\r
-               case 0: return "gfx/hud/sb_fuel";\r
-               default: return "";\r
+               case 0:\r
+                       if(getstati(STAT_ITEMS) & IT_FUEL_REGEN)\r
+                               return "gfx/hud/sb_fuel_regen";\r
+                       else\r
+                               return "gfx/hud/sb_fuel";\r
+               default:\r
+                       return "";\r
        }\r
 }\r
 \r