X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fscoreboard.qc;h=fd765ed1122bc236f37dc1fed71823195397d4b0;hp=43ebc2e3ff95c03294023cbc039e6c63d44af4db;hb=HEAD;hpb=7c5cfb9ea9ac91909283d436c3550fe2c160c86f diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 43ebc2e3ff..1258a5e5da 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -34,6 +35,7 @@ void Scoreboard_Draw_Export(int fh) HUD_Write_Cvar("hud_panel_scoreboard_bg_teams_color_team"); HUD_Write_Cvar("hud_panel_scoreboard_accuracy_doublerows"); HUD_Write_Cvar("hud_panel_scoreboard_accuracy_nocolors"); + HUD_Write_Cvar("hud_panel_scoreboard_spectators_position"); } const int MAX_SBT_FIELDS = MAX_SCORE; @@ -41,11 +43,16 @@ const int MAX_SBT_FIELDS = MAX_SCORE; PlayerScoreField sbt_field[MAX_SBT_FIELDS + 1]; float sbt_field_size[MAX_SBT_FIELDS + 1]; string sbt_field_title[MAX_SBT_FIELDS + 1]; +float sbt_field_title_condense_factor[MAX_SBT_FIELDS + 1]; +float sbt_field_title_width[MAX_SBT_FIELDS + 1]; int sbt_num_fields; +float sbt_field_title_maxwidth; +float sbt_field_title_maxwidth_factor; string autocvar_hud_fontsize; -string hud_fontsize_str; float max_namesize; +float name_field_index; +int sb_field_sizes_init; float sbt_bg_alpha; float sbt_fg_alpha; @@ -73,13 +80,14 @@ float autocvar_hud_panel_scoreboard_table_bg_alpha = 0; float autocvar_hud_panel_scoreboard_table_bg_scale = 0.25; float autocvar_hud_panel_scoreboard_table_fg_alpha = 0.9; float autocvar_hud_panel_scoreboard_table_fg_alpha_self = 1; +float autocvar_hud_panel_scoreboard_table_fieldtitle_maxwidth = 0.07; bool autocvar_hud_panel_scoreboard_table_highlight = true; float autocvar_hud_panel_scoreboard_table_highlight_alpha = 0.2; 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_accuracy = true; bool autocvar_hud_panel_scoreboard_accuracy_doublerows = false; @@ -89,7 +97,8 @@ float autocvar_hud_panel_scoreboard_accuracy_showdelay_minpos = 0.75; bool autocvar_hud_panel_scoreboard_itemstats = true; bool autocvar_hud_panel_scoreboard_itemstats_doublerows = false; -bool autocvar_hud_panel_scoreboard_itemstats_filter = true; +int autocvar_hud_panel_scoreboard_itemstats_filter = 1; +int autocvar_hud_panel_scoreboard_itemstats_filter_mask = 12; float autocvar_hud_panel_scoreboard_itemstats_showdelay = 2.2; // slightly more delayed than accuracy float autocvar_hud_panel_scoreboard_itemstats_showdelay_minpos = 0.75; @@ -103,6 +112,15 @@ float autocvar_hud_panel_scoreboard_minwidth = 0.4; 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 @@ -111,53 +129,401 @@ string Label_getInfo(string label, int mode) if (mode == 1) label = "bckills"; // first case in the switch +#define SCO_LABEL(strlabel, label, padding, help) \ + case label: \ + if (!mode) \ + return CTX(strlabel); \ + LOG_HELP("^3", label, padding, "^7", help); + switch(label) { - case "bckills": if (!mode) return CTX(_("SCO^bckills")); else LOG_HELP(strcat("^3", "bckills", " ^7", _("Number of ball carrier kills"))); - case "bctime": if (!mode) return CTX(_("SCO^bctime")); else LOG_HELP(strcat("^3", "bctime", " ^7", _("Total amount of time holding the ball in Keepaway"))); - case "caps": if (!mode) return CTX(_("SCO^caps")); else LOG_HELP(strcat("^3", "caps", " ^7", _("How often a flag (CTF) or a key (KeyHunt) was captured"))); - case "captime": if (!mode) return CTX(_("SCO^captime")); else LOG_HELP(strcat("^3", "captime", " ^7", _("Time of fastest capture (CTF)"))); - case "deaths": if (!mode) return CTX(_("SCO^deaths")); else LOG_HELP(strcat("^3", "deaths", " ^7", _("Number of deaths"))); - case "destroyed": if (!mode) return CTX(_("SCO^destroyed")); else LOG_HELP(strcat("^3", "destroyed", " ^7", _("Number of keys destroyed by pushing them into void"))); - case "dmg": if (!mode) return CTX(_("SCO^damage")); else LOG_HELP(strcat("^3", "dmg", " ^7", _("The total damage done"))); - case "dmgtaken": if (!mode) return CTX(_("SCO^dmgtaken")); else LOG_HELP(strcat("^3", "dmgtaken", " ^7", _("The total damage taken"))); - case "drops": if (!mode) return CTX(_("SCO^drops")); else LOG_HELP(strcat("^3", "drops", " ^7", _("Number of flag drops"))); - case "elo": if (!mode) return CTX(_("SCO^elo")); else LOG_HELP(strcat("^3", "elo", " ^7", _("Player ELO"))); - case "fastest": if (!mode) return CTX(_("SCO^fastest")); else LOG_HELP(strcat("^3", "fastest", " ^7", _("Time of fastest lap (Race/CTS)"))); - case "faults": if (!mode) return CTX(_("SCO^faults")); else LOG_HELP(strcat("^3", "faults", " ^7", _("Number of faults committed"))); - case "fckills": if (!mode) return CTX(_("SCO^fckills")); else LOG_HELP(strcat("^3", "fckills", " ^7", _("Number of flag carrier kills"))); - case "fps": if (!mode) return CTX(_("SCO^fps")); else LOG_HELP(strcat("^3", "fps", " ^7", _("FPS"))); - case "frags": if (!mode) return CTX(_("SCO^frags")); else LOG_HELP(strcat("^3", "frags", " ^7", _("Number of kills minus suicides"))); - case "goals": if (!mode) return CTX(_("SCO^goals")); else LOG_HELP(strcat("^3", "goals", " ^7", _("Number of goals scored"))); - case "kckills": if (!mode) return CTX(_("SCO^kckills")); else LOG_HELP(strcat("^3", "kckills", " ^7", _("Number of keys carrier kills"))); - case "kd": if (!mode) return CTX(_("SCO^k/d")); else LOG_HELP(strcat("^3", "kd", " ^7", _("The kill-death ratio"))); - case "kdr": if (!mode) return CTX(_("SCO^kdr")); else LOG_HELP(strcat("^3", "kdr", " ^7", _("The kill-death ratio"))); - case "kdratio": if (!mode) return CTX(_("SCO^kdratio")); else LOG_HELP(strcat("^3", "kdratio", " ^7", _("The kill-death ratio"))); - case "kills": if (!mode) return CTX(_("SCO^kills")); else LOG_HELP(strcat("^3", "kills", " ^7", _("Number of kills"))); - case "laps": if (!mode) return CTX(_("SCO^laps")); else LOG_HELP(strcat("^3", "laps", " ^7", _("Number of laps finished (Race/CTS)"))); - case "lives": if (!mode) return CTX(_("SCO^lives")); else LOG_HELP(strcat("^3", "lives", " ^7", _("Number of lives (LMS)"))); - case "losses": if (!mode) return CTX(_("SCO^losses")); else LOG_HELP(strcat("^3", "losses", " ^7", _("Number of times a key was lost"))); - case "name": if (!mode) return CTX(_("SCO^name")); else LOG_HELP(strcat("^3", "name", " ^7", _("Player name"))); - case "nick": if (!mode) return CTX(_("SCO^nick")); else LOG_HELP(strcat("^3", "nick", " ^7", _("Player name"))); - case "objectives": if (!mode) return CTX(_("SCO^objectives")); else LOG_HELP(strcat("^3", "objectives", " ^7", _("Number of objectives destroyed"))); - case "pickups": if (!mode) return CTX(_("SCO^pickups")); else LOG_HELP(strcat("^3", "pickups", " ^7", _("How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up"))); - case "ping": if (!mode) return CTX(_("SCO^ping")); else LOG_HELP(strcat("^3", "ping", " ^7", _("Ping time"))); - case "pl": if (!mode) return CTX(_("SCO^pl")); else LOG_HELP(strcat("^3", "pl", " ^7", _("Packet loss"))); - case "pushes": if (!mode) return CTX(_("SCO^pushes")); else LOG_HELP(strcat("^3", "pushes", " ^7", _("Number of players pushed into void"))); - case "rank": if (!mode) return CTX(_("SCO^rank")); else LOG_HELP(strcat("^3", "rank", " ^7", _("Player rank"))); - 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 "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"))); - case "takes": if (!mode) return CTX(_("SCO^takes")); else LOG_HELP(strcat("^3", "takes", " ^7", _("Number of domination points taken (Domination)"))); - case "teamkills": if (!mode) return CTX(_("SCO^teamkills")); else LOG_HELP(strcat("^3", "teamkills", " ^7", _("Number of teamkills"))); - case "ticks": if (!mode) return CTX(_("SCO^ticks")); else LOG_HELP(strcat("^3", "ticks", " ^7", _("Number of ticks (Domination)"))); - case "time": if (!mode) return CTX(_("SCO^time")); else LOG_HELP(strcat("^3", "time", " ^7", _("Total time raced (Race/CTS)"))); - default: return label; + SCO_LABEL(_("SCO^bckills"), "bckills", " ", _("Number of ball carrier kills")); + SCO_LABEL(_("SCO^bctime"), "bctime", " ", _("Total amount of time holding the ball in Keepaway")); + SCO_LABEL(_("SCO^caps"), "caps", " ", _("How often a flag (CTF) or a key (KeyHunt) was captured")); + SCO_LABEL(_("SCO^captime"), "captime", " ", _("Time of fastest capture (CTF)")); + SCO_LABEL(_("SCO^deaths"), "deaths", " ", _("Number of deaths")); + SCO_LABEL(_("SCO^destructions"), "destructions", " ", _("Number of keys destroyed by pushing them into void")); + SCO_LABEL(_("SCO^damage dealt"), "dmg", " ", _("The total damage dealt")); + SCO_LABEL(_("SCO^damage taken"), "dmgtaken", " ", _("The total damage taken")); + SCO_LABEL(_("SCO^drops"), "drops", " ", _("Number of flag drops")); + SCO_LABEL(_("SCO^elo"), "elo", " ", _("Player ELO")); + SCO_LABEL(_("SCO^fastest"), "fastest", " ", _("Time of fastest lap (Race/CTS)")); + SCO_LABEL(_("SCO^faults"), "faults", " ", _("Number of faults committed")); + SCO_LABEL(_("SCO^fckills"), "fckills", " ", _("Number of flag carrier kills")); + SCO_LABEL(_("SCO^fps"), "fps", " ", _("FPS")); + SCO_LABEL(_("SCO^frags"), "frags", " ", _("Number of kills minus suicides")); + SCO_LABEL(_("SCO^generators"), "generators", " ", _("Number of generators destroyed")); + SCO_LABEL(_("SCO^goals"), "goals", " ", _("Number of goals scored")); + SCO_LABEL(_("SCO^hunts"), "hunts", " ", _("Number of hunts (Survival)")); + SCO_LABEL(_("SCO^kckills"), "kckills", " ", _("Number of keys carrier kills")); + SCO_LABEL(_("SCO^k/d"), "kd", " ", _("The kill-death ratio")); + SCO_LABEL(_("SCO^kdr"), "kdr", " ", _("The kill-death ratio")); + SCO_LABEL(_("SCO^kdratio"), "kdratio", " ", _("The kill-death ratio")); + SCO_LABEL(_("SCO^kills"), "kills", " ", _("Number of kills")); + SCO_LABEL(_("SCO^laps"), "laps", " ", _("Number of laps finished (Race/CTS)")); + SCO_LABEL(_("SCO^lives"), "lives", " ", _("Number of lives (LMS)")); + SCO_LABEL(_("SCO^losses"), "losses", " ", _("Number of times a key was lost")); + SCO_LABEL(_("SCO^name"), "name", " ", _("Player name")); + SCO_LABEL(_("SCO^nick"), "nick", " ", _("Player name")); + SCO_LABEL(_("SCO^objectives"), "objectives", " ", _("Number of objectives destroyed")); + SCO_LABEL(_("SCO^pickups"), "pickups", " ", _("How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up")); + SCO_LABEL(_("SCO^ping"), "ping", " ", _("Ping time")); + SCO_LABEL(_("SCO^pl"), "pl", " ", _("Packet loss")); + SCO_LABEL(_("SCO^pushes"), "pushes", " ", _("Number of players pushed into void")); + SCO_LABEL(_("SCO^rank"), "rank", " ", _("Player rank")); + SCO_LABEL(_("SCO^returns"), "returns", " ", _("Number of flag returns")); + SCO_LABEL(_("SCO^revivals"), "revivals", " ", _("Number of revivals")); + SCO_LABEL(_("SCO^rounds won"), "rounds", " ", _("Number of rounds won")); + SCO_LABEL(_("SCO^rounds played"), "rounds_pl", " ", _("Number of rounds played")); + SCO_LABEL(_("SCO^score"), "score", " ", _("Total score")); + SCO_LABEL(_("SCO^suicides"), "suicides", " ", _("Number of suicides")); + SCO_LABEL(_("SCO^sum"), "sum", " ", _("Number of kills minus deaths")); + SCO_LABEL(_("SCO^survivals"), "survivals", " ", _("Number of survivals")); + SCO_LABEL(_("SCO^takes"), "takes", " ", _("Number of domination points taken (Domination)")); + SCO_LABEL(_("SCO^teamkills"), "teamkills", " ", _("Number of teamkills")); + SCO_LABEL(_("SCO^ticks"), "ticks", " ", _("Number of ticks (Domination)")); + SCO_LABEL(_("SCO^time"), "time", " ", _("Total time raced (Race/CTS)")); } return label; +#undef SCO_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); } @@ -170,6 +536,8 @@ void Scoreboard_InitScores() 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; @@ -196,10 +564,17 @@ void Scoreboard_InitScores() //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)) @@ -238,14 +613,8 @@ int Scoreboard_CompareScore(int vl, int vr, int f) float Scoreboard_ComparePlayerScores(entity left, entity right) { - float vl, vr, r; - vl = entcs_GetTeam(left.sv_entnum); - vr = entcs_GetTeam(right.sv_entnum); - - if(!left.gotscores) - vl = NUM_SPECTATOR; - if(!right.gotscores) - vr = NUM_SPECTATOR; + int vl = (left.gotscores) ? entcs_GetTeam(left.sv_entnum) : NUM_SPECTATOR; + int vr = (right.gotscores) ? entcs_GetTeam(right.sv_entnum) : NUM_SPECTATOR; if(vl > vr) return true; @@ -261,17 +630,18 @@ float Scoreboard_ComparePlayerScores(entity left, entity right) return false; } - r = Scoreboard_CompareScore(left.scores(ps_primary), right.scores(ps_primary), scores_flags(ps_primary)); - if (r >= 0) - return r; + 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(ps_secondary), right.scores(ps_secondary), scores_flags(ps_secondary)); - 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, true, { - r = Scoreboard_CompareScore(left.scores(it), right.scores(it), scores_flags(it)); - if (r >= 0) return r; + 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) @@ -295,26 +665,29 @@ void Scoreboard_UpdatePlayerPos(entity player) float Scoreboard_CompareTeamScores(entity left, entity right) { - int i, r; - if(left.team == NUM_SPECTATOR) return 1; if(right.team == NUM_SPECTATOR) return 0; - r = Scoreboard_CompareScore(left.teamscores(ts_primary), right.teamscores(ts_primary), teamscores_flags(ts_primary)); - if (r >= 0) - return r; - - r = Scoreboard_CompareScore(left.teamscores(ts_secondary), right.teamscores(ts_secondary), teamscores_flags(ts_secondary)); - if (r >= 0) - return r; - - for(i = 0; i < MAX_TEAMSCORE; ++i) + int fld_idx = -1; + int r; + for(int i = -2; i < MAX_TEAMSCORE; ++i) { - r = Scoreboard_CompareScore(left.teamscores(i), right.teamscores(i), teamscores_flags(i)); - if (r >= 0) - return r; + if (i < 0) + { + if (fld_idx == -1) fld_idx = ts_primary; + else if (ts_secondary == ts_primary) continue; + else fld_idx = ts_secondary; + } + else + { + fld_idx = i; + if (fld_idx == ts_primary || fld_idx == ts_secondary) continue; + } + + r = Scoreboard_CompareScore(left.teamscores(fld_idx), right.teamscores(fld_idx), teamscores_flags(fld_idx)); + if (r >= 0) return r; } if (left.team < right.team) @@ -375,19 +748,20 @@ void Cmd_Scoreboard_Help() // e.g. -teams,rc,cts,lms/kills ?+rc/kills #define SCOREBOARD_DEFAULT_COLUMNS \ "ping pl fps name |" \ -" -teams,rc,cts,inv,lms/kills +ft,tdm/kills ?+rc,inv/kills" \ -" -teams,lms/deaths +ft,tdm/deaths" \ +" -teams,rc,cts,surv,inv,lms/kills +ft,tdm,tmayhem/kills ?+rc,inv/kills" \ +" -teams,surv,lms/deaths +ft,tdm,tmayhem/deaths" \ " +tdm/sum" \ -" -teams,lms,rc,cts,inv,ka/suicides +ft,tdm/suicides ?+rc,inv/suicides" \ -" -cts,dm,tdm,ka,ft/frags" /* tdm already has this in "score" */ \ -" +tdm,ft,dom,ons,as/teamkills"\ -" -rc,cts,nb/dmg -rc,cts,nb/dmgtaken" \ +" -teams,lms,rc,cts,surv,inv,ka/suicides +ft,tdm,tmayhem/suicides ?+rc,inv/suicides" \ +" -cts,dm,tdm,surv,ka,ft,mayhem,tmayhem/frags" /* tdm already has this in "score" */ \ +" +tdm,ft,dom,ons,as,tmayhem/teamkills"\ +" -rc,cts,surv,nb/dmg -rc,cts,surv,nb/dmgtaken" \ +" +surv/survivals +surv/hunts" \ " +ctf/pickups +ctf/fckills +ctf/returns +ctf/caps +ons/takes +ons/caps" \ " +lms/lives +lms/rank" \ " +kh/kckills +kh/losses +kh/caps" \ " ?+rc/laps ?+rc/time +rc,cts/fastest" \ " +as/objectives +nb/faults +nb/goals" \ -" +ka/pickups +ka/bckills +ka/bctime +ft/revivals" \ +" +ka,tka/pickups +ka,tka/bckills +ka,tka/bctime +ft/revivals" \ " +dom/ticks +dom/takes" \ " -lms,rc,cts,inv,nb/score" @@ -422,9 +796,16 @@ void Cmd_Scoreboard_SetFields(int argc) cvar_set("scoreboard_columns", SCOREBOARD_DEFAULT_COLUMNS); argc = tokenizebyseparator(strcat("0 1 ", SCOREBOARD_DEFAULT_COLUMNS), " "); } - else if(argv(2) == "all") + else if(argv(2) == "all" || argv(2) == "ALL") { - string s = "ping pl name |"; // scores without a label + string s = "ping pl name |"; // scores without label (not really scores) + if(argv(2) == "ALL") + { + // scores without label + s = strcat(s, " ", "sum"); + s = strcat(s, " ", "kdratio"); + s = strcat(s, " ", "frags"); + } FOREACH(Scores, true, { if(it != ps_primary) if(it != ps_secondary) @@ -465,12 +846,11 @@ void Cmd_Scoreboard_SetFields(int argc) str = strtolower(str); strcpy(sbt_field_title[sbt_num_fields], TranslateScoresLabel(str)); - sbt_field_size[sbt_num_fields] = stringwidth(sbt_field_title[sbt_num_fields], false, hud_fontsize); PlayerScoreField j; switch(str) { - // fields without a label (not networked) + // fields without a label (not networked via the score system) case "ping": sbt_field[sbt_num_fields] = SP_PING; break; case "pl": sbt_field[sbt_num_fields] = SP_PL; break; case "name": case "nick": sbt_field[sbt_num_fields] = SP_NAME; have_name = true; break; @@ -496,7 +876,6 @@ void Cmd_Scoreboard_SetFields(int argc) LOG_INFOF("^1Error:^7 Unknown score field: '%s'", str); strfree(sbt_field_title[sbt_num_fields]); - sbt_field_size[sbt_num_fields] = 0; continue; LABEL(found) @@ -529,7 +908,6 @@ void Cmd_Scoreboard_SetFields(int argc) for(i = sbt_num_fields; i > 0; --i) { sbt_field_title[i] = sbt_field_title[i-1]; - sbt_field_size[i] = sbt_field_size[i-1]; sbt_field[i] = sbt_field[i-1]; } sbt_field_title[0] = strzone(TranslateScoresLabel("name")); @@ -543,12 +921,10 @@ void Cmd_Scoreboard_SetFields(int argc) for(i = sbt_num_fields; i > 1; --i) { sbt_field_title[i] = sbt_field_title[i-1]; - sbt_field_size[i] = sbt_field_size[i-1]; sbt_field[i] = sbt_field[i-1]; } sbt_field_title[1] = strzone("|"); sbt_field[1] = SP_SEPARATOR; - sbt_field_size[1] = stringwidth("|", false, hud_fontsize); ++sbt_num_fields; LOG_INFO("fixed missing field '|'"); } @@ -556,7 +932,6 @@ void Cmd_Scoreboard_SetFields(int argc) else if(!have_separator) { strcpy(sbt_field_title[sbt_num_fields], "|"); - sbt_field_size[sbt_num_fields] = stringwidth("|", false, hud_fontsize); sbt_field[sbt_num_fields] = SP_SEPARATOR; ++sbt_num_fields; LOG_INFO("fixed missing field '|'"); @@ -564,7 +939,6 @@ void Cmd_Scoreboard_SetFields(int argc) if(!have_secondary) { strcpy(sbt_field_title[sbt_num_fields], TranslateScoresLabel(scores_label(ps_secondary))); - sbt_field_size[sbt_num_fields] = stringwidth(sbt_field_title[sbt_num_fields], false, hud_fontsize); sbt_field[sbt_num_fields] = ps_secondary; ++sbt_num_fields; LOG_INFOF("fixed missing field '%s'", scores_label(ps_secondary)); @@ -572,7 +946,6 @@ void Cmd_Scoreboard_SetFields(int argc) if(!have_primary) { strcpy(sbt_field_title[sbt_num_fields], TranslateScoresLabel(scores_label(ps_primary))); - sbt_field_size[sbt_num_fields] = stringwidth(sbt_field_title[sbt_num_fields], false, hud_fontsize); sbt_field[sbt_num_fields] = ps_primary; ++sbt_num_fields; LOG_INFOF("fixed missing field '%s'", scores_label(ps_primary)); @@ -580,6 +953,7 @@ void Cmd_Scoreboard_SetFields(int argc) } sbt_field[sbt_num_fields] = SP_END; + sb_field_sizes_init = 1; } string Scoreboard_AddPlayerId(string pl_name, entity pl) @@ -605,7 +979,13 @@ string Scoreboard_GetName(entity pl) } else if(!teamplay) { - int f = entcs_GetClientColors(pl.sv_entnum); + int f; + // NOTE: always adding 1024 allows saving the colormap 0 as a value != 0 + if (playerslots[pl.sv_entnum].colormap >= 1024) + f = playerslots[pl.sv_entnum].colormap - 1024; // override server-side player colors + else + f = entcs_GetClientColors(pl.sv_entnum); + { sbt_field_icon0 = "gfx/scoreboard/playercolor_base"; sbt_field_icon1 = "gfx/scoreboard/playercolor_shirt"; @@ -617,7 +997,23 @@ string Scoreboard_GetName(entity pl) 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; @@ -629,6 +1025,9 @@ string Scoreboard_GetField(entity pl, PlayerScoreField field) 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: @@ -638,8 +1037,16 @@ string Scoreboard_GetField(entity pl, PlayerScoreField field) 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: @@ -665,6 +1072,8 @@ string Scoreboard_GetField(entity pl, PlayerScoreField field) 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: @@ -673,12 +1082,23 @@ string Scoreboard_GetField(entity pl, PlayerScoreField field) 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: @@ -692,6 +1112,8 @@ string Scoreboard_GetField(entity pl, PlayerScoreField field) } else { sbt_field_rgb = '1 0 0'; } + if (rounds_played) + return sprintf("%.1f", f / rounds_played); return ftos(f); case SP_ELO: @@ -717,7 +1139,12 @@ string Scoreboard_GetField(entity pl, PlayerScoreField field) 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: @@ -729,7 +1156,7 @@ string Scoreboard_GetField(entity pl, PlayerScoreField field) 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"; } @@ -738,7 +1165,7 @@ float sbt_fixcolumnwidth_len; float sbt_fixcolumnwidth_iconlen; float sbt_fixcolumnwidth_marginlen; -string Scoreboard_FixColumnWidth(int i, string str) +string Scoreboard_FixColumnWidth(int i, string str, bool init) { TC(int, i); float f; @@ -778,6 +1205,9 @@ string Scoreboard_FixColumnWidth(int i, string str) else sbt_fixcolumnwidth_marginlen = 0; + if (init) + sbt_field_title_width[i] = stringwidth(sbt_field_title[i], false, hud_fontsize); + if(sbt_field[i] == SP_NAME) // name gets all remaining space { int j; @@ -786,33 +1216,74 @@ string Scoreboard_FixColumnWidth(int i, string str) if(j != i) if (sbt_field[i] != SP_SEPARATOR) remaining_space += sbt_field_size[j] + hud_fontsize.x; - sbt_field_size[i] = panel_size.x - remaining_space; + sbt_field_size[i] = max(sbt_field_title_width[i], panel_size.x - remaining_space); if (sbt_fixcolumnwidth_iconlen != 0) remaining_space += sbt_fixcolumnwidth_marginlen + sbt_fixcolumnwidth_iconlen * hud_fontsize.x; - float namesize = panel_size.x - remaining_space; + float namesize = max(sbt_field_title_width[i], panel_size.x - remaining_space); str = textShortenToWidth(str, namesize, hud_fontsize, stringwidth_colors); sbt_fixcolumnwidth_len = stringwidth(str, true, hud_fontsize); - max_namesize = vid_conwidth - remaining_space; + max_namesize = max(sbt_field_title_width[i], vid_conwidth - remaining_space); } else + { + if (init) + { + sbt_field_size[i] = sbt_field_title_width[i]; + float title_maxwidth = sbt_field_title_maxwidth * sbt_field_title_maxwidth_factor; + if (sbt_field_size[i] && sbt_field_size[i] > title_maxwidth) + sbt_field_size[i] = title_maxwidth; + } sbt_fixcolumnwidth_len = stringwidth(str, false, hud_fontsize); + } f = sbt_fixcolumnwidth_len + sbt_fixcolumnwidth_marginlen + sbt_fixcolumnwidth_iconlen * hud_fontsize.x; if(sbt_field_size[i] < f) sbt_field_size[i] = f; + sbt_field_title_condense_factor[i] = 0; + if (sbt_field_title_width[i] > sbt_field_size[i]) + { + float real_maxwidth = sbt_field_size[i]; + float title_maxwidth = sbt_field_title_maxwidth * sbt_field_title_maxwidth_factor; + if (sbt_field_title_width[i] > title_maxwidth) + real_maxwidth = max(sbt_field_size[i], title_maxwidth); + sbt_field_title_condense_factor[i] = real_maxwidth / sbt_field_title_width[i]; + } + return str; } -void Scoreboard_initFieldSizes() +void Scoreboard_initFieldSizes(bool compress_more) { + if (compress_more) + { + float sbt_field_title_maxwidth_factor_prev = sbt_field_title_maxwidth_factor; + sbt_field_title_maxwidth_factor -= 0.05; + if (sbt_field_title_maxwidth * sbt_field_title_maxwidth_factor < 0.01 * vid_conwidth) + { + sbt_field_title_maxwidth_factor = (0.01 * vid_conwidth) / sbt_field_title_maxwidth; + if (sbt_field_title_maxwidth_factor_prev == sbt_field_title_maxwidth_factor) + return; + } + } + else + sbt_field_title_maxwidth_factor = 1; + for(int i = 0; i < sbt_num_fields; ++i) { - sbt_field_size[i] = stringwidth(sbt_field_title[i], false, hud_fontsize); - Scoreboard_FixColumnWidth(i, ""); + if (sbt_field[i] == SP_NAME) + { + name_field_index = i; + continue; + } + + Scoreboard_FixColumnWidth(i, "", true); } + + // update name field size in the end as it takes remaining space + Scoreboard_FixColumnWidth(name_field_index, "", true); } vector Scoreboard_DrawHeader(vector pos, vector rgb, bool other_players) @@ -831,9 +1302,18 @@ vector Scoreboard_DrawHeader(vector pos, vector rgb, bool other_players) if (sbt_highlight) if (i % 2) drawfill(pos - eX * hud_fontsize.x * 0.5, column_dim, '0 0 0', sbt_highlight_alpha, DRAWFLAG_NORMAL); + vector prev_drawfontscale = drawfontscale; + if (sbt_field_title_condense_factor[i]) + drawfontscale.x *= sbt_field_title_condense_factor[i]; drawstring(pos + text_offset, sbt_field_title[i], hud_fontsize, rgb * 1.5, sbt_fg_alpha, DRAWFLAG_NORMAL); + if (sbt_field_title_condense_factor[i]) + { + drawfontscale.x *= sbt_field_title_condense_factor[i]; + drawfontscale = prev_drawfontscale; + } pos.x += column_dim.x; } + if(sbt_field[i] == SP_SEPARATOR) { pos.x = panel_pos.x + panel_size.x - hud_fontsize.x * 0.5; @@ -851,8 +1331,21 @@ vector Scoreboard_DrawHeader(vector pos, vector rgb, bool other_players) drawfill(pos - eX * hud_fontsize.x * 0.5, column_dim, '0 0 0', sbt_highlight_alpha, DRAWFLAG_NORMAL); } - text_offset.x = sbt_field_size[i] - stringwidth(sbt_field_title[i], false, hud_fontsize); + vector prev_drawfontscale = drawfontscale; + float titlewidth = stringwidth(sbt_field_title[i], false, hud_fontsize); + if (sbt_field_title_condense_factor[i]) + { + drawfontscale.x *= sbt_field_title_condense_factor[i]; + text_offset.x = sbt_field_size[i] - titlewidth * sbt_field_title_condense_factor[i]; + } + else + text_offset.x = sbt_field_size[i] - titlewidth; drawstring(pos + text_offset, sbt_field_title[i], hud_fontsize, rgb * 1.5, sbt_fg_alpha, DRAWFLAG_NORMAL); + if (sbt_field_title_condense_factor[i]) + { + drawfontscale.x *= sbt_field_title_condense_factor[i]; + drawfontscale = prev_drawfontscale; + } pos.x -= hud_fontsize.x; } } @@ -871,7 +1364,12 @@ void Scoreboard_DrawItem(vector item_pos, vector rgb, entity pl, bool is_self, i 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); @@ -898,8 +1396,8 @@ void Scoreboard_DrawItem(vector item_pos, vector rgb, entity pl, bool is_self, i pos.x += sbt_field_size[i] + hud_fontsize.x; continue; } - str = Scoreboard_GetField(pl, field); - str = Scoreboard_FixColumnWidth(i, str); + str = Scoreboard_GetField(pl, field, autocvar_hud_panel_scoreboard_scores_per_round); + str = Scoreboard_FixColumnWidth(i, str, false); pos.x += sbt_field_size[i] + hud_fontsize.x; @@ -934,8 +1432,8 @@ void Scoreboard_DrawItem(vector item_pos, vector rgb, entity pl, bool is_self, i continue; } - str = Scoreboard_GetField(pl, field); - str = Scoreboard_FixColumnWidth(i, str); + str = Scoreboard_GetField(pl, field, autocvar_hud_panel_scoreboard_scores_per_round); + str = Scoreboard_FixColumnWidth(i, str, false); if(field == SP_NAME) { tmp.x = sbt_fixcolumnwidth_len; // left or right aligned? let's put it right... @@ -1003,10 +1501,10 @@ vector Scoreboard_DrawOthers(vector item_pos, vector rgb, int this_team, entity 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) @@ -1040,6 +1538,16 @@ vector Scoreboard_DrawOthers(vector item_pos, vector rgb, int this_team, entity } } + 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; @@ -1094,6 +1602,12 @@ vector Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size) 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); @@ -1155,19 +1669,45 @@ vector Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size) ++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; @@ -1216,10 +1756,11 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) int rows = 1; if (autocvar_hud_panel_scoreboard_accuracy_doublerows && weapon_cnt >= floor((REGISTRY_COUNT(Weapons) - nHidden - 1) * 0.5)) rows = 2; - int columnns = ceil(weapon_cnt / rows); + int columns = ceil(weapon_cnt / rows); - float weapon_height = 29; - float height = hud_fontsize.y + weapon_height; + float aspect = max(0.001, autocvar_hud_panel_weapons_aspect); + float weapon_height = hud_fontsize.y * 2.3 / aspect; + float height = weapon_height + hud_fontsize.y; drawstring(pos + eX * panel_bg_padding, sprintf(_("Accuracy stats (average %d%%)"), average_accuracy), hud_fontsize, '1 1 1', panel_fg_alpha * scoreboard_acc_fade_alpha, DRAWFLAG_NORMAL); pos.y += 1.25 * hud_fontsize.y; @@ -1248,7 +1789,7 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) pos = panel_pos; vector tmp = panel_size; - float weapon_width = tmp.x / columnns / rows; + float weapon_width = tmp.x / columns / rows; if (sbt_bg_alpha) drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb, sbt_bg_alpha * scoreboard_acc_fade_alpha, DRAWFLAG_NORMAL); @@ -1256,7 +1797,7 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) if(sbt_highlight) { // column highlighting - for (int i = 0; i < columnns; ++i) + for (int i = 0; i < columns; ++i) if ((i % 2) == 0) drawfill(pos + eX * weapon_width * rows * i, vec2(weapon_width * rows, height * rows), '0 0 0', sbt_highlight_alpha * scoreboard_acc_fade_alpha, DRAWFLAG_NORMAL); @@ -1301,11 +1842,8 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) weapons_with_stats += 1; average_accuracy += weapon_stats; // store sum of all accuracies in average_accuracy - string s; - s = sprintf("%d%%", weapon_stats * 100); - - float padding; - padding = (weapon_width - stringwidth(s, false, hud_fontsize)) / 2; // center the accuracy value + string s = sprintf("%d%%", weapon_stats * 100); + float padding = (weapon_width - stringwidth(s, false, hud_fontsize)) / 2; if(!autocvar_hud_panel_scoreboard_accuracy_nocolors) rgb = Accuracy_GetColor(weapon_stats); @@ -1314,7 +1852,7 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) } tmpos.x += weapon_width * rows; pos.x += weapon_width * rows; - if (rows == 2 && column == columnns - 1) { + if (rows == 2 && column == columns - 1) { tmpos.x = oldposx; tmpos.y += height; pos.y += height; @@ -1330,18 +1868,31 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) return end_pos; } -.bool uninteresting; -STATIC_INIT(default_order_items_label) +bool is_item_filtered(entity it) { - IL_EACH(default_order_items, true, { - if(!(it.instanceOfPowerup - || it == ITEM_HealthMega || it == ITEM_HealthBig - || it == ITEM_ArmorMega || it == ITEM_ArmorBig - )) + if (!autocvar_hud_panel_scoreboard_itemstats_filter) + return false; + int mask = autocvar_hud_panel_scoreboard_itemstats_filter_mask; + if (mask <= 0) + return false; + if (it.instanceOfArmor || it.instanceOfHealth) + { + int ha_mask = floor(mask) % 10; + switch (ha_mask) { - it.uninteresting = true; + default: return false; + case 4: if (it == ITEM_HealthMega || it == ITEM_ArmorMega) return true; // else fallthrough + case 3: if (it == ITEM_HealthBig || it == ITEM_ArmorBig) return true; // else fallthrough + case 2: if (it == ITEM_HealthMedium || it == ITEM_ArmorMedium) return true; // else fallthrough + case 1: if (it == ITEM_HealthSmall || it == ITEM_ArmorSmall) return true; // else fallthrough } - }); + } + if (it.instanceOfAmmo) + { + int ammo_mask = floor(mask / 10) % 10; + return (ammo_mask == 1); + } + return false; } vector Scoreboard_ItemStats_Draw(vector pos, vector rgb, vector bg_size) @@ -1353,7 +1904,7 @@ vector Scoreboard_ItemStats_Draw(vector pos, vector rgb, vector bg_size) IL_EACH(default_order_items, true, { int q = g_inventory.inv_items[it.m_id]; //q = 1; // debug: display all items - if (autocvar_hud_panel_scoreboard_itemstats_filter && it.uninteresting) + if (is_item_filtered(it)) ++uninteresting_cnt; else if (!q) ++disowned_cnt; @@ -1363,11 +1914,10 @@ vector Scoreboard_ItemStats_Draw(vector pos, vector rgb, vector bg_size) if (n <= 0) return pos; int rows = (autocvar_hud_panel_scoreboard_itemstats_doublerows && n >= floor(REGISTRY_COUNT(Items) / 2)) ? 2 : 1; - int columnns = max(6, ceil(n / rows)); + int columns = max(6, ceil(n / rows)); - float height = 40; - float fontsize = height * 1/3; - float item_height = height * 2/3; + float item_height = hud_fontsize.y * 2.3; + float height = item_height + hud_fontsize.y; drawstring(pos + eX * panel_bg_padding, _("Item stats"), hud_fontsize, '1 1 1', panel_fg_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); pos.y += 1.25 * hud_fontsize.y; @@ -1396,7 +1946,7 @@ vector Scoreboard_ItemStats_Draw(vector pos, vector rgb, vector bg_size) pos = panel_pos; vector tmp = panel_size; - float item_width = tmp.x / columnns / rows; + float item_width = tmp.x / columns / rows; if (sbt_bg_alpha) drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb, sbt_bg_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); @@ -1404,13 +1954,13 @@ vector Scoreboard_ItemStats_Draw(vector pos, vector rgb, vector bg_size) if(sbt_highlight) { // column highlighting - for (int i = 0; i < columnns; ++i) + for (int i = 0; i < columns; ++i) if ((i % 2) == 0) - drawfill(pos + '1 0 0' * item_width * rows * i, '0 1 0' * height * rows + '1 0 0' * item_width * rows, '0 0 0', sbt_highlight_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); + drawfill(pos + eX * item_width * rows * i, vec2(item_width * rows, height * rows), '0 0 0', sbt_highlight_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); // row highlighting for (int i = 0; i < rows; ++i) - drawfill(pos + '0 1 0' * item_height + '0 1 0' * height * i, '1 0 0' * panel_size.x + '0 1 0' * fontsize, rgb, sbt_highlight_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); + drawfill(pos + eY * (item_height + height * i), vec2(panel_size.x, hud_fontsize.y), rgb, sbt_highlight_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); } if (rows == 2) @@ -1420,17 +1970,17 @@ vector Scoreboard_ItemStats_Draw(vector pos, vector rgb, vector bg_size) vector tmpos = pos; int column = 0; - IL_EACH(default_order_items, !(autocvar_hud_panel_scoreboard_itemstats_filter && it.uninteresting), { + IL_EACH(default_order_items, !is_item_filtered(it), { int n = g_inventory.inv_items[it.m_id]; //n = 1 + floor(i * 3 + 4.8) % 7; // debug: display a value for each item if (n <= 0) continue; - drawpic_aspect_skin(tmpos, it.m_icon, '1 0 0' * item_width + '0 1 0' * item_height, '1 1 1', panel_fg_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(tmpos, it.m_icon, eX * item_width + eY * item_height, '1 1 1', panel_fg_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); string s = ftos(n); - float padding = (item_width - stringwidth(s, false, '1 0 0' * fontsize)) / 2; // center - drawstring(tmpos + '1 0 0' * padding + '0 1 0' * item_height, s, '1 1 0' * fontsize, '1 1 1', panel_fg_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); + float padding = (item_width - stringwidth(s, false, hud_fontsize)) / 2; + drawstring(tmpos + vec2(padding, item_height), s, hud_fontsize, '1 1 1', panel_fg_alpha * scoreboard_itemstats_fade_alpha, DRAWFLAG_NORMAL); tmpos.x += item_width * rows; pos.x += item_width * rows; - if (rows == 2 && column == columnns - 1) { + if (rows == 2 && column == columns - 1) { tmpos.x = oldposx; tmpos.y += height; pos.y += height; @@ -1524,7 +2074,6 @@ vector Scoreboard_MapStats_Draw(vector pos, vector rgb, vector bg_size) { return end_pos; } - vector Scoreboard_Rankings_Draw(vector pos, string ranktitle, entity pl, vector rgb, vector bg_size) { int i; @@ -1538,12 +2087,17 @@ vector Scoreboard_Rankings_Draw(vector pos, string ranktitle, entity pl, vector vector hl_rgb = rgb + '0.5 0.5 0.5'; - pos.y += hud_fontsize.y; + 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; @@ -1563,16 +2117,22 @@ vector Scoreboard_Rankings_Draw(vector pos, string ranktitle, entity pl, vector float ranksize = 3 * hud_fontsize.x; float timesize = 5 * hud_fontsize.x; vector columnsize = vec2(ranksize + timesize + namesize + hud_fontsize.x, 1.25 * hud_fontsize.y); - int columns = max(1, floor((panel_size.x - 2 * panel_bg_padding) / columnsize.x)); - columns = min(columns, RANKINGS_RECEIVED_CNT); + rankings_columns = max(1, floor((panel_size.x - 2 * panel_bg_padding) / columnsize.x)); + rankings_columns = min(rankings_columns, RANKINGS_RECEIVED_CNT); + if (!rankings_cnt) + { + rankings_cnt = RANKINGS_RECEIVED_CNT; + rankings_rows = ceil(rankings_cnt / rankings_columns); + } // expand name column to fill the entire row - float available_space = (panel_size.x - 2 * panel_bg_padding - columnsize.x * columns) / columns; + float available_space = (panel_size.x - 2 * panel_bg_padding - columnsize.x * rankings_columns) / rankings_columns; namesize += available_space; columnsize.x += available_space; - panel_size.y = ceil(RANKINGS_RECEIVED_CNT / columns) * 1.25 * hud_fontsize.y; + 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(); @@ -1595,21 +2155,21 @@ vector Scoreboard_Rankings_Draw(vector pos, string ranktitle, entity pl, vector string str = ""; int column = 0, j = 0; string zoned_name_self = strzone(strdecolorize(entcs_GetName(player_localnum))); - for(i = 0; i < RANKINGS_RECEIVED_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); @@ -1617,21 +2177,26 @@ vector Scoreboard_Rankings_Draw(vector pos, string ranktitle, entity pl, vector pos.y += 1.25 * hud_fontsize.y; j++; - if(j >= ceil(RANKINGS_RECEIVED_CNT / columns)) + if(j >= rankings_rows) { column++; j = 0; - pos.x += panel_size.x / columns; + pos.x += panel_size.x / rankings_columns; pos.y = panel_pos.y; } } 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) { @@ -1682,7 +2247,7 @@ bool Scoreboard_ItemStats_WouldDraw(float ypos) if (!have_item_stats) { IL_EACH(default_order_items, true, { - if (!(autocvar_hud_panel_scoreboard_itemstats_filter && it.uninteresting)) + if (!is_item_filtered(it)) { int q = g_inventory.inv_items[it.m_id]; //q = 1; // debug: display all items @@ -1700,6 +2265,45 @@ bool Scoreboard_ItemStats_WouldDraw(float ypos) return true; } +vector Scoreboard_Spectators_Draw(vector pos) { + + entity pl, tm; + string str = ""; + + for(pl = players.sort_next; pl; pl = pl.sort_next) + { + if(pl.team == NUM_SPECTATOR) + { + for(tm = teams.sort_next; tm; tm = tm.sort_next) + if(tm.team == NUM_SPECTATOR) + break; + str = sprintf("%s (%d)", _("Spectators"), tm.team_size); + draw_beginBoldFont(); + drawstring(pos, str, hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + draw_endBoldFont(); + pos.y += 1.25 * hud_fontsize.y; + + pos = Scoreboard_DrawOthers(pos, '0 0 0', pl.team, NULL, pl, 0); + pos.y += 1.25 * hud_fontsize.y; + + break; + } + } + if (str != "") // if there's at least one spectator + pos.y += 0.5 * hud_fontsize.y; + + 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) @@ -1717,11 +2321,22 @@ void Scoreboard_Draw() scoreboard_fade_alpha = min(1, scoreboard_fade_alpha + frametime * scoreboard_fadeinspeed); else scoreboard_fade_alpha = 1; + + static string hud_fontsize_str; if(hud_fontsize_str != autocvar_hud_fontsize) { hud_fontsize = HUD_GetFontsize("hud_fontsize"); - Scoreboard_initFieldSizes(); strcpy(hud_fontsize_str, autocvar_hud_fontsize); + sb_field_sizes_init = 1; + } + + static float scoreboard_table_fieldtitle_maxwidth_prev; + if (scoreboard_table_fieldtitle_maxwidth_prev != autocvar_hud_panel_scoreboard_table_fieldtitle_maxwidth) + { + scoreboard_table_fieldtitle_maxwidth_prev = autocvar_hud_panel_scoreboard_table_fieldtitle_maxwidth; + sbt_field_title_maxwidth = bound(0.01, autocvar_hud_panel_scoreboard_table_fieldtitle_maxwidth, 0.1); + sbt_field_title_maxwidth *= vid_conwidth; + sb_field_sizes_init = 1; } } else { @@ -1766,14 +2381,24 @@ void Scoreboard_Draw() float excess = max(0, max_namesize - autocvar_hud_panel_scoreboard_namesize * hud_fontsize.x); float fixed_scoreboard_width = bound(vid_conwidth * autocvar_hud_panel_scoreboard_minwidth, vid_conwidth - excess, vid_conwidth * 0.93); - panel_pos.x = 0.5 * (vid_conwidth - fixed_scoreboard_width); + scoreboard_left = 0.5 * (vid_conwidth - fixed_scoreboard_width); + scoreboard_right = scoreboard_left + fixed_scoreboard_width; + panel_pos.x = scoreboard_left; panel_size.x = fixed_scoreboard_width; + // field sizes can be initialized now after panel_size.x calculation + if (!sbt_field_size[0] || sb_field_sizes_init) + { + bool compress = (sb_field_sizes_init == 2); + Scoreboard_initFieldSizes(compress); + sb_field_sizes_init = 0; + } + Scoreboard_UpdatePlayerTeams(); - float initial_pos_y = panel_pos.y; + scoreboard_top = panel_pos.y; vector pos = panel_pos; - entity pl, tm; + entity tm; string str; vector str_pos; @@ -1784,73 +2409,69 @@ void Scoreboard_Draw() 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 if (gametype_custom_name != "") + str = gametype_custom_name; + 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 @@ -1983,52 +2604,67 @@ void Scoreboard_Draw() pos = Scoreboard_MakeTable(pos, tm, panel_bg_color, bg_size); } + // if the name column is too small, try to compress all other field titles + if (sbt_field_size[name_field_index] < sbt_field_title_width[name_field_index] + hud_fontsize.x) + sb_field_sizes_init = 2; + + // draw scoreboard spectators before accuracy and item stats + if (autocvar_hud_panel_scoreboard_spectators_position == 0) { + pos = Scoreboard_Spectators_Draw(pos); + } + + // draw accuracy and item stats if (Scoreboard_AccuracyStats_WouldDraw(pos.y)) pos = Scoreboard_AccuracyStats_Draw(pos, panel_bg_color, bg_size); if (Scoreboard_ItemStats_WouldDraw(pos.y)) pos = Scoreboard_ItemStats_Draw(pos, panel_bg_color, bg_size); + // draw scoreboard spectators after accuracy and item stats and before rankings + if (autocvar_hud_panel_scoreboard_spectators_position == 1) { + pos = Scoreboard_Spectators_Draw(pos); + } + if(MUTATOR_CALLHOOK(ShowRankings)) { string ranktitle = M_ARGV(0, string); - if(race_speedaward) { - drawcolorcodedstring(pos, sprintf(_("Speed award: %d%s ^7(%s^7)"), race_speedaward, 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, 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 } pos = Scoreboard_Rankings_Draw(pos, ranktitle, playerslots[player_localnum], panel_bg_color, bg_size); } + else + rankings_cnt = 0; - pos = Scoreboard_MapStats_Draw(pos, panel_bg_color, bg_size); - - // List spectators - for(pl = players.sort_next; pl; pl = pl.sort_next) - { - if(pl.team == NUM_SPECTATOR) - { - for(tm = teams.sort_next; tm; tm = tm.sort_next) - if(tm.team == NUM_SPECTATOR) - break; - str = sprintf("%s (%d)", _("Spectators"), tm.team_size); - draw_beginBoldFont(); - drawstring(pos, str, hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - draw_endBoldFont(); - pos.y += 1.25 * hud_fontsize.y; + // draw scoreboard spectators after rankings + if (autocvar_hud_panel_scoreboard_spectators_position == 2) { + pos = Scoreboard_Spectators_Draw(pos); + } - pos = Scoreboard_DrawOthers(pos, '0 0 0', pl.team, NULL, pl, 0); - pos.y += 1.25 * hud_fontsize.y; + pos = Scoreboard_MapStats_Draw(pos, panel_bg_color, bg_size); - break; - } + // draw scoreboard spectators after mapstats + if (autocvar_hud_panel_scoreboard_spectators_position == 3) { + pos = Scoreboard_Spectators_Draw(pos); } // print information about respawn status float respawn_time = STAT(RESPAWN_TIME); - if(!intermission) - if(respawn_time) + if(!intermission && respawn_time) { if(respawn_time < 0) { @@ -2063,14 +2699,26 @@ void Scoreboard_Draw() drawcolorcodedstring(pos + '0.5 0 0' * (panel_size.x - stringwidth(str, true, hud_fontsize)), str, hud_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); } - pos.y += 2 * hud_fontsize.y; + pos.y += hud_fontsize.y; if (scoreboard_fade_alpha < 1) - scoreboard_bottom = initial_pos_y + (pos.y - initial_pos_y) * scoreboard_fade_alpha; + scoreboard_bottom = scoreboard_top + (pos.y - scoreboard_top) * scoreboard_fade_alpha; else if (pos.y != scoreboard_bottom) { if (pos.y > scoreboard_bottom) - scoreboard_bottom = min(pos.y, scoreboard_bottom + frametime * 10 * (pos.y - initial_pos_y)); + scoreboard_bottom = min(pos.y, scoreboard_bottom + frametime * 10 * (pos.y - scoreboard_top)); else - scoreboard_bottom = max(pos.y, scoreboard_bottom - frametime * 10 * (pos.y - initial_pos_y)); + scoreboard_bottom = max(pos.y, scoreboard_bottom - frametime * 10 * (pos.y - scoreboard_top)); + } + + if (rankings_cnt) + { + if (scoreboard_fade_alpha == 1) + { + if (scoreboard_bottom > 0.95 * vid_conheight) + rankings_rows = max(1, rankings_rows - 1); + else if (scoreboard_bottom + 1.25 * hud_fontsize.y < 0.95 * vid_conheight) + rankings_rows = min(ceil(RANKINGS_RECEIVED_CNT / rankings_columns), rankings_rows + 1); + } + rankings_cnt = rankings_rows * rankings_columns; } }