return rgb;\r
}\r
\r
-void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, float lettersize, vector rgb, float highlighted, float stroke, float alpha, float dflags)\r
+void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, float lettersize, vector rgb, float alpha, float dflags)\r
{\r
- float l, i;\r
- string str, tmp, l_length;\r
+ float l;\r
+ string str, tmp, l_length, final_num;\r
float minus, plus;\r
- vector vsize, num_color;\r
+ vector vsize;\r
\r
vsize_x = vsize_y = lettersize;\r
vsize_z = 0;\r
if((showminusplus == 2 && num >= 0) || (num > 0 && showminusplus == 3))\r
{\r
plus = true;\r
- pos_x -= lettersize;\r
} else\r
plus = false; \r
\r
{\r
minus = true;\r
num = -num;\r
- pos_x -= lettersize;\r
} else\r
minus = false;\r
\r
\r
if(l > digits)\r
{\r
- str = substring(str, l-digits, 999);\r
+ str = substring(str, l - digits, 999);\r
l = strlen(str);\r
- } else if(l < digits)\r
- pos_x += (digits-l) * lettersize;\r
-\r
- if (highlighted == 1) {\r
- vector hl_size;\r
- hl_size_x = vsize_x * l + vsize_x * 0.2;\r
- hl_size_y = vsize_y * 1.1;\r
- hl_size_z = 0;\r
- if(minus)\r
- hl_size_x = hl_size_x + vsize_x;\r
-\r
- vector hl_pos;\r
- hl_pos_x = pos_x - lettersize/10;\r
- hl_pos_y = pos_y - lettersize/20;\r
- hl_pos_z = 0;\r
-\r
- drawpic(hl_pos, strcat("gfx/hud/sb_highlight_", l_length), hl_size, '1 1 1', alpha, dflags);\r
}\r
\r
- if (stroke == 1)\r
- num_color = '1 1 1';\r
- else\r
- num_color = rgb;\r
-\r
if(minus)\r
- {\r
- if (stroke == 1)\r
- drawpic(pos, "gfx/hud/num_minus_stroke", vsize, rgb, alpha, dflags);\r
- drawpic(pos, "gfx/hud/num_minus", vsize, num_color, alpha, dflags);\r
- pos_x += lettersize;\r
- } else if(plus)\r
- {\r
- if (stroke == 1)\r
- drawpic(pos, "gfx/hud/num_plus_stroke", vsize, rgb, alpha, dflags);\r
- drawpic(pos, "gfx/hud/num_plus", vsize, num_color, alpha, dflags);\r
- pos_x += lettersize;\r
- }\r
+ final_num = "-";\r
+ else if(plus)\r
+ final_num = "+";\r
\r
- for(i = 0; i < l; ++i)\r
- {\r
- tmp = substring(str, i, 1);\r
- if (stroke == 1)\r
- drawpic(pos, strcat("gfx/hud/num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);\r
- drawpic(pos, strcat("gfx/hud/num_", tmp), vsize, num_color, alpha, dflags);\r
- pos_x += lettersize;\r
- }\r
+ final_num = strcat(final_num, str);\r
+ drawstring(pos, final_num, vsize, rgb, alpha, dflags);\r
}\r
\r
void Sbar_DrawXNum_Colored (vector pos, float x, float lettersize, float alpha)\r
color_y = 0;\r
color_z = 0;\r
}\r
- Sbar_DrawXNum(pos, x, 3, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(pos, x, 3, 0, lettersize, color, alpha, DRAWFLAG_NORMAL);\r
}\r
\r
void Cmd_Sbar_SetFields(float argc);\r
\r
string str;\r
float f, field, field_number;\r
+ vector hl_color;\r
field_number = 3; // the number of components each row has\r
\r
for(fieldcounter = 1; fieldcounter <= field_number; ++fieldcounter)\r
if(field == ST_HIGHLIGHT)\r
{\r
if(getstati(STAT_VORE_EATEN))\r
- drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color2")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ {\r
+ if(teamplay && GetPlayerColor(pl.entnum - 1) == GetPlayerColor(player_localentnum - 1)) // same team\r
+ hl_color = stov(cvar_string("sbar_stomachboard_color2"));\r
+ else\r
+ hl_color = stov(cvar_string("sbar_stomachboard_color3"));\r
+ }\r
else\r
- drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color1")), cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ hl_color = stov(cvar_string("sbar_stomachboard_color1"));\r
+ drawfill(pos - '0 0 0', '193 11 0', hl_color, cvar("sbar_stomachboard_highlight_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
\r
if(field == ST_NAME) {\r
continue;\r
\r
rgb = GetTeamRGB(tm.team);\r
- Sbar_DrawXNum(pos - '9.5 0 0' * sbar_fontsize_y + '0 1 0' * sbar_fontsize_y, tm.(teamscores[ts_primary]), 6, 0, sbar_fontsize_y * 1.5, rgb, 0, 1, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(pos - '9.5 0 0' * sbar_fontsize_y + '0 1 0' * sbar_fontsize_y, tm.(teamscores[ts_primary]), 6, 0, sbar_fontsize_y * 1.5, rgb, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);\r
\r
if(ts_primary != ts_secondary)\r
- Sbar_DrawXNum(pos - '7.5 0 0' * sbar_fontsize_y + '0 2.5 0' * sbar_fontsize_y, tm.(teamscores[ts_secondary]), 6, 0, sbar_fontsize_y * 1, rgb, 0, 1, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(pos - '7.5 0 0' * sbar_fontsize_y + '0 2.5 0' * sbar_fontsize_y, tm.(teamscores[ts_secondary]), 6, 0, sbar_fontsize_y * 1, rgb, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);\r
\r
pos = Sbar_Scoreboard_MakeTable(pos, tm, rgb, bg_size);\r
}\r
void Sbar_Score()\r
{\r
float score, distribution, leader;\r
- vector score_pos, secondary_score_pos, distribution_color;\r
+ vector score_pos, secondary_score_pos, race_score_pos, distribution_color;\r
+ string racetime, secondary_racetime;\r
entity tm, pl, me;\r
me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1];\r
\r
if(gametype == GAME_RPG)\r
return;\r
\r
- score_pos = top + '-240 8 0';\r
- secondary_score_pos = score_pos + '210 -6 0';\r
+ score_pos = top + '-80 8 0';\r
+ secondary_score_pos = score_pos + '80 -6 0';\r
\r
if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD\r
pl = players.sort_next;\r
score = me.(scores[ps_primary]);\r
\r
float racemin, racesec, racemsec;\r
- float distsec, distmsec, minusplus;\r
+ float distsec, distmsec;\r
+ string s_racemin, s_racesec, s_racemsec;\r
\r
racemin = floor(score/(60 * TIME_FACTOR));\r
racesec = floor((score - racemin*(60 * TIME_FACTOR))/TIME_FACTOR);\r
racemsec = score - racemin*60*TIME_FACTOR - racesec*TIME_FACTOR;\r
\r
+ if(racemin < 10) s_racemin = strcat("0", ftos(racemin));\r
+ else s_racemin = ftos(racemin);\r
+ if(racesec < 10) s_racesec = strcat("0", ftos(racesec));\r
+ else s_racesec = ftos(racesec);\r
+ if(racemsec < 10) s_racemsec = strcat("0", ftos(racemsec));\r
+ else s_racemsec = ftos(racemsec);\r
+\r
if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) {\r
// distribution display\r
distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);\r
if (distribution < TIME_FACTOR && distribution > -TIME_FACTOR)\r
distmsec = fabs(distribution);\r
else {\r
- distsec = floor(fabs(distribution)/TIME_FACTOR);\r
- distmsec = fabs(distribution) - distsec*TIME_FACTOR;\r
- if (distribution < 0)\r
- distsec = -distsec;\r
+ distsec = floor(fabs(distribution) / TIME_FACTOR);\r
+ distmsec = fabs(distribution) - distsec * TIME_FACTOR;\r
}\r
\r
- if (distribution <= 0) {\r
+ if (distribution < 0) {\r
distribution_color = '0 1 0';\r
- minusplus = 1; // minusplus 1: always prefix with minus sign\r
+ secondary_racetime = "-"; // always prefix with minus sign\r
}\r
- else {\r
+ else if (distribution > 0) {\r
distribution_color = '1 0 0';\r
- minusplus = 2; // minusplus 1: always prefix with plus sign\r
+ secondary_racetime = "+"; // minusplus 1: always prefix with plus sign\r
}\r
- Sbar_DrawXNum(score_pos + '335 16 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- Sbar_DrawXNum(score_pos + '403 16 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawpic(score_pos + '335 16 0' - '16 0 0' * TIME_DECIMALS, "gfx/hud/num_dot", '16 16 0', distribution_color, sbar_alpha_fg, DRAWFLAG_ADDITIVE);\r
- }\r
- // race record display\r
- if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead\r
- drawpic(score_pos + '335 0 0' - '32 0 0' * (4 + TIME_DECIMALS), "gfx/hud/sb_highlight_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ else\r
+ distribution_color = '1 1 1';\r
\r
- Sbar_DrawXNum(score_pos + '335 0 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- Sbar_DrawXNum(score_pos + '335 0 0' - TIME_DECIMALS * '30 0 0' - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawpic(score_pos + '335 0 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "gfx/hud/num_dot", '30 30 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);\r
+ secondary_racetime = strcat(secondary_racetime, ftos(distsec), ".", ftos(distmsec));\r
+ drawstring(score_pos + '222 0 0' - '14 0 0', secondary_racetime, '14 14 0', distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ }\r
\r
- Sbar_DrawXNum(score_pos + '335 0 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawpic(score_pos + '335 0 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "gfx/hud/num_colon", '30 30 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);\r
+ racetime = strcat(s_racemin, " : ", s_racesec, " . ", s_racemsec);\r
+ race_score_pos = top + '0 0 0';\r
+ race_score_pos -= '1 0 0' * stringwidth(racetime, FALSE, '30 30 0') * 0.5;\r
+ drawstring(race_score_pos, racetime, '30 30 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
\r
} else if (!teamplay) { // non-teamgames, except race/cts\r
// me vector := [team/connected frags id]\r
else\r
distribution_color = '1 0 0';\r
\r
- Sbar_DrawXNum(secondary_score_pos, distribution, 6, 0, 16, distribution_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- Sbar_DrawXNum(score_pos, score, 6, 0, 34, distribution_color, leader, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(secondary_score_pos, distribution, 6, 3, 16, distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(score_pos, score, 6, 0, 34, distribution_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
} else { // teamgames\r
float max_fragcount;\r
max_fragcount = -999;\r
if(tm.team == myteam) {\r
if (max_fragcount == score)\r
leader = 1;\r
- Sbar_DrawXNum(score_pos, score, 6, 0, 34, GetTeamRGB(tm.team) * 0.8, leader, 1, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(score_pos, score, 6, 0, 34, GetTeamRGB(tm.team), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
} else {\r
if (max_fragcount == score)\r
leader = 1;\r
- Sbar_DrawXNum(secondary_score_pos, score, 6, 0, 16, GetTeamRGB(tm.team) * 0.8, leader, 1, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(secondary_score_pos, score, 6, 3, 16, GetTeamRGB(tm.team), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
secondary_score_pos = secondary_score_pos + '0 16 0';\r
}\r
}\r
void Sbar_Timer()\r
{\r
float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft;\r
- vector bgpos, timer_color;\r
+ vector pos, bgpos, timer_color;\r
+ string finaltime;\r
bgpos = '0 0 0';\r
\r
vector topright;\r
if (minutes < 10)\r
bgpos_x = topright_x - (54 + 17 + 12) * scale;\r
else if (minutes < 100) // nudge the timer background left if more digits are drawn\r
- bgpos_x = topright_x - (72 + 17 + 12) * scale;\r
+ bgpos_x = topright_x - (62 + 17 + 12) * scale;\r
else\r
- bgpos_x = topright_x - (90 + 17 + 12) * scale;\r
+ bgpos_x = topright_x - (70 + 17 + 12) * scale;\r
bgpos_y = 0;\r
bgpos_z = 0;\r
} else {\r
minutes = minutesLeft;\r
seconds = secondsLeft;\r
- if (minutes == 0)\r
- bgpos_x = topright_x - (36 + 7 + 12) * scale;\r
- else if (minutes < 10) // nudge the timer background left if more digits are drawn\r
+ if (minutes < 10) // nudge the timer background left if more digits are drawn\r
bgpos_x = topright_x - (54 + 17 + 12) * scale;\r
else if (minutes < 100)\r
- bgpos_x = topright_x - (72 + 17 + 12) * scale;\r
+ bgpos_x = topright_x - (62 + 17 + 12) * scale;\r
else\r
- bgpos_x = topright_x - (90 + 17 + 12) * scale;\r
+ bgpos_x = topright_x - (70 + 17 + 12) * scale;\r
bgpos_y = 0;\r
bgpos_z = 0;\r
}\r
}\r
}\r
\r
- if(minutesLeft >= 1 || cvar("sbar_increment_maptime") || timelimit == 0 || warmup_stage) {\r
- Sbar_DrawXNum(topright - ('103 -2 0' - '0 2 0') * scale, minutes, 3, 0, 18 * scale, timer_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawpic(topright - ('53 0 0' - '0 1 0') * scale, "gfx/hud/num_colon", '18 18 0' * scale, timer_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawpic(topright - ('19 0 0' + '3 0 0' - '0 2 0'), "gfx/hud/sb_time", '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ finaltime = strcat(ftos(minutes), ":");\r
+ if(seconds < 10)\r
+ finaltime = strcat(finaltime, "0", ftos(seconds));\r
+ else\r
+ finaltime = strcat(finaltime, ftos(seconds));\r
+\r
+ pos = topright - ('24 -2 0' + '3 0 0' - '0 2 0');\r
+ pos -= '1 0 0' * stringwidth(finaltime, FALSE, 18 * scale * '1 1 0');\r
+ drawstring(pos, finaltime, 18 * scale * '1 1 0', timer_color, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+}\r
+\r
+void Sbar_Ring()\r
+{\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
- Sbar_DrawXNum(topright - ('36 -2 0' + '3 0 0' - '0 2 0') * scale, seconds, -2, 0, 18 * scale, timer_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
\r
void CSQC_Strength_Timer() {\r
picsize = '22 22 0';\r
countdown_fontsize = 18;\r
\r
- if (vid_conwidth >= 800)\r
- pos = bottomright - '34 48 0';\r
- else\r
- pos = bottomright - '34 96 0';\r
+ pos = bottomright - '34 48 0';\r
\r
//strength\r
strength_time = getstatf(STAT_STRENGTH_FINISHED);\r
{\r
drawpic(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);\r
}\r
- Sbar_DrawXNum(pos - '40 -2 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(pos - '30 -2 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
else if(dt > -1)\r
{\r
{\r
drawpic(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);\r
}\r
- Sbar_DrawXNum(pos - '40 -24 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ Sbar_DrawXNum(pos - '30 -24 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
else if(dt > -1)\r
{\r
{\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
Sbar_UpdatePlayerTeams();\r
if (intermission == 2) // map voting screen\r
{\r
- if(spectatee_status != -1) {\r
- Sbar_Score();\r
- Sbar_Timer();\r
- }\r
+ Sbar_Timer();\r
if(sb_showscores)\r
- Sbar_DrawScoreboard();\r
+ Sbar_DrawScoreboard();\r
else\r
Sbar_FinaleOverlay();\r
\r
else\r
Sbar_DrawScoreboard();\r
float armor, health;\r
- armor = getstati(STAT_ARMOR); // armor is not used in Vore Tournament by default, but still exists for mods that might want it\r
+ armor = getstati(STAT_ARMOR);\r
health = getstati(STAT_HEALTH);\r
\r
stat_items = getstati(STAT_ITEMS);\r
}\r
}\r
\r
+ vector hl_color;\r
+ string hl_string;\r
if(getstati(STAT_VORE_EATEN))\r
{\r
- drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(stov(cvar_string("sbar_stomachboard_color2"))), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawstring(bottomleft - '-80 172 0', "predator:", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ if(teamplay && GetPlayerColor(getstati(STAT_VORE_EATEN) - 1) == GetPlayerColor(player_localentnum - 1)) // same team\r
+ hl_color = stov(cvar_string("sbar_stomachboard_color2"));\r
+ else\r
+ hl_color = stov(cvar_string("sbar_stomachboard_color3"));\r
+ hl_string = "predator:";\r
}\r
else\r
{\r
- drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(stov(cvar_string("sbar_stomachboard_color1"))), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawstring(bottomleft - '-80 172 0', "self:", '10 10 0', ' 1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ hl_color = stov(cvar_string("sbar_stomachboard_color1"));\r
+ hl_string = "self:";\r
}\r
+ drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(hl_color), cvar("sbar_stomachboard_status_alpha") * sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ drawstring(bottomleft - '-80 173 0', hl_string, '11 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
\r
float stomach_load;\r
stomach_load = getstati(STAT_VORE_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise\r
\r
- Sbar_DrawXNum(bottomleft - '-18 170 0', bound(0, stomach_load, 9), 1, 0, 22, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- drawstring(bottomleft - '-40 170 0', "/", '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- Sbar_DrawXNum(bottomleft - '-50 170 0', bound(0, g_balance_vore_swallow_limit, 9), 1, 0, 22, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ vector status_pos;\r
+ string status_text;\r
+ status_text = strcat(ftos(bound(0, stomach_load, 9)), "/", ftos(bound(0, g_balance_vore_swallow_limit, 9)));\r
+ status_pos = bottomleft - '-43 171 0';\r
+ status_pos -= '1 0 0' * stringwidth(status_text, FALSE, '22 22 0') * 0.5;\r
+ drawstring(status_pos, status_text, '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
\r
if(getstati(STAT_VORE_DIGESTING))\r
drawstring(bottomleft - '-76 142 0', "stomach digesting", '12 12 0', '1 0.5 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
if(f)\r
{\r
Sbar_PrintStomachboardItem(pos - '-16 124 0', pl);\r
- pos_y += 1.25 * sbar_fontsize_y;\r
+ pos_y += 1.1 * sbar_fontsize_y;\r
}\r
\r
if(getstati(STAT_VORE_EATEN))\r
}\r
}\r
\r
- vector health_pos;\r
- health_pos = bottom - '77 58 0';\r
+ vector health_pos, armor_pos;\r
+ health_pos = bottom - '43 58 0';\r
+ armor_pos = bottom - '43 68 0';\r
+\r
+ // armor\r
+ x = armor;\r
+ if (x > 0)\r
+ {\r
+ drawpic(armor_pos + '-8 -13.5 0', "gfx/hud/sb_armor", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ armor_pos -= '1 0 0' * stringwidth(ftos(x), FALSE, '12 12 0') * 0.5;\r
+ Sbar_DrawXNum_Colored(armor_pos, x, 12, sbar_alpha_fg);\r
+ }\r
\r
// health\r
x = health;\r
- drawpic(health_pos + '22 16 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- if(x < 100) health_pos_x -= 9; // always center\r
- if(x < 10) health_pos_x -= 11; // always center\r
+ drawpic(health_pos + '-11 16 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ health_pos -= '1 0 0' * stringwidth(ftos(x), FALSE, '22 22 0') * 0.5;\r
Sbar_DrawXNum_Colored(health_pos, x, 22, sbar_alpha_fg);\r
\r
// ammo\r
pos_x = bottom_x + 140;\r
pos_y = bottom_y - 20;\r
\r
+ float weapon_clipload, weapon_clipsize;\r
+ vector ammo_pos_offset;\r
+\r
// if we are using the jetpack, show fuel ammo. Otherwise show the ammo of our weapon\r
if(stat_items & IT_JETPACK && button_jetpack)\r
{\r
a = getstati(GetAmmoStat(0)); // how much fuel do we have?\r
drawpic(pos - '98 18 0', GetAmmoPicture(0), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- Sbar_DrawXNum(pos - '144 16 0', a, 3, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ ammo_pos_offset = '1 0 0' * stringwidth(ftos(a), FALSE, '16 16 0') * 0.5;\r
+ Sbar_DrawXNum(pos - '118 16 0' - ammo_pos_offset, a, 3, 0, 16, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
}\r
else\r
{\r
{\r
a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?\r
drawpic(pos - '98 18 0', GetAmmoPicture(i), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
- Sbar_DrawXNum(pos - '144 16 0', a, 3, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ weapon_clipsize = getstati(STAT_WEAPON_CLIPSIZE);\r
+\r
+ // if the weapon we're holding is reloadable, show both its ammo and load\r
+ if(weapon_clipsize)\r
+ {\r
+ weapon_clipload = getstati(STAT_WEAPON_CLIPLOAD);\r
+ if(weapon_clipload < 0) // we're reloading\r
+ {\r
+ ammo_pos_offset = '1 0 0' * stringwidth("- -", FALSE, '16 16 0') * 0.5;\r
+ drawstring(pos - '118 23 0' - ammo_pos_offset, "- -", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ }\r
+ else\r
+ {\r
+ ammo_pos_offset = '1 0 0' * stringwidth(ftos(weapon_clipload), FALSE, '16 16 0') * 0.5;\r
+ Sbar_DrawXNum(pos - '118 23 0' - ammo_pos_offset, weapon_clipload, 2, 0, 16, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ }\r
+ ammo_pos_offset = '1 0 0' * stringwidth(ftos(a), FALSE, '12 12 0') * 0.5;\r
+ Sbar_DrawXNum(pos - '118 7 0' - ammo_pos_offset, a, 3, 0, 12, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ }\r
+ else\r
+ {\r
+ ammo_pos_offset = '1 0 0' * stringwidth(ftos(a), FALSE, '16 16 0') * 0.5;\r
+ Sbar_DrawXNum(pos - '118 16 0' - ammo_pos_offset, a, 3, 0, 16, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+ }\r
}\r
}\r
}\r
if (e && e.netname != "" && e.netname != "N/A")\r
drawpic(bottom - '96 96 0', strcat("gfx/hud/bg_status_activeweapon_", e.netname), '192 96 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
\r
- // draw scores and timer\r
+ // draw scores, timer, and ring\r
Sbar_Score();\r
Sbar_Timer();\r
+ Sbar_Ring();\r
\r
// draw strength/invincibility icon and timer\r
CSQC_Strength_Timer();\r
projects / voretournament / voretournament.git / blobdiff