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=e11a134558519acaa873875f8da9922b390b1786;hp=5e4a31f1e7dce6198f459837f61e62dc954f0c4f;hb=e757068f0bf4ce3c5b29c9e52f251b39a4ef7470;hpb=d01c567581179df7cc68bcdc8dce58efad911bc4 diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 5e4a31f1e7..e11a134558 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -2,6 +2,7 @@ #include #include +#include #include #include "quickmenu.qh" #include @@ -56,10 +57,14 @@ 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_bg_teams_color_team = 0; float autocvar_hud_panel_scoreboard_namesize = 15; +float autocvar_hud_panel_scoreboard_team_size_position = 0; bool autocvar_hud_panel_scoreboard_accuracy = true; bool autocvar_hud_panel_scoreboard_accuracy_doublerows = false; bool autocvar_hud_panel_scoreboard_accuracy_nocolors = false; +float autocvar_hud_panel_scoreboard_accuracy_showdelay = 2; +float autocvar_hud_panel_scoreboard_accuracy_showdelay_minpos = 0.75; + bool autocvar_hud_panel_scoreboard_ctf_leaderboard = true; bool autocvar_hud_panel_scoreboard_dynamichud = false; @@ -70,56 +75,65 @@ bool autocvar_hud_panel_scoreboard_spectators_showping = true; bool autocvar_hud_panel_scoreboard_spectators_aligned = false; float autocvar_hud_panel_scoreboard_minwidth = 0.4; - -void drawstringright(vector, string, vector, vector, float, float); -void drawstringcenter(vector, string, vector, vector, float, float); - -// wrapper to put all possible scores titles through gettext -string TranslateScoresLabel(string l) +// mode 0: returns translated label +// mode 1: prints name and description of all the labels +string Label_getInfo(string label, int mode) { - switch(l) + if (mode == 1) + label = "bckills"; // first case in the switch + + switch(label) { - case "bckills": return CTX(_("SCO^bckills")); - case "bctime": return CTX(_("SCO^bctime")); - case "caps": return CTX(_("SCO^caps")); - case "captime": return CTX(_("SCO^captime")); - case "deaths": return CTX(_("SCO^deaths")); - case "destroyed": return CTX(_("SCO^destroyed")); - case "dmg": return CTX(_("SCO^damage")); - case "dmgtaken": return CTX(_("SCO^dmgtaken")); - case "drops": return CTX(_("SCO^drops")); - case "faults": return CTX(_("SCO^faults")); - case "fckills": return CTX(_("SCO^fckills")); - case "goals": return CTX(_("SCO^goals")); - case "kckills": return CTX(_("SCO^kckills")); - case "kdratio": return CTX(_("SCO^kdratio")); - case "kd": return CTX(_("SCO^k/d")); - case "kdr": return CTX(_("SCO^kdr")); - case "kills": return CTX(_("SCO^kills")); - case "teamkills": return CTX(_("SCO^teamkills")); - case "laps": return CTX(_("SCO^laps")); - case "lives": return CTX(_("SCO^lives")); - case "losses": return CTX(_("SCO^losses")); - case "name": return CTX(_("SCO^name")); - case "sum": return CTX(_("SCO^sum")); - case "nick": return CTX(_("SCO^nick")); - case "objectives": return CTX(_("SCO^objectives")); - case "pickups": return CTX(_("SCO^pickups")); - case "ping": return CTX(_("SCO^ping")); - case "pl": return CTX(_("SCO^pl")); - case "pushes": return CTX(_("SCO^pushes")); - case "rank": return CTX(_("SCO^rank")); - case "returns": return CTX(_("SCO^returns")); - case "revivals": return CTX(_("SCO^revivals")); - case "rounds": return CTX(_("SCO^rounds won")); - case "score": return CTX(_("SCO^score")); - case "suicides": return CTX(_("SCO^suicides")); - case "takes": return CTX(_("SCO^takes")); - case "ticks": return CTX(_("SCO^ticks")); - default: return l; + case "bckills": if (!mode) return CTX(_("SCO^bckills")); else LOG_INFO(strcat("^3", "bckills", " ^7", _("Number of ball carrier kills"))); + case "bctime": if (!mode) return CTX(_("SCO^bctime")); else LOG_INFO(strcat("^3", "bctime", " ^7", _("Total amount of time holding the ball in Keepaway"))); + case "caps": if (!mode) return CTX(_("SCO^caps")); else LOG_INFO(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_INFO(strcat("^3", "captime", " ^7", _("Time of fastest capture (CTF)"))); + case "deaths": if (!mode) return CTX(_("SCO^deaths")); else LOG_INFO(strcat("^3", "deaths", " ^7", _("Number of deaths"))); + case "destroyed": if (!mode) return CTX(_("SCO^destroyed")); else LOG_INFO(strcat("^3", "destroyed", " ^7", _("Number of keys destroyed by pushing them into void"))); + case "dmg": if (!mode) return CTX(_("SCO^damage")); else LOG_INFO(strcat("^3", "dmg", " ^7", _("The total damage done"))); + case "dmgtaken": if (!mode) return CTX(_("SCO^dmgtaken")); else LOG_INFO(strcat("^3", "dmgtaken", " ^7", _("The total damage taken"))); + case "drops": if (!mode) return CTX(_("SCO^drops")); else LOG_INFO(strcat("^3", "drops", " ^7", _("Number of flag drops"))); + case "elo": if (!mode) return CTX(_("SCO^elo")); else LOG_INFO(strcat("^3", "elo", " ^7", _("Player ELO"))); + case "fastest": if (!mode) return CTX(_("SCO^fastest")); else LOG_INFO(strcat("^3", "fastest", " ^7", _("Time of fastest lap (Race/CTS)"))); + case "faults": if (!mode) return CTX(_("SCO^faults")); else LOG_INFO(strcat("^3", "faults", " ^7", _("Number of faults committed"))); + case "fckills": if (!mode) return CTX(_("SCO^fckills")); else LOG_INFO(strcat("^3", "fckills", " ^7", _("Number of flag carrier kills"))); + case "fps": if (!mode) return CTX(_("SCO^fps")); else LOG_INFO(strcat("^3", "fps", " ^7", _("FPS"))); + case "frags": if (!mode) return CTX(_("SCO^frags")); else LOG_INFO(strcat("^3", "frags", " ^7", _("Number of kills minus suicides"))); + case "goals": if (!mode) return CTX(_("SCO^goals")); else LOG_INFO(strcat("^3", "goals", " ^7", _("Number of goals scored"))); + case "kckills": if (!mode) return CTX(_("SCO^kckills")); else LOG_INFO(strcat("^3", "kckills", " ^7", _("Number of keys carrier kills"))); + case "kd": if (!mode) return CTX(_("SCO^k/d")); else LOG_INFO(strcat("^3", "kd", " ^7", _("The kill-death ratio"))); + case "kdr": if (!mode) return CTX(_("SCO^kdr")); else LOG_INFO(strcat("^3", "kdr", " ^7", _("The kill-death ratio"))); + case "kdratio": if (!mode) return CTX(_("SCO^kdratio")); else LOG_INFO(strcat("^3", "kdratio", " ^7", _("The kill-death ratio"))); + case "kills": if (!mode) return CTX(_("SCO^kills")); else LOG_INFO(strcat("^3", "kills", " ^7", _("Number of kills"))); + case "laps": if (!mode) return CTX(_("SCO^laps")); else LOG_INFO(strcat("^3", "laps", " ^7", _("Number of laps finished (Race/CTS)"))); + case "lives": if (!mode) return CTX(_("SCO^lives")); else LOG_INFO(strcat("^3", "lives", " ^7", _("Number of lives (LMS)"))); + case "losses": if (!mode) return CTX(_("SCO^losses")); else LOG_INFO(strcat("^3", "losses", " ^7", _("Number of times a key was lost"))); + case "name": if (!mode) return CTX(_("SCO^name")); else LOG_INFO(strcat("^3", "name", " ^7", _("Player name"))); + case "nick": if (!mode) return CTX(_("SCO^nick")); else LOG_INFO(strcat("^3", "nick", " ^7", _("Player name"))); + case "objectives": if (!mode) return CTX(_("SCO^objectives")); else LOG_INFO(strcat("^3", "objectives", " ^7", _("Number of objectives destroyed"))); + case "pickups": if (!mode) return CTX(_("SCO^pickups")); else LOG_INFO(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_INFO(strcat("^3", "ping", " ^7", _("Ping time"))); + case "pl": if (!mode) return CTX(_("SCO^pl")); else LOG_INFO(strcat("^3", "pl", " ^7", _("Packet loss"))); + case "pushes": if (!mode) return CTX(_("SCO^pushes")); else LOG_INFO(strcat("^3", "pushes", " ^7", _("Number of players pushed into void"))); + case "rank": if (!mode) return CTX(_("SCO^rank")); else LOG_INFO(strcat("^3", "rank", " ^7", _("Player rank"))); + case "returns": if (!mode) return CTX(_("SCO^returns")); else LOG_INFO(strcat("^3", "returns", " ^7", _("Number of flag returns"))); + case "revivals": if (!mode) return CTX(_("SCO^revivals")); else LOG_INFO(strcat("^3", "revivals", " ^7", _("Number of revivals"))); + case "rounds": if (!mode) return CTX(_("SCO^rounds won")); else LOG_INFO(strcat("^3", "rounds", " ^7", _("Number of rounds won"))); + case "score": if (!mode) return CTX(_("SCO^score")); else LOG_INFO(strcat("^3", "score", " ^7", _("Total score"))); + case "suicides": if (!mode) return CTX(_("SCO^suicides")); else LOG_INFO(strcat("^3", "suicides", " ^7", _("Number of suicides"))); + case "sum": if (!mode) return CTX(_("SCO^sum")); else LOG_INFO(strcat("^3", "sum", " ^7", _("Number of kills minus deaths"))); + case "takes": if (!mode) return CTX(_("SCO^takes")); else LOG_INFO(strcat("^3", "takes", " ^7", _("Number of domination points taken (Domination)"))); + case "teamkills": if (!mode) return CTX(_("SCO^teamkills")); else LOG_INFO(strcat("^3", "teamkills", " ^7", _("Number of teamkills"))); + case "ticks": if (!mode) return CTX(_("SCO^ticks")); else LOG_INFO(strcat("^3", "ticks", " ^7", _("Number of ticks (Domination)"))); + case "time": if (!mode) return CTX(_("SCO^time")); else LOG_INFO(strcat("^3", "time", " ^7", _("Total time raced (Race/CTS)"))); + default: return label; } + return label; } +void PrintScoresLabels() { Label_getInfo(string_null, 1); } +string TranslateScoresLabel(string label) { return Label_getInfo(label, 0); } + void Scoreboard_InitScores() { int i, f; @@ -150,7 +164,6 @@ void Scoreboard_InitScores() Cmd_Scoreboard_SetFields(0); } -float SetTeam(entity pl, float Team); //float lastpnum; void Scoreboard_UpdatePlayerTeams() { @@ -179,7 +192,7 @@ void Scoreboard_UpdatePlayerTeams() int Scoreboard_CompareScore(int vl, int vr, int f) { - TC(int, vl); TC(int, vr); TC(int, f); + TC(int, vl); TC(int, vr); TC(int, f); if(f & SFL_ZERO_IS_WORST) { if(vl == 0 && vr != 0) @@ -298,47 +311,16 @@ void Cmd_Scoreboard_Help() { LOG_INFO(_("You can modify the scoreboard using the ^2scoreboard_columns_set command.")); LOG_INFO(_("Usage:")); - LOG_INFO("^2scoreboard_columns_set default"); - LOG_INFO(_("^2scoreboard_columns_set ^7field1 field2 ...")); + LOG_INFO("^2scoreboard_columns_set ^3default"); + LOG_INFO(_("^2scoreboard_columns_set ^3field1 field2 ...")); + LOG_INFO(_("^2scoreboard_columns_set ^7without arguments reads the arguments from the cvar scoreboard_columns")); + LOG_INFO(_(" ^5Note: ^7scoreboard_columns_set without arguments is executed on every map start")); + LOG_INFO(_("^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands it into the cvar scoreboard_columns so you can edit it")); LOG_INFO(_("You can use a ^3|^7 to start the right-aligned fields.")); LOG_INFO(_("The following field names are recognized (case insensitive):")); LOG_INFO(""); - LOG_INFO(strcat("^3name^7 ", _("Name of a player"))); - LOG_INFO(strcat("^3nick^7 ", _("Name of a player"))); - LOG_INFO(strcat("^3ping^7 ", _("Ping time"))); - LOG_INFO(strcat("^3pl^7 ", _("Packet loss"))); - LOG_INFO(strcat("^3elo^7 ", _("Player ELO"))); - LOG_INFO(strcat("^3fps^7 ", _("Player FPS"))); - LOG_INFO(strcat("^3kills^7 ", _("Number of kills"))); - LOG_INFO(strcat("^3deaths^7 ", _("Number of deaths"))); - LOG_INFO(strcat("^3suicides^7 ", _("Number of suicides"))); - LOG_INFO(strcat("^3frags^7 ", _("kills - suicides"))); - LOG_INFO(strcat("^3teamkills^7 ", _("Number of teamkills"))); - LOG_INFO(strcat("^3kd^7 ", _("The kill-death ratio"))); - LOG_INFO(strcat("^3dmg^7 ", _("The total damage done"))); - LOG_INFO(strcat("^3dmgtaken^7 ", _("The total damage taken"))); - LOG_INFO(strcat("^3sum^7 ", _("kills - deaths"))); - LOG_INFO(strcat("^3caps^7 ", _("How often a flag (CTF) or a key (KeyHunt) was captured"))); - LOG_INFO(strcat("^3pickups^7 ", _("How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up"))); - LOG_INFO(strcat("^3captime^7 ", _("Time of fastest cap (CTF)"))); - LOG_INFO(strcat("^3fckills^7 ", _("Number of flag carrier kills"))); - LOG_INFO(strcat("^3returns^7 ", _("Number of flag returns"))); - LOG_INFO(strcat("^3drops^7 ", _("Number of flag drops"))); - LOG_INFO(strcat("^3lives^7 ", _("Number of lives (LMS)"))); - LOG_INFO(strcat("^3rank^7 ", _("Player rank"))); - LOG_INFO(strcat("^3pushes^7 ", _("Number of players pushed into void"))); - LOG_INFO(strcat("^3destroyed^7 ", _("Number of keys destroyed by pushing them into void"))); - LOG_INFO(strcat("^3kckills^7 ", _("Number of keys carrier kills"))); - LOG_INFO(strcat("^3losses^7 ", _("Number of times a key was lost"))); - LOG_INFO(strcat("^3laps^7 ", _("Number of laps finished (race/cts)"))); - LOG_INFO(strcat("^3time^7 ", _("Total time raced (race/cts)"))); - LOG_INFO(strcat("^3fastest^7 ", _("Time of fastest lap (race/cts)"))); - LOG_INFO(strcat("^3ticks^7 ", _("Number of ticks (DOM)"))); - LOG_INFO(strcat("^3takes^7 ", _("Number of domination points taken (DOM)"))); - LOG_INFO(strcat("^3bckills^7 ", _("Number of ball carrier kills"))); - LOG_INFO(strcat("^3bctime^7 ", _("Total amount of time holding the ball in Keepaway"))); - LOG_INFO(strcat("^3score^7 ", _("Total score"))); + PrintScoresLabels(); LOG_INFO(""); LOG_INFO(_("Before a field you can put a + or - sign, then a comma separated list\n" @@ -382,7 +364,7 @@ void Cmd_Scoreboard_Help() void Cmd_Scoreboard_SetFields(int argc) { - TC(int, argc); + TC(int, argc); int i, slash; string str, pattern; bool have_name = false, have_primary = false, have_secondary = false, have_separator = false; @@ -405,8 +387,12 @@ void Cmd_Scoreboard_SetFields(int argc) if(argc == 3) { - if(argv(2) == "default") + if(argv(2) == "default" || argv(2) == "expand_default") + { + if(argv(2) == "expand_default") + cvar_set("scoreboard_columns", SCOREBOARD_DEFAULT_COLUMNS); argc = tokenizebyseparator(strcat("0 1 ", SCOREBOARD_DEFAULT_COLUMNS), " "); + } else if(argv(2) == "all") { string s = "ping pl name |"; // scores without a label @@ -448,8 +434,7 @@ void Cmd_Scoreboard_SetFields(int argc) continue; } - strunzone(sbt_field_title[sbt_num_fields]); - sbt_field_title[sbt_num_fields] = strzone(TranslateScoresLabel(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); str = strtolower(str); @@ -540,8 +525,7 @@ LABEL(found) } else if(!have_separator) { - strunzone(sbt_field_title[sbt_num_fields]); - sbt_field_title[sbt_num_fields] = strzone("|"); + 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; @@ -549,8 +533,7 @@ LABEL(found) } if(!have_secondary) { - strunzone(sbt_field_title[sbt_num_fields]); - sbt_field_title[sbt_num_fields] = strzone(TranslateScoresLabel(scores_label(ps_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; @@ -558,8 +541,7 @@ LABEL(found) } if(!have_primary) { - strunzone(sbt_field_title[sbt_num_fields]); - sbt_field_title[sbt_num_fields] = strzone(TranslateScoresLabel(scores_label(ps_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; @@ -597,6 +579,7 @@ string Scoreboard_GetName(entity pl) } return entcs_GetName(pl.sv_entnum); } + string Scoreboard_GetField(entity pl, PlayerScoreField field) { float tmp, num, denom; @@ -613,7 +596,7 @@ string Scoreboard_GetField(entity pl, PlayerScoreField field) { case SP_PING: if (!pl.gotscores) - return "\xE2\x96\xB6\xE2\x96\xB6\xE2\x96\xB6"; // >>> sign using U+25B6 + return "\xE2\x96\xB6\xE2\x96\xB6\xE2\x96\xB6"; // >>> sign using U+25B6 (Black Right-Pointing Triangle) //str = getplayerkeyvalue(pl.sv_entnum, "ping"); f = pl.ping; if(f == 0) @@ -717,7 +700,7 @@ float sbt_fixcolumnwidth_marginlen; string Scoreboard_FixColumnWidth(int i, string str) { - TC(int, i); + TC(int, i); float f; vector sz; @@ -841,9 +824,9 @@ vector Scoreboard_DrawHeader(vector pos, vector rgb, bool other_players) void Scoreboard_DrawItem(vector item_pos, vector rgb, entity pl, bool is_self, int pl_number) { - TC(bool, is_self); TC(int, pl_number); + TC(bool, is_self); TC(int, pl_number); string str; - bool is_spec = (entcs_GetTeam(pl.sv_entnum) == NUM_SPECTATOR); + bool is_spec = (entcs_GetSpecState(pl.sv_entnum) == ENTCS_SPEC_PURE); vector h_pos = item_pos; vector h_size = vec2(panel_size.x, hud_fontsize.y * 1.25); @@ -856,6 +839,10 @@ void Scoreboard_DrawItem(vector item_pos, vector rgb, entity pl, bool is_self, i float fg_alpha = (is_self ? sbt_fg_alpha_self : sbt_fg_alpha); vector pos = item_pos; + // put a "self indicator" beside the self row, unicode U+25C0 (black left-pointing triangle) + if (is_self) + drawstring(pos+eX*(panel_size.x+.5*hud_fontsize.x)+eY, "\xE2\x97\x80", vec2(hud_fontsize.x, hud_fontsize.y), rgb, panel_fg_alpha, DRAWFLAG_NORMAL); + pos.x += hud_fontsize.x * 0.5; pos.y += (1.25 - 1) / 2 * hud_fontsize.y; // center text vertically vector tmp = '0 0 0'; @@ -1026,6 +1013,12 @@ vector Scoreboard_DrawOthers(vector item_pos, vector rgb, int this_team, entity field_pos.x += fieldpadding + (max(fieldsize, min_fieldsize) - fieldsize) * 0.5; drawstring(field_pos, field, hud_fontsize, sbt_field_rgb, sbt_fg_alpha, DRAWFLAG_NORMAL); } + if(pl.eliminated) + { + 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, '0 0 0', 0.5 * panel_fg_alpha, DRAWFLAG_NORMAL); + } pos.x += column_width; pos.x += hud_fontsize.x; } @@ -1060,7 +1053,7 @@ vector Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size) panel_size.y += panel_bg_padding * 2; HUD_Panel_DrawBg(); - vector end_pos = panel_pos + eY * (panel_size.y + hud_fontsize.y); + vector end_pos = panel_pos + eY * (panel_size.y + 0.5* hud_fontsize.y); if(panel.current_panel_bg != "0") end_pos.y += panel_bg_border * 2; @@ -1137,8 +1130,11 @@ bool Scoreboard_WouldDraw() return true; else if (intermission == 2) return false; - else if (spectatee_status != -1 && STAT(HEALTH) <= 0 && autocvar_cl_deathscoreboard && gametype != MAPINFO_TYPE_CTS && !active_minigame) + else if (spectatee_status != -1 && STAT(HEALTH) <= 0 && autocvar_cl_deathscoreboard && !ISGAMETYPE(CTS) + && (!HUD_MinigameMenu_IsOpened() || !active_minigame)) + { return true; + } else if (scoreboard_showscores_force) return true; return false; @@ -1147,6 +1143,15 @@ bool Scoreboard_WouldDraw() float average_accuracy; vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) { + if (frametime) + { + if (scoreboard_fade_alpha == 1) + scoreboard_acc_fade_alpha = min(1, scoreboard_acc_fade_alpha + frametime * 10); + else + scoreboard_acc_fade_alpha = 1; // sync fading with the scoreboard + } + vector initial_pos = pos; + WepSet weapons_stat = WepSet_GetFromStat(); WepSet weapons_inmap = WepSet_GetFromStat_InMap(); int disownedcnt = 0; @@ -1162,7 +1167,7 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) } if (weapon_stats < 0 && !((weapons_stat & set) || (weapons_inmap & set))) { - if (((it.spawnflags & WEP_FLAG_HIDDEN) || (it.spawnflags & WEP_FLAG_MUTATORBLOCKED))) + if (it.spawnflags & (WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_SPECIALATTACK)) ++nHidden; else ++disownedcnt; @@ -1180,7 +1185,7 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) float weapon_height = 29; float height = hud_fontsize.y + weapon_height; - drawstring(pos + eX * panel_bg_padding, sprintf(_("Accuracy stats (average %d%%)"), average_accuracy), hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + 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; if(panel.current_panel_bg != "0") pos.y += panel_bg_border; @@ -1188,7 +1193,11 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) panel_pos = pos; panel_size.y = height * rows; panel_size.y += panel_bg_padding * 2; + + float panel_bg_alpha_save = panel_bg_alpha; + panel_bg_alpha *= scoreboard_acc_fade_alpha; HUD_Panel_DrawBg(); + panel_bg_alpha = panel_bg_alpha_save; vector end_pos = panel_pos + eY * (panel_size.y + hud_fontsize.y); if(panel.current_panel_bg != "0") @@ -1206,18 +1215,18 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) float weapon_width = tmp.x / columnns / rows; if (sbt_bg_alpha) - drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb, sbt_bg_alpha, DRAWFLAG_NORMAL); + drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb, sbt_bg_alpha * scoreboard_acc_fade_alpha, DRAWFLAG_NORMAL); if(sbt_highlight) { // column highlighting for (int i = 0; i < columnns; ++i) if ((i % 2) == 0) - drawfill(pos + eX * weapon_width * rows * i, vec2(weapon_width * rows, height * rows), '0 0 0', sbt_highlight_alpha, DRAWFLAG_NORMAL); + 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); // row highlighting for (int i = 0; i < rows; ++i) - drawfill(pos + eY * (weapon_height + height * i), vec2(tmp.x, hud_fontsize.y), rgb, sbt_highlight_alpha, DRAWFLAG_NORMAL); + drawfill(pos + eY * (weapon_height + height * i), vec2(tmp.x, hud_fontsize.y), rgb, sbt_highlight_alpha * scoreboard_acc_fade_alpha, DRAWFLAG_NORMAL); } average_accuracy = 0; @@ -1250,7 +1259,7 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) weapon_alpha = 0.2 * sbt_fg_alpha; // weapon icon - drawpic_aspect_skin(tmpos, it.model2, vec2(weapon_width, weapon_height), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(tmpos, it.model2, vec2(weapon_width, weapon_height), '1 1 1', weapon_alpha * scoreboard_acc_fade_alpha, DRAWFLAG_NORMAL); // the accuracy if (weapon_stats >= 0) { weapons_with_stats += 1; @@ -1265,7 +1274,7 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) if(!autocvar_hud_panel_scoreboard_accuracy_nocolors) rgb = Accuracy_GetColor(weapon_stats); - drawstring(tmpos + vec2(padding, weapon_height), s, hud_fontsize, rgb, sbt_fg_alpha, DRAWFLAG_NORMAL); + drawstring(tmpos + vec2(padding, weapon_height), s, hud_fontsize, rgb, sbt_fg_alpha * scoreboard_acc_fade_alpha, DRAWFLAG_NORMAL); } tmpos.x += weapon_width * rows; pos.x += weapon_width * rows; @@ -1281,7 +1290,10 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) average_accuracy = floor((average_accuracy * 100 / weapons_with_stats) + 0.5); panel_size.x += panel_bg_padding * 2; // restore initial width - return end_pos; + + if (scoreboard_acc_fade_alpha == 1) + return end_pos; + return initial_pos + (end_pos - initial_pos) * scoreboard_acc_fade_alpha; } vector MapStats_DrawKeyValue(vector pos, string key, string value) { @@ -1380,7 +1392,7 @@ vector Scoreboard_Rankings_Draw(vector pos, entity pl, vector rgb, vector bg_siz vector hl_rgb = rgb + '0.5 0.5 0.5'; pos.y += hud_fontsize.y; - drawstring(pos + eX * panel_bg_padding, ((gametype == MAPINFO_TYPE_CTF) ? _("Capture time rankings") : _("Rankings")), hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring(pos + eX * panel_bg_padding, ((ISGAMETYPE(CTF)) ? _("Capture time rankings") : _("Rankings")), 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; @@ -1435,6 +1447,7 @@ vector Scoreboard_Rankings_Draw(vector pos, entity pl, vector rgb, vector bg_siz vector text_ofs = vec2(0.5 * hud_fontsize.x, (1.25 - 1) / 2 * hud_fontsize.y); // center text vertically 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) { float t; @@ -1442,7 +1455,7 @@ vector Scoreboard_Rankings_Draw(vector pos, entity pl, vector rgb, vector bg_siz if (t == 0) continue; - if(strdecolorize(grecordholder[i]) == strdecolorize(entcs_GetName(player_localnum))) + 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) drawfill(pos, columnsize, hl_rgb, sbt_highlight_alpha, DRAWFLAG_NORMAL); @@ -1465,11 +1478,45 @@ vector Scoreboard_Rankings_Draw(vector pos, entity pl, vector rgb, vector bg_siz pos.y = panel_pos.y; } } + strfree(zoned_name_self); 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) +{ + if (ISGAMETYPE(CTS) || ISGAMETYPE(RACE) || ISGAMETYPE(NEXBALL)) + return false; + if (!autocvar_hud_panel_scoreboard_accuracy || warmup_stage || ypos > 0.91 * vid_conheight) + return false; + + if (time < scoreboard_time + autocvar_hud_panel_scoreboard_accuracy_showdelay + && ypos > autocvar_hud_panel_scoreboard_accuracy_showdelay_minpos * vid_conheight + && !intermission) + { + return false; + } + + if (!have_weapon_stats) + { + FOREACH(Weapons, it != WEP_Null, { + int weapon_stats = weapon_accuracy[i - WEP_FIRST]; + if (weapon_stats >= 0) + { + have_weapon_stats = true; + break; + } + }); + if (!have_weapon_stats) + return false; + } + + return true; +} + void Scoreboard_Draw() { if(!autocvar__hud_configure) @@ -1478,6 +1525,8 @@ void Scoreboard_Draw() // frametime checks allow to toggle the scoreboard even when the game is paused if(scoreboard_active) { + if (scoreboard_fade_alpha < 1) + scoreboard_time = time; if(hud_configure_menu_open == 1) scoreboard_fade_alpha = 1; float scoreboard_fadeinspeed = autocvar_hud_panel_scoreboard_fadeinspeed; @@ -1489,9 +1538,7 @@ void Scoreboard_Draw() { hud_fontsize = HUD_GetFontsize("hud_fontsize"); Scoreboard_initFieldSizes(); - if(hud_fontsize_str) - strunzone(hud_fontsize_str); - hud_fontsize_str = strzone(autocvar_hud_fontsize); + strcpy(hud_fontsize_str, autocvar_hud_fontsize); } } else { @@ -1503,7 +1550,10 @@ void Scoreboard_Draw() } if (!scoreboard_fade_alpha) + { + scoreboard_acc_fade_alpha = 0; return; + } } else scoreboard_fade_alpha = 0; @@ -1541,14 +1591,76 @@ void Scoreboard_Draw() string str; vector str_pos; - // Heading - vector sb_heading_fontsize; - sb_heading_fontsize = hud_fontsize * 2; + vector sb_gameinfo_type_fontsize, sb_gameinfo_detail_fontsize; + + // Begin of Game Info Section + sb_gameinfo_type_fontsize = hud_fontsize * 2.5; + sb_gameinfo_detail_fontsize = hud_fontsize * 1.3; + + // Game Info: Game Type + str = MapInfo_Type_ToText(gametype); draw_beginBoldFont(); - drawstring(pos + eX * panel_bg_padding, _("Scoreboard"), sb_heading_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + 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_heading_fontsize.y; + // Game Info: Game Detail + float tl, fl, ll; + str = ""; // optionally "^7Limits: " + tl = STAT(TIMELIMIT); + fl = STAT(FRAGLIMIT); + ll = STAT(LEADLIMIT); + if(tl > 0) + str = strcat(str, sprintf(_("^3%1.0f minutes"), tl)); + if(!ISGAMETYPE(LMS)) + { + 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") ? CTX(_("SCO^is beaten")) : + 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") ? CTX(_("SCO^is beaten")) : + TranslateScoresLabel(scores_label(ps_primary)))); + } + } + if(ll > 0) + { + if(tl > 0 || fl > 0) + str = strcat(str, "^7 / "); // delimiter + if(teamplay) + { + 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") ? CTX(_("SCO^is beaten")) : + TranslateScoresLabel(teamscores_label(ts_primary)))); + } + else + { + 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") ? CTX(_("SCO^is beaten")) : + TranslateScoresLabel(scores_label(ps_primary)))); + } + } + } + + 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(panel.current_panel_bg != "0") pos.y += panel_bg_border; @@ -1561,9 +1673,40 @@ void Scoreboard_Draw() if(teamplay) { vector panel_bg_color_save = panel_bg_color; - vector team_score_baseoffset = eY * hud_fontsize.y - eX * hud_fontsize.x * 0.5; - if(panel.current_panel_bg != "0") - team_score_baseoffset.x -= panel_bg_border; + vector team_score_baseoffset; + vector team_size_baseoffset; + if (autocvar_hud_panel_scoreboard_team_size_position != 1) // team size not on left + { + // put team score to the left of scoreboard (and team size to the right) + team_score_baseoffset = eY * hud_fontsize.y - eX * hud_fontsize.x * 0.5; + team_size_baseoffset = eY * hud_fontsize.y + eX * hud_fontsize.x * 0.5; + if(panel.current_panel_bg != "0") + { + team_score_baseoffset.x -= panel_bg_border; + team_size_baseoffset.x += panel_bg_border; + } + } + else + { + // put team score to the right of scoreboard (and team size to the left) + team_score_baseoffset = eY * hud_fontsize.y + eX * hud_fontsize.x * 0.5; + team_size_baseoffset = eY * hud_fontsize.y - eX * hud_fontsize.x * 0.5; + if(panel.current_panel_bg != "0") + { + team_score_baseoffset.x += panel_bg_border; + team_size_baseoffset.x -= panel_bg_border; + } + } + + int team_size_total = 0; + if (autocvar_hud_panel_scoreboard_team_size_position != 0) // team size not off + { + // calculate team size total (sum of all team sizes) + for(tm = teams.sort_next; tm; tm = tm.sort_next) + if(tm.team != NUM_SPECTATOR) + team_size_total += tm.team_size; + } + for(tm = teams.sort_next; tm; tm = tm.sort_next) { if(tm.team == NUM_SPECTATOR) @@ -1574,13 +1717,56 @@ void Scoreboard_Draw() draw_beginBoldFont(); vector rgb = Team_ColorRGB(tm.team); str = ftos(tm.(teamscores(ts_primary))); - str_pos = pos + team_score_baseoffset - eX * stringwidth(str, false, hud_fontsize * 1.5); + if (autocvar_hud_panel_scoreboard_team_size_position != 1) // team size not on left + { + // team score on the left (default) + str_pos = pos + team_score_baseoffset - eX * stringwidth(str, false, hud_fontsize * 1.5); + } + else + { + // team score on the right + str_pos = pos + team_score_baseoffset + eX * (panel_size.x + hud_fontsize.x * 1.5); + } drawstring(str_pos, str, hud_fontsize * 1.5, rgb, panel_fg_alpha, DRAWFLAG_NORMAL); + // team size (if set to show on the side) + if (autocvar_hud_panel_scoreboard_team_size_position != 0) // team size not off + { + // calculate the starting position for the whole team size info string + str = sprintf("%d/%d", tm.team_size, team_size_total); + if (autocvar_hud_panel_scoreboard_team_size_position == 1) + { + // team size on the left + str_pos = pos + team_size_baseoffset - eX * stringwidth(str, false, hud_fontsize * 1.5); + } + else + { + // team size on the right + str_pos = pos + team_size_baseoffset + eX * (panel_size.x + hud_fontsize.x * 1.5); + } + str = sprintf("%d", tm.team_size); + drawstring(str_pos, str, hud_fontsize * 1.5, rgb, panel_fg_alpha, DRAWFLAG_NORMAL); + str_pos += eX * stringwidth(str, true, hud_fontsize * 1.5) + eY * hud_fontsize.y * .5; + str = sprintf("/%d", team_size_total); + drawstring(str_pos, str, hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + } + + + // secondary score, e.g. keyhunt if(ts_primary != ts_secondary) { str = ftos(tm.(teamscores(ts_secondary))); - str_pos = pos + team_score_baseoffset - vec2(stringwidth(str, false, hud_fontsize), hud_fontsize.y * 1.5); + if (autocvar_hud_panel_scoreboard_team_size_position != 1) // team size not on left + { + // left + str_pos = pos + team_score_baseoffset - vec2(stringwidth(str, false, hud_fontsize), hud_fontsize.y * -1.5); + } + else + { + // right + str_pos = pos + team_score_baseoffset + vec2(panel_size.x + hud_fontsize.x * 1.5, hud_fontsize.y * 1.5); + } + drawstring(str_pos, str, hud_fontsize, rgb, panel_fg_alpha, DRAWFLAG_NORMAL); } draw_endBoldFont(); @@ -1599,16 +1785,15 @@ void Scoreboard_Draw() for(tm = teams.sort_next; tm; tm = tm.sort_next) if(tm.team != NUM_SPECTATOR) break; + // display it anyway pos = Scoreboard_MakeTable(pos, tm, panel_bg_color, bg_size); } - bool show_accuracy = (gametype != MAPINFO_TYPE_CTS && gametype != MAPINFO_TYPE_RACE && gametype != MAPINFO_TYPE_NEXBALL); - - if (show_accuracy && autocvar_hud_panel_scoreboard_accuracy && !warmup_stage) + if (Scoreboard_AccuracyStats_WouldDraw(pos.y)) pos = Scoreboard_AccuracyStats_Draw(pos, panel_bg_color, bg_size); - if(gametype == MAPINFO_TYPE_CTS || gametype == MAPINFO_TYPE_RACE || (autocvar_hud_panel_scoreboard_ctf_leaderboard && gametype == MAPINFO_TYPE_CTF && STAT(CTF_SHOWLEADERBOARD))) { + if(ISGAMETYPE(CTS) || ISGAMETYPE(RACE) || (autocvar_hud_panel_scoreboard_ctf_leaderboard && ISGAMETYPE(CTF) && STAT(CTF_SHOWLEADERBOARD))) { 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; @@ -1643,63 +1828,6 @@ void Scoreboard_Draw() } } - // Print info string - float tl, fl, ll; - str = sprintf(_("playing ^3%s^7 on ^2%s^7"), MapInfo_Type_ToText(gametype), shortmapname); - tl = STAT(TIMELIMIT); - fl = STAT(FRAGLIMIT); - ll = STAT(LEADLIMIT); - if(gametype == MAPINFO_TYPE_LMS) - { - if(tl > 0) - str = strcat(str, sprintf(_(" for up to ^1%1.0f minutes^7"), tl)); - } - else - { - if(tl > 0) - str = strcat(str, sprintf(_(" for up to ^1%1.0f minutes^7"), tl)); - if(fl > 0) - { - if(tl > 0) - str = strcat(str, _(" or")); - if(teamplay) - { - str = strcat(str, sprintf(_(" until ^3%s %s^7"), ScoreString(teamscores_flags(ts_primary), fl), - (teamscores_label(ts_primary) == "score") ? CTX(_("SCO^points")) : - (teamscores_label(ts_primary) == "fastest") ? CTX(_("SCO^is beaten")) : - TranslateScoresLabel(teamscores_label(ts_primary)))); - } - else - { - str = strcat(str, sprintf(_(" until ^3%s %s^7"), ScoreString(scores_flags(ps_primary), fl), - (scores_label(ps_primary) == "score") ? CTX(_("SCO^points")) : - (scores_label(ps_primary) == "fastest") ? CTX(_("SCO^is beaten")) : - TranslateScoresLabel(scores_label(ps_primary)))); - } - } - if(ll > 0) - { - if(tl > 0 || fl > 0) - str = strcat(str, _(" or")); - if(teamplay) - { - str = strcat(str, sprintf(_(" until a lead of ^3%s %s^7"), ScoreString(teamscores_flags(ts_primary), ll), - (teamscores_label(ts_primary) == "score") ? CTX(_("SCO^points")) : - (teamscores_label(ts_primary) == "fastest") ? CTX(_("SCO^is beaten")) : - TranslateScoresLabel(teamscores_label(ts_primary)))); - } - else - { - str = strcat(str, sprintf(_(" until a lead of ^3%s %s^7"), ScoreString(scores_flags(ps_primary), ll), - (scores_label(ps_primary) == "score") ? CTX(_("SCO^points")) : - (scores_label(ps_primary) == "fastest") ? CTX(_("SCO^is beaten")) : - TranslateScoresLabel(scores_label(ps_primary)))); - } - } - } - - pos.y += 1.2 * hud_fontsize.y; - drawcolorcodedstring(pos + '0.5 0 0' * (panel_size.x - stringwidth(str, true, hud_fontsize)), str, hud_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); // print information about respawn status float respawn_time = STAT(RESPAWN_TIME);