float autocvar_hud_panel_scoreboard_table_highlight_alpha_self = 0.4;
float autocvar_hud_panel_scoreboard_table_highlight_alpha_eliminated = 0.6;
float autocvar_hud_panel_scoreboard_bg_teams_color_team = 0;
-float autocvar_hud_panel_scoreboard_namesize = 15;
float autocvar_hud_panel_scoreboard_team_size_position = 0;
float autocvar_hud_panel_scoreboard_spectators_position = 1;
bool autocvar_hud_panel_scoreboard_playerid = false;
string autocvar_hud_panel_scoreboard_playerid_prefix = "#";
string autocvar_hud_panel_scoreboard_playerid_suffix = " ";
+bool autocvar_hud_panel_scoreboard_scores_per_round;
+
+float scoreboard_time;
+
+SHUTDOWN(scoreboard)
+{
+ if(autocvar_hud_panel_scoreboard_scores_per_round)
+ cvar_set("hud_panel_scoreboard_scores_per_round", "0");
+}
// mode 0: returns translated label
// mode 1: prints name and description of all the labels
case "returns": if (!mode) return CTX(_("SCO^returns")); else LOG_HELP(strcat("^3", "returns", " ^7", _("Number of flag returns")));
case "revivals": if (!mode) return CTX(_("SCO^revivals")); else LOG_HELP(strcat("^3", "revivals", " ^7", _("Number of revivals")));
case "rounds": if (!mode) return CTX(_("SCO^rounds won")); else LOG_HELP(strcat("^3", "rounds", " ^7", _("Number of rounds won")));
+ case "rounds_pl": if (!mode) return CTX(_("SCO^rounds played"));else LOG_HELP(strcat("^3", "rounds_pl", " ^7", _("Number of rounds played")));
case "score": if (!mode) return CTX(_("SCO^score")); else LOG_HELP(strcat("^3", "score", " ^7", _("Total score")));
case "suicides": if (!mode) return CTX(_("SCO^suicides")); else LOG_HELP(strcat("^3", "suicides", " ^7", _("Number of suicides")));
case "sum": if (!mode) return CTX(_("SCO^sum")); else LOG_HELP(strcat("^3", "sum", " ^7", _("Number of kills minus deaths")));
return label;
}
+bool scoreboard_ui_disabling;
+void HUD_Scoreboard_UI_Disable()
+{
+ scoreboard_ui_disabling = true;
+ sb_showscores = false;
+}
+
+void HUD_Scoreboard_UI_Disable_Instantly()
+{
+ scoreboard_ui_disabling = false;
+ scoreboard_ui_enabled = 0;
+ scoreboard_selected_panel = 0;
+ scoreboard_selected_player = NULL;
+ scoreboard_selected_team = NULL;
+}
+
+// mode: 0 normal, 1 team selection
+void Scoreboard_UI_Enable(int mode)
+{
+ if(isdemo()) return;
+
+ if (mode == 1)
+ {
+ if (scoreboard_ui_enabled == 2 || !teamplay || intermission)
+ return;
+
+ // release player's pressed keys as they aren't released elsewhere
+ // in particular jump needs to be released as it may open the team selection
+ // (when server detects jump has been pressed it sends the command to open the team selection)
+ Release_Common_Keys();
+ scoreboard_ui_enabled = 2;
+ scoreboard_selected_panel = SB_PANEL_SCOREBOARD;
+ }
+ else
+ {
+ if (scoreboard_ui_enabled == 1)
+ return;
+ scoreboard_ui_enabled = 1;
+ scoreboard_selected_panel = SB_PANEL_FIRST;
+ }
+ scoreboard_selected_player = NULL;
+ scoreboard_selected_team = NULL;
+ scoreboard_selected_panel_time = time;
+}
+
+int rankings_start_column;
+int rankings_rows = 0;
+int rankings_columns = 0;
+int rankings_cnt = 0;
+float HUD_Scoreboard_InputEvent(float bInputType, float nPrimary, float nSecondary)
+{
+ string s;
+
+ if(!scoreboard_ui_enabled || scoreboard_ui_disabling)
+ return false;
+
+ if(bInputType == 3)
+ {
+ mousepos.x = nPrimary;
+ mousepos.y = nSecondary;
+ return true;
+ }
+
+ if(bInputType == 2)
+ return false;
+
+ // at this point bInputType can only be 0 or 1 (key pressed or released)
+ bool key_pressed = (bInputType == 0);
+
+ // ESC to exit (TAB-ESC works too)
+ if(nPrimary == K_ESCAPE)
+ {
+ if (!key_pressed)
+ return true;
+ HUD_Scoreboard_UI_Disable();
+ return true;
+ }
+
+ // block any input while a menu dialog is fading
+ if(autocvar__menu_alpha)
+ {
+ hudShiftState = 0;
+ return true;
+ }
+
+ // allow console bind to work
+ string con_keys = findkeysforcommand("toggleconsole", 0);
+ int keys = tokenize(con_keys); // findkeysforcommand returns data for this
+
+ bool hit_con_bind = false;
+ int i;
+ for (i = 0; i < keys; ++i)
+ {
+ if(nPrimary == stof(argv(i)))
+ hit_con_bind = true;
+ }
+
+ if(key_pressed) {
+ if(nPrimary == K_ALT) hudShiftState |= S_ALT;
+ if(nPrimary == K_CTRL) hudShiftState |= S_CTRL;
+ if(nPrimary == K_SHIFT) hudShiftState |= S_SHIFT;
+ if(nPrimary == K_TAB) hudShiftState |= S_TAB;
+ }
+ else {
+ if(nPrimary == K_ALT) hudShiftState -= (hudShiftState & S_ALT);
+ if(nPrimary == K_CTRL) hudShiftState -= (hudShiftState & S_CTRL);
+ if(nPrimary == K_SHIFT) hudShiftState -= (hudShiftState & S_SHIFT);
+ if(nPrimary == K_TAB) hudShiftState -= (hudShiftState & S_TAB);
+ }
+
+ if(nPrimary == K_TAB)
+ {
+ if (!key_pressed)
+ return true;
+ if (scoreboard_ui_enabled == 2)
+ {
+ if (hudShiftState & S_SHIFT)
+ goto uparrow_action;
+ else
+ goto downarrow_action;
+ }
+
+ if (hudShiftState & S_SHIFT)
+ {
+ --scoreboard_selected_panel;
+ if (scoreboard_selected_panel == SB_PANEL_RANKINGS && !rankings_cnt)
+ --scoreboard_selected_panel;
+ if (scoreboard_selected_panel < SB_PANEL_FIRST)
+ scoreboard_selected_panel = SB_PANEL_MAX;
+ }
+ else
+ {
+ ++scoreboard_selected_panel;
+ if (scoreboard_selected_panel == SB_PANEL_RANKINGS && !rankings_cnt)
+ ++scoreboard_selected_panel;
+ if (scoreboard_selected_panel > SB_PANEL_MAX)
+ scoreboard_selected_panel = SB_PANEL_FIRST;
+ }
+
+ scoreboard_selected_panel_time = time;
+ }
+ else if(nPrimary == K_DOWNARROW)
+ {
+ if (!key_pressed)
+ return true;
+ LABEL(downarrow_action);
+ if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD)
+ {
+ if (scoreboard_ui_enabled == 2)
+ {
+ entity curr_team = NULL;
+ bool scoreboard_selected_team_found = false;
+ if (!scoreboard_selected_team)
+ scoreboard_selected_team_found = true;
+
+ for(entity tm = teams.sort_next; tm; tm = tm.sort_next)
+ {
+ if(tm.team == NUM_SPECTATOR)
+ continue;
+ curr_team = tm;
+ if (scoreboard_selected_team_found)
+ goto ok_team;
+ if (scoreboard_selected_team == tm)
+ scoreboard_selected_team_found = true;
+ }
+ LABEL(ok_team);
+ if (curr_team == scoreboard_selected_team) // loop reached the last team
+ curr_team = NULL;
+ scoreboard_selected_team = curr_team;
+ }
+ else
+ {
+ entity pl, tm;
+ entity curr_pl = NULL;
+ bool scoreboard_selected_player_found = false;
+ if (!scoreboard_selected_player)
+ scoreboard_selected_player_found = true;
+
+ for(tm = teams.sort_next; tm; tm = tm.sort_next)
+ {
+ if(tm.team != NUM_SPECTATOR)
+ for(pl = players.sort_next; pl; pl = pl.sort_next)
+ {
+ if(pl.team != tm.team)
+ continue;
+ curr_pl = pl;
+ if (scoreboard_selected_player_found)
+ goto ok_done;
+ if (scoreboard_selected_player == pl)
+ scoreboard_selected_player_found = true;
+ }
+ }
+ LABEL(ok_done);
+ if (curr_pl == scoreboard_selected_player) // loop reached the last player
+ curr_pl = NULL;
+ scoreboard_selected_player = curr_pl;
+ }
+ }
+ }
+ else if(nPrimary == K_UPARROW)
+ {
+ if (!key_pressed)
+ return true;
+ LABEL(uparrow_action);
+ if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD)
+ {
+ if (scoreboard_ui_enabled == 2)
+ {
+ entity prev_team = NULL;
+ for(entity tm = teams.sort_next; tm; tm = tm.sort_next)
+ {
+ if(tm.team == NUM_SPECTATOR)
+ continue;
+ if (tm == scoreboard_selected_team)
+ goto ok_team2;
+ prev_team = tm;
+ }
+ LABEL(ok_team2);
+ scoreboard_selected_team = prev_team;
+ }
+ else
+ {
+ entity prev_pl = NULL;
+ entity pl, tm;
+ for(tm = teams.sort_next; tm; tm = tm.sort_next)
+ {
+ if(tm.team != NUM_SPECTATOR)
+ for(pl = players.sort_next; pl; pl = pl.sort_next)
+ {
+ if(pl.team != tm.team)
+ continue;
+ if (pl == scoreboard_selected_player)
+ goto ok_done2;
+ prev_pl = pl;
+ }
+ }
+ LABEL(ok_done2);
+ scoreboard_selected_player = prev_pl;
+ }
+ }
+ }
+ else if(nPrimary == K_RIGHTARROW)
+ {
+ if (!key_pressed)
+ return true;
+ if (scoreboard_selected_panel == SB_PANEL_RANKINGS)
+ rankings_start_column = min(rankings_start_column + 1, (ceil(RANKINGS_RECEIVED_CNT / rankings_rows) - rankings_columns));
+ }
+ else if(nPrimary == K_LEFTARROW)
+ {
+ if (!key_pressed)
+ return true;
+ if (scoreboard_selected_panel == SB_PANEL_RANKINGS)
+ rankings_start_column = max(rankings_start_column - 1, 0);
+ }
+ else if(nPrimary == K_ENTER || nPrimary == K_SPACE || nPrimary == K_KP_ENTER)
+ {
+ if (!key_pressed)
+ return true;
+ if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD)
+ {
+ if (scoreboard_ui_enabled == 2)
+ {
+ string team_name;
+ if (!scoreboard_selected_team || (hudShiftState & S_SHIFT))
+ team_name = "auto";
+ else
+ team_name = Static_Team_ColorName(scoreboard_selected_team.team);
+ localcmd(sprintf("cmd selectteam %s; cmd join\n", team_name));
+ HUD_Scoreboard_UI_Disable();
+ }
+ else if (scoreboard_selected_player)
+ localcmd(sprintf("spectate %d\n", scoreboard_selected_player.sv_entnum + 1));
+ }
+ }
+ else if(nPrimary == 'c' && (hudShiftState & S_CTRL))
+ {
+ if (!key_pressed)
+ return true;
+ if (scoreboard_ui_enabled == 1 && scoreboard_selected_panel == SB_PANEL_SCOREBOARD)
+ {
+ switch (scoreboard_selected_columns_layout)
+ {
+ case 0:
+ if (autocvar_scoreboard_columns != "" && autocvar_scoreboard_columns != "all" && autocvar_scoreboard_columns != "default")
+ {
+ localcmd(sprintf("scoreboard_columns_set\n")); // sets the layout saved in scoreboard_columns
+ scoreboard_selected_columns_layout = 1;
+ break;
+ }
+ // fallthrough
+ case 1:
+ localcmd(sprintf("scoreboard_columns_set default\n"));
+ scoreboard_selected_columns_layout = 2;
+ break;
+ case 2:
+ localcmd(sprintf("scoreboard_columns_set all\n"));
+ scoreboard_selected_columns_layout = 0;
+ break;
+ }
+ }
+ }
+ else if(nPrimary == 'r' && (hudShiftState & S_CTRL))
+ {
+ if (!key_pressed)
+ return true;
+ if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD)
+ localcmd("toggle hud_panel_scoreboard_scores_per_round\n");
+ }
+ else if(nPrimary == 't' && (hudShiftState & S_CTRL))
+ {
+ if (!key_pressed)
+ return true;
+ if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD)
+ {
+ if (scoreboard_selected_player)
+ {
+ localcmd(sprintf("commandmode tell \"%s^7\"\n", entcs_GetName(scoreboard_selected_player.sv_entnum)));
+ HUD_Scoreboard_UI_Disable();
+ }
+ }
+ }
+ else if(nPrimary == 'k' && (hudShiftState & S_CTRL))
+ {
+ if (!key_pressed)
+ return true;
+ if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD)
+ {
+ if (scoreboard_selected_player)
+ localcmd(sprintf("vcall kick \"%s^7\"\n", entcs_GetName(scoreboard_selected_player.sv_entnum)));
+ }
+ }
+ else if(hit_con_bind || nPrimary == K_PAUSE)
+ return false;
+
+ return true;
+}
+
void PrintScoresLabels() { Label_getInfo(string_null, 1); }
string TranslateScoresLabel(string label) { return Label_getInfo(label, 0); }
-#define SB_EXTRA_SORTING_FIELDS 5
-PlayerScoreField sb_extra_sorting_field[SB_EXTRA_SORTING_FIELDS];
void Scoreboard_InitScores()
{
int i, f;
ps_primary = ps_secondary = NULL;
ts_primary = ts_secondary = -1;
FOREACH(Scores, true, {
+ if(scores_flags(it) & SFL_NOT_SORTABLE)
+ continue;
f = (scores_flags(it) & SFL_SORT_PRIO_MASK);
if(f == SFL_SORT_PRIO_PRIMARY)
ps_primary = it;
if(f == SFL_SORT_PRIO_SECONDARY)
ps_secondary = it;
- if(ps_primary == it || ps_secondary == it)
- continue;
- if (scores_label(it) == "kills") sb_extra_sorting_field[0] = it;
- if (scores_label(it) == "deaths") sb_extra_sorting_field[1] = it;
- if (scores_label(it) == "suicides") sb_extra_sorting_field[2] = it;
- if (scores_label(it) == "dmg") sb_extra_sorting_field[3] = it;
- if (scores_label(it) == "dmgtaken") sb_extra_sorting_field[4] = it;
});
if(ps_secondary == NULL)
ps_secondary = ps_primary;
//float lastpnum;
void Scoreboard_UpdatePlayerTeams()
{
+ static float update_time;
+ if (time <= update_time)
+ return;
+ update_time = time;
+
entity pl, tmp;
+ numplayers = 0;
//int num = 0;
for(pl = players.sort_next; pl; pl = pl.sort_next)
{
+ numplayers += pl.team != NUM_SPECTATOR;
//num += 1;
int Team = entcs_GetScoreTeam(pl.sv_entnum);
if(SetTeam(pl, Team))
return false;
}
- entity fld = NULL;
- int r;
- for (int i = -2; i < SB_EXTRA_SORTING_FIELDS; ++i)
- {
- if (i < 0)
- {
- if (!fld) fld = ps_primary;
- else if (ps_secondary == ps_primary) continue;
- else fld = ps_secondary;
- }
- else
- {
- fld = sb_extra_sorting_field[i];
- if (fld == ps_primary || fld == ps_secondary) continue;
- }
- if (!fld) continue;
+ int res = Scoreboard_CompareScore(left.scores(ps_primary), right.scores(ps_primary), scores_flags(ps_primary));
+ if (res >= 0) return res;
- r = Scoreboard_CompareScore(left.scores(fld), right.scores(fld), scores_flags(fld));
- if (r >= 0) return r;
+ if (ps_secondary && ps_secondary != ps_primary)
+ {
+ res = Scoreboard_CompareScore(left.scores(ps_secondary), right.scores(ps_secondary), scores_flags(ps_secondary));
+ if (res >= 0) return res;
}
+ FOREACH(Scores, (it != ps_primary && it != ps_secondary), {
+ res = Scoreboard_CompareScore(left.scores(it), right.scores(it), scores_flags(it));
+ if (res >= 0) return res;
+ });
+
if (left.sv_entnum < right.sv_entnum)
return true;
return entcs_GetName(pl.sv_entnum);
}
-string Scoreboard_GetField(entity pl, PlayerScoreField field)
+int autocvar_hud_panel_scoreboard_ping_best = 0;
+int autocvar_hud_panel_scoreboard_ping_medium = 70;
+int autocvar_hud_panel_scoreboard_ping_high = 100;
+int autocvar_hud_panel_scoreboard_ping_worst = 150;
+vector autocvar_hud_panel_scoreboard_ping_best_color = '0 1 0';
+vector autocvar_hud_panel_scoreboard_ping_medium_color = '1 1 0';
+vector autocvar_hud_panel_scoreboard_ping_high_color = '1 0.5 0';
+vector autocvar_hud_panel_scoreboard_ping_worst_color = '1 0 0';
+#define PING_BEST autocvar_hud_panel_scoreboard_ping_best
+#define PING_MED autocvar_hud_panel_scoreboard_ping_medium
+#define PING_HIGH autocvar_hud_panel_scoreboard_ping_high
+#define PING_WORST autocvar_hud_panel_scoreboard_ping_worst
+#define COLOR_BEST autocvar_hud_panel_scoreboard_ping_best_color
+#define COLOR_MED autocvar_hud_panel_scoreboard_ping_medium_color
+#define COLOR_HIGH autocvar_hud_panel_scoreboard_ping_high_color
+#define COLOR_WORST autocvar_hud_panel_scoreboard_ping_worst_color
+string Scoreboard_GetField(entity pl, PlayerScoreField field, bool per_round)
{
float tmp, num, denom;
int f;
sbt_field_icon0_rgb = '1 1 1';
sbt_field_icon1_rgb = '1 1 1';
sbt_field_icon2_rgb = '1 1 1';
+ int rounds_played = 0;
+ if (per_round)
+ rounds_played = pl.(scores(SP_ROUNDS_PL));
switch(field)
{
case SP_PING:
f = pl.ping;
if(f == 0)
return _("N/A");
- tmp = max(0, min(220, f-80)) / 220;
- sbt_field_rgb = '1 1 1' - '0 1 1' * tmp;
+ if(f < PING_BEST)
+ sbt_field_rgb = COLOR_BEST;
+ else if(f < PING_MED)
+ sbt_field_rgb = COLOR_BEST + (COLOR_MED - COLOR_BEST) * ((f - PING_BEST) / (PING_MED - PING_BEST));
+ else if(f < PING_HIGH)
+ sbt_field_rgb = COLOR_MED + (COLOR_HIGH - COLOR_MED) * ((f - PING_MED) / (PING_HIGH - PING_MED));
+ else if(f < PING_WORST)
+ sbt_field_rgb = COLOR_HIGH + (COLOR_WORST - COLOR_HIGH) * ((f - PING_HIGH) / (PING_WORST - PING_HIGH));
+ else
+ sbt_field_rgb = COLOR_WORST;
return ftos(f);
case SP_PL:
case SP_FRAGS:
f = pl.(scores(SP_KILLS));
f -= pl.(scores(SP_SUICIDES));
+ if (rounds_played)
+ return sprintf("%.1f", f / rounds_played);
return ftos(f);
case SP_KDRATIO:
if(denom == 0) {
sbt_field_rgb = '0 1 0';
- str = sprintf("%d", num);
+ if (rounds_played)
+ str = sprintf("%.1f", num / rounds_played);
+ else
+ str = sprintf("%d", num);
} else if(num <= 0) {
sbt_field_rgb = '1 0 0';
- str = sprintf("%.1f", num/denom);
+ if (rounds_played)
+ str = sprintf("%.2f", num / (denom * rounds_played));
+ else
+ str = sprintf("%.1f", num / denom);
} else
- str = sprintf("%.1f", num/denom);
+ {
+ if (rounds_played)
+ str = sprintf("%.2f", num / (denom * rounds_played));
+ else
+ str = sprintf("%.1f", num / denom);
+ }
return str;
case SP_SUM:
} else {
sbt_field_rgb = '1 0 0';
}
+ if (rounds_played)
+ return sprintf("%.1f", f / rounds_played);
return ftos(f);
case SP_ELO:
return ftos(fps);
}
+ case SP_ROUNDS_PL:
+ return ftos(pl.(scores(field)));
+
case SP_DMG: case SP_DMGTAKEN:
+ if (rounds_played)
+ return sprintf("%.2f k", pl.(scores(field)) / (1000 * rounds_played));
return sprintf("%.1f k", pl.(scores(field)) / 1000);
default: case SP_SCORE:
sbt_field_rgb = '0 1 1';
else
sbt_field_rgb = '1 1 1';
- return ScoreString(f, tmp);
+ return ScoreString(f, tmp, rounds_played);
}
//return "error";
}
vector h_pos = item_pos;
vector h_size = vec2(panel_size.x, hud_fontsize.y * 1.25);
// alternated rows highlighting
- if(is_self)
+ if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD && scoreboard_ui_enabled == 1)
+ {
+ if (pl == scoreboard_selected_player)
+ drawfill(h_pos, h_size, rgb, 0.44 * panel_fg_alpha, DRAWFLAG_NORMAL);
+ }
+ else if(is_self)
drawfill(h_pos, h_size, rgb, sbt_highlight_alpha_self, DRAWFLAG_NORMAL);
else if((sbt_highlight) && (!(pl_number % 2)))
drawfill(h_pos, h_size, rgb, sbt_highlight_alpha, DRAWFLAG_NORMAL);
pos.x += sbt_field_size[i] + hud_fontsize.x;
continue;
}
- str = Scoreboard_GetField(pl, field);
+ str = Scoreboard_GetField(pl, field, autocvar_hud_panel_scoreboard_scores_per_round);
str = Scoreboard_FixColumnWidth(i, str);
pos.x += sbt_field_size[i] + hud_fontsize.x;
continue;
}
- str = Scoreboard_GetField(pl, field);
+ str = Scoreboard_GetField(pl, field, autocvar_hud_panel_scoreboard_scores_per_round);
str = Scoreboard_FixColumnWidth(i, str);
if(field == SP_NAME) {
if(this_team == NUM_SPECTATOR)
{
if(autocvar_hud_panel_scoreboard_spectators_showping)
- field = Scoreboard_GetField(pl, SP_PING);
+ field = Scoreboard_GetField(pl, SP_PING, autocvar_hud_panel_scoreboard_scores_per_round);
}
else if(autocvar_hud_panel_scoreboard_others_showscore)
- field = Scoreboard_GetField(pl, SP_SCORE);
+ field = Scoreboard_GetField(pl, SP_SCORE, autocvar_hud_panel_scoreboard_scores_per_round);
string str = entcs_GetName(pl.sv_entnum);
if (autocvar_hud_panel_scoreboard_playerid)
}
}
+ if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD && scoreboard_ui_enabled == 1)
+ {
+ if (pl == scoreboard_selected_player)
+ {
+ h_size.x = column_width + hud_fontsize.x * 0.25;
+ h_size.y = hud_fontsize.y;
+ drawfill(pos - hud_fontsize.x * 0.25 * eX, h_size, rgb, 0.44 * panel_fg_alpha, DRAWFLAG_NORMAL);
+ }
+ }
+
vector name_pos = pos;
if((this_team == NUM_SPECTATOR) && autocvar_hud_panel_scoreboard_spectators_aligned)
name_pos.x += max(fieldsize, min_fieldsize) + 2 * fieldpadding + hud_fontsize.x * 0.25;
panel_pos = pos;
panel_size.y = 1.25 * hud_fontsize.y * (1 + bound(1, tm.team_size, max_players));
panel_size.y += panel_bg_padding * 2;
+
+ vector scoreboard_selected_hl_pos = pos;
+ vector scoreboard_selected_hl_size = '0 0 0';
+ scoreboard_selected_hl_size.x = scoreboard_right - scoreboard_left;
+ scoreboard_selected_hl_size.y = panel_size.y;
+
HUD_Panel_DrawBg();
vector end_pos = panel_pos + eY * (panel_size.y + 0.5 * hud_fontsize.y);
++i;
}
+ if (scoreboard_selected_panel == SB_PANEL_SCOREBOARD)
+ {
+ if (scoreboard_ui_enabled == 1 || (tm && scoreboard_selected_team == tm))
+ {
+ float _alpha = (scoreboard_ui_enabled == 2) ? 0.2 : 0.3 * max(0, (1 - (time - scoreboard_selected_panel_time) * 2));
+ _alpha *= panel_fg_alpha;
+ if (_alpha)
+ drawfill(scoreboard_selected_hl_pos, scoreboard_selected_hl_size, '1 1 1', _alpha, DRAWFLAG_NORMAL);
+ }
+ }
+
panel_size.x += panel_bg_padding * 2; // restore initial width
return end_pos;
}
bool Scoreboard_WouldDraw()
{
- if (MUTATOR_CALLHOOK(DrawScoreboard))
+ if (scoreboard_ui_enabled)
+ {
+ if (scoreboard_ui_disabling)
+ {
+ if (scoreboard_fade_alpha == 0)
+ HUD_Scoreboard_UI_Disable_Instantly();
+ return false;
+ }
+ if (intermission && scoreboard_ui_enabled == 2)
+ {
+ HUD_Scoreboard_UI_Disable_Instantly();
+ return false;
+ }
+ return true;
+ }
+ else if (MUTATOR_CALLHOOK(DrawScoreboard))
return false;
else if (QuickMenu_IsOpened())
return false;
else if (HUD_Radar_Clickable())
return false;
- else if (scoreboard_showscores)
+ else if (sb_showscores) // set by +showscores engine command
return true;
else if (intermission == 1)
return true;
return end_pos;
}
-int rankings_rows = 0;
-int rankings_columns = 0;
-int rankings_cnt = 0;
vector Scoreboard_Rankings_Draw(vector pos, string ranktitle, entity pl, vector rgb, vector bg_size)
{
int i;
vector hl_rgb = rgb + '0.5 0.5 0.5';
+ vector scoreboard_selected_hl_pos = pos;
+
drawstring(pos + eX * panel_bg_padding, ranktitle, hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
pos.y += 1.25 * hud_fontsize.y;
if(panel.current_panel_bg != "0")
pos.y += panel_bg_border;
+ vector scoreboard_selected_hl_size = '0 0 0';
+ scoreboard_selected_hl_size.x = scoreboard_right - scoreboard_left;
+ scoreboard_selected_hl_size.y = pos.y - scoreboard_selected_hl_pos.y;
+
panel_pos = pos;
float namesize = 0;
panel_size.y = rankings_rows * 1.25 * hud_fontsize.y;
panel_size.y += panel_bg_padding * 2;
+ scoreboard_selected_hl_size.y += panel_size.y;
HUD_Panel_DrawBg();
string str = "";
int column = 0, j = 0;
string zoned_name_self = strzone(strdecolorize(entcs_GetName(player_localnum)));
- for(i = 0; i < rankings_cnt; ++i)
+ int start_item = rankings_start_column * rankings_rows;
+ for(i = start_item; i < start_item + rankings_cnt; ++i)
{
- float t;
- t = grecordtime[i];
+ int t = grecordtime[i];
if (t == 0)
continue;
if(strdecolorize(grecordholder[i]) == zoned_name_self)
drawfill(pos, columnsize, hl_rgb, sbt_highlight_alpha_self, DRAWFLAG_NORMAL);
- else if(!((j + column) & 1) && sbt_highlight)
+ else if(!((j + rankings_start_column + column) & 1) && sbt_highlight)
drawfill(pos, columnsize, hl_rgb, sbt_highlight_alpha, DRAWFLAG_NORMAL);
str = count_ordinal(i+1);
drawstring(pos + text_ofs, str, hud_fontsize, '1 1 1', sbt_fg_alpha, DRAWFLAG_NORMAL);
- drawstring(pos + text_ofs + eX * ranksize, TIME_ENCODED_TOSTRING(t), hud_fontsize, '1 1 1', sbt_fg_alpha, DRAWFLAG_NORMAL);
+ drawstring(pos + text_ofs + eX * ranksize, TIME_ENCODED_TOSTRING(t, true), hud_fontsize, '1 1 1', sbt_fg_alpha, DRAWFLAG_NORMAL);
str = ColorTranslateRGB(grecordholder[i]);
if(cut)
str = textShortenToWidth(str, namesize, hud_fontsize, stringwidth_colors);
}
strfree(zoned_name_self);
+ if (scoreboard_selected_panel == SB_PANEL_RANKINGS)
+ {
+ float fade = max(0, (1 - (time - scoreboard_selected_panel_time) * 2));
+ drawfill(scoreboard_selected_hl_pos, scoreboard_selected_hl_size, '1 1 1', fade * 0.44, DRAWFLAG_NORMAL);
+ }
+
panel_size.x += panel_bg_padding * 2; // restore initial width
return end_pos;
}
-float scoreboard_time;
bool have_weapon_stats;
bool Scoreboard_AccuracyStats_WouldDraw(float ypos)
{
return pos;
}
+string Scoreboard_Fraglimit_Draw(float limit, bool is_leadlimit)
+{
+ string s_label = (teamplay) ? teamscores_label(ts_primary) : scores_label(ps_primary);
+ int s_flags = (teamplay) ? teamscores_flags(ts_primary) : scores_flags(ps_primary);
+ return sprintf((is_leadlimit ? _("^2+%s %s") : _("^5%s %s")), ScoreString(s_flags, limit, 0),
+ (s_label == "score") ? CTX(_("SCO^points")) :
+ (s_label == "fastest") ? "" : TranslateScoresLabel(s_label));
+}
+
void Scoreboard_Draw()
{
if(!autocvar__hud_configure)
sb_gameinfo_detail_fontsize = hud_fontsize * 1.3;
// Game Info: Game Type
- str = MapInfo_Type_ToText(gametype);
+ if (scoreboard_ui_enabled == 2)
+ str = _("Team Selection");
+ else
+ str = MapInfo_Type_ToText(gametype);
draw_beginBoldFont();
drawcolorcodedstring(pos + '0.5 0 0' * (panel_size.x - stringwidth(str, true, sb_gameinfo_type_fontsize)), str, sb_gameinfo_type_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
draw_endBoldFont();
+ pos.y += sb_gameinfo_type_fontsize.y;
// Game Info: Game Detail
- float tl = STAT(TIMELIMIT);
- float fl = STAT(FRAGLIMIT);
- float ll = STAT(LEADLIMIT);
- float ll_and_fl = STAT(LEADLIMIT_AND_FRAGLIMIT);
- str = "";
- if(tl > 0)
- str = strcat(str, sprintf(_("^3%1.0f minutes"), tl));
- if(!gametype.m_hidelimits)
- {
- if(fl > 0)
- {
- if(tl > 0)
- str = strcat(str, "^7 / "); // delimiter
- if(teamplay)
- {
- str = strcat(str, sprintf(_("^5%s %s"), ScoreString(teamscores_flags(ts_primary), fl),
- (teamscores_label(ts_primary) == "score") ? CTX(_("SCO^points")) :
- (teamscores_label(ts_primary) == "fastest") ? "" :
- TranslateScoresLabel(teamscores_label(ts_primary))));
- }
- else
- {
- str = strcat(str, sprintf(_("^5%s %s"), ScoreString(scores_flags(ps_primary), fl),
- (scores_label(ps_primary) == "score") ? CTX(_("SCO^points")) :
- (scores_label(ps_primary) == "fastest") ? "" :
- TranslateScoresLabel(scores_label(ps_primary))));
- }
- }
- if(ll > 0)
- {
- if(tl > 0 || fl > 0)
- {
- // delimiter
- if (ll_and_fl && fl > 0)
- str = strcat(str, "^7 & ");
- else
- str = strcat(str, "^7 / ");
- }
+ if (scoreboard_ui_enabled == 2)
+ {
+ if (scoreboard_selected_team)
+ str = sprintf(_("^7Press ^3%s^7 to join the selected team"), translate_key("SPACE"));
+ else
+ str = sprintf(_("^7Press ^3%s^7 to auto-select a team and join"), translate_key("SPACE"));
+ drawcolorcodedstring(pos + '0.5 0 0' * (panel_size.x - stringwidth(str, true, sb_gameinfo_detail_fontsize)), str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
- if(teamplay)
+ pos.y += sb_gameinfo_detail_fontsize.y + hud_fontsize.y * 0.3;
+ str = sprintf(_("^7Press ^3%s ^7to select a specific team"), translate_key("TAB"));
+ drawcolorcodedstring(pos + '0.5 0 0' * (panel_size.x - stringwidth(str, true, sb_gameinfo_detail_fontsize)), str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+ }
+ else
+ {
+ float tl = STAT(TIMELIMIT);
+ float fl = STAT(FRAGLIMIT);
+ float ll = STAT(LEADLIMIT);
+ float ll_and_fl = STAT(LEADLIMIT_AND_FRAGLIMIT);
+ str = "";
+ if(tl > 0)
+ str = strcat(str, sprintf(_("^3%1.0f minutes"), tl));
+ if(!gametype.m_hidelimits)
+ {
+ if(fl > 0)
{
- str = strcat(str, sprintf(_("^2+%s %s"), ScoreString(teamscores_flags(ts_primary), ll),
- (teamscores_label(ts_primary) == "score") ? CTX(_("SCO^points")) :
- (teamscores_label(ts_primary) == "fastest") ? "" :
- TranslateScoresLabel(teamscores_label(ts_primary))));
+ if(tl > 0)
+ str = strcat(str, "^7 / "); // delimiter
+ str = strcat(str, Scoreboard_Fraglimit_Draw(fl, false));
}
- else
+ if(ll > 0)
{
- str = strcat(str, sprintf(_("^2+%s %s"), ScoreString(scores_flags(ps_primary), ll),
- (scores_label(ps_primary) == "score") ? CTX(_("SCO^points")) :
- (scores_label(ps_primary) == "fastest") ? "" :
- TranslateScoresLabel(scores_label(ps_primary))));
+ if(tl > 0 || fl > 0)
+ {
+ // delimiter
+ if (ll_and_fl && fl > 0)
+ str = strcat(str, "^7 & ");
+ else
+ str = strcat(str, "^7 / ");
+ }
+ str = strcat(str, Scoreboard_Fraglimit_Draw(ll, true));
}
}
+ drawcolorcodedstring(pos + '1 0 0' * (panel_size.x - stringwidth(str, true, sb_gameinfo_detail_fontsize)), str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); // align right
+ // map name and player count
+ if (campaign)
+ str = "";
+ else
+ str = sprintf(_("^5%d^7/^5%d ^7players"), numplayers, srv_maxplayers ? srv_maxplayers : maxclients);
+ str = strcat("^7", _("Map:"), " ^2", mi_shortname, " ", str); // reusing "Map:" translatable string
+ drawcolorcodedstring(pos, str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); // align left
}
-
- pos.y += sb_gameinfo_type_fontsize.y;
- drawcolorcodedstring(pos + '1 0 0' * (panel_size.x - stringwidth(str, true, sb_gameinfo_detail_fontsize)), str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); // align right
- // map name
- str = sprintf(_("^7Map: ^2%s"), shortmapname);
- drawcolorcodedstring(pos, str, sb_gameinfo_detail_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); // align left
// End of Game Info Section
pos.y += sb_gameinfo_detail_fontsize.y + hud_fontsize.y * 0.3; // space between Game Info Section and score table
if(MUTATOR_CALLHOOK(ShowRankings)) {
string ranktitle = M_ARGV(0, string);
- string unit = GetSpeedUnit(autocvar_hud_panel_physics_speed_unit);
- if(race_speedaward) {
- drawcolorcodedstring(pos, sprintf(_("Speed award: %d%s ^7(%s^7)"), race_speedaward, unit, ColorTranslateRGB(race_speedaward_holder)), hud_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
- pos.y += 1.25 * hud_fontsize.y;
- }
- if(race_speedaward_alltimebest) {
- drawcolorcodedstring(pos, sprintf(_("All-time fastest: %d%s ^7(%s^7)"), race_speedaward_alltimebest, unit, ColorTranslateRGB(race_speedaward_alltimebest_holder)), hud_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
- pos.y += 1.25 * hud_fontsize.y;
+ string unit = GetSpeedUnit(autocvar_hud_speed_unit);
+ float conversion_factor = GetSpeedUnitFactor(autocvar_hud_speed_unit);
+ if(race_speedaward_alltimebest)
+ {
+ string name;
+ float namesize = autocvar_hud_panel_scoreboard_namesize * hud_fontsize.x;
+ str = "";
+ if(race_speedaward)
+ {
+ name = textShortenToWidth(ColorTranslateRGB(race_speedaward_holder), namesize, hud_fontsize, stringwidth_colors);
+ str = sprintf(_("Speed award: %d%s ^7(%s^7)"), race_speedaward * conversion_factor, unit, name);
+ str = strcat(str, " / ");
+ }
+ name = textShortenToWidth(ColorTranslateRGB(race_speedaward_alltimebest_holder), namesize, hud_fontsize, stringwidth_colors);
+ str = strcat(str, sprintf(_("All-time fastest: %d%s ^7(%s^7)"), race_speedaward_alltimebest * conversion_factor, unit, name));
+ drawcolorcodedstring(pos, str, hud_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+ pos.y += 1.25 * hud_fontsize.y; // line height + line spacing
}
- if (race_speedaward || race_speedaward_alltimebest)
- pos.y += 0.25 * hud_fontsize.y;
pos = Scoreboard_Rankings_Draw(pos, ranktitle, playerslots[player_localnum], panel_bg_color, bg_size);
}
else
// print information about respawn status
float respawn_time = STAT(RESPAWN_TIME);
- if(!intermission)
- if(respawn_time)
+ if(!intermission && respawn_time)
{
if(respawn_time < 0)
{
projects / xonotic / xonotic-data.pk3dir.git / blobdiff