X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fscoreboard.qc;h=96d30aa52ce8559e6c4cc7dc234d74a44f2e9a99;hb=89f405ba71d1c354dca27a0af246f04fb9ec42e6;hp=3a11bdb1e7f0085aba298ff439644428dfc7e253;hpb=e57fd111a3279a4aa4789e2c72f9c819a56c7be9;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 3a11bdb1e..96d30aa52 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -96,6 +96,7 @@ string TranslateScoresLabel(string l) 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")); @@ -295,62 +296,66 @@ void Scoreboard_UpdateTeamPos(entity Team) void Cmd_Scoreboard_Help() { - LOG_INFO(_("You can modify the scoreboard using the ^2scoreboard_columns_set command.\n")); - LOG_INFO(_("^3|---------------------------------------------------------------|\n")); - LOG_INFO(_("Usage:\n")); - LOG_INFO(_("^2scoreboard_columns_set default\n")); - LOG_INFO(_("^2scoreboard_columns_set ^7field1 field2 ...\n")); - LOG_INFO(_("The following field names are recognized (case insensitive):\n")); - LOG_INFO(_("You can use a ^3|^7 to start the right-aligned fields.\n")); - LOG_INFO("\n"); - - LOG_INFO(_("^3name^7 or ^3nick^7 Name of a player\n")); - LOG_INFO(_("^3ping^7 Ping time\n")); - LOG_INFO(_("^3pl^7 Packet loss\n")); - LOG_INFO(_("^3elo^7 Player ELO\n")); - LOG_INFO(_("^3kills^7 Number of kills\n")); - LOG_INFO(_("^3deaths^7 Number of deaths\n")); - LOG_INFO(_("^3suicides^7 Number of suicides\n")); - LOG_INFO(_("^3frags^7 kills - suicides\n")); - LOG_INFO(_("^3kd^7 The kill-death ratio\n")); - LOG_INFO(_("^3dmg^7 The total damage done\n")); - LOG_INFO(_("^3dmgtaken^7 The total damage taken\n")); - LOG_INFO(_("^3sum^7 frags - deaths\n")); - LOG_INFO(_("^3caps^7 How often a flag (CTF) or a key (KeyHunt) was captured\n")); - LOG_INFO(_("^3pickups^7 How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up\n")); - LOG_INFO(_("^3captime^7 Time of fastest cap (CTF)\n")); - LOG_INFO(_("^3fckills^7 Number of flag carrier kills\n")); - LOG_INFO(_("^3returns^7 Number of flag returns\n")); - LOG_INFO(_("^3drops^7 Number of flag drops\n")); - LOG_INFO(_("^3lives^7 Number of lives (LMS)\n")); - LOG_INFO(_("^3rank^7 Player rank\n")); - LOG_INFO(_("^3pushes^7 Number of players pushed into void\n")); - LOG_INFO(_("^3destroyed^7 Number of keys destroyed by pushing them into void\n")); - LOG_INFO(_("^3kckills^7 Number of keys carrier kills\n")); - LOG_INFO(_("^3losses^7 Number of times a key was lost\n")); - LOG_INFO(_("^3laps^7 Number of laps finished (race/cts)\n")); - LOG_INFO(_("^3time^7 Total time raced (race/cts)\n")); - LOG_INFO(_("^3fastest^7 Time of fastest lap (race/cts)\n")); - LOG_INFO(_("^3ticks^7 Number of ticks (DOM)\n")); - LOG_INFO(_("^3takes^7 Number of domination points taken (DOM)\n")); - LOG_INFO(_("^3bckills^7 Number of ball carrier kills\n")); - LOG_INFO(_("^3bctime^7 Total amount of time holding the ball in Keepaway\n")); - LOG_INFO(_("^3score^7 Total score\n")); - LOG_INFO("\n"); + 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(_("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"))); + LOG_INFO(""); LOG_INFO(_("Before a field you can put a + or - sign, then a comma separated list\n" "of game types, then a slash, to make the field show up only in these\n" "or in all but these game types. You can also specify 'all' as a\n" - "field to show all fields available for the current game mode.\n\n")); + "field to show all fields available for the current game mode.")); + LOG_INFO(""); LOG_INFO(_("The special game type names 'teams' and 'noteams' can be used to\n" - "include/exclude ALL teams/noteams game modes.\n\n")); + "include/exclude ALL teams/noteams game modes.")); + LOG_INFO(""); - LOG_INFO(_("Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4\n")); + LOG_INFO(_("Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4")); LOG_INFO(_("will display name, ping and pl aligned to the left, and the fields\n" - "right of the vertical bar aligned to the right.\n")); + "right of the vertical bar aligned to the right.")); LOG_INFO(_("'field3' will only be shown in CTF, and 'field4' will be shown in all\n" - "other gamemodes except DM.\n")); + "other gamemodes except DM.")); } // NOTE: adding a gametype with ? to not warn for an optional field @@ -358,18 +363,21 @@ void Cmd_Scoreboard_Help() // otherwise the previous exclusive rule warns anyway // e.g. -teams,rc,cts,lms/kills ?+rc/kills #define SCOREBOARD_DEFAULT_COLUMNS \ -"ping pl name |" \ +"ping pl fps name |" \ " -teams,rc,cts,inv,lms/kills +ft,tdm/kills ?+rc,inv/kills" \ " -teams,lms/deaths +ft,tdm/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" \ -" +ctf/caps +ctf/pickups +ctf/fckills +ctf/returns +ons/caps +ons/takes" \ +" +ctf/pickups +ctf/fckills +ctf/returns +ctf/caps +ons/takes +ons/caps" \ " +lms/lives +lms/rank" \ -" +kh/caps +kh/pushes +kh/destroyed" \ +" +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" \ +" +dom/ticks +dom/takes" \ " -lms,rc,cts,inv,nb/score" void Cmd_Scoreboard_SetFields(int argc) @@ -401,8 +409,7 @@ void Cmd_Scoreboard_SetFields(int argc) argc = tokenizebyseparator(strcat("0 1 ", SCOREBOARD_DEFAULT_COLUMNS), " "); else if(argv(2) == "all") { - string s; - s = "ping pl name |"; + string s = "ping pl name |"; // scores without a label FOREACH(Scores, true, { if(it != ps_primary) if(it != ps_secondary) @@ -423,10 +430,8 @@ void Cmd_Scoreboard_SetFields(int argc) for(i = 1; i < argc - 1; ++i) { - float nocomplain; str = argv(i+1); - - nocomplain = false; + bool nocomplain = false; if(substring(str, 0, 1) == "?") { nocomplain = true; @@ -443,8 +448,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); @@ -460,6 +464,7 @@ void Cmd_Scoreboard_SetFields(int argc) case "elo": sbt_field[sbt_num_fields] = SP_ELO; break; case "dmg": case "damage": sbt_field[sbt_num_fields] = SP_DMG; break; case "dmgtaken": case "damagetaken": sbt_field[sbt_num_fields] = SP_DMGTAKEN; break; + case "fps": sbt_field[sbt_num_fields] = SP_FPS; break; default: { FOREACH(Scores, true, { @@ -475,7 +480,7 @@ LABEL(notfound) else { if(!nocomplain) - LOG_INFOF("^1Error:^7 Unknown score field: '%s'\n", str); + LOG_INFOF("^1Error:^7 Unknown score field: '%s'", str); continue; } LABEL(found) @@ -514,7 +519,7 @@ LABEL(found) sbt_field_title[0] = strzone(TranslateScoresLabel("name")); sbt_field[0] = SP_NAME; ++sbt_num_fields; - LOG_INFO("fixed missing field 'name'\n"); + LOG_INFO("fixed missing field 'name'"); if(!have_separator) { @@ -529,35 +534,32 @@ LABEL(found) sbt_field[1] = SP_SEPARATOR; sbt_field_size[1] = stringwidth("|", false, hud_fontsize); ++sbt_num_fields; - LOG_INFO("fixed missing field '|'\n"); + LOG_INFO("fixed missing field '|'"); } } 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; - LOG_INFO("fixed missing field '|'\n"); + LOG_INFO("fixed missing field '|'"); } 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; - LOG_INFOF("fixed missing field '%s'\n", scores_label(ps_secondary)); + LOG_INFOF("fixed missing field '%s'", scores_label(ps_secondary)); } 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; - LOG_INFOF("fixed missing field '%s'\n", scores_label(ps_primary)); + LOG_INFOF("fixed missing field '%s'", scores_label(ps_primary)); } } @@ -675,6 +677,19 @@ string Scoreboard_GetField(entity pl, PlayerScoreField field) } } + case SP_FPS: + { + float fps = pl.(scores(SP_FPS)); + if(fps == 0) + { + sbt_field_rgb = '1 1 1'; + return ((pl.ping == 0) ? _("N/A") : "..."); // if 0 ping, either connecting or bot (either case can't show proper score) + } + //sbt_field_rgb = HUD_Get_Num_Color(fps, 200); + sbt_field_rgb = '1 0 0' + '0 1 1' * (bound(0, fps, 60) / 60); + return ftos(fps); + } + case SP_DMG: case SP_DMGTAKEN: return sprintf("%.1f k", pl.(scores(field)) / 1000); @@ -1136,6 +1151,11 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) int weapon_stats = weapon_accuracy[i - WEP_FIRST]; WepSet set = it.m_wepset; + if(it.spawnflags & WEP_TYPE_OTHER) + { + ++nHidden; + continue; + } if (weapon_stats < 0 && !((weapons_stat & set) || (weapons_inmap & set))) { if (((it.spawnflags & WEP_FLAG_HIDDEN) || (it.spawnflags & WEP_FLAG_MUTATORBLOCKED))) @@ -1216,6 +1236,8 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size) WepSet set = it.m_wepset; if (weapon_stats < 0 && !((weapons_stat & set) || (weapons_inmap & set))) continue; + if (it.spawnflags & WEP_TYPE_OTHER) + continue; float weapon_alpha; if (weapon_stats >= 0) @@ -1463,9 +1485,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 {