From: terencehill Date: Sat, 16 Feb 2019 23:08:47 +0000 (+0000) Subject: Merge branch 'master' into 'master' X-Git-Tag: xonotic-v0.8.5~1600 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=797bf448a96c0c13d783c7c919bb2caf6fa16707;hp=250b1e189a2098732efa511c488e8c765d7ea066 Merge branch 'master' into 'master' Fix crash when g_maxplayers smaller than current amount of active players See merge request xonotic/xonotic-data.pk3dir!637 --- diff --git a/.tx/merge-base b/.tx/merge-base index 6db991ba09..38ac59cba3 100644 --- a/.tx/merge-base +++ b/.tx/merge-base @@ -1 +1 @@ -Tue Jan 15 07:24:12 CET 2019 +Thu Feb 7 07:24:09 CET 2019 diff --git a/_hud_common.cfg b/_hud_common.cfg index 75e8eb8d6f..e31655e258 100644 --- a/_hud_common.cfg +++ b/_hud_common.cfg @@ -186,6 +186,7 @@ seta hud_shownames_crosshairdistance_antioverlap 0 "allow antioverlap to work as seta hud_shownames_self 0 "also include your own name to be shown when third person camera mode is on (chase_active/cl_eventchase)" seta hud_shownames_status 1 "1 = draw health/armor status of teammates" seta hud_shownames_statusbar_height 4 "height of status bar" +seta hud_shownames_statusbar_highlight 1 "Always highlight values of health and armor from 0 to half status bar" seta hud_shownames_aspect 8 "aspect ratio of total drawing area per name" seta hud_shownames_fontsize 12 "font size" seta hud_shownames_decolorize 1 "1 = decolorize name in team games, 2 = decolorize always" diff --git a/commands.cfg b/commands.cfg index 0f2e568925..798104a68c 100644 --- a/commands.cfg +++ b/commands.cfg @@ -117,9 +117,9 @@ alias menu_showquitdialog "menu_cmd directmenu Quit" alias menu_showmonstertools "menu_cmd directmenu MonsterTools" // command executed before loading a map by the menu -// makes sure maxplayers is at least minplayers or bot_number + 1 +// makes sure maxplayers is at least minplayers or minplayers_per_team * 4 or bot_number + 1 alias _menu_loadmap_prepare_maxpl "maxplayers $_menu_loadmap_maxplayers" -alias menu_loadmap_prepare "disconnect; wait; g_campaign 0; menu_cmd rpn /_menu_loadmap_maxplayers menu_maxplayers minplayers bot_number 1 add max max def; _menu_loadmap_prepare_maxpl; g_maplist_shufflenow" +alias menu_loadmap_prepare "disconnect; wait; g_campaign 0; menu_cmd rpn /_menu_loadmap_maxplayers menu_maxplayers minplayers bot_number 1 add max minplayers_per_team 4 mul max max def; _menu_loadmap_prepare_maxpl; g_maplist_shufflenow" // ========================================================== diff --git a/common.ast.po b/common.ast.po index de3a047a2f..68f59eed1a 100644 --- a/common.ast.po +++ b/common.ast.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Asturian (http://www.transifex.com/team-xonotic/xonotic/" "language/ast/)\n" @@ -202,11 +202,11 @@ msgstr "^3CTRL ^7pa deshabilitar comprobación de colisión, ^3SHIFT ^7y" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3TECLES DIREICIONALES ^7p'axustes finos." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "El meyor personal" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "El meyor del sirvidor" @@ -536,332 +536,374 @@ msgstr "^1PENALIZACIÓN: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2PENALIZACIÓN: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "SCO^captures" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^muertes" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "SCO^destruyíu" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "SCO^dmgtaken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" -msgstr "SCO^fallos" - -#: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" -msgstr "SCO^goles" +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "SCO^tasa a/m" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" -msgstr "SCO^a/m" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" +msgstr "SCO^fallos" + #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" -msgstr "SCO^asesinatos" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" -msgstr "SCO^vueltes" +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" -msgstr "SCO^vides" +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" +msgstr "SCO^goles" #: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" -msgstr "SCO^perdes" +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" -msgstr "SCO^nome" +msgid "SCO^k/d" +msgstr "SCO^a/m" +#: qcsrc/client/hud/panel/scoreboard.qc:103 #: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" -msgstr "SCO^nomatu" +msgid "SCO^kdratio" +msgstr "SCO^tasa a/m" #: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" -msgstr "SCO^oxetivos" - -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" -msgstr "SCO^coyíes" - -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" -msgstr "SCO^ping" - -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" -msgstr "SCO^emburrios" - -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" -msgstr "SCO^clasificación" - -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" -msgstr "SCO^devoluciones" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" +msgstr "SCO^asesinatos" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" -msgstr "SCO^rondes ganaes" - -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" -msgstr "SCO^puntuación" - -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "SCO^suicidios" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" +msgstr "SCO^vueltes" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" +msgstr "SCO^vides" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" +msgstr "SCO^perdes" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" +msgstr "SCO^nome" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" +msgstr "SCO^nomatu" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" +msgstr "SCO^oxetivos" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" +msgstr "SCO^coyíes" -#: qcsrc/client/hud/panel/scoreboard.qc:311 +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" +msgstr "SCO^ping" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" +msgstr "SCO^emburrios" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" +msgstr "SCO^clasificación" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" +msgstr "SCO^devoluciones" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" +msgstr "SCO^rondes ganaes" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" +msgstr "SCO^puntuación" + +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "SCO^suicidios" + +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -869,32 +911,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -903,104 +945,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Estadístiques de precisión (promediu %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Estadístiques del mapa:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Monstruos amortiaos:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Secretos alcontraos:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Rangos" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Tabla de puntuaciones" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Espeutadores" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "xugando ^3%s^7 en ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " por más de ^1%1.0f minutos^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " ó" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " fasta ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^puntos" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Remaneciendo en ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Tas muertu, espera ^3%s^7 enantes de remanecer" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Tas muertu, primi ^2%s^7 pa remanecer" @@ -1099,28 +1141,28 @@ msgstr " (%d votos)" msgid "Don't care" msgstr "Nun m'importa" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Decidi'l mou de xuegu" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Vota un mapa" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "Falten %d segundos" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1230,7 +1272,7 @@ msgstr "Fuercia" msgid "Shield" msgstr "Proteición" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5391,6 +5433,7 @@ msgstr "Panel de mensaxes d'información" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5402,6 +5445,7 @@ msgid "Disable" msgstr "Deshabilitar" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5556,6 +5600,11 @@ msgstr "Panel de físiques" msgid "Powerups Panel" msgstr "Panel d'ameyores" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Aspeutu forciáu:" @@ -5576,10 +5625,6 @@ msgstr "Panel del temporizador de carrera" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.be.po b/common.be.po index a4e85954fd..ff071c4db1 100644 --- a/common.be.po +++ b/common.be.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Belarusian (http://www.transifex.com/team-xonotic/xonotic/" "language/be/)\n" @@ -202,11 +202,11 @@ msgstr "^3CTRL ^7каб адключыць тэст калізій, ^3SHIFT ^7і msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3СТРЭЛКІ ^7для дакладнага рэгулявання." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Уласны рэкорд" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Рэкорд сервера" @@ -536,365 +536,407 @@ msgstr "^1ШТРАФ: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2ШТРАФ: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "забойствы" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "час" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "узяцці" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "SCO^час трымання" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^смерці" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "SCO^знішчана" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "SCO^выкіданні" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "SCO^правалы" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "забойствы" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "SCO^галы" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "SCO^kcзабойствы" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "см/заб" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "см/заб" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "см/заб" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "см/заб" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "SCO^забойствы" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "SCO^колы" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "SCO^жыцці" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "SCO^паразы" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "SCO^імя" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "SCO^сума" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "SCO^мянушка" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "SCO^мэты" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "SCO^узяцці" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "SCO^пінг" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "SCO^пз" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "SCO^штуршкі" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "SCO^рэйтынг" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "SCO^вяртанні" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "SCO^адраджэнні" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "SCO^лік" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "SCO^самагубствы" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" -msgstr "SCO^узяцці" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" -msgstr "SCO^цікі" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "SCO^самагубствы" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "SCO^сума" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" +msgstr "SCO^узяцці" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" +msgstr "SCO^цікі" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +msgid "Usage:" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -903,104 +945,104 @@ msgstr "" msgid "N/A" msgstr "Н/Д" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Статыстыка траплянняў (у сярэднім %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Статыстыка мапы:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Пачвар забіта:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Схованак адшукана:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Рэйтынг" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Табло" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Гледачы" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "гуляецца ^3%s^7 на ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " на час ^1%1.0f хвілін^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " ці" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " да ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^пункты" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "SCO^пабіты" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " па дасягненні лідэрства ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Адраджэнне праз ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Вы мёртвы, пачакайце ^3%s^7 да адраджэння" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Вы мёртвы, націсніце ^2%s^7 каб адрадзіцца" @@ -1099,28 +1141,28 @@ msgstr " (%d галасоў)" msgid "Don't care" msgstr "Усё адно" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Абярыце тып гульні" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Галасаванка за мапу" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d секунд засталося" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1230,7 +1272,7 @@ msgstr "Моц" msgid "Shield" msgstr "Панцыр" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Шпулянне Тубай" @@ -5348,6 +5390,7 @@ msgstr "Панэль інфармацыйных паведамленняў" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5359,6 +5402,7 @@ msgid "Disable" msgstr "Адключыць" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5513,6 +5557,11 @@ msgstr "Панэль фізікі" msgid "Powerups Panel" msgstr "Панэль бонусаў" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Стасунак:" @@ -5533,10 +5582,6 @@ msgstr "Панэль гоначнага таймера" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Радар:" diff --git a/common.bg.po b/common.bg.po index c4f7192155..3eb3bfccb9 100644 --- a/common.bg.po +++ b/common.bg.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Bulgarian (http://www.transifex.com/team-xonotic/xonotic/" "language/bg/)\n" @@ -202,11 +202,11 @@ msgstr "^3CTRL ^7за да изключите проверката за сблъ msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3ARROW KEYS ^7за фини настройки" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Лично постижение" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Сървърно постижение" @@ -536,365 +536,407 @@ msgstr "^1ДУЗПА: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2ДУЗПА: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "SCO^bcубийства" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "SCO^bcвреме" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "SCO^пленявания" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "SCO^capвреме" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^умирания" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "SCO^унищожавания" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "SCO^изпускания" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "SCO^фалове" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "SCO^знаменосци" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "SCO^голове" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "SCO^kcубийства" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "SCO^kdсъотношение" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "SCO^k/d" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "SCO^kdr" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "SCO^kdсъотношение" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "SCO^убийства" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "SCO^обиколки" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "SCO^животи" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "SCO^загуби" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "SCO^име" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "SCO^сума" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "SCO^прякор" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "SCO^цели" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "SCO^задигания" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "SCO^пинг" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "SCO^зп" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "SCO^избутвания" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "SCO^ранг" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "SCO^връщания" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "SCO^съживявания" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "SCO^резултат" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "SCO^самоубийства" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" -msgstr "SCO^взимания" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" -msgstr "SCO^щракания" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "SCO^самоубийства" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "SCO^сума" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" +msgstr "SCO^взимания" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" +msgstr "SCO^щракания" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +msgid "Usage:" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -903,104 +945,104 @@ msgstr "" msgid "N/A" msgstr "няма" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Точност (средно %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Статистика за картата:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Убити чудовища:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Открити тайни(ци):" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Класиране" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Ранглист" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Зяпачи" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "играят ^3%s^7 на ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " до ^1%1.0f минути^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " или" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " до ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^точки" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "SCO^е победен" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "до водачеството на ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Съживяване след ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Мъртав сте, изчакайте ^3%s^7 преди съживяване" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Мъртав сте, натиснете ^2%s^7 за съживяване" @@ -1099,28 +1141,28 @@ msgstr "(%d гласа)" msgid "Don't care" msgstr "Не ми пука" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Изберете вид игра" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Гласуване за карта" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "остават %d секунди" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1231,7 +1273,7 @@ msgstr "Сила" msgid "Shield" msgstr "Щит" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n хвърляне на туба" @@ -5408,6 +5450,7 @@ msgstr "Панел с информационни съобщения" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5419,6 +5462,7 @@ msgid "Disable" msgstr "Забраняване" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5573,6 +5617,11 @@ msgstr "Панел за физика" msgid "Powerups Panel" msgstr "Панел с бонуси!" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Принудително съотношение:" @@ -5593,10 +5642,6 @@ msgstr "Панел с таймер за състезание" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Радар:" diff --git a/common.ca.po b/common.ca.po index 5d3653dbbe..9ba2c40561 100644 --- a/common.ca.po +++ b/common.ca.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Catalan (http://www.transifex.com/team-xonotic/xonotic/" "language/ca/)\n" @@ -198,11 +198,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "" @@ -532,332 +532,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -865,32 +907,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -899,104 +941,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1095,28 +1137,28 @@ msgstr "" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1226,7 +1268,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5324,6 +5366,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5335,6 +5378,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5489,6 +5533,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5509,10 +5558,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.cs.po b/common.cs.po index 1ce0b23857..82235bf714 100644 --- a/common.cs.po +++ b/common.cs.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Czech (http://www.transifex.com/team-xonotic/xonotic/language/" "cs/)\n" @@ -203,11 +203,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Vlastní rekord" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Rekord serveru" @@ -537,332 +537,374 @@ msgstr "^1PENALTA: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2PENALTA: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -870,32 +912,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -904,104 +946,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1100,28 +1142,28 @@ msgstr "" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1231,7 +1273,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5330,6 +5372,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5341,6 +5384,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5495,6 +5539,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5515,10 +5564,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.de.po b/common.de.po index fc60079b0d..3923108e4f 100644 --- a/common.de.po +++ b/common.de.po @@ -25,9 +25,9 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-22 11:34+0000\n" -"Last-Translator: afba88cf42cbdff57149d4a6d53a94f9\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" +"Last-Translator: divVerent \n" "Language-Team: German (http://www.transifex.com/team-xonotic/xonotic/" "language/de/)\n" "Language: de\n" @@ -216,11 +216,11 @@ msgstr "^3CTRL^7, um Kollisionstests zu deaktivieren, ^3SHIFT ^7und" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3PFEILTASTEN ^7für Feinjustierungen." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Persönliche Bestzeit" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Server-Bestzeit" @@ -550,365 +550,407 @@ msgstr "^1STRAFZEIT: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2STRAFZEIT: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "bbkills" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "bbzeit" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "caps" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "capzeit" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "tode" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "zerstört" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "schaden" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "scherhal" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "fallen" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "Spieler ELO" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "faults" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "fckills" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "tore" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "kckills" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "kdratio" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "k/d" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "kdr" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "kdratio" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "Anzahl an Kills" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "kills" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "runden" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "leben" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "verloren" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "name" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "summe" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "nick" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "ziele" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "aufheb" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "Latenz" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "ping" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "Paketverlust" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "pl" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "schubser" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "rang" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "zurück" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "wiederbelebungen" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "gewonnene Runden" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "punkte" -#: qcsrc/client/hud/panel/scoreboard.qc:116 +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 msgid "SCO^suicides" msgstr "suizide" -#: qcsrc/client/hud/panel/scoreboard.qc:117 +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "summe" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 msgid "SCO^takes" msgstr "takes" -#: qcsrc/client/hud/panel/scoreboard.qc:118 +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:126 msgid "SCO^ticks" msgstr "ticks" -#: qcsrc/client/hud/panel/scoreboard.qc:298 +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:311 msgid "" "You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 +#: qcsrc/client/hud/panel/scoreboard.qc:312 msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 +#: qcsrc/client/hud/panel/scoreboard.qc:314 msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 +#: qcsrc/client/hud/panel/scoreboard.qc:315 msgid "" "^2scoreboard_columns_set ^7without arguments reads the arguments from the " "cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:316 msgid "" " ^5Note: ^7scoreboard_columns_set without arguments is executed on every " "map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 +#: qcsrc/client/hud/panel/scoreboard.qc:317 msgid "" "^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " "it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" -msgstr "Name eines Spielers" - -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" -msgstr "Latenz" - -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "Paketverlust" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" -msgstr "Spieler ELO" - -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" -msgstr "Spieler FPS" - -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" -msgstr "Anzahl an Kills" - -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" -msgstr "" - #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -917,104 +959,104 @@ msgstr "" msgid "N/A" msgstr "N/V" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Genauigkeit (Durchschn.: %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Map-Statistiken:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Monster getötet:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Gefundene Geheimnisse:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "Eroberungszeit-Rangliste" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Platzierungen" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Punktetafel" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "Geschwindigkeitspreis: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "Rekordzeit: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Zuschauer" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "^3%s^7 auf ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " für bis zu ^1%1.0f Minuten^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " oder" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " bis ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "Punkte" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "wurde geschlagen" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " bis zu einem Vorsprung von ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Erneut spawnen in ^3%s^1 …" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Du bist tot, warte ^3%s^7 bis zum Respawn" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Du bist tot, drücke ^2%s^7, um neu zu spawnen" @@ -1113,28 +1155,28 @@ msgstr " (%d Stimmen)" msgid "Don't care" msgstr "Mir egal" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Wähle den Spieltyp" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Stimme für eine Map ab" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d Sekunden übrig" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1244,7 +1286,7 @@ msgstr "Stärke" msgid "Shield" msgstr "Schutzschild" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#% Tuba-Werfen" @@ -5484,6 +5526,7 @@ msgstr "Informations-Panel" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5495,6 +5538,7 @@ msgid "Disable" msgstr "Aus" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5649,6 +5693,11 @@ msgstr "Physik-Panel" msgid "Powerups Panel" msgstr "Powerup-Panel" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Seitenverhältnis:" @@ -5669,10 +5718,6 @@ msgstr "Rundenzeit-Panel" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.de_CH.po b/common.de_CH.po index 654779b017..22faa5a576 100644 --- a/common.de_CH.po +++ b/common.de_CH.po @@ -25,9 +25,9 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-22 11:34+0000\n" -"Last-Translator: afba88cf42cbdff57149d4a6d53a94f9\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" +"Last-Translator: divVerent \n" "Language-Team: German (http://www.transifex.com/team-xonotic/xonotic/" "language/de/)\n" "Language: de\n" @@ -216,11 +216,11 @@ msgstr "^3CTRL^7, um Kollisionstests zu deaktivieren, ^3SHIFT ^7und" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3PFEILTASTEN ^7für Feinjustierungen." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Persönliche Bestzeit" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Server-Bestzeit" @@ -550,365 +550,407 @@ msgstr "^1STRAFZEIT: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2STRAFZEIT: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "bbkills" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "bbzeit" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "caps" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "capzeit" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "tode" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "zerstört" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "schaden" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "scherhal" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "fallen" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "Spieler ELO" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "faults" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "fckills" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "tore" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "kckills" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "kdratio" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "k/d" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "kdr" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "kdratio" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "Anzahl an Kills" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "kills" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "runden" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "leben" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "verloren" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "name" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "summe" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "nick" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "ziele" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "aufheb" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "Latenz" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "ping" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "Paketverlust" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "pl" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "schubser" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "rang" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "zurück" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "wiederbelebungen" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "gewonnene Runden" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "punkte" -#: qcsrc/client/hud/panel/scoreboard.qc:116 +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 msgid "SCO^suicides" msgstr "suizide" -#: qcsrc/client/hud/panel/scoreboard.qc:117 +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "summe" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 msgid "SCO^takes" msgstr "takes" -#: qcsrc/client/hud/panel/scoreboard.qc:118 +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:126 msgid "SCO^ticks" msgstr "ticks" -#: qcsrc/client/hud/panel/scoreboard.qc:298 +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:311 msgid "" "You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 +#: qcsrc/client/hud/panel/scoreboard.qc:312 msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 +#: qcsrc/client/hud/panel/scoreboard.qc:314 msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 +#: qcsrc/client/hud/panel/scoreboard.qc:315 msgid "" "^2scoreboard_columns_set ^7without arguments reads the arguments from the " "cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:316 msgid "" " ^5Note: ^7scoreboard_columns_set without arguments is executed on every " "map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 +#: qcsrc/client/hud/panel/scoreboard.qc:317 msgid "" "^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " "it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" -msgstr "Name eines Spielers" - -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" -msgstr "Latenz" - -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "Paketverlust" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" -msgstr "Spieler ELO" - -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" -msgstr "Spieler FPS" - -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" -msgstr "Anzahl an Kills" - -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" -msgstr "" - #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -917,104 +959,104 @@ msgstr "" msgid "N/A" msgstr "N/V" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Genauigkeit (Durchschn.: %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Map-Statistiken:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Monster getötet:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Gefundene Geheimnisse:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "Eroberungszeit-Rangliste" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Platzierungen" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Punktetafel" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "Geschwindigkeitspreis: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "Rekordzeit: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Zuschauer" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "^3%s^7 auf ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " für bis zu ^1%1.0f Minuten^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " oder" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " bis ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "Punkte" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "wurde geschlagen" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " bis zu einem Vorsprung von ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Erneut spawnen in ^3%s^1 …" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Du bist tot, warte ^3%s^7 bis zum Respawn" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Du bist tot, drücke ^2%s^7, um neu zu spawnen" @@ -1113,28 +1155,28 @@ msgstr " (%d Stimmen)" msgid "Don't care" msgstr "Mir egal" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Wähle den Spieltyp" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Stimme für eine Map ab" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d Sekunden übrig" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1244,7 +1286,7 @@ msgstr "Stärke" msgid "Shield" msgstr "Schutzschild" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#% Tuba-Werfen" @@ -5485,6 +5527,7 @@ msgstr "Informations-Panel" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5496,6 +5539,7 @@ msgid "Disable" msgstr "Aus" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5650,6 +5694,11 @@ msgstr "Physik-Panel" msgid "Powerups Panel" msgstr "Powerup-Panel" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Seitenverhältnis:" @@ -5670,10 +5719,6 @@ msgstr "Rundenzeit-Panel" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.el.po b/common.el.po index e46556dafb..24f58efde9 100644 --- a/common.el.po +++ b/common.el.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2019-01-11 19:29+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-28 18:12+0000\n" "Last-Translator: Mensious Mensious \n" "Language-Team: Greek (http://www.transifex.com/team-xonotic/xonotic/language/" "el/)\n" @@ -206,11 +206,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Προσωπικό ρεκόρ" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Ρεκόρ διακομιστή" @@ -307,7 +307,7 @@ msgstr "" #: qcsrc/client/hud/panel/quickmenu.qc:798 msgid "QMCMD^need help, icon" -msgstr "" +msgstr "QMCMD^χρειάζομαι βοήθεια, εικονίδιο" #: qcsrc/client/hud/panel/quickmenu.qc:799 msgid "QMCMD^enemy seen (l:%y^7)" @@ -364,7 +364,7 @@ msgstr "" #: qcsrc/client/hud/panel/quickmenu.qc:805 msgid "QMCMD^dropped flag, icon" -msgstr "" +msgstr "QMCMD^πεζμένει σημαία, εικονίδιο" #: qcsrc/client/hud/panel/quickmenu.qc:806 msgid "QMCMD^drop weapon, icon" @@ -372,7 +372,7 @@ msgstr "QMCMD^πεζμένο όπλο, εικονίδιο" #: qcsrc/client/hud/panel/quickmenu.qc:806 msgid "QMCMD^dropped weapon %w^7 (l:%l^7)" -msgstr "" +msgstr "QMCMD^πεζμένο όπλο %w^7 (l:%l^7)" #: qcsrc/client/hud/panel/quickmenu.qc:807 msgid "QMCMD^drop flag/key, icon" @@ -380,7 +380,7 @@ msgstr "QMCMD^πεζμένει σημαία/κλειδί, εικονίδιο" #: qcsrc/client/hud/panel/quickmenu.qc:807 msgid "QMCMD^dropped flag/key %w^7 (l:%l^7)" -msgstr "" +msgstr "QMCMD^πεζμένει σημαία/κλειδί %w^7 (l:%l^7)" #: qcsrc/client/hud/panel/quickmenu.qc:811 msgid "QMCMD^Send private message to" @@ -540,332 +540,374 @@ msgstr "^1Ποινή %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2Ποινή %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "Νούμερο για σκοτομούς" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "SCO^καταστροφή" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "SCO^dmgtaken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" -msgstr "SCO^Γκολς" - #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" -msgstr "SCO^k/d" +msgid "SCO^fastest" +msgstr "SCO^Γρηγορότερο" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" -msgstr "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" -msgstr "SCO^Γύροι" +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" -msgstr "SCO^Ζωντανοί" +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" +msgstr "SCO^Γκολς" #: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" -msgstr "SCO^Χαμένοι" +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" -msgstr "SCO^Όνομα" +msgid "SCO^k/d" +msgstr "SCO^k/d" +#: qcsrc/client/hud/panel/scoreboard.qc:103 #: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" +msgstr "SCO^kdr" + #: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +msgid "SCO^kdratio" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +msgid "Number of laps finished (Race/CTS)" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" +msgstr "SCO^Γύροι" + #: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +msgid "Number of lives (LMS)" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" +msgstr "SCO^Ζωντανοί" + #: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" +msgstr "SCO^Χαμένοι" +#: qcsrc/client/hud/panel/scoreboard.qc:110 #: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" -msgstr "SCO^κατάταξη" - -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" -msgstr "SCO^γύροι νικήθηκαν" - -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" -msgstr "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" +msgstr "SCO^Όνομα" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" -msgstr "Όνομα για ένα παίκτη" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "Κατάταξη παικτών" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" +msgstr "SCO^κατάταξη" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" -msgstr "Παίκτης FPS" - -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" -msgstr "Νούμερο για σκοτομούς" - -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" +msgstr "SCO^γύροι νικήθηκαν" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" +msgstr "SCO^score" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "Σύνολο score" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "Κατάταξη παικτών" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" +msgstr "SCO^Χρόνος" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "Σύνολο score" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -873,32 +915,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -907,104 +949,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Στατιστικά χάρτη:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Κατατάξεις" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Scoreboard" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Θεατές" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "Πέζουνε ^3%s^7 on ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "ή" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " μέχρι ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^Πόντοι" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Πέθανες, πάτα ^2%s^7 για να ξαναγεννηθείς" @@ -1104,28 +1146,28 @@ msgstr " (%d ψήφοι)" msgid "Don't care" msgstr "Δεν με νοιάζει" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Ψηφοφορία χάρτη" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d δευτερόλεπτα απομένουν" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1235,7 +1277,7 @@ msgstr "Δύναμη" msgid "Shield" msgstr "Ασπίδα" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5341,6 +5383,7 @@ msgstr "Πίνακας Πληροφοριών" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5352,6 +5395,7 @@ msgid "Disable" msgstr "Απενεργοποίηση" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "Ενεργοποίηση παρακουλούθησης" @@ -5506,6 +5550,11 @@ msgstr "Πίνακας Φυσικής" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5526,10 +5575,6 @@ msgstr "Πίνακας Χρονοδιακόπτη Αγώνα" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Ραντάρ:" @@ -7732,7 +7777,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:65 msgid "Gamemode Settings" -msgstr "" +msgstr "Ρυθμίσεις κατηγορίας παιχνιδιού" #: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:67 msgid "Display capture times in Capture The Flag" diff --git a/common.en_AU.po b/common.en_AU.po index 197f4ee2b4..fdeb4d40b1 100644 --- a/common.en_AU.po +++ b/common.en_AU.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: English (Australia) (http://www.transifex.com/team-xonotic/" "xonotic/language/en_AU/)\n" @@ -201,11 +201,11 @@ msgstr "^3CTRL ^7to disable collision testing, ^3SHIFT ^7and" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Personal best" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Server best" @@ -535,365 +535,407 @@ msgstr "^1PENALTY: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2PENALTY: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "SCO^bckills" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "SCO^bctime" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "SCO^caps" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "SCO^captime" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^deaths" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "SCO^destroyed" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "SCO^dmgtaken" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "SCO^drops" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "SCO^faults" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "SCO^fckills" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "SCO^goals" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "SCO^kckills" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "SCO^kdratio" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "SCO^k/d" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "SCO^kdr" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "SCO^kdratio" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "SCO^kills" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "SCO^laps" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "SCO^lives" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "SCO^losses" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "SCO^name" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "SCO^sum" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "SCO^nick" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "SCO^objectives" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "SCO^pickups" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "SCO^ping" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "SCO^pl" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "SCO^pushes" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "SCO^rank" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "SCO^returns" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "SCO^revivals" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "SCO^score" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" -msgstr "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" -msgstr "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "SCO^suicides" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "SCO^sum" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" +msgstr "SCO^takes" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" +msgstr "SCO^ticks" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +msgid "Usage:" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -902,104 +944,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Accuracy stats (average %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Map stats:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Monsters killed:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Secrets found:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Rankings" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Scoreboard" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Spectators" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "playing ^3%s^7 on ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " for up to ^1%1.0f minutes^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " or" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " until ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^points" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "SCO^is beaten" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " until a lead of ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Respawning in ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "You are dead, wait ^3%s^7 before respawning" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "You are dead, press ^2%s^7 to respawn" @@ -1098,28 +1140,28 @@ msgstr " (%d votes)" msgid "Don't care" msgstr "Don't care" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Decide the gametype" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Vote for a map" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d seconds left" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1229,7 +1271,7 @@ msgstr "Strength" msgid "Shield" msgstr "Shield" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Tuba Throwing" @@ -5411,6 +5453,7 @@ msgstr "Info Messages Panel" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5422,6 +5465,7 @@ msgid "Disable" msgstr "Disable" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5576,6 +5620,11 @@ msgstr "Physics Panel" msgid "Powerups Panel" msgstr "Powerups Panel" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Forced aspect:" @@ -5596,10 +5645,6 @@ msgstr "Race Timer Panel" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.eo.po b/common.eo.po index 64f07e4678..d389ac50ff 100644 --- a/common.eo.po +++ b/common.eo.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Esperanto (http://www.transifex.com/team-xonotic/xonotic/" "language/eo/)\n" @@ -198,11 +198,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "" @@ -532,332 +532,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^mortoj" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "SCO^dmgtaken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -865,32 +907,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -899,104 +941,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Spektantoj" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1095,28 +1137,28 @@ msgstr "" msgid "Don't care" msgstr "Ne zorgas" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1226,7 +1268,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5324,6 +5366,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5335,6 +5378,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5489,6 +5533,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5509,10 +5558,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.es.po b/common.es.po index c4f42ca322..4b826f36bc 100644 --- a/common.es.po +++ b/common.es.po @@ -26,8 +26,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Spanish (http://www.transifex.com/team-xonotic/xonotic/" "language/es/)\n" @@ -217,11 +217,11 @@ msgstr "^3CTRL ^7para deshabilitar la prueba de colisiones, ^3SHIFT ^7y" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3TECLAS DE DIRECCIÓN ^7para ajustes finos." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Record personal" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Record del servidor" @@ -551,365 +551,407 @@ msgstr "^1SANCION: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2SANCION: %.1f(%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "SCO^bckills" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "SCO^bctime" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "SCO^capturas" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "SCO^tiempo de captura" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^muertes" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "SCO^destruido" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "SCO^daño" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "SCO^daño recibido" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "SCO^caidas" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "SCO^faltas" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "SCO^fckills" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "SCO^metas" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "SCO^kckills" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "SCO^kdratio" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "SCO^k/d" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "SCO^kdr" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "SCO^kdratio" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "SCO^muertes" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "SCO^vueltas" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "SCO^vidas" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "SCO^derrotas" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "SCO^nombre" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "SCO^suma" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "SCO^nick" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "SCO^objetivos" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "SCO^recogidas" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "SCO^ping" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "SCO^pl" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "SCO^ofensivas" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "SCO^rango" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "SCO^devoluciones" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "SCO^reanimaciones" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "SCO^rondas ganadas" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "SCO^puntuación" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "SCO^suicidios" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" -msgstr "SCO^tomas" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" -msgstr "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "SCO^suicidios" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "SCO^suma" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" +msgstr "SCO^tomas" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" +msgstr "SCO^ticks" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +msgid "Usage:" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -918,104 +960,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Estadísticas de precisión (promedio %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Estadistícas de mapa:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Monstruos asesinados:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Secretos encontrados:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "Clasificaciones de tiempo de captura" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Clasificaciones" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Tabla de puntuación" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "Premio de velocidad: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "El mas rápido de todos los tiempos: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Espectadores" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "jugando ^3%s^7 en ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " para un máximo de ^1%1.0f minutos^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " o" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " hasta ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^puntos" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "SCO^es batido" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " hasta una ventaja de ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Reapareciendo en ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Estás muerto, espera ^3%s^7 antes de reaparecer" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Estás muerto, pulsa ^2%s^7 para reaparecer" @@ -1114,28 +1156,28 @@ msgstr " (%d votos)" msgid "Don't care" msgstr "No importa" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Elige el modo de juego" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Vota un mapa" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d segundos restantes" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1245,7 +1287,7 @@ msgstr "Fuerza" msgid "Shield" msgstr "Escudo" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Lanzamiento de Tuba" @@ -5475,6 +5517,7 @@ msgstr "Panel de información de mensajes" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5486,6 +5529,7 @@ msgid "Disable" msgstr "Desactivar" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5640,6 +5684,11 @@ msgstr "Panel de la física" msgid "Powerups Panel" msgstr "Panel de poderes" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Forzar aspecto:" @@ -5660,10 +5709,6 @@ msgstr "Panel del cronómetro de carrera" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.es_MX.po b/common.es_MX.po index 0320d870c9..d8f775fdb8 100644 --- a/common.es_MX.po +++ b/common.es_MX.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/team-xonotic/" "xonotic/language/es_MX/)\n" @@ -197,11 +197,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "" @@ -531,332 +531,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -864,32 +906,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -898,104 +940,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1094,28 +1136,28 @@ msgstr "" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1225,7 +1267,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5323,6 +5365,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5334,6 +5377,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5488,6 +5532,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5508,10 +5557,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.fi.po b/common.fi.po index 82377d4b81..4439d88dfb 100644 --- a/common.fi.po +++ b/common.fi.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Finnish (http://www.transifex.com/team-xonotic/xonotic/" "language/fi/)\n" @@ -199,11 +199,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Oma Ennätys" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Serverin Paras" @@ -533,332 +533,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^kuolemaa" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "SCO^dmgtaken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" -msgstr "SCO^tappoa" - -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" -msgstr "SCO^kierrosta" +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" -msgstr "SCO^nimi" +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" -msgstr "Viive" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "SCO^itsemurhia" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" +msgstr "SCO^tappoa" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" +msgstr "SCO^kierrosta" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" +msgstr "SCO^nimi" + +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" +msgstr "Viive" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "SCO^itsemurhia" + +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -866,32 +908,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -900,104 +942,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1096,28 +1138,28 @@ msgstr "(%d ääntä)" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Äänestä karttaa" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d sekuntia jäljellä" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1227,7 +1269,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n tuubanheitto!" @@ -5328,6 +5370,7 @@ msgstr "Tiedotuspaneeli" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5339,6 +5382,7 @@ msgid "Disable" msgstr "Pois päältä" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5493,6 +5537,11 @@ msgstr "Fysiikkapaneeli" msgid "Powerups Panel" msgstr "Tehonlisäyspaneeli" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Pakotettu näkymä:" @@ -5513,10 +5562,6 @@ msgstr "Kilpajuoksun ajanoton paneeli" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Tutka:" diff --git a/common.fr.po b/common.fr.po index c67ab07a3a..b1a6d22243 100644 --- a/common.fr.po +++ b/common.fr.po @@ -12,13 +12,13 @@ # RedGuff , 2014 # Yannick Le Guen , 2013 # Hugo Locurcio, 2013 -# Yannick Le Guen , 2013-2018 +# Yannick Le Guen , 2013-2019 msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-29 16:31+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 11:05+0000\n" "Last-Translator: Yannick Le Guen \n" "Language-Team: French (http://www.transifex.com/team-xonotic/xonotic/" "language/fr/)\n" @@ -211,11 +211,11 @@ msgstr "^3CTRL ^7pour désactiver les essais de collision, ^3MAJ ^7et" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3TOUCHES FLÉCHÉES ^7pour des ajustements précis." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Record personnel" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Record du serveur" @@ -545,170 +545,354 @@ msgstr "^1PÉNALITÉ : %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2PÉNALITÉ : %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "Nombre de porteurs de balle tués" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "balles tués" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "temps balle" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "Temps total de possession de balle en mode Gardez-la-Balle" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" +"Combien de fois un drapeau (CTF) ou une clé (Chasse aux Clés) a été " +"capturé(e)" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "captures" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "temps capture" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "Temps de la capture la plus rapide (CTF)" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "Nombre de morts" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "morts" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "Nombre de clés détruites en les poussant dans le vide" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "détruits" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "dommages" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "Les dommages totaux infligés" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "dmg reçus" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "Les dommages totaux subis" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "Nombre de drapeaux lâchés" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "lâchés" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "ELO du joueur" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "elo" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "plus rapide" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "Temps du tour le plus rapide (Course / CTS)" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "Nombre de fautes commises" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "fautes" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "Nombre de porteurs de drapeaux tués" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "drap. tués" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "IPS" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "ips" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "Nombre de meurtres moins les suicides" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "frags" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "Nombre de buts marqués" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "buts" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "Nombre de porteurs de clés tués" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "clés tués" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "ratio tm" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "t/m" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "Le ratio meurtre-mort" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "tmr" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "ratio tm" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "Nombre de meurtres" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "meurtres" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" -msgstr "meurtres équipe" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" +msgstr "Nombre de tours complétés (Course / CTS)" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "tours" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "Nombre de vies (LMS)" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "vies" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "Nombre de fois qu'une clé a été perdue" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "pertes" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "Nom du joueur" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "nom" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "somme" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "pseudo" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "Nombres d'objectifs détruits" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "objectifs" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" +"Combien de fois un drapeau (CTF) ou une clé (Chasse aux Clés) ou une balle " +"(Gardez-la-Balle) a été ramassé(e)" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "collectés" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "Temps de ping" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "ping" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "Perte de paquets" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "pl" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "Nombre de joueurs poussés dans le vide" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "poussés" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "Rang du joueur" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "rang" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "Nombre de drapeaux retournés" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "retournés" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "Nombre de dégels" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "dégels" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "Nombre de manches gagnées" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "manches gagnées" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "score" -#: qcsrc/client/hud/panel/scoreboard.qc:116 +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "Score total" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "Nombre de suicides" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 msgid "SCO^suicides" msgstr "suicides" -#: qcsrc/client/hud/panel/scoreboard.qc:117 +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" +msgstr "Nombre de meurtres moins les morts" + +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "somme" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" +msgstr "Nombre de points de domination capturés (Domination)" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 msgid "SCO^takes" msgstr "prises" -#: qcsrc/client/hud/panel/scoreboard.qc:118 +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" +msgstr "Nombre de meurtres équipe" + +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" +msgstr "meurtres équipe" + +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" +msgstr "Nombre de marques (Domination)" + +#: qcsrc/client/hud/panel/scoreboard.qc:126 msgid "SCO^ticks" msgstr "marques" -#: qcsrc/client/hud/panel/scoreboard.qc:298 +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" +msgstr "temps" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" +msgstr "Temps total couru (Course / CTS)" + +#: qcsrc/client/hud/panel/scoreboard.qc:311 msgid "" "You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" "Vous pouvez modifier le tableau des scores en utilisant la commande " "^2scoreboard_columns_set." -#: qcsrc/client/hud/panel/scoreboard.qc:299 +#: qcsrc/client/hud/panel/scoreboard.qc:312 msgid "Usage:" msgstr "Utilisation :" -#: qcsrc/client/hud/panel/scoreboard.qc:301 +#: qcsrc/client/hud/panel/scoreboard.qc:314 msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "^2scoreboard_columns_set ^3champ1 champ2..." -#: qcsrc/client/hud/panel/scoreboard.qc:302 +#: qcsrc/client/hud/panel/scoreboard.qc:315 msgid "" "^2scoreboard_columns_set ^7without arguments reads the arguments from the " "cvar scoreboard_columns" @@ -716,7 +900,7 @@ msgstr "" "^2scoreboard_columns_set ^7sans argument lit les arguments de la cvar " "scoreboard_columns" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:316 msgid "" " ^5Note: ^7scoreboard_columns_set without arguments is executed on every " "map start" @@ -724,7 +908,7 @@ msgstr "" " ^5Remarque : ^7scoreboard_columns_set sans argument est exécuté pour " "chaque nouvelle carte" -#: qcsrc/client/hud/panel/scoreboard.qc:304 +#: qcsrc/client/hud/panel/scoreboard.qc:317 msgid "" "^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " "it into the cvar scoreboard_columns so you can edit it" @@ -732,158 +916,16 @@ msgstr "" "^2scoreboard_columns_set ^3expand_default ^7charge la disposition par défaut " "et l'étend dans la cvar scoreboard_columns pour que vous puissiez l'éditer" -#: qcsrc/client/hud/panel/scoreboard.qc:305 +#: qcsrc/client/hud/panel/scoreboard.qc:318 msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "Vous pouvez utiliser un ^3|^7 pour créer des champs alignés à droite." -#: qcsrc/client/hud/panel/scoreboard.qc:306 +#: qcsrc/client/hud/panel/scoreboard.qc:319 msgid "The following field names are recognized (case insensitive):" msgstr "Les noms de champ suivants sont reconnus (non sensibles à la casse) :" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" -msgstr "Nom d'un joueur" - -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" -msgstr "Temps de ping" - -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "Perte de paquets" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" -msgstr "ELO du joueur" - -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" -msgstr "IPS du joueur" - -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" -msgstr "Nombre de meurtres" - -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" -msgstr "Nombre de morts" - -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" -msgstr "Nombre de suicides" - -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" -msgstr "meurtres - suicides" - -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "Nombre de meurtres équipe" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "Le ratio meurtre-mort" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "Les dommages totaux infligés" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "Les dommages totaux subis" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "meurtres - morts" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" -msgstr "" -"Combien de fois un drapeau (CTF) ou une clé (Chasse aux Clés) a été " -"capturé(e)" - #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" -"Combien de fois un drapeau (CTF) ou une clé (Chasse aux Clés) ou une balle " -"(Gardez-la-Balle) a été ramassé(e)" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "Temps de la capture la plus rapide (CTF)" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "Nombre de porteurs de drapeaux tués" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "Nombre de drapeaux retournés" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "Nombre de drapeaux lâchés" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "Nombre de vies (LMS)" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "Rang du joueur" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "Nombre de joueurs poussés dans le vide" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "Nombre de clés détruites en les poussant dans le vide" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "Nombre de porteurs de clés tués" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "Nombre de fois qu'une clé a été perdue" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "Nombre de tours complétés (course/cts)" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "Temps total en course (course/cts)" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "Temps du tour le plus rapide (course/cts)" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "Nombre de marques (DOM)" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "Nombre de points de domination capturés (DOM)" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "Nombre de porteurs de balle tués" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "Temps total de possession de balle en mode Gardez-la-Balle" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "Score total" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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" @@ -897,7 +939,7 @@ msgstr "" "comme champ\n" "pour afficher tous les champs disponibles pour le mode de jeu actuel." -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." @@ -906,11 +948,11 @@ msgstr "" "pour\n" "inclure ou exclure TOUS les modes de jeu en équipe ou non." -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "Exemple : scoreboard_columns_set name ping pl | +ctf/champ3 -dm/champ4" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." @@ -918,7 +960,7 @@ msgstr "" "affiche le nom, le ping et le pl alignés à gauche, et les champs\n" "à droite de la barre verticale alignés à droite." -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." @@ -926,10 +968,10 @@ msgstr "" "« champ3 » sera affiché uniquement en CTF, et « champ4 » sera affiché\n" "dans tous les autres modes de jeu sauf DM." -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -938,104 +980,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Stats de précision (moyenne %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Stat. de la carte :" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Monstres tués :" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Secrets trouvés :" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "Classement des temps de capture" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Classements" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Tableau des scores" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "Récompense de vitesse : %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "Le plus rapide jamais vu : %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Spectateurs" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "partie de ^3%s^7 en cours sur ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " pendant ^1%1.0f minutes^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " ou" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " jusqu'à ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "points" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "est battu" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " jusqu'à un écart de ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Réapparition dans ^3%s^1…" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Vous êtes mort, attendez ^3%s^7 avant de réapparaître" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Vous êtes mort, appuyez sur ^2%s^7 pour réapparaître" @@ -1135,29 +1177,29 @@ msgstr " (%d votes)" msgid "Don't care" msgstr "Ne pas voter" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Choisissez le mode de jeu" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Votez pour une carte" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d secondes restantes" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" "mv_mapdownload : ^3Vous n'êtes pas censé utiliser cette commande vous-même !" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "^1Erreur :^7 Impossible de trouver l'index du pak." -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "Demande d'aperçu..." @@ -1269,7 +1311,7 @@ msgstr "Force" msgid "Shield" msgstr "Bouclier" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "Lancer du @!#% Tuba" @@ -1437,7 +1479,7 @@ msgid "" "freeze all enemies to win" msgstr "" "Tuez les ennemis pour les geler, tenez-vous à côté des équipiers gelés pour " -"les ranimer ; gelez tous les ennemis pour gagner" +"les dégeler ; gelez tous les ennemis pour gagner" #: qcsrc/common/mapinfo.qh:544 msgid "Hold the ball to get points for kills" @@ -2680,22 +2722,22 @@ msgstr "^BG%s^K1 a été gelé par ^BG%s" #: qcsrc/common/notifications/all.inc:364 #, c-format msgid "^BG%s^K3 was revived by ^BG%s" -msgstr "^BG%s^K3 a été ranimé par ^BG%s" +msgstr "^BG%s^K3 a été dégelé par ^BG%s" #: qcsrc/common/notifications/all.inc:365 #, c-format msgid "^BG%s^K3 was revived by falling" -msgstr "^BG%s^K3 a été ranimé après être tombé" +msgstr "^BG%s^K3 a été dégelé après être tombé" #: qcsrc/common/notifications/all.inc:366 #, c-format msgid "^BG%s^K3 was revived by their Nade explosion" -msgstr "^BG%s^K3 a été ranimé par l'explosion de sa Grenade" +msgstr "^BG%s^K3 a été dégelé par l'explosion de sa Grenade" #: qcsrc/common/notifications/all.inc:367 #, c-format msgid "^BG%s^K3 was automatically revived after %s second(s)" -msgstr "^BG%s^K3 a été automatiquement ranimé après %s seconde(s)" +msgstr "^BG%s^K3 a été automatiquement dégelé après %s seconde(s)" #: qcsrc/common/notifications/all.inc:368 #, c-format @@ -3925,21 +3967,21 @@ msgstr "^F2Vous avez ramassé quelques vies supplémentaires" #: qcsrc/common/notifications/all.inc:680 #, c-format msgid "^K3You revived ^BG%s" -msgstr "^K3Vous avez ranimé ^BG%s" +msgstr "^K3Vous avez dégelé ^BG%s" #: qcsrc/common/notifications/all.inc:681 msgid "^K3You revived yourself" -msgstr "^K3Vous vous êtes ranimé tout seul" +msgstr "^K3Vous vous êtes dégelé tout seul" #: qcsrc/common/notifications/all.inc:682 #, c-format msgid "^K3You were revived by ^BG%s" -msgstr "^K3Vous avez été ranimé par ^BG%s" +msgstr "^K3Vous avez été dégelé par ^BG%s" #: qcsrc/common/notifications/all.inc:683 #, c-format msgid "^K3You were automatically revived after %s second(s)" -msgstr "^K3Vous avez été automatiquement ranimé après %s seconde(s)" +msgstr "^K3Vous avez été automatiquement dégelé après %s seconde(s)" #: qcsrc/common/notifications/all.inc:685 msgid "^BGThe generator is under attack!" @@ -5531,6 +5573,7 @@ msgstr "Messages d'Information" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5542,6 +5585,7 @@ msgid "Disable" msgstr "Désactiver" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "Activer les spectateurs" @@ -5696,6 +5740,11 @@ msgstr "Effets Physiques" msgid "Powerups Panel" msgstr "Bonus de puissance" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "Toujours activer" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Aspect forcé :" @@ -5716,10 +5765,6 @@ msgstr "Chronomètre de Course" msgid "Enable in team games" msgstr "Activer dans les jeux en équipe" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "Toujours activer" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar :" diff --git a/common.ga.po b/common.ga.po index 2869dc4694..3694e6e28b 100644 --- a/common.ga.po +++ b/common.ga.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Irish (http://www.transifex.com/team-xonotic/xonotic/language/" "ga/)\n" @@ -200,11 +200,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Sáriarracht phearsanta" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Curiarracht an fhreastalaí" @@ -534,332 +534,374 @@ msgstr "^1PIONÓS: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2PIONÓS: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -867,32 +909,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -901,104 +943,104 @@ msgstr "" msgid "N/A" msgstr "N/A/F" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Clár Scóir" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Lucht féachana" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "nó" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "go dtí ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1097,28 +1139,28 @@ msgstr "(%d vóta)" msgid "Don't care" msgstr "Is cuma liom" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Roghnaigh cineál an chluiche" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Vótáil le léarscáil" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d soicind fágtha" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1228,7 +1270,7 @@ msgstr "Neart" msgid "Shield" msgstr "Sciath" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5326,6 +5368,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5337,6 +5380,7 @@ msgid "Disable" msgstr "Díchumasaigh" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5491,6 +5535,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5511,10 +5560,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.gd.po b/common.gd.po index b2eded8269..735f3b68f2 100644 --- a/common.gd.po +++ b/common.gd.po @@ -3,16 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# GunChleoc, 2017-2018 +# GunChleoc, 2017-2019 # GunChleoc, 2017 # GunChleoc, 2017 msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" -"Last-Translator: divVerent \n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-02-06 18:19+0000\n" +"Last-Translator: GunChleoc\n" "Language-Team: Gaelic, Scottish (http://www.transifex.com/team-xonotic/" "xonotic/language/gd/)\n" "Language: gd\n" @@ -26,11 +26,12 @@ msgstr "" #, c-format msgid "^2Successfully exported to %s! (Note: It's saved in data/data/)" msgstr "" +"^2Chaidh às-phortadh gu %s! (An aire: Chaidh a shàbhaladh ann an data/data/)" #: qcsrc/client/hud/hud_config.qc:247 #, c-format msgid "^1Couldn't write to %s" -msgstr "" +msgstr "^1Cha b’ urrainn dhuinn sgrìobhadh gu %s" #: qcsrc/client/hud/panel/chat.qc:84 msgid "^3Player^7: This is the chat area." @@ -206,13 +207,13 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3IUCHRAICHEAN SAIGHDE ^7airson mion-ghleusadh." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" -msgstr "" +msgstr "As fheàrr gu pearsanta" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" -msgstr "" +msgstr "As fheàrr air an fhrithealaiche" #: qcsrc/client/hud/panel/notify.qc:117 qcsrc/client/hud/panel/notify.qc:118 #: qcsrc/client/hud/panel/score.qc:63 @@ -238,11 +239,11 @@ msgstr "Lean air adhart…" #: qcsrc/client/hud/panel/quickmenu.qc:781 #: qcsrc/client/hud/panel/quickmenu.qc:788 msgid "Chat" -msgstr "" +msgstr "Cabadaich" #: qcsrc/client/hud/panel/quickmenu.qc:782 msgid "QMCMD^Send public message to" -msgstr "" +msgstr "QMCMD^Cuir teachdaireachd phoblach gu" #: qcsrc/client/hud/panel/quickmenu.qc:783 msgid "QMCMD^:-) / nice one" @@ -266,7 +267,7 @@ msgstr "sin sibh / gura math a thèid leibh is gabhaibh tlachd" #: qcsrc/client/hud/panel/quickmenu.qc:787 msgid "QMCMD^Send in English" -msgstr "" +msgstr "QMCMD^Cuir sa Bheurla" #: qcsrc/client/hud/panel/quickmenu.qc:792 #: qcsrc/client/hud/panel/quickmenu.qc:808 @@ -522,350 +523,392 @@ msgstr "Loidhne crìochnachaidh" #: qcsrc/client/hud/panel/racetimer.qc:82 #, c-format msgid "Intermediate %d" -msgstr "" +msgstr "Eadar-mheadhanach %d" #: qcsrc/client/hud/panel/racetimer.qc:151 msgid "^1Intermediate 1 (+15.42)" -msgstr "" +msgstr "^1adar-mheadhanach 1 (+15.42)" #: qcsrc/client/hud/panel/racetimer.qc:154 #: qcsrc/client/hud/panel/racetimer.qc:200 #: qcsrc/client/hud/panel/racetimer.qc:250 #, c-format msgid "^1PENALTY: %.1f (%s)" -msgstr "" +msgstr "^1PEANAS: %.1f (%s)" #: qcsrc/client/hud/panel/racetimer.qc:252 #, c-format msgid "^2PENALTY: %.1f (%s)" +msgstr "^2PEANAS: %.1f (%s)" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "SCO^dmgtaken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "FPS" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "SCO^fps" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "Ainm a’ chluicheadair" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" +msgstr "SCO^ainm" + +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" +msgstr "SCO^far-ainm" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "Ping time" -msgstr "" +msgstr "Ùine a’ ping" -#: qcsrc/client/hud/panel/scoreboard.qc:312 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" +msgstr "SCO^ping" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "Packet loss" +msgstr "Call phacaidean" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" +msgstr "Cleachdadh:" + +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -873,32 +916,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -907,111 +950,111 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Amhairc" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "a' cluich ^3%s^7 air ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " fad suas ri ^1%1.0f mionaid(ean)^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "no" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " gu ruige ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "puingean" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" #: qcsrc/client/hud/panel/timer.qc:67 msgid "WARMUP" -msgstr "" +msgstr "BLÀTHACHADH" #: qcsrc/client/hud/panel/vote.qc:27 msgid "^1You must answer before entering hud configure mode" @@ -1103,28 +1146,28 @@ msgstr " (Bhòtaichean: %d)" msgid "Don't care" msgstr "Tha mi coma" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Tagh seòrsa a' gheama" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Bhòt airson mapa" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "Tha %d diog(an) air fhàgail" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1234,7 +1277,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5336,6 +5379,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5347,6 +5391,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5501,6 +5546,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5521,10 +5571,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.he.po b/common.he.po index 6cd906f8dc..a486b6eb9b 100644 --- a/common.he.po +++ b/common.he.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Hebrew (http://www.transifex.com/team-xonotic/xonotic/" "language/he/)\n" @@ -199,11 +199,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "" @@ -533,332 +533,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -866,32 +908,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -900,104 +942,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1096,28 +1138,28 @@ msgstr "" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "הצבע למפה" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1227,7 +1269,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5325,6 +5367,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5336,6 +5379,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5490,6 +5534,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5510,10 +5559,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.hu.po b/common.hu.po index c7a43d5fd2..cf8e181cc0 100644 --- a/common.hu.po +++ b/common.hu.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Hungarian (http://www.transifex.com/team-xonotic/xonotic/" "language/hu/)\n" @@ -205,11 +205,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "az ^3ALT^7 + ^3NYÍLGOMBOK^7-kal finoman mozgathatsz!" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Saját legjobb idő" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Szerver legjobb idő" @@ -539,365 +539,407 @@ msgstr "^1BÜNTETÉS: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2BÜNTETÉS: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "LH gyilokok" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "Labdaidő" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "Rablások" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "Halálok" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "megsemmisítve" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "SCO^sérülés" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "elvesztve" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "Hibák" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "ZH gyilokok" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "Gólok" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "KH gyilokok" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "ÖH arány" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "Ö/H" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "ÖHA" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "ÖH arány" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "Gyilokok" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "Körök" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "Életek" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "elvesztve" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "Név" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "SCO^össz" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "Nick" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "célpontok" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "Zászlók" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "Ping" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "CSV" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "Lökések" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "Rang" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "Visszaszerzések" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "Újraéledések" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "Pontok" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "Öngyilokok" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" -msgstr "Átvétel" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" -msgstr "Tikk" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "Öngyilokok" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "SCO^össz" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" +msgstr "Átvétel" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" +msgstr "Tikk" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +msgid "Usage:" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -906,104 +948,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Tüzelési pontosság (Átlag: %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Pálya statisztikák:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Megölt szörnyek:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Feldezett titkok:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "Célbaérési idő rangsor" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Helyezések" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Ponttábla" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Nézők" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " még ^1%.1f percig^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " vagy " -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "pontszámig" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr " időt valaki meg nem dönti" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " amíg valaki ^3%s %s^7 -ig nem vezeti a mezőnyt." -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Respawning: ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Meghaltál, várj ^3%s^7 időt újraéledésig" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Meghaltál, ^2%s^7 az újraéledéshez" @@ -1102,28 +1144,28 @@ msgstr "(%d szavazat)" msgid "Don't care" msgstr "Mindegy" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Válassz játéktípust" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Válassz pályát!" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d másodperc maradt hátra" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1233,7 +1275,7 @@ msgstr "Sebzésnövelő" msgid "Shield" msgstr "Védelmező" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Tuba Dobás" @@ -5341,6 +5383,7 @@ msgstr "Infó üzenetek panel" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5352,6 +5395,7 @@ msgid "Disable" msgstr "Letiltás" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5506,6 +5550,11 @@ msgstr "Fizika Panel" msgid "Powerups Panel" msgstr "Turbózó Panel" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Kényszerített arány:" @@ -5526,10 +5575,6 @@ msgstr "Időmérő Panel" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.it.po b/common.it.po index 6dd2828fa5..62dca3128f 100644 --- a/common.it.po +++ b/common.it.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Antonio , 2013-2018 +# Antonio , 2013-2019 # Antonio 'terencehill' Piu , 2011-2012 # Costa , 2014 # Felice Sallustio , 2011 @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-24 16:29+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-30 13:00+0000\n" "Last-Translator: Antonio \n" "Language-Team: Italian (http://www.transifex.com/team-xonotic/xonotic/" "language/it/)\n" @@ -203,11 +203,11 @@ msgstr "^3CTRL ^7per disabilitare il test di collisione, ^3SHIFT ^7e" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3ARROW KEYS ^7per fini aggiustamenti." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Migliore personale" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Migliore del server" @@ -537,170 +537,353 @@ msgstr "^1PENALITÀ: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2PENALITÀ: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "Numbero di uccisioni di portapalla" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "uccis. pp" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "tempo pp" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "Tempo totale di possesso della palla in Keepaway" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" +"Per quante volte una bandiera (CTF) o una chiave (KeyHunt) è stata catturata" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "catture" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "tempo cattura" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "Tempo della cattura più veloce (CTF)" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "Numero di morti" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "morti" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "Numero di chiavi distrutte spingendole nel vuoto" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "distrutte" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "danno" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "Il danno totale inflitto" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "danno subìto" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "Il danno totale subìto" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "Numero di bandiere cadute" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "cadute" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "ELO del giocatore" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "elo" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "più veloce" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "Tempo del giro più veloce (Corsa/CTS)" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "Numero di falli commessi" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "falli" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "Numero di uccisioni dei portabandiera" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "uccis. pb" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "FPS" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "fps" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "Numero di uccisioni meno suicidi" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "frags" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "Numero di goal segnati" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "gol" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "Numero di uccisioni di portachiavi" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "uccis. pc" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "rapp. u/m" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "u/m" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "Rapporto uccisioni-morti" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "rum" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "rapp. u/m" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "Numero di uccisioni" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "uccisioni" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" -msgstr "uccis. team" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" +msgstr "Numero di giri completati (Corsa/CTS)" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "giri" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "Numero di vite (LMS)" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "vite" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "Numero di volte che una chiave è stata persa" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "perdute" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "Nome giocatore" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "nome" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "somma" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "nick" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "Numero di obiettivi distrutti" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "obiettivi" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" +"Per quante volte una bandiera (CTF) o una chiave (KeyHunt) o una palla " +"(Keepaway) viene raccolta" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "raccolte" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "Tempo di ping" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "ping" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "Perdita Pacchetti" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "pl" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "Numero di giocatori spinti nel vuoto" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "spinte" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "Posizione del giocatore" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "posizione" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "Numero di riporti della bandiera" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "ritorni" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "Numero di risvegli" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "risvegli" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "Numero di round vinti" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "round vinti" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "punti" -#: qcsrc/client/hud/panel/scoreboard.qc:116 +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "Punteggio totale" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "Numero di suicidi" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 msgid "SCO^suicides" msgstr "suicidi" -#: qcsrc/client/hud/panel/scoreboard.qc:117 +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" +msgstr "Numero di uccisioni meno morti" + +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "somma" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" +msgstr "Numero di punti di dominio presi (Dominazione)" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 msgid "SCO^takes" msgstr "presi" -#: qcsrc/client/hud/panel/scoreboard.qc:118 +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" +msgstr "Numero di team uccisioni" + +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" +msgstr "uccis. team" + +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" +msgstr "Numero di tick (Dominazione)" + +#: qcsrc/client/hud/panel/scoreboard.qc:126 msgid "SCO^ticks" msgstr "tick" -#: qcsrc/client/hud/panel/scoreboard.qc:298 +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" +msgstr "tempo" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" +msgstr "Tempo totale di gara (Corsa/CTS)" + +#: qcsrc/client/hud/panel/scoreboard.qc:311 msgid "" "You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" "Puoi modificare la tabella dei punteggi usando il comando " "^2scoreboard_columns_set." -#: qcsrc/client/hud/panel/scoreboard.qc:299 +#: qcsrc/client/hud/panel/scoreboard.qc:312 msgid "Usage:" msgstr "Uso:" -#: qcsrc/client/hud/panel/scoreboard.qc:301 +#: qcsrc/client/hud/panel/scoreboard.qc:314 msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "^2scoreboard_columns_set ^7campo1 campo2 ..." -#: qcsrc/client/hud/panel/scoreboard.qc:302 +#: qcsrc/client/hud/panel/scoreboard.qc:315 msgid "" "^2scoreboard_columns_set ^7without arguments reads the arguments from the " "cvar scoreboard_columns" @@ -708,7 +891,7 @@ msgstr "" "^2scoreboard_columns_set ^7senza argomenti legge gli argomenti dalla cvar " "scoreboard_columns" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:316 msgid "" " ^5Note: ^7scoreboard_columns_set without arguments is executed on every " "map start" @@ -716,7 +899,7 @@ msgstr "" " ^5Nota: ^7scoreboard_columns_set senza argomenti è eseguito ad ogni avvio " "di mappa" -#: qcsrc/client/hud/panel/scoreboard.qc:304 +#: qcsrc/client/hud/panel/scoreboard.qc:317 msgid "" "^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " "it into the cvar scoreboard_columns so you can edit it" @@ -724,158 +907,17 @@ msgstr "" "^2scoreboard_columns_set ^3expand_default ^7carica il layout di default e lo " "espande nella cvar scoreboard_columns così da poterlo modificare" -#: qcsrc/client/hud/panel/scoreboard.qc:305 +#: qcsrc/client/hud/panel/scoreboard.qc:318 msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "Puoi usare ^3|^7 per cominciare i campi allineati a destra." -#: qcsrc/client/hud/panel/scoreboard.qc:306 +#: qcsrc/client/hud/panel/scoreboard.qc:319 msgid "The following field names are recognized (case insensitive):" msgstr "" "Sono riconsciuti i seguenti nomi di campo (non importa se maiusc./minusc.):" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" -msgstr "Nome di un giocatore" - -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" -msgstr "Tempo di ping" - -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "Perdita Pacchetti" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" -msgstr "ELO del giocatore" - -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" -msgstr "FPS del giocatore" - -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" -msgstr "Numero di uccisioni" - -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" -msgstr "Numero di morti" - -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" -msgstr "Numero di suicidi" - -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" -msgstr "uccisioni - suicidi" - -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "Numero di team uccisioni" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "Rapporto uccisioni-morti" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "Il danno totale inflitto" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "Il danno totale subìto" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "uccisioni - morti" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" -msgstr "" -"Per quante volte una bandiera (CTF) o una chiave (KeyHunt) è stata catturata" - #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" -"Per quante volte una bandiera (CTF) o una chiave (KeyHunt) o una palla " -"(Keepaway) viene raccolta" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "Tempo della cattura più veloce (CTF)" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "Numero di uccisioni dei portabandiera" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "Numero di riporti della bandiera" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "Numero di bandiere cadute" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "Numero di vite (LMS)" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "Posizione del giocatore" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "Numero di giocatori spinti nel vuoto" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "Numero di chiavi distrutte spingendole nel vuoto" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "Numero di uccisioni di portachiavi" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "Numero di volte che una chiave è stata persa" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "Numero di giri completati (corsa/cts)" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "Tempo totale di gara (corsa/cts)" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "Tempo del giro più veloce (corsa/cts)" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "Numero di tick (DOM)" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "Numero di punti di dominio presi (DOM)" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "Numbero di uccisioni di portapalla" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "Tempo totale di possesso della palla in Keepaway" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "Punteggio totale" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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" @@ -890,7 +932,7 @@ msgstr "" "come campo per mostrare tutti i campi disponibili per l'attuale modalità di " "gioco." -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." @@ -899,11 +941,11 @@ msgstr "" "usati\n" "per includere/escludere TUTTE le modalità a squadre/senza squadre." -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "Esempio: scoreboard_columns_set name ping pl | +ctf/campo3 -dm/campo4" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." @@ -911,7 +953,7 @@ msgstr "" "mostrerà nome, ping e pl allineati a sinistra, e i campi a destra\n" "della barra verticale allineati a destra." -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." @@ -919,10 +961,10 @@ msgstr "" "'campo3' sarà mostrato solo in CTF, e 'campo4' sarà mostrato in tutte\n" "le altre modalità di gioco eccetto DM." -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -931,104 +973,104 @@ msgstr "" msgid "N/A" msgstr "N.D." -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Statistiche precisione (media %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Statistiche mappa:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Mostri uccisi:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Segreti trovati:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "Classifica tempi di cattura" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Classifica" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Punteggi" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "Premio velocità: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "Più veloce di sempre: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Spettatori" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "giocando a ^3%s^7 in ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " fino a ^1%1.0f minuti^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " o" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " fino a ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "punti" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "è battuto" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " fino a che si vince di ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Rinascita in ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Sei morto, aspetta ^3%s^7 prima di rinascere" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Sei morto, premi ^2%s^7 per rinascere" @@ -1127,28 +1169,28 @@ msgstr " (%d voti)" msgid "Don't care" msgstr "Non importa" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Decidere il tipo di gioco" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Vota per una mappa" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d secondi rimanenti" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "mv_mapdownload: ^3Non dovresti usare questo comando!" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "^1Errore:^7 Impossibile trovare il pak index." -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "Richiedendo l'anteprima..." @@ -1259,7 +1301,7 @@ msgstr "Forza" msgid "Shield" msgstr "Scudo" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Tuba Throwing" @@ -5534,6 +5576,7 @@ msgstr "Pannello delle informazioni" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5545,6 +5588,7 @@ msgid "Disable" msgstr "Disabilita" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "Abilita da spettatore" @@ -5699,6 +5743,11 @@ msgstr "Pannello Fisica" msgid "Powerups Panel" msgstr "Pannello dei Powerup" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "Abilita sempre" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Forza aspetto:" @@ -5719,10 +5768,6 @@ msgstr "Pannello Tempi Corsa" msgid "Enable in team games" msgstr "Abilita nei giochi a squadre" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "Abilita sempre" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.ja_JP.po b/common.ja_JP.po index 8bfe73721a..db6004c785 100644 --- a/common.ja_JP.po +++ b/common.ja_JP.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/team-xonotic/" "xonotic/language/ja_JP/)\n" @@ -199,11 +199,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "" @@ -533,332 +533,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -866,32 +908,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -900,104 +942,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1096,28 +1138,28 @@ msgstr "" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1227,7 +1269,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5325,6 +5367,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5336,6 +5379,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5490,6 +5534,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5510,10 +5559,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.jbo.po b/common.jbo.po index 1572d63d25..c1cee8534f 100644 --- a/common.jbo.po +++ b/common.jbo.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Lojban (http://www.transifex.com/team-xonotic/xonotic/" "language/jbo/)\n" @@ -197,11 +197,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "" @@ -531,332 +531,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -864,32 +906,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -898,104 +940,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1094,28 +1136,28 @@ msgstr "" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1225,7 +1267,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5323,6 +5365,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5334,6 +5377,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5488,6 +5532,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5508,10 +5557,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.kk@Cyrl.po b/common.kk@Cyrl.po index 2cfdf31c3d..352125e53f 100644 --- a/common.kk@Cyrl.po +++ b/common.kk@Cyrl.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Kazakh (Cyrillic) (http://www.transifex.com/team-xonotic/" "xonotic/language/kk%40Cyrl/)\n" @@ -201,11 +201,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Жеке рекорд" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Серверде рекорд" @@ -535,332 +535,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -868,32 +910,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -902,104 +944,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Рекордық үстелі" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1098,28 +1140,28 @@ msgstr "" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1229,7 +1271,7 @@ msgstr "" msgid "Shield" msgstr "Қалқан" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5327,6 +5369,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5338,6 +5381,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5492,6 +5536,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5512,10 +5561,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.ko.po b/common.ko.po index 6310b18a50..8e08532750 100644 --- a/common.ko.po +++ b/common.ko.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Korean (http://www.transifex.com/team-xonotic/xonotic/" "language/ko/)\n" @@ -202,11 +202,11 @@ msgstr "^3CTRL ^7로 충돌 테스트를 비활성화하고, ^3SHIFT ^7와" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3방향키 ^7로 미세하게 조정하세요." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "개인 최고 기록" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "서버 최고 기록" @@ -536,365 +536,407 @@ msgstr "^1불이익: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2불이익: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "SCO^공 운반자 킬" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "SCO^공 운반 시간" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "SCO^점령" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "SCO^점령 시간" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^죽음" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "SCO^파괴" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "SCO^데미지" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "SCO^입은 데미지" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "SCO^떨어뜨림" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "SCO^실수" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "SCO^깃발 운반자 킬" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "SCO^골" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "SCO^열쇠 운반자 킬" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "SCO^킬뎃비율" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "SCO^킬/뎃" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "SCO^킬뎃비" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "SCO^킬뎃비율" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "SCO^죽임" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "SCO^바퀴" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "SCO^목숨" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "SCO^패배" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "SCO^이름" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "SCO^합" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "SCO^별칭" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "SCO^목표" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "SCO^픽업" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "SCO^핑" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "SCO^패킷 손실" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "SCO^밀어냄" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "SCO^순위" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "SCO^귀환" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "SCO^부활" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "SCO^회 이김" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "SCO^점수" -#: qcsrc/client/hud/panel/scoreboard.qc:116 +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 msgid "SCO^suicides" msgstr "SCO^자살" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" -msgstr "SCO^가져감" - -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "SCO^합" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" +msgstr "SCO^가져감" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +msgid "Usage:" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -903,104 +945,104 @@ msgstr "" msgid "N/A" msgstr "준비중" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "정확도 통계(평균 %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "맵 스텟:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "죽인 몬스터 수:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "비밀 발견:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "순위" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "점수판" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "관전자" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "^3%s^7를 ^2%s^7에서 하는 중" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " 최고 ^1%1.0f 분^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "혹은" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "^3%s %s^7까지" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^점" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "SCO^가 쓰러졌어요" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "^3%s %s^7의 차이가 날 때까지" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1^3%s^1 동안 부활 중..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "당신은 죽었어요, 부활까지 ^3%s^7 기다리세요" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "당신은 죽었어요, ^2%s^7를 눌러 부활하세요" @@ -1099,28 +1141,28 @@ msgstr "(투표 %d 표)" msgid "Don't care" msgstr "신경 안 씀" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "게임 유형을 정하세요" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "투표해서 맵을 정하세요" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d 초 남음" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1230,7 +1272,7 @@ msgstr "힘" msgid "Shield" msgstr "방어" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5351,6 +5393,7 @@ msgstr "정보 메시지 제어반" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5362,6 +5405,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5516,6 +5560,11 @@ msgstr "물리 제어반" msgid "Powerups Panel" msgstr "파워업 제어반" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5536,10 +5585,6 @@ msgstr "경주 시간 기록기 제어반" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.kw.po b/common.kw.po index 344095284e..0e7ce3199c 100644 --- a/common.kw.po +++ b/common.kw.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Cornish (http://www.transifex.com/team-xonotic/xonotic/" "language/kw/)\n" @@ -200,11 +200,11 @@ msgstr "^3CTRL ^7rag diallosegi provow kesskwattyans, ^3SHIFT ^7ha" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3ARROW KEYS ^7rag desedhansow fin." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Rekord personel" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Rekord an servyer" @@ -534,365 +534,407 @@ msgstr "^1SPAL: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2SPAL: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "SCO^pelyow ledhys" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "SCO^termyn pel" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "SCO^sesyansow" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "SCO^termyn sesya" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^mernansow" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "SCO^distruys" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "SCO^damach" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "SCO^dmch recevys" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "SCO^droppyansow" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "SCO^fowtys" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "SCO^baneryow ledhys" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "SCO^golyow" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "SCO^alhwedhow ledhys" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "SCO^komparriv l/m" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "SCO^l/m" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "SCO^klm" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "SCO^komparriv l/m" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "SCO^ladhansow" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "SCO^troyow" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "SCO^bewnansow" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "SCO^fallow" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "SCO^hanow" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "SCO^somm" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "SCO^leshanow" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "SCO^amkanow" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "SCO^kuntellys" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "SCO^ping" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "SCO^pl" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "SCO^herdhys" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "SCO^renk" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "SCO^daskorrys" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "SCO^teudhys" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "SCO^rondys gwaynyes" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "SCO^skor" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "SCO^omladhansow" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" -msgstr "SCO^kemerys" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" -msgstr "SCO^merkys" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "SCO^omladhansow" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "SCO^somm" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" +msgstr "SCO^kemerys" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" +msgstr "SCO^merkys" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +msgid "Usage:" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -901,104 +943,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Statystygyon kewerder (kresek %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Statystygyon an mappa:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Tebelvestes ledhys:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Kevrinyow diskudhys:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "Renkyow an termyn sesya" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Renkyansow" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Bord an skoryow" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "Powas tooth: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "An kreffa oll-dermyn: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Miroryon" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "ow kwari ^3%s^7 war ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "rag ^1%1.0f mynysen^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " po" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " bys dhe ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^poynt" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "SCO^fethys" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " bys dhe hembronk a ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Dasapperyans yn ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Marow owgh, gortewgh ^3%s^7 kyns dasapperya" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Marow owgh, gweskewgh ^2%s^7 rag dasapperya" @@ -1097,28 +1139,28 @@ msgstr " (Raglevow: %d)" msgid "Don't care" msgstr "Ny'm deur" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Ervira an modh gwari" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Ragleva rag mappa" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d eylen gesys" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1228,7 +1270,7 @@ msgstr "Krevder" msgid "Shield" msgstr "Skoos" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "Tewlel an @!#%'n tuba" @@ -5341,6 +5383,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5352,6 +5395,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5506,6 +5550,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5526,10 +5575,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.mk.po b/common.mk.po index a9e8247dec..6dd773c09e 100644 --- a/common.mk.po +++ b/common.mk.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Macedonian (http://www.transifex.com/team-xonotic/xonotic/" "language/mk/)\n" @@ -197,11 +197,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "" @@ -531,332 +531,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -864,32 +906,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -898,104 +940,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1094,28 +1136,28 @@ msgstr "" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1225,7 +1267,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5323,6 +5365,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5334,6 +5377,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5488,6 +5532,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5508,10 +5557,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.ms.po b/common.ms.po index 7e6f6b9951..e08dde74b9 100644 --- a/common.ms.po +++ b/common.ms.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Malay (http://www.transifex.com/team-xonotic/xonotic/language/" "ms/)\n" @@ -199,11 +199,11 @@ msgstr "^3CTRL ^7untuk melumpuhkan percubaan perlanggaran, ^3SHIFT ^7dan" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3KEKUNCI ANAK PANAH ^7untuk pelarasan halus." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Pencapaian terbaik peribadi" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Pencapaian terbaik pelayan" @@ -533,332 +533,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -866,32 +908,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -900,104 +942,104 @@ msgstr "" msgid "N/A" msgstr "Tiada" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Statistik ketepatan (puratanya %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Statistik peta:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Raksasa dibunuh:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Rahsia dijumpai:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "Kedudukan masa tangkapan" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Kedudukan" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Papan markah" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "Anugerah kelajuan: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "Terlaju sepanjang masa: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Penonton" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "bermain ^3%s^7 di ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " sehingga ^1%1.0f minit^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "atau" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " sehingga ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^mata" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "SCO^dikalahkan" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " sehingga pimpinan ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Lahir semula dalam ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Anda dah mati, tunggu ^3%s^7 sebelum lahir semula" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Anda dah mati, tekan ^2%s^7 untuk lahir semula" @@ -1096,28 +1138,28 @@ msgstr " (%d undi)" msgid "Don't care" msgstr "Tak kisah" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Tentukan jenis permainan" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Undi peta" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "Tinggal %d saat" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1227,7 +1269,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5334,6 +5376,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5345,6 +5388,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5499,6 +5543,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5519,10 +5568,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.nl.po b/common.nl.po index 2eb0e4c3d3..3105846357 100644 --- a/common.nl.po +++ b/common.nl.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Dutch (http://www.transifex.com/team-xonotic/xonotic/language/" "nl/)\n" @@ -202,11 +202,11 @@ msgstr "^3CTRL ^7om het testen van botsingen uit te schakelen, ^3SHIFT ^7and" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3ARROW KEYS ^7voor fijnafstellingen." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Persoonlijk record" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Serverrecord" @@ -536,365 +536,407 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "SCO^veroveringen" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "SCO^verovertijd" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^doden" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "SCO^vernietigd" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "SCO^schade" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "SCO^schade ontvangen" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "SCO^vallen" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "SCO^fouten" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "SCO^vdmoorden" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "SCO^doelpunten" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "SCO^sdmoorden" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "SCO^mdratio" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "SCO^m/d" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "SCO^mdr" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "SCO^mdratio" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "SCO^moorden" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "SCO^ronden" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "SCO^levens" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "SCO^verliezen" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "SCO^naam" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "SCO^totaal" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "SCO^bijnaam" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "SCO^doelen" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "SCO^aantal keren vlag opgepakt" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "Ping" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "SCO^duwen" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "SCO^rang" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "SCO^aantal keren vlag teruggebracht" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "SCO^reanimatie" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "SCO^rondes gewonnen" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "SCO^score" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "SCO^zelfmoorden" - -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "SCO^zelfmoorden" + +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "SCO^totaal" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +msgid "Usage:" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -903,104 +945,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Kaartstatistieken:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Monsters vermoord:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Geheimen gevonden:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Scorebord" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Toeschouwers" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "of" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "tot ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^punten" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "SCO^is verslagen" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "tot een voorsprong van ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Terugkeren in ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Je bent dood, wacht ^3%s^7 voor terugkeren" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Je bent dood, druk op ^2%s^7 om terug te keren" @@ -1099,28 +1141,28 @@ msgstr "(%d stemmen)" msgid "Don't care" msgstr "Maakt mij niets uit" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Kies het speltype" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Stem voor een kaart" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d seconden resterend" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1230,7 +1272,7 @@ msgstr "Kracht" msgid "Shield" msgstr "Schild" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Tuba Smijten" @@ -5380,6 +5422,7 @@ msgstr "Informatieberichtenpaneel" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5391,6 +5434,7 @@ msgid "Disable" msgstr "Uitschakelen" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5545,6 +5589,11 @@ msgstr "Fysicapaneel" msgid "Powerups Panel" msgstr "Powerupspaneel" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Geforceerde verhouding:" @@ -5565,10 +5614,6 @@ msgstr "Racetijdpaneel" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.no.po b/common.no.po index ed154211ef..5b2a8de8d8 100644 --- a/common.no.po +++ b/common.no.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Norwegian (http://www.transifex.com/team-xonotic/xonotic/" "language/no/)\n" @@ -197,11 +197,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "" @@ -531,332 +531,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -864,32 +906,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -898,104 +940,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1094,28 +1136,28 @@ msgstr "" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1225,7 +1267,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5323,6 +5365,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5334,6 +5377,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5488,6 +5532,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5508,10 +5557,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.pl.po b/common.pl.po index 4a0edb79c7..f79682bb11 100644 --- a/common.pl.po +++ b/common.pl.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Polish (http://www.transifex.com/team-xonotic/xonotic/" "language/pl/)\n" @@ -212,11 +212,11 @@ msgstr "^3CTRL ^7aby wyłączyć testowanie kolizji, ^3SHIFT ^7i" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3ARROW KEYS ^7do małych korekty." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Rekord osobisty" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Rekord serwera" @@ -546,365 +546,407 @@ msgstr "^1KARA: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2KARA: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "przejęcia" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "czas przejęcia" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "śmierci" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "zniszczony" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "zadane obrażenia" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "przyjęte obrażenia" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "porzucenia" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "błędy" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "fckills" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "cele" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "kckills" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "zabici" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "okrążenia" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "życia" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "straty" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "nazwa" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "suma" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "nick" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "cele" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "ping" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "pl" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "pchnięcia" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "ranga" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "zwroty" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "rozmrożenia" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "wygranych rund" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "wynik" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "samobójstwa" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" -msgstr "SCO^przejęcia" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" -msgstr "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "samobójstwa" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "suma" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" +msgstr "SCO^przejęcia" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" +msgstr "SCO^ticks" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +msgid "Usage:" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -913,104 +955,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Statystyka dokładności (średnia %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Statystyka mapy:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Zabite potwory:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Znalezione sekrety:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "Ranking czasów przejęcia" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Rankingi" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Tablica wyników" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Obserwujący" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "grasz ^3%s^7 na ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " aż do 1 ^1%1.0f minut^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " lub" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " do ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "punkty" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "jest pobity" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " dopóki prowadzenie ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Wskrzeszanie za ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Jesteś martwy, czekaj ^3%s^7 przed wskrzeszeniem" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Jesteś martwy, wciśnij ^2%s^7 by się wskrzesić" @@ -1109,28 +1151,28 @@ msgstr "(%d głosów)" msgid "Don't care" msgstr "Wszystko jedno" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Wybierz rodzaj gry" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Głosuj na mapę" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "pozostało %d sekund" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1240,7 +1282,7 @@ msgstr "Siła" msgid "Shield" msgstr "Tarcza" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#% Rzut Tubą" @@ -5391,6 +5433,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5402,6 +5445,7 @@ msgid "Disable" msgstr "Dezaktywuj" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5556,6 +5600,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5576,10 +5625,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.pot b/common.pot index ca0ce568a7..6c76b3dddb 100644 --- a/common.pot +++ b/common.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -196,11 +196,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "" @@ -530,332 +530,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -863,32 +905,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -897,104 +939,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1093,28 +1135,28 @@ msgstr "" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1224,7 +1266,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5322,6 +5364,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5333,6 +5376,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5487,6 +5531,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5507,10 +5556,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.pt.po b/common.pt.po index 026c5c9d04..1d4e4013a1 100644 --- a/common.pt.po +++ b/common.pt.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Portuguese (http://www.transifex.com/team-xonotic/xonotic/" "language/pt/)\n" @@ -207,11 +207,11 @@ msgstr "^3CTRL ^7para desativar o teste de colisão, ^3SHIFT ^7e" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3TECLAS DIRECIONAIS ^7para pequenos ajustes." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Recorde pessoal" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Recorde do servidor" @@ -541,365 +541,407 @@ msgstr "^1PENALIDADE: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2PENALIDADE: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "pblvítimas" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "pbltempo" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "capturas" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "tempo de captura" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "mortes" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "destruído" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "dano" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "dano recebido" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "quedas" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "faltas" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "pbndvítimas" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "golos" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "pcvítimas" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "taxa de v/m" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "v/m" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "fmr" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "taxa de v/m" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "vítimas" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "voltas" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "vidas" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "derrotas" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "nome" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "soma" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "apelido" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "objetivos" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "coletas" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "ping" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "pp" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "empurrões" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "classificação" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "retornos" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "ressurreições" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "rodadas vencidas" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "pontuação" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "suicídios" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" -msgstr "tomadas" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" -msgstr "ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "suicídios" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "soma" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" +msgstr "tomadas" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" +msgstr "ticks" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +msgid "Usage:" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -908,104 +950,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Estatísticas de pontaria (média %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Estatísticas do mapa:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Monstros mortos:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Segredos encontrados:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "Classificações de tempo de captura" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Classificações" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Placar de pontuações" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "Prémio de velocidade: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "O mais rápido de todos: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Espetadores" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "a jogar ^3%s^7 em ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " até ^1%1.0f minutos^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " ou" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " até ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "pontos" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "foi espancado" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " até uma vantagem de ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Ressurgindo em ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Morreste. Espera ^3%s^7 antes de ressurgir" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Morreste. Pressiona ^2%s^7 para ressurgir" @@ -1104,28 +1146,28 @@ msgstr "(%d votos)" msgid "Don't care" msgstr "Não importa" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Decidir o modo de jogo" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Vota num mapa" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "Faltam %d segundos" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1235,7 +1277,7 @@ msgstr "Força" msgid "Shield" msgstr "Escudo" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Atirar da Tuba" @@ -5464,6 +5506,7 @@ msgstr "Painel de Mensagens de Informação" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5475,6 +5518,7 @@ msgid "Disable" msgstr "Desativar" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5629,6 +5673,11 @@ msgstr "Painel de Física" msgid "Powerups Panel" msgstr "Painel de Potencializadores" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Forçar aspecto:" @@ -5649,10 +5698,6 @@ msgstr "Painel do Cronómetro da Corrida" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.pt_BR.po b/common.pt_BR.po index b9f8dcf7fd..317cce7401 100644 --- a/common.pt_BR.po +++ b/common.pt_BR.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2019-01-15 02:59+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 16:23+0000\n" "Last-Translator: Jean Trindade Pereira \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/team-xonotic/" "xonotic/language/pt_BR/)\n" @@ -206,11 +206,11 @@ msgstr "Use ^3CTRL ^7para desligar o teste de colisão, e ^3SHIFT ^7e" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3TECLAS DIRECIONAIS ^7para pequenos ajustes." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Recorde pessoal" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Recorde do servidor" @@ -540,169 +540,352 @@ msgstr "^1PENALIDADE: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2PENALIDADE: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "Número de vítimas de portador de bola" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "pblvítimas" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "pbltempo" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "Tempo total segurando a bola em Keepaway" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" +"Quão frequente uma bandeira (CTF) ou uma chave (Caça a Chaves) foi capturada" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "capturas" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "tempo de captura" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "Tempo da captura mais rápida (CTF)" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "Número de mortes" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "mortes" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "Número de chaves destruídas ao empurrá-las para o vazio" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "destruído" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "dano" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "O dano total causado" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "dano recebido" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "O dano total recebido" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "Quantas vezes a bandeira foi largada" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "quedas" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "ELO do jogador" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "elo" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "mais rápido" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "Tempo da volta mais rápida (Corrida/CTS)" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "Faltas cometidas" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "faltas" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "Número de vítimas de portador de bandeira" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "pbndvítimas" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "FPS" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "fps" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "Vítimas menos suicídios" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "execuções" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "Gols" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "gols" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "Número de vítimas de portador de chave" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "pcvítimas" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "taxa de v/m" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "v/m" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "A taxa de vítimas/mortes" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "fmr" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "taxa de v/m" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "Número de vítimas" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "vítimas" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" -msgstr "vítimas de equipe" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" +msgstr "Voltas concluídas (Corrida/CTS)" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "voltas" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "Número de vidas (LMS)" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "vidas" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "Vezes em que uma chave foi perdida" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "derrotas" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "Nome do jogador" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "nome" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "soma" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "apelido" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "Objetivos destruídos" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "objetivos" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" +"Quão frequente uma bandeira (CTF), uma chave (Caça a Chaves) ou uma bola " +"(Keepaway) foi coletada" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "coletas" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "Tempo de ping" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "ping" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "Perda de pacotes" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "pp" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "Número de jogadores empurrados para o vazio" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "empurrões" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "Classificação do jogador" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "classificação" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "Número de retornos da bandeira" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "retornos" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "Ressurreições" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "ressurreições" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "Rodadas vencidas" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "rodadas vencidas" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "pontuação" -#: qcsrc/client/hud/panel/scoreboard.qc:116 +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "Pontuação total" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "Número de suicídios" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 msgid "SCO^suicides" msgstr "suicídios" -#: qcsrc/client/hud/panel/scoreboard.qc:117 +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" +msgstr "Vítimas menos mortes" + +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "soma" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" +msgstr "Pontos de dominação capturados (Dominação)" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 msgid "SCO^takes" msgstr "tomadas" -#: qcsrc/client/hud/panel/scoreboard.qc:118 +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" +msgstr "Número de vítimas de equipe" + +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" +msgstr "vítimas de equipe" + +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" +msgstr "Número de tiques (Dominação)" + +#: qcsrc/client/hud/panel/scoreboard.qc:126 msgid "SCO^ticks" msgstr "ticks" -#: qcsrc/client/hud/panel/scoreboard.qc:298 +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" +msgstr "tempo" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" +msgstr "Tempo total em corridas (Corrida/CTS)" + +#: qcsrc/client/hud/panel/scoreboard.qc:311 msgid "" "You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" "É possível modificar o placar usando o comando ^2scoreboard_columns_set." -#: qcsrc/client/hud/panel/scoreboard.qc:299 +#: qcsrc/client/hud/panel/scoreboard.qc:312 msgid "Usage:" msgstr "Uso:" -#: qcsrc/client/hud/panel/scoreboard.qc:301 +#: qcsrc/client/hud/panel/scoreboard.qc:314 msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "^2scoreboard_columns_set ^3field1 field2..." -#: qcsrc/client/hud/panel/scoreboard.qc:302 +#: qcsrc/client/hud/panel/scoreboard.qc:315 msgid "" "^2scoreboard_columns_set ^7without arguments reads the arguments from the " "cvar scoreboard_columns" @@ -710,7 +893,7 @@ msgstr "" "^2scoreboard_columns_set ^7sem argumentos lê os argumentos do cvar " "scoreboard_columns" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:316 msgid "" " ^5Note: ^7scoreboard_columns_set without arguments is executed on every " "map start" @@ -718,7 +901,7 @@ msgstr "" " ^5Observação: ^7scoreboard_columns_set sem argumentos é executado sempre " "que um mapa é iniciado" -#: qcsrc/client/hud/panel/scoreboard.qc:304 +#: qcsrc/client/hud/panel/scoreboard.qc:317 msgid "" "^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " "it into the cvar scoreboard_columns so you can edit it" @@ -726,159 +909,18 @@ msgstr "" "^2scoreboard_columns_set ^3expand_default ^7carrega o layout padrão e o " "expande no cvar scoreboard_columns para ficar editável" -#: qcsrc/client/hud/panel/scoreboard.qc:305 +#: qcsrc/client/hud/panel/scoreboard.qc:318 msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "É possível usar um ^3|^7 para iniciar os campos alinhados à direita." -#: qcsrc/client/hud/panel/scoreboard.qc:306 +#: qcsrc/client/hud/panel/scoreboard.qc:319 msgid "The following field names are recognized (case insensitive):" msgstr "" "Os seguintes nomes de campo são reconhecidos (maiúsculas e minúsculas não " "diferem):" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" -msgstr "Nome de um jogador" - -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" -msgstr "Tempo de ping" - -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "Perda de pacotes" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" -msgstr "ELO do jogador" - -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" -msgstr "FPS do jogador" - -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" -msgstr "Número de vítimas" - -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" -msgstr "Número de mortes" - -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" -msgstr "Número de suicídios" - -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" -msgstr "vítimas - suicídios" - -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "Número de vítimas de equipe" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "A taxa de vítimas/mortes" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "O dano total causado" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "O dano total recebido" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "vítimas - mortes" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" -msgstr "" -"Quão frequente uma bandeira (CTF) ou uma chave (Caça a Chaves) foi capturada" - #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" -"Quão frequente uma bandeira (CTF), uma chave (Caça a Chaves) ou uma bola " -"(Keepaway) foi coletada" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "Tempo da captura mais rápida (CTF)" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "Número de vítimas de portador de bandeira" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "Número de retornos da bandeira" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "Quantas vezes a bandeira foi largada" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "Número de vidas (LMS)" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "Classificação do jogador" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "Número de jogadores empurrados para o vazio" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "Número de chaves destruídas ao empurrá-las para o vazio" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "Número de vítimas de portador de chave" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "Vezes em que uma chave foi perdida" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "Voltas concluídas (corrida/cts)" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "Tempo total em corridas (corrida/cts)" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "Tempo da volta mais rápida (corrida/cts)" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "Número de tiques (DOM)" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "Pontos de dominação capturados (DOM)" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "Número de vítimas de portador de bola" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "Tempo total segurando a bola em Keepaway" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "Pontuação total" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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" @@ -891,7 +933,7 @@ msgstr "" "Também é possível especificar a palavra \"all\" como um\n" "campo para exibir todos os campos disponíveis para o modo de jogo atual." -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." @@ -899,11 +941,11 @@ msgstr "" "É possível usar os nomes especiais de modos de jogo \"teams\" e \"noteams\"\n" "para incluir/excluir TODOS os modos de jogo de equipe/sem equipe." -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "Exemplo: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." @@ -911,7 +953,7 @@ msgstr "" "exibirá o nome, ping e pp alinhados à esquerda e os campos\n" "à direita da barra vertical alinhada à direita." -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." @@ -919,10 +961,10 @@ msgstr "" "\"field3\" só aparecerá em CTF e 'field4' aparecerá em todos\n" "os outros modos de jogo, exceto MM." -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -931,104 +973,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Estatísticas de precisão (média %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Estatísticas do mapa:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Monstros mortos:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Segredos encontrados:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "Classificações de tempo de capturas" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Classificações" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Placar" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "Prêmio de velocidade: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "O mais rápido de todos: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Espectadores" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "jogando ^3%s^7 em ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " por até ^1%1.0f minutos^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " ou" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " até ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "pontos" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "foi espancado" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " até uma vantagem de ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Ressurgindo em ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Você morreu. Espere ^3%s^7 antes de ressurgir" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Você morreu. Aperte ^2%s^7 para ressurgir" @@ -1128,28 +1170,28 @@ msgstr "(%d votos)" msgid "Don't care" msgstr "Não importa" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Decidir o modo de jogo" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Vote em um mapa" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "Faltam %d segundos" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "mv_mapdownload: ^3Você não pode usar esse comando sozinho!" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "^1Erro:^7 Não foi possível encontrar o índice do pak." -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "Solicitando prévia..." @@ -1168,7 +1210,7 @@ msgstr "Progresso de captura" #: qcsrc/client/view.qc:1536 msgid "Revival progress" -msgstr "Progresso de renascimento" +msgstr "Progresso de ressurreição" #: qcsrc/common/command/generic.qc:156 msgid "error creating curl handle" @@ -1261,7 +1303,7 @@ msgstr "Força" msgid "Shield" msgstr "Escudo" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Tuba Throwing" @@ -5498,6 +5540,7 @@ msgstr "Painel de Mensagens de Informação" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5509,6 +5552,7 @@ msgid "Disable" msgstr "Desabilitar" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "Ativar observação" @@ -5663,6 +5707,11 @@ msgstr "Painel de Física" msgid "Powerups Panel" msgstr "Painel de Potencializadores" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "Ativar sempre" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Forçar aspecto:" @@ -5683,10 +5732,6 @@ msgstr "Painel do Cronômetro de Corrida" msgid "Enable in team games" msgstr "Ativar em modos de equipe" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "Ativar sempre" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.ro.po b/common.ro.po index ed957aa34b..a3dfe66a76 100644 --- a/common.ro.po +++ b/common.ro.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Romanian (http://www.transifex.com/team-xonotic/xonotic/" "language/ro/)\n" @@ -206,11 +206,11 @@ msgstr "^3CTRL ^7pentru a dezactiva testarea de coliziune, ^3SHIFT ^7și" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3SĂGEȚI ^7pentru ajustări fine." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Record personal" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Record server" @@ -540,365 +540,407 @@ msgstr "^1PENALIZARE: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2PENALIZARE: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "SCO^bcucideri" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "SCO^bctimp" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "SCO^capturi" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "SCO^timpcapturi" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^morți" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "SCO^distrus" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "SCO^dauneprimite" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "SCO^căzături" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "SCO^defecte" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "SCO^fcucideri" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "SCO^goluri" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "SCO^kcucideri" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "SCO^kdrație" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "SCO^u/m" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "SCO^rum" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "SCO^kdrație" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "SCO^ucideri" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "SCO^ture" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "SCO^vieți" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "SCO^pierderi" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "SCO^nume" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "SCO^sumă" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "SCO^poreclă" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "SCO^obiective" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "SCO^ridicări" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "SCO^latență" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "SCO^pl" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "SCO^împingeri" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "SCO^rang" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "SCO^returnări" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "SCO^reînvieri" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "SCO^scor" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "SCO^sinucideri" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" -msgstr "SCO^luări" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" -msgstr "SCO^tic-uri" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "SCO^sinucideri" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "SCO^sumă" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" +msgstr "SCO^luări" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" +msgstr "SCO^tic-uri" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +msgid "Usage:" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -907,104 +949,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Statistici de acuratețe (medie %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Statistici hartă:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Monștri uciși:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Secrete descoperite:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Clasament" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Tabelă de scor" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Spectatori" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "se joacă ^3%s^7 pe harta ^2%s^7 " -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "timp de ^1%1.0f minute^7 " +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "sau " -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "până la ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^puncte" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "SCO^este bătut" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "până la un avans de ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Respawn în ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Ești mort, așteaptă ^3%s^7 până la respawn" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Ești mort, apasă ^2%s^7 pentru a te respawna" @@ -1103,28 +1145,28 @@ msgstr "(%d voturi)" msgid "Don't care" msgstr "Nu-mi pasă" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Alege tipul de joc" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Votează o hartă" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d secunde rămase" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1234,7 +1276,7 @@ msgstr "Forță" msgid "Shield" msgstr "Scut" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "Aruncă @!#%'n Tuba" @@ -5459,6 +5501,7 @@ msgstr "Fereastra Informatii" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5470,6 +5513,7 @@ msgid "Disable" msgstr "Dezactivat" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5624,6 +5668,11 @@ msgstr "Panou Fizici" msgid "Powerups Panel" msgstr "Panou Powerup" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Aspect forțat:" @@ -5644,10 +5693,6 @@ msgstr "Panou de Timp pentru Curse" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.ru.po b/common.ru.po index d162356435..6a8de2f02e 100644 --- a/common.ru.po +++ b/common.ru.po @@ -6,7 +6,7 @@ # adem4ik, 2014 # Alex Talker , 2014-2015 # Andrei Stepanov, 2014 -# Andrei Stepanov , 2014-2018 +# Andrei Stepanov , 2014-2019 # Andrey P , 2016 # Artem Vorotnikov , 2015 # Lord Canistra , 2011 @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2019-01-04 23:45+0000\n" -"Last-Translator: Nick S \n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-02-05 01:06+0000\n" +"Last-Translator: Andrei Stepanov \n" "Language-Team: Russian (http://www.transifex.com/team-xonotic/xonotic/" "language/ru/)\n" "Language: ru\n" @@ -211,11 +211,11 @@ msgstr "^3CTRL ^7для отключения теста коллизий, ^3SHIF msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3СТРЕЛКИ ^7для точной настройки." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Личный рекорд" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Рекорд сервера" @@ -545,170 +545,353 @@ msgstr "^1ШТРАФ: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2ШТРАФ: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "Число убитых переносчиков мяча" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "SCO^убийства" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "SCO^время" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "Общее время владения мячом в режиме Прятки" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" +"Как часто флаг (Захват флага) или ключ (Охота за ключами) были захвачены" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "SCO^захватов" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "SCO^время захвата" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "Время быстрейшего захвата (CTF)" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "Число смертей" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^смерти" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "Число ключей, разрушенных толчком в пустоту" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "SCO^разрушено" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "SCO^урон" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "Общий нанесённый урон" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "SCO^уронпол" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "Общий принятый урон" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "Число брошенных флагов" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "SCO^потери" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "ЭЛО игрока" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "SCO^эло" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "SCO^быстрейший" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "Время лучшего круга (Гонка/CTS)" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "Количество совершённых ошибок" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "SCO^ошибок" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "Число убитых флагоносцев" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "SCO^фнубийства" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "FPS" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "SCO^fps" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "Количество убийств за вычетом самоубийств" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "SCO^фраги" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "Количество забитых голов" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "SCO^голы" -#: qcsrc/client/hud/panel/scoreboard.qc:94 +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" +msgstr "Число убийств носителей ключей" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 msgid "SCO^kckills" msgstr "SCO^нкубийства" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "SCO^уб/см" - -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "SCO^уб/см" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "Отношение убийств/смертей" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "SCO^уб/см" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "SCO^уб/см" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "Число убийств" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "SCO^убийства" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" -msgstr "SCO^союзубийства" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" +msgstr "Количество завершённых кругов (Гонка/CTS)" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "SCO^круги" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "Количество жизней (LMS)" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "SCO^жизни" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "Число потерянных ключей" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "SCO^поражений" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "Имя игрока" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "SCO^имя" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "SCO^сум" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "SCO^ник" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "Количество уничтоженных целей" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "SCO^целей" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" +"Как часто флаг (Захват флага) или ключ (Охота за ключами) или мяч (Прятки) " +"были подобраны" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "SCO^поднятия" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "Время пинга" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "SCO^пинг" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "Потеря пакета" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "потери" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "Число отправленных в пустоту игроков" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "SCO^толчков" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "Ранг игрока" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "SCO^ранг" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "Число возвратов флага" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "SCO^возвраты" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "Количество возрождений" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "SCO^возрождения" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "Количество выигранных раундов" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "SCO^раундов выиграно" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "SCO^счёт" -#: qcsrc/client/hud/panel/scoreboard.qc:116 +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" +msgstr "Общий счёт" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" +msgstr "Число суицидов" + +#: qcsrc/client/hud/panel/scoreboard.qc:122 msgid "SCO^suicides" msgstr "SCO^суициды" -#: qcsrc/client/hud/panel/scoreboard.qc:117 +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" +msgstr "Количество убийств за вычетом смертей" + +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "SCO^сум" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" +msgstr "Количество захваченных точек доминации (Доминация)" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 msgid "SCO^takes" msgstr "SCO^подборов" -#: qcsrc/client/hud/panel/scoreboard.qc:118 +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" +msgstr "Число убийств союзников" + +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" +msgstr "SCO^союзубийства" + +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" +msgstr "Количество тиков (Доминация)" + +#: qcsrc/client/hud/panel/scoreboard.qc:126 msgid "SCO^ticks" msgstr "SCO^тиков" -#: qcsrc/client/hud/panel/scoreboard.qc:298 +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" +msgstr "SCO^время" + +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" +msgstr "Общее время гонки (Гонка/CTS)" + +#: qcsrc/client/hud/panel/scoreboard.qc:311 msgid "" "You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" "Вы можете изменить таблицу результатов, используя команду " "^2scoreboard_columns_set." -#: qcsrc/client/hud/panel/scoreboard.qc:299 +#: qcsrc/client/hud/panel/scoreboard.qc:312 msgid "Usage:" msgstr "Применение:" -#: qcsrc/client/hud/panel/scoreboard.qc:301 +#: qcsrc/client/hud/panel/scoreboard.qc:314 msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "^2scoreboard_columns_set ^3поле1 поле2 ..." -#: qcsrc/client/hud/panel/scoreboard.qc:302 +#: qcsrc/client/hud/panel/scoreboard.qc:315 msgid "" "^2scoreboard_columns_set ^7without arguments reads the arguments from the " "cvar scoreboard_columns" @@ -716,7 +899,7 @@ msgstr "" "^2scoreboard_columns_set ^7 без аргументов считывает конфигурацию из cvar'а " "scoreboard_columns" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:316 msgid "" " ^5Note: ^7scoreboard_columns_set without arguments is executed on every " "map start" @@ -724,7 +907,7 @@ msgstr "" " ^5Примечание: ^7scoreboard_columns_set без аргументов выполняется перед " "началом каждой карты" -#: qcsrc/client/hud/panel/scoreboard.qc:304 +#: qcsrc/client/hud/panel/scoreboard.qc:317 msgid "" "^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " "it into the cvar scoreboard_columns so you can edit it" @@ -733,157 +916,16 @@ msgstr "" "умолчанию и выводит её в переменную scoreboard_columns, где вы можете её " "отредактировать" -#: qcsrc/client/hud/panel/scoreboard.qc:305 +#: qcsrc/client/hud/panel/scoreboard.qc:318 msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "Используйте ^3|^7 для начала полей, выровненных справа." -#: qcsrc/client/hud/panel/scoreboard.qc:306 +#: qcsrc/client/hud/panel/scoreboard.qc:319 msgid "The following field names are recognized (case insensitive):" msgstr "Распознаны следующие имена полей (без учёта регистра):" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" -msgstr "Имя игрока" - -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" -msgstr "Время пинга" - -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "Потеря пакета" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" -msgstr "ЭЛО игрока" - -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" -msgstr "FPS игрока" - -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" -msgstr "Число убийств" - -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" -msgstr "Число смертей" - -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" -msgstr "Число суицидов" - -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" -msgstr "убийства - суициды" - -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "Число убийств союзников" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "Отношение убийств/смертей" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "Общий нанесённый урон" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "Общий принятый урон" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "убийства - смерти" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" -msgstr "" -"Как часто флаг (Захват флага) или ключ (Охота за ключами) были захвачены" - #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" -"Как часто флаг (Захват флага) или ключ (Охота за ключами) или мяч (Прятки) " -"были подобраны" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "Время быстрейшего захвата (Захват флага)" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "Число убитых флагоносцев" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "Число возвратов флага" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "Число брошенных флагов" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "Количество жизней (LMS)" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "Ранг игрока" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "Число отправленных в пустоту игроков" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "Число ключей, разрушенных толчком в пустоту" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "Число убийств носителей ключей" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "Число потерянных ключей" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "Число законченных кругов (race/cts)" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "Общее время гонок (race/cts)" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "Время лучшего круга (race/cts)" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "Количество тиков (DOM)" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "Количество захваченных точек доминации (DOM)" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "Число убитых переносчиков мяча" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "Общее время владения мячом в режиме Прятки" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "Общий счёт" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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" @@ -894,7 +936,7 @@ msgstr "" "режимов. Вы так же можете указать 'all' как поле для показа всех\n" "полей текущего игрового режима." -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." @@ -903,11 +945,11 @@ msgstr "" "использованы для включения/отключения ВСЕХ командных\n" "или некомандных игровых режимов." -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "Например: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." @@ -915,7 +957,7 @@ msgstr "" "отобразит имя, пинг и потери пакетов выровненными слева, и поля\n" "вертикальной панели справа." -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." @@ -923,10 +965,10 @@ msgstr "" "'field3' будет отображаться только в CTF, и 'field4' во всех других режимах " "кроме DM." -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -935,104 +977,104 @@ msgstr "" msgid "N/A" msgstr "Н/Д" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Точность попаданий (средняя %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Статистика карты:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Монстров убито:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Секретов найдено:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "Рейтинг времени захвата" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Рейтинг" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Таблица результатов" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "Награда за скорость: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "Быстрейший за всё время: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Зрители" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "режим ^3%s^7 на карте ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " до ^1%1.0f минут^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " или" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " до ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^очков" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "SCO^побит" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " по достижению лидерства в ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Возрождение через ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Вы мертвы, подождите ^3%s^7 до возрождения" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Вы мертвы, нажмите ^2%s^7 для возрождения" @@ -1131,29 +1173,29 @@ msgstr " (голосов: %d)" msgid "Don't care" msgstr "Всё равно" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Выберите тип игры" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Голосование за карту" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "Секунд осталось: %d" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" "mv_mapdownload: ^3Вы не должны использовать эту команду по своему усмотрению!" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "^1Error:^7 Не удалось найти индекс пака." -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "Запрос эскиза..." @@ -1263,7 +1305,7 @@ msgstr "Сила" msgid "Shield" msgstr "Щит" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Швыряние Трубой" @@ -2026,7 +2068,7 @@ msgstr "^F4ПРИМЕЧАНИЕ: ^BGИгроки не видят чат зрит #: qcsrc/common/notifications/all.inc:241 #, c-format msgid "^BG%s^BG captured the ^TC^TT^BG flag" -msgstr "^BG%s^BG захватили ^TC^TT^BG флаг" +msgstr "^BG%s^BG захватил ^TC^TT^BG флаг" #: qcsrc/common/notifications/all.inc:242 #, c-format @@ -2034,18 +2076,18 @@ msgid "" "^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds, breaking ^BG" "%s^BG's previous record of ^F2%s^BG seconds" msgstr "" -"^BG%s^BG захватили ^TC^TT^BG флаг за ^F1%s^BG секунд, побив предыдущий " -"рекорд ^BG%s^BG - ^F2%s^BG секунды" +"^BG%s^BG захватил ^TC^TT^BG флаг за ^F1%s^BG секунд, побив предыдущий рекорд " +"^BG%s^BG - ^F2%s^BG секунды" #: qcsrc/common/notifications/all.inc:243 #, c-format msgid "^BG%s^BG captured the flag" -msgstr "^BG%s^BG захватили флаг" +msgstr "^BG%s^BG захватил флаг" #: qcsrc/common/notifications/all.inc:244 #, c-format msgid "^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds" -msgstr "^BG%s^BG захватили ^TC^TT^BG флаг за ^F1%s^BG секунд" +msgstr "^BG%s^BG захватил ^TC^TT^BG флаг за ^F1%s^BG секунд" #: qcsrc/common/notifications/all.inc:245 #, c-format @@ -2053,7 +2095,7 @@ msgid "" "^BG%s^BG captured the ^TC^TT^BG flag in ^F2%s^BG seconds, failing to break " "^BG%s^BG's previous record of ^F1%s^BG seconds" msgstr "" -"^BG%s^BG захватили ^TC^TT^BG флаг за ^F2%s^BG секунд, не сумев побить " +"^BG%s^BG захватил ^TC^TT^BG флаг за ^F2%s^BG секунд, не сумев побить " "предыдущий рекорд ^BG%s^BG - ^F2%s^BG секунды" #: qcsrc/common/notifications/all.inc:246 @@ -5469,6 +5511,7 @@ msgstr "Панель информационных сообщений" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5480,6 +5523,7 @@ msgid "Disable" msgstr "Отключить" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "Включить наблюдение" @@ -5634,6 +5678,11 @@ msgstr "Панель физики" msgid "Powerups Panel" msgstr "Панель бонусов" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "Включать всегда" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Соотношение:" @@ -5654,10 +5703,6 @@ msgstr "Гоночная панель таймера" msgid "Enable in team games" msgstr "Включить в командных играх" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "Включать всегда" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Радар:" @@ -9406,7 +9451,7 @@ msgstr "Присоединился:" #: qcsrc/menu/xonotic/statslist.qc:103 msgid "Last match:" -msgstr "Последний матч" +msgstr "Последний матч:" #: qcsrc/menu/xonotic/statslist.qc:110 msgid "Time played:" diff --git a/common.sq.po b/common.sq.po index d87ec4d793..74f198ad2a 100644 --- a/common.sq.po +++ b/common.sq.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Albanian (http://www.transifex.com/team-xonotic/xonotic/" "language/sq/)\n" @@ -197,11 +197,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "" @@ -531,332 +531,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -864,32 +906,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -898,104 +940,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1094,28 +1136,28 @@ msgstr "" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1225,7 +1267,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5323,6 +5365,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5334,6 +5377,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5488,6 +5532,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5508,10 +5557,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.sr.po b/common.sr.po index f449d7b989..95752582cf 100644 --- a/common.sr.po +++ b/common.sr.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Serbian (http://www.transifex.com/team-xonotic/xonotic/" "language/sr/)\n" @@ -203,11 +203,11 @@ msgstr "^3CTRL ^7за онемогућавање провере сударања msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3ARROW KEYS ^7за тачнија прилагођавања." -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Лични рекорд" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Рекорд на серверу" @@ -537,365 +537,407 @@ msgstr "^1КАЗНА: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2КАЗНА: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "SCO^освајања" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "SCO^време освајања" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^смрти" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "SCO^уништено" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "SCO^штета" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "SCO^примљено штете" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "SCO^испуштања" -#: qcsrc/client/hud/panel/scoreboard.qc:91 +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 msgid "SCO^faults" msgstr "SCO^грешака" -#: qcsrc/client/hud/panel/scoreboard.qc:92 +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 msgid "SCO^fckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:93 +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 msgid "SCO^goals" msgstr "SCO^циљева" -#: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:96 +#: qcsrc/client/hud/panel/scoreboard.qc:103 msgid "SCO^k/d" msgstr "SCO^у/с" -#: qcsrc/client/hud/panel/scoreboard.qc:97 +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:98 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 msgid "SCO^kills" msgstr "SCO^убистава" -#: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 +#: qcsrc/client/hud/panel/scoreboard.qc:107 msgid "SCO^laps" msgstr "SCO^кругова" -#: qcsrc/client/hud/panel/scoreboard.qc:101 +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 msgid "SCO^lives" msgstr "SCO^живота" -#: qcsrc/client/hud/panel/scoreboard.qc:102 +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:109 msgid "SCO^losses" msgstr "SCO^губитака" -#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:110 msgid "SCO^name" msgstr "SCO^име" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" -msgstr "SCO^свота" - -#: qcsrc/client/hud/panel/scoreboard.qc:105 +#: qcsrc/client/hud/panel/scoreboard.qc:111 msgid "SCO^nick" msgstr "SCO^надимак" -#: qcsrc/client/hud/panel/scoreboard.qc:106 +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:112 msgid "SCO^objectives" msgstr "SCO^циљеви" -#: qcsrc/client/hud/panel/scoreboard.qc:107 +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "SCO^pickups" msgstr "SCO^купљења" -#: qcsrc/client/hud/panel/scoreboard.qc:108 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "SCO^ping" msgstr "SCO^пинг" -#: qcsrc/client/hud/panel/scoreboard.qc:109 +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "SCO^pl" msgstr "SCO^гп" -#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:116 msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:117 msgid "SCO^rank" msgstr "SCO^ранг" -#: qcsrc/client/hud/panel/scoreboard.qc:112 +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:118 msgid "SCO^returns" msgstr "SCO^враћања" -#: qcsrc/client/hud/panel/scoreboard.qc:113 +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:119 msgid "SCO^revivals" msgstr "SCO^оживљавања" -#: qcsrc/client/hud/panel/scoreboard.qc:114 +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:120 msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 +#: qcsrc/client/hud/panel/scoreboard.qc:121 msgid "SCO^score" msgstr "SCO^резултат" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "SCO^самоубистава" - -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "SCO^самоубистава" + +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" +msgstr "SCO^свота" + +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +msgid "Usage:" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgid "The following field names are recognized (case insensitive):" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" -msgstr "" - -#: qcsrc/client/hud/panel/scoreboard.qc:346 -msgid "" "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." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -904,104 +946,104 @@ msgstr "" msgid "N/A" msgstr "Н/Д" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "Статистика прецизности (просек %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Статистика мапе:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Убијено чудовишта:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Нађено тајни:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Рангови" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Табела са резултатима" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Пратиоци" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "игра се ^3%s^7 на ^2%s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr " највише ^1%1.0f минута^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " или" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " до ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^бодова" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr " до предности од ^3%s %s^7" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Оживљавање за ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Мртви сте, сачекајте ^3%s^7 пре оживљавања" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Мртви сте, притисните ^2%s^7 да бисте се оживели" @@ -1100,28 +1142,28 @@ msgstr "(%d гласова)" msgid "Don't care" msgstr "Свеједно" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Одаберите врсту игре" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Гласајте за мапу" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "Преостало секунди: %d" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1231,7 +1273,7 @@ msgstr "Снага" msgid "Shield" msgstr "Штит" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n бацање трубе" @@ -5349,6 +5391,7 @@ msgstr "Плоча инфо порука" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5360,6 +5403,7 @@ msgid "Disable" msgstr "Онемогући" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5514,6 +5558,11 @@ msgstr "Плоча физике" msgid "Powerups Panel" msgstr "Плоча појачања" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Присиљени поглед:" @@ -5534,10 +5583,6 @@ msgstr "Плоча са бројачем за трке" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Радар:" diff --git a/common.sv.po b/common.sv.po index 4b64258beb..5c99e5901c 100644 --- a/common.sv.po +++ b/common.sv.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Swedish (http://www.transifex.com/team-xonotic/xonotic/" "language/sv/)\n" @@ -197,11 +197,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "" @@ -531,332 +531,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -864,32 +906,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -898,104 +940,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1094,28 +1136,28 @@ msgstr "" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1225,7 +1267,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Tubakastning" @@ -5327,6 +5369,7 @@ msgstr "Info Meddelanden Panel" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5338,6 +5381,7 @@ msgid "Disable" msgstr "Inaktivera" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5492,6 +5536,11 @@ msgstr "Fysik Panel" msgid "Powerups Panel" msgstr "Powerups Panel" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Fast aspekt:" @@ -5512,10 +5561,6 @@ msgstr "Race Tidtagare Panel" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.tr.po b/common.tr.po index ec01e2da36..6988f1d995 100644 --- a/common.tr.po +++ b/common.tr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Turkish (http://www.transifex.com/team-xonotic/xonotic/" "language/tr/)\n" @@ -200,11 +200,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Kişisel rekor" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Sunucu rekoru" @@ -534,332 +534,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -867,32 +909,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -901,104 +943,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Harita verileri:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "Canavarlar öldürüldü:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Sırlar bulundu:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "Zaman sıralamasını yakala" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "Sıralamalar" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "Sonuçlar" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "Hız ödülü: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "Tüm zamanların en hızlısı: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Seyirciler" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "veya" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1Yeniden doğuma son ^3%s^1..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "Öldünüz, yeniden doğmadan önce ^3%s^7 bekleyin" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "Öldünüz, yeniden doğmak için ^2%s^7 basın" @@ -1097,28 +1139,28 @@ msgstr " (%d oy)" msgid "Don't care" msgstr "Umrumda değil" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Oyun türüne karar verin" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Haritayı oyla" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d saniye kaldı" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1228,7 +1270,7 @@ msgstr "Kuvvet" msgid "Shield" msgstr "Zırh" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Tuba Atma" @@ -5345,6 +5387,7 @@ msgstr "Bilgi Mesajları Paneli" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5356,6 +5399,7 @@ msgid "Disable" msgstr "Devredışı" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5510,6 +5554,11 @@ msgstr "Fizik Paneli" msgid "Powerups Panel" msgstr "Güç Paneli" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Zorlama yönü:" @@ -5530,10 +5579,6 @@ msgstr "Yarış Zamanlayıcı Paneli" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Radar:" diff --git a/common.uk.po b/common.uk.po index 7f939cc1f5..42a3018cdc 100644 --- a/common.uk.po +++ b/common.uk.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Ukrainian (http://www.transifex.com/team-xonotic/xonotic/" "language/uk/)\n" @@ -208,11 +208,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3СТРІЛКИ ^7для точного налаштування" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "Власний найкращий результат" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "Найкращий результат на сервері" @@ -542,332 +542,374 @@ msgstr "^1ШТРАФ: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2ШТРАФ: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" -msgstr "Пінг" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" +msgstr "Пінг" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -875,32 +917,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -909,104 +951,104 @@ msgstr "" msgid "N/A" msgstr "Н/Д" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "Статистика мапи:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "Знайдено секретів:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "Спектатори" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1105,28 +1147,28 @@ msgstr " (%d голосів)" msgid "Don't care" msgstr "Не турбує" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "Виберіть тип гри" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "Проголосуйте за мапу" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "%d секунд залишилось" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1236,7 +1278,7 @@ msgstr "Сила" msgid "Shield" msgstr "Щит" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Tuba Throwing" @@ -5386,6 +5428,7 @@ msgstr "Панель інформаційних повідомлень" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5397,6 +5440,7 @@ msgid "Disable" msgstr "Вимкнути" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5551,6 +5595,11 @@ msgstr "Панель фізики" msgid "Powerups Panel" msgstr "Панель підсилень" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "Примусовий аспект:" @@ -5571,10 +5620,6 @@ msgstr "Панель таймера гонки" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "Радар:" diff --git a/common.uz@Latn.po b/common.uz@Latn.po index 79854b9fb5..f83bdf3c52 100644 --- a/common.uz@Latn.po +++ b/common.uz@Latn.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Uzbek (Latin) (http://www.transifex.com/team-xonotic/xonotic/" "language/uz%40Latn/)\n" @@ -197,11 +197,11 @@ msgstr "" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "" @@ -531,332 +531,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 -msgid "SCO^caps" +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 -msgid "SCO^captime" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 -msgid "SCO^deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:87 -msgid "SCO^destroyed" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:88 -msgid "SCO^damage" +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +msgid "SCO^deaths" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "SCO^destroyed" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +msgid "SCO^damage" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +msgid "SCO^dmgtaken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +msgid "Player ELO" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "Number of goals scored" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "Number of keys carrier kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +msgid "SCO^k/d" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" +#: qcsrc/client/hud/panel/scoreboard.qc:103 +#: qcsrc/client/hud/panel/scoreboard.qc:104 +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "SCO^kdratio" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "Number of kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -864,32 +906,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -898,104 +940,104 @@ msgstr "" msgid "N/A" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "" @@ -1094,28 +1136,28 @@ msgstr "" msgid "Don't care" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1225,7 +1267,7 @@ msgstr "" msgid "Shield" msgstr "" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5323,6 +5365,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5334,6 +5377,7 @@ msgid "Disable" msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5488,6 +5532,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5508,10 +5557,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "" diff --git a/common.zh_CN.po b/common.zh_CN.po index c09d8de76f..e5ef1c2811 100644 --- a/common.zh_CN.po +++ b/common.zh_CN.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Chinese (China) (http://www.transifex.com/team-xonotic/" "xonotic/language/zh_CN/)\n" @@ -205,11 +205,11 @@ msgstr "^3CTRL ^7以禁用碰撞检测， ^3SHIFT ^7以及" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3箭头键 ^7以微调。" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "个人最佳" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "服务器最佳" @@ -539,332 +539,374 @@ msgstr "" msgid "^2PENALTY: %.1f (%s)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "SCO^captime" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^死亡数" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "SCO^已破坏" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:89 -msgid "SCO^dmgtaken" +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:90 -msgid "SCO^drops" +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "SCO^dmgtaken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "SCO^drops" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" -msgstr "SCO^击杀/死亡比" +msgid "SCO^elo" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" -msgstr "SCO^击杀/死亡" +msgid "SCO^fastest" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" -msgstr "SCO^击杀/死亡比" +msgid "Number of faults committed" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" -msgstr "SCO^击杀数" +msgid "Number of flag carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "SCO^fckills" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" -msgstr "SCO^生命数" +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" -msgstr "SCO^名字" +msgid "SCO^k/d" +msgstr "SCO^击杀/死亡" +#: qcsrc/client/hud/panel/scoreboard.qc:103 #: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" +msgstr "SCO^击杀/死亡比" + #: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" -msgstr "SCO^昵称" +msgid "SCO^kdratio" +msgstr "SCO^击杀/死亡比" #: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" -msgstr "SCO^目标" - -#: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" -msgstr "SCO^拾起" +msgid "Number of kills" +msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" -msgstr "SCO^延迟" +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" +msgstr "SCO^击杀数" -#: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "Number of laps finished (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" -msgstr "SCO^排名" - -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" -msgstr "SCO^带回数" - -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" -msgstr "SCO^重生数" - -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" -msgstr "SCO^赢局数" - -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" -msgstr "SCO^分数" - -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "SCO^自杀数" - -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "Number of lives (LMS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" +msgstr "SCO^生命数" -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:110 +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" +msgstr "SCO^名字" -#: qcsrc/client/hud/panel/scoreboard.qc:303 -msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" +msgstr "SCO^昵称" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" +msgstr "SCO^目标" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" +msgstr "SCO^拾起" -#: qcsrc/client/hud/panel/scoreboard.qc:311 +#: qcsrc/client/hud/panel/scoreboard.qc:114 msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" +msgstr "SCO^延迟" + +#: qcsrc/client/hud/panel/scoreboard.qc:115 msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" +msgstr "SCO^排名" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" +msgstr "SCO^带回数" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" +msgstr "SCO^重生数" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" +msgstr "SCO^赢局数" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" +msgstr "SCO^分数" + +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "SCO^自杀数" + +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -872,32 +914,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -906,104 +948,104 @@ msgstr "" msgid "N/A" msgstr "无" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "精准度 (平均 %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "地图统计:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "怪物击杀:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "秘密已发现:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "占领时间排名" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "排名" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "计分板" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "速度奖励: %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "观众" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "最多 ^1%1.0f 分钟^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr "或者" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr " 直到 ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^分" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "SCO^被击败" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1在^3%s^1后重生..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "你死了,等待^3%s^7后重生" -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "你死了, 按下^2%s^7 重生" @@ -1102,28 +1144,28 @@ msgstr "(%d票)" msgid "Don't care" msgstr "不在意" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "选择游戏种类" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "投票选择地图" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "剩余%d秒" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1233,7 +1275,7 @@ msgstr "神力" msgid "Shield" msgstr "护盾" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5334,6 +5376,7 @@ msgstr "" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5345,6 +5388,7 @@ msgid "Disable" msgstr "禁用" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5499,6 +5543,11 @@ msgstr "" msgid "Powerups Panel" msgstr "" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5519,10 +5568,6 @@ msgstr "" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "雷达:" diff --git a/common.zh_TW.po b/common.zh_TW.po index 58e97e4fa1..4f55b0d912 100644 --- a/common.zh_TW.po +++ b/common.zh_TW.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Xonotic\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-13 15:42+0100\n" -"PO-Revision-Date: 2018-12-13 14:42+0000\n" +"POT-Creation-Date: 2019-01-27 07:23+0100\n" +"PO-Revision-Date: 2019-01-27 06:23+0000\n" "Last-Translator: divVerent \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/team-xonotic/" "xonotic/language/zh_TW/)\n" @@ -201,11 +201,11 @@ msgstr "^3CTRL ^7來禁止踫撞測試, ^3SHIFT ^7和" msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments." msgstr "^3ALT ^7+ ^3ARROW KEYS ^7 進行微調" -#: qcsrc/client/hud/panel/modicons.qc:571 +#: qcsrc/client/hud/panel/modicons.qc:576 msgid "Personal best" msgstr "個人最好成績" -#: qcsrc/client/hud/panel/modicons.qc:581 +#: qcsrc/client/hud/panel/modicons.qc:586 msgid "Server best" msgstr "服務器玩家中最好的成積" @@ -535,332 +535,374 @@ msgstr "^1懲罰: %.1f (%s)" msgid "^2PENALTY: %.1f (%s)" msgstr "^2懲罰: %.1f (%s)" -#: qcsrc/client/hud/panel/scoreboard.qc:82 +#: qcsrc/client/hud/panel/scoreboard.qc:86 +msgid "Number of ball carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:86 msgid "SCO^bckills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:83 +#: qcsrc/client/hud/panel/scoreboard.qc:87 msgid "SCO^bctime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:84 +#: qcsrc/client/hud/panel/scoreboard.qc:87 +msgid "Total amount of time holding the ball in Keepaway" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 +msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:88 msgid "SCO^caps" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:85 +#: qcsrc/client/hud/panel/scoreboard.qc:89 msgid "SCO^captime" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:86 +#: qcsrc/client/hud/panel/scoreboard.qc:89 +msgid "Time of fastest capture (CTF)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 +msgid "Number of deaths" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:90 msgid "SCO^deaths" msgstr "SCO^死亡" -#: qcsrc/client/hud/panel/scoreboard.qc:87 +#: qcsrc/client/hud/panel/scoreboard.qc:91 +msgid "Number of keys destroyed by pushing them into void" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:91 msgid "SCO^destroyed" msgstr "SCO^已破壞" -#: qcsrc/client/hud/panel/scoreboard.qc:88 +#: qcsrc/client/hud/panel/scoreboard.qc:92 msgid "SCO^damage" msgstr "SCO^傷害" -#: qcsrc/client/hud/panel/scoreboard.qc:89 +#: qcsrc/client/hud/panel/scoreboard.qc:92 +msgid "The total damage done" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:93 msgid "SCO^dmgtaken" msgstr "SCO^得到的傷害" -#: qcsrc/client/hud/panel/scoreboard.qc:90 +#: qcsrc/client/hud/panel/scoreboard.qc:93 +msgid "The total damage taken" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 +msgid "Number of flag drops" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:94 msgid "SCO^drops" msgstr "SCO^掉落" -#: qcsrc/client/hud/panel/scoreboard.qc:91 -msgid "SCO^faults" +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "Player ELO" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:92 -msgid "SCO^fckills" +#: qcsrc/client/hud/panel/scoreboard.qc:95 +msgid "SCO^elo" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:93 -msgid "SCO^goals" +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "SCO^fastest" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:94 -msgid "SCO^kckills" +#: qcsrc/client/hud/panel/scoreboard.qc:96 +msgid "Time of fastest lap (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:95 -msgid "SCO^kdratio" +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "Number of faults committed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:96 -msgid "SCO^k/d" +#: qcsrc/client/hud/panel/scoreboard.qc:97 +msgid "SCO^faults" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:97 -msgid "SCO^kdr" +#: qcsrc/client/hud/panel/scoreboard.qc:98 +msgid "Number of flag carrier kills" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:98 -msgid "SCO^kills" -msgstr "SCO^擊殺" +msgid "SCO^fckills" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:99 -msgid "SCO^teamkills" +msgid "FPS" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:99 +msgid "SCO^fps" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:100 -msgid "SCO^laps" -msgstr "SCO^圈數" +msgid "Number of kills minus suicides" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:100 +msgid "SCO^frags" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:101 -msgid "SCO^lives" -msgstr "SCO^生命" +msgid "Number of goals scored" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:101 +msgid "SCO^goals" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:102 -msgid "SCO^losses" -msgstr "SCO^失敗" +msgid "Number of keys carrier kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:102 +msgid "SCO^kckills" +msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:103 -msgid "SCO^name" -msgstr "SCO^名字" +msgid "SCO^k/d" +msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:103 #: qcsrc/client/hud/panel/scoreboard.qc:104 -msgid "SCO^sum" +#: qcsrc/client/hud/panel/scoreboard.qc:105 +msgid "The kill-death ratio" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:104 +msgid "SCO^kdr" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:105 -msgid "SCO^nick" +msgid "SCO^kdratio" msgstr "" #: qcsrc/client/hud/panel/scoreboard.qc:106 -msgid "SCO^objectives" -msgstr "SCO^目標" +msgid "Number of kills" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:106 +msgid "SCO^kills" +msgstr "SCO^擊殺" #: qcsrc/client/hud/panel/scoreboard.qc:107 -msgid "SCO^pickups" -msgstr "SCO^撿起" +msgid "Number of laps finished (Race/CTS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:107 +msgid "SCO^laps" +msgstr "SCO^圈數" #: qcsrc/client/hud/panel/scoreboard.qc:108 -msgid "SCO^ping" -msgstr "SCO^延遲" +msgid "Number of lives (LMS)" +msgstr "" + +#: qcsrc/client/hud/panel/scoreboard.qc:108 +msgid "SCO^lives" +msgstr "SCO^生命" #: qcsrc/client/hud/panel/scoreboard.qc:109 -msgid "SCO^pl" +msgid "Number of times a key was lost" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:110 -msgid "SCO^pushes" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:109 +msgid "SCO^losses" +msgstr "SCO^失敗" +#: qcsrc/client/hud/panel/scoreboard.qc:110 #: qcsrc/client/hud/panel/scoreboard.qc:111 -msgid "SCO^rank" -msgstr "SCO^排名" - -#: qcsrc/client/hud/panel/scoreboard.qc:112 -msgid "SCO^returns" -msgstr "SCO^返回" - -#: qcsrc/client/hud/panel/scoreboard.qc:113 -msgid "SCO^revivals" -msgstr "SCO^復活" - -#: qcsrc/client/hud/panel/scoreboard.qc:114 -msgid "SCO^rounds won" -msgstr "SCO^回合勝利" - -#: qcsrc/client/hud/panel/scoreboard.qc:115 -msgid "SCO^score" -msgstr "SCO^分數" - -#: qcsrc/client/hud/panel/scoreboard.qc:116 -msgid "SCO^suicides" -msgstr "SCO^自殺" - -#: qcsrc/client/hud/panel/scoreboard.qc:117 -msgid "SCO^takes" +msgid "Player name" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:118 -msgid "SCO^ticks" -msgstr "SCO^抽搐" - -#: qcsrc/client/hud/panel/scoreboard.qc:298 -msgid "" -"You can modify the scoreboard using the ^2scoreboard_columns_set command." -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:110 +msgid "SCO^name" +msgstr "SCO^名字" -#: qcsrc/client/hud/panel/scoreboard.qc:299 -msgid "Usage:" +#: qcsrc/client/hud/panel/scoreboard.qc:111 +msgid "SCO^nick" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:301 -msgid "^2scoreboard_columns_set ^3field1 field2 ..." +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "Number of objectives destroyed" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:302 -msgid "" -"^2scoreboard_columns_set ^7without arguments reads the arguments from the " -"cvar scoreboard_columns" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:112 +msgid "SCO^objectives" +msgstr "SCO^目標" -#: qcsrc/client/hud/panel/scoreboard.qc:303 +#: qcsrc/client/hud/panel/scoreboard.qc:113 msgid "" -" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " -"map start" +"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:304 -msgid "" -"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " -"it into the cvar scoreboard_columns so you can edit it" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:113 +msgid "SCO^pickups" +msgstr "SCO^撿起" -#: qcsrc/client/hud/panel/scoreboard.qc:305 -msgid "You can use a ^3|^7 to start the right-aligned fields." +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "Ping time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:306 -msgid "The following field names are recognized (case insensitive):" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:114 +msgid "SCO^ping" +msgstr "SCO^延遲" -#: qcsrc/client/hud/panel/scoreboard.qc:309 -#: qcsrc/client/hud/panel/scoreboard.qc:310 -msgid "Name of a player" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "Packet loss" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:311 -msgid "Ping time" +#: qcsrc/client/hud/panel/scoreboard.qc:115 +msgid "SCO^pl" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:312 -msgid "Packet loss" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "Number of players pushed into void" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:313 -msgid "Player ELO" +#: qcsrc/client/hud/panel/scoreboard.qc:116 +msgid "SCO^pushes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:314 -msgid "Player FPS" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "Player rank" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:315 -msgid "Number of kills" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:117 +msgid "SCO^rank" +msgstr "SCO^排名" -#: qcsrc/client/hud/panel/scoreboard.qc:316 -msgid "Number of deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "Number of flag returns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:317 -msgid "Number of suicides" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:118 +msgid "SCO^returns" +msgstr "SCO^返回" -#: qcsrc/client/hud/panel/scoreboard.qc:318 -msgid "kills - suicides" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "Number of revivals" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:319 -msgid "Number of teamkills" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:119 +msgid "SCO^revivals" +msgstr "SCO^復活" -#: qcsrc/client/hud/panel/scoreboard.qc:320 -msgid "The kill-death ratio" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "Number of rounds won" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:321 -msgid "The total damage done" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:120 +msgid "SCO^rounds won" +msgstr "SCO^回合勝利" -#: qcsrc/client/hud/panel/scoreboard.qc:322 -msgid "The total damage taken" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "SCO^score" +msgstr "SCO^分數" -#: qcsrc/client/hud/panel/scoreboard.qc:323 -msgid "kills - deaths" +#: qcsrc/client/hud/panel/scoreboard.qc:121 +msgid "Total score" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:324 -msgid "How often a flag (CTF) or a key (KeyHunt) was captured" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "Number of suicides" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:325 -msgid "" -"How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:122 +msgid "SCO^suicides" +msgstr "SCO^自殺" -#: qcsrc/client/hud/panel/scoreboard.qc:326 -msgid "Time of fastest cap (CTF)" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "Number of kills minus deaths" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:327 -msgid "Number of flag carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:123 +msgid "SCO^sum" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:328 -msgid "Number of flag returns" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "Number of domination points taken (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:329 -msgid "Number of flag drops" +#: qcsrc/client/hud/panel/scoreboard.qc:124 +msgid "SCO^takes" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:330 -msgid "Number of lives (LMS)" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "Number of teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:331 -msgid "Player rank" +#: qcsrc/client/hud/panel/scoreboard.qc:125 +msgid "SCO^teamkills" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:332 -msgid "Number of players pushed into void" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "Number of ticks (Domination)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:333 -msgid "Number of keys destroyed by pushing them into void" -msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:126 +msgid "SCO^ticks" +msgstr "SCO^抽搐" -#: qcsrc/client/hud/panel/scoreboard.qc:334 -msgid "Number of keys carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "SCO^time" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:335 -msgid "Number of times a key was lost" +#: qcsrc/client/hud/panel/scoreboard.qc:127 +msgid "Total time raced (Race/CTS)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:336 -msgid "Number of laps finished (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:311 +msgid "" +"You can modify the scoreboard using the ^2scoreboard_columns_set command." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:337 -msgid "Total time raced (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:312 +msgid "Usage:" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:338 -msgid "Time of fastest lap (race/cts)" +#: qcsrc/client/hud/panel/scoreboard.qc:314 +msgid "^2scoreboard_columns_set ^3field1 field2 ..." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:339 -msgid "Number of ticks (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:315 +msgid "" +"^2scoreboard_columns_set ^7without arguments reads the arguments from the " +"cvar scoreboard_columns" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:340 -msgid "Number of domination points taken (DOM)" +#: qcsrc/client/hud/panel/scoreboard.qc:316 +msgid "" +" ^5Note: ^7scoreboard_columns_set without arguments is executed on every " +"map start" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:341 -msgid "Number of ball carrier kills" +#: qcsrc/client/hud/panel/scoreboard.qc:317 +msgid "" +"^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands " +"it into the cvar scoreboard_columns so you can edit it" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:342 -msgid "Total amount of time holding the ball in Keepaway" +#: qcsrc/client/hud/panel/scoreboard.qc:318 +msgid "You can use a ^3|^7 to start the right-aligned fields." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:343 -msgid "Total score" +#: qcsrc/client/hud/panel/scoreboard.qc:319 +msgid "The following field names are recognized (case insensitive):" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:346 +#: qcsrc/client/hud/panel/scoreboard.qc:325 msgid "" "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" @@ -868,32 +910,32 @@ msgid "" "field to show all fields available for the current game mode." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:352 +#: qcsrc/client/hud/panel/scoreboard.qc:331 msgid "" "The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:356 +#: qcsrc/client/hud/panel/scoreboard.qc:335 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:357 +#: qcsrc/client/hud/panel/scoreboard.qc:336 msgid "" "will display name, ping and pl aligned to the left, and the fields\n" "right of the vertical bar aligned to the right." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:359 +#: qcsrc/client/hud/panel/scoreboard.qc:338 msgid "" "'field3' will only be shown in CTF, and 'field4' will be shown in all\n" "other gamemodes except DM." msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:622 -#: qcsrc/client/hud/panel/scoreboard.qc:629 -#: qcsrc/client/hud/panel/scoreboard.qc:681 -#: qcsrc/client/hud/panel/scoreboard.qc:692 +#: qcsrc/client/hud/panel/scoreboard.qc:601 +#: qcsrc/client/hud/panel/scoreboard.qc:608 +#: qcsrc/client/hud/panel/scoreboard.qc:660 +#: qcsrc/client/hud/panel/scoreboard.qc:671 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121 @@ -902,104 +944,104 @@ msgstr "" msgid "N/A" msgstr "N/A" -#: qcsrc/client/hud/panel/scoreboard.qc:1200 +#: qcsrc/client/hud/panel/scoreboard.qc:1179 #, c-format msgid "Accuracy stats (average %d%%)" msgstr "精準度統計 (平均 %d%%)" -#: qcsrc/client/hud/panel/scoreboard.qc:1348 +#: qcsrc/client/hud/panel/scoreboard.qc:1327 msgid "Map stats:" msgstr "地圖統計:" -#: qcsrc/client/hud/panel/scoreboard.qc:1378 +#: qcsrc/client/hud/panel/scoreboard.qc:1357 msgid "Monsters killed:" msgstr "怪物擊殺:" -#: qcsrc/client/hud/panel/scoreboard.qc:1385 +#: qcsrc/client/hud/panel/scoreboard.qc:1364 msgid "Secrets found:" msgstr "發現秘密:" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Capture time rankings" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1407 +#: qcsrc/client/hud/panel/scoreboard.qc:1386 msgid "Rankings" msgstr "排名" -#: qcsrc/client/hud/panel/scoreboard.qc:1608 +#: qcsrc/client/hud/panel/scoreboard.qc:1589 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:43 msgid "Scoreboard" msgstr "分數板" -#: qcsrc/client/hud/panel/scoreboard.qc:1671 +#: qcsrc/client/hud/panel/scoreboard.qc:1652 #, c-format msgid "Speed award: %d%s ^7(%s^7)" msgstr "速度獎勵： %d%s ^7(%s^7)" -#: qcsrc/client/hud/panel/scoreboard.qc:1675 +#: qcsrc/client/hud/panel/scoreboard.qc:1656 #, c-format msgid "All-time fastest: %d%s ^7(%s^7)" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1691 +#: qcsrc/client/hud/panel/scoreboard.qc:1672 #, c-format msgid "Spectators" msgstr "觀眾" -#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1687 #, c-format msgid "playing ^3%s^7 on ^2%s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1713 -#: qcsrc/client/hud/panel/scoreboard.qc:1718 +#: qcsrc/client/hud/panel/scoreboard.qc:1694 +#: qcsrc/client/hud/panel/scoreboard.qc:1699 #, c-format msgid " for up to ^1%1.0f minutes^7" msgstr "" +#: qcsrc/client/hud/panel/scoreboard.qc:1703 #: qcsrc/client/hud/panel/scoreboard.qc:1722 -#: qcsrc/client/hud/panel/scoreboard.qc:1741 msgid " or" msgstr " 或" -#: qcsrc/client/hud/panel/scoreboard.qc:1725 -#: qcsrc/client/hud/panel/scoreboard.qc:1732 +#: qcsrc/client/hud/panel/scoreboard.qc:1706 +#: qcsrc/client/hud/panel/scoreboard.qc:1713 #, c-format msgid " until ^3%s %s^7" msgstr "直到 ^3%s %s^7" +#: qcsrc/client/hud/panel/scoreboard.qc:1707 +#: qcsrc/client/hud/panel/scoreboard.qc:1714 #: qcsrc/client/hud/panel/scoreboard.qc:1726 #: qcsrc/client/hud/panel/scoreboard.qc:1733 -#: qcsrc/client/hud/panel/scoreboard.qc:1745 -#: qcsrc/client/hud/panel/scoreboard.qc:1752 msgid "SCO^points" msgstr "SCO^點數" +#: qcsrc/client/hud/panel/scoreboard.qc:1708 +#: qcsrc/client/hud/panel/scoreboard.qc:1715 #: qcsrc/client/hud/panel/scoreboard.qc:1727 #: qcsrc/client/hud/panel/scoreboard.qc:1734 -#: qcsrc/client/hud/panel/scoreboard.qc:1746 -#: qcsrc/client/hud/panel/scoreboard.qc:1753 msgid "SCO^is beaten" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1744 -#: qcsrc/client/hud/panel/scoreboard.qc:1751 +#: qcsrc/client/hud/panel/scoreboard.qc:1725 +#: qcsrc/client/hud/panel/scoreboard.qc:1732 #, c-format msgid " until a lead of ^3%s %s^7" msgstr "" -#: qcsrc/client/hud/panel/scoreboard.qc:1775 +#: qcsrc/client/hud/panel/scoreboard.qc:1756 #, c-format msgid "^1Respawning in ^3%s^1..." msgstr "^1將在 ^3%s^1 秒后重生..." -#: qcsrc/client/hud/panel/scoreboard.qc:1785 +#: qcsrc/client/hud/panel/scoreboard.qc:1766 #, c-format msgid "You are dead, wait ^3%s^7 before respawning" msgstr "你死亡了, 在重生前 , 請等待 ^3%s^7 " -#: qcsrc/client/hud/panel/scoreboard.qc:1794 +#: qcsrc/client/hud/panel/scoreboard.qc:1775 #, c-format msgid "You are dead, press ^2%s^7 to respawn" msgstr "你死了,按下 ^2%s^7 重生" @@ -1098,28 +1140,28 @@ msgstr " (%d 投票)" msgid "Don't care" msgstr "不用擔心" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Decide the gametype" msgstr "決定遊戲類型" -#: qcsrc/client/mapvoting.qc:374 +#: qcsrc/client/mapvoting.qc:375 msgid "Vote for a map" msgstr "投票地圖" -#: qcsrc/client/mapvoting.qc:391 +#: qcsrc/client/mapvoting.qc:392 #, c-format msgid "%d seconds left" msgstr "只剩 %d 秒" -#: qcsrc/client/mapvoting.qc:504 +#: qcsrc/client/mapvoting.qc:505 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!" msgstr "" -#: qcsrc/client/mapvoting.qc:514 +#: qcsrc/client/mapvoting.qc:515 msgid "^1Error:^7 Couldn't find pak index." msgstr "" -#: qcsrc/client/mapvoting.qc:523 +#: qcsrc/client/mapvoting.qc:524 msgid "Requesting preview..." msgstr "" @@ -1229,7 +1271,7 @@ msgstr "力量" msgid "Shield" msgstr "盾牌" -#: qcsrc/common/mapinfo.qc:621 +#: qcsrc/common/mapinfo.qc:626 #, no-c-format msgid "@!#%'n Tuba Throwing" msgstr "" @@ -5335,6 +5377,7 @@ msgstr "消息板面" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:16 #: qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:15 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:14 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:15 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:50 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.qc:62 @@ -5346,6 +5389,7 @@ msgid "Disable" msgstr "禁用" #: qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qc:17 +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:15 msgid "Enable spectating" msgstr "" @@ -5500,6 +5544,11 @@ msgstr "物理板面" msgid "Powerups Panel" msgstr "能力提升板面" +#: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:16 +#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 +msgid "Always enable" +msgstr "" + #: qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc:23 msgid "Forced aspect:" msgstr "" @@ -5520,10 +5569,6 @@ msgstr "競賽計時器板面" msgid "Enable in team games" msgstr "" -#: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:17 -msgid "Always enable" -msgstr "" - #: qcsrc/menu/xonotic/dialog_hudpanel_radar.qc:23 msgid "Radar:" msgstr "雷達:" diff --git a/hud_luma.cfg b/hud_luma.cfg index 9dcfe0629a..813ecbaef0 100644 --- a/hud_luma.cfg +++ b/hud_luma.cfg @@ -207,7 +207,7 @@ seta hud_panel_pressedkeys_bg_color_team "" seta hud_panel_pressedkeys_bg_alpha "" seta hud_panel_pressedkeys_bg_border "" seta hud_panel_pressedkeys_bg_padding "1" -seta hud_panel_pressedkeys_aspect "1.6" +seta hud_panel_pressedkeys_aspect "1.8" seta hud_panel_pressedkeys_attack "0" seta hud_panel_chat_pos "0.010000 0.700000" diff --git a/hud_luminos.cfg b/hud_luminos.cfg index 3f4fe39fab..c5cfe4ac54 100644 --- a/hud_luminos.cfg +++ b/hud_luminos.cfg @@ -207,7 +207,7 @@ seta hud_panel_pressedkeys_bg_color_team "" seta hud_panel_pressedkeys_bg_alpha "" seta hud_panel_pressedkeys_bg_border "" seta hud_panel_pressedkeys_bg_padding "" -seta hud_panel_pressedkeys_aspect "1.6" +seta hud_panel_pressedkeys_aspect "1.8" seta hud_panel_pressedkeys_attack "0" seta hud_panel_chat_pos "0.010000 0.700000" diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg index 609ab766de..b728258463 100644 --- a/hud_luminos_minimal.cfg +++ b/hud_luminos_minimal.cfg @@ -207,7 +207,7 @@ seta hud_panel_pressedkeys_bg_color_team "" seta hud_panel_pressedkeys_bg_alpha "" seta hud_panel_pressedkeys_bg_border "" seta hud_panel_pressedkeys_bg_padding "" -seta hud_panel_pressedkeys_aspect "1.6" +seta hud_panel_pressedkeys_aspect "1.8" seta hud_panel_pressedkeys_attack "0" seta hud_panel_chat_pos "0 0.775000" diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg index b7a7d20ab2..3bfd694b19 100644 --- a/hud_luminos_minimal_xhair.cfg +++ b/hud_luminos_minimal_xhair.cfg @@ -207,7 +207,7 @@ seta hud_panel_pressedkeys_bg_color_team "" seta hud_panel_pressedkeys_bg_alpha "" seta hud_panel_pressedkeys_bg_border "" seta hud_panel_pressedkeys_bg_padding "" -seta hud_panel_pressedkeys_aspect "1.6" +seta hud_panel_pressedkeys_aspect "1.8" seta hud_panel_pressedkeys_attack "0" seta hud_panel_chat_pos "0 0.775000" diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg index ce81868119..c808f62fb5 100644 --- a/hud_luminos_old.cfg +++ b/hud_luminos_old.cfg @@ -207,7 +207,7 @@ seta hud_panel_pressedkeys_bg_color_team "" seta hud_panel_pressedkeys_bg_alpha "" seta hud_panel_pressedkeys_bg_border "" seta hud_panel_pressedkeys_bg_padding "" -seta hud_panel_pressedkeys_aspect "1.6" +seta hud_panel_pressedkeys_aspect "1.8" seta hud_panel_pressedkeys_attack "0" seta hud_panel_chat_pos "0.020000 0.780000" diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg index 4159b01c7d..b0b02d080c 100644 --- a/hud_nexuiz.cfg +++ b/hud_nexuiz.cfg @@ -207,7 +207,7 @@ seta hud_panel_pressedkeys_bg_color_team "" seta hud_panel_pressedkeys_bg_alpha "" seta hud_panel_pressedkeys_bg_border "" seta hud_panel_pressedkeys_bg_padding "" -seta hud_panel_pressedkeys_aspect "1.6" +seta hud_panel_pressedkeys_aspect "1.8" seta hud_panel_pressedkeys_attack "0" seta hud_panel_chat_pos "0 0.760000" diff --git a/languages.txt b/languages.txt index 03b1697ab0..fe24f31ed7 100644 --- a/languages.txt +++ b/languages.txt @@ -1,25 +1,25 @@ -ast "Asturian" "Asturianu" 69% -de "German" "Deutsch" 92% -de_CH "German (Switzerland)" "Deutsch (Schweiz)" 92% +ast "Asturian" "Asturianu" 68% +de "German" "Deutsch" 91% +de_CH "German (Switzerland)" "Deutsch (Schweiz)" 91% en "English" "English" 100% -en_AU "English (Australia)" "English (Australia)" 81% -es "Spanish" "Español" 92% +en_AU "English (Australia)" "English (Australia)" 80% +es "Spanish" "Español" 91% fr "French" "Français" 99% ga "Irish" "Irish" 34% it "Italian" "Italiano" 100% hu "Hungarian" "Magyar" 51% nl "Dutch" "Nederlands" 66% pl "Polish" "Polski" 76% -pt "Portuguese" "Português" 91% +pt "Portuguese" "Português" 90% pt_BR "Portuguese (Brazil)" "Português (Brasil)" 100% ro "Romanian" "Romana" 78% -fi "Finnish" "Suomi" 32% +fi "Finnish" "Suomi" 31% el "Greek" "Ελληνική" 48% be "Belarusian" "Беларуская" 58% -bg "Bulgarian" "Български" 64% +bg "Bulgarian" "Български" 63% ru "Russian" "Русский" 100% sr "Serbian" "Српски" 66% uk "Ukrainian" "Українська" 53% -zh_CN "Chinese (China)" "中文" 60% +zh_CN "Chinese (China)" "中文" 59% zh_TW "Chinese (Taiwan)" "國語" 65% ko "Korean" "한국의" 32% diff --git a/notifications.cfg b/notifications.cfg index 58c9801ab2..55be0a627e 100644 --- a/notifications.cfg +++ b/notifications.cfg @@ -245,7 +245,7 @@ seta notification_INFO_KEYHUNT_DROP "1" "0 = off, 1 = print to console, 2 = prin seta notification_INFO_KEYHUNT_LOST "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_KEYHUNT_PICKUP "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_KEYHUNT_PUSHED "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" -seta notification_INFO_LMS_FORFEIT "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" +seta notification_INFO_LMS_FORFEIT "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_LMS_NOLIVES "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_MINIGAME_INVITE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_MONSTERS_DISABLED "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" @@ -261,6 +261,7 @@ seta notification_INFO_POWERUP_STRENGTH "1" "0 = off, 1 = print to console, 2 = seta notification_INFO_QUIT_DISCONNECT "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_QUIT_KICK_IDLING "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_QUIT_KICK_SPECTATING "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" +seta notification_INFO_QUIT_KICK_TEAMKILL "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_QUIT_SPECTATE "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_RACE_ABANDONED "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_RACE_FAIL_RANKED "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" @@ -310,8 +311,6 @@ seta notification_INFO_WEAPON_HAGAR_MURDER_SPRAY "1" "0 = off, 1 = print to cons seta notification_INFO_WEAPON_HAGAR_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_HLAC_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_HLAC_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" -seta notification_INFO_WEAPON_HMG_MURDER_SNIPE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" -seta notification_INFO_WEAPON_HMG_MURDER_SPRAY "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_HOOK_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_KLEINBOTTLE_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_KLEINBOTTLE_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" @@ -324,14 +323,19 @@ seta notification_INFO_WEAPON_MORTAR_MURDER_BOUNCE "1" "0 = off, 1 = print to co seta notification_INFO_WEAPON_MORTAR_MURDER_EXPLODE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_MORTAR_SUICIDE_BOUNCE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_MORTAR_SUICIDE_EXPLODE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" +seta notification_INFO_WEAPON_OVERKILL_HMG_MURDER_SNIPE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" +seta notification_INFO_WEAPON_OVERKILL_HMG_MURDER_SPRAY "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" +seta notification_INFO_WEAPON_OVERKILL_MACHINEGUN_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" +seta notification_INFO_WEAPON_OVERKILL_NEX_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" +seta notification_INFO_WEAPON_OVERKILL_RPC_MURDER_DIRECT "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" +seta notification_INFO_WEAPON_OVERKILL_RPC_MURDER_SPLASH "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" +seta notification_INFO_WEAPON_OVERKILL_RPC_SUICIDE_DIRECT "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" +seta notification_INFO_WEAPON_OVERKILL_RPC_SUICIDE_SPLASH "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" +seta notification_INFO_WEAPON_OVERKILL_SHOTGUN_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_RIFLE_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_RIFLE_MURDER_HAIL "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_RIFLE_MURDER_HAIL_PIERCING "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_RIFLE_MURDER_PIERCING "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" -seta notification_INFO_WEAPON_RPC_MURDER_DIRECT "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" -seta notification_INFO_WEAPON_RPC_MURDER_SPLASH "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" -seta notification_INFO_WEAPON_RPC_SUICIDE_DIRECT "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" -seta notification_INFO_WEAPON_RPC_SUICIDE_SPLASH "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_SEEKER_MURDER_SPRAY "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_SEEKER_MURDER_TAG "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_SEEKER_SUICIDE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" @@ -537,7 +541,7 @@ seta notification_CENTER_VEHICLE_STEAL "1" "0 = off, 1 = centerprint" seta notification_CENTER_VEHICLE_STEAL_SELF "1" "0 = off, 1 = centerprint" seta notification_CENTER_WEAPON_MINELAYER_LIMIT "1" "0 = off, 1 = centerprint" -// MSG_MULTI notifications (count = 153): +// MSG_MULTI notifications (count = 156): seta notification_DEATH_MURDER_BUFF "1" "Enable this multiple notification" seta notification_DEATH_MURDER_CHEAT "1" "Enable this multiple notification" seta notification_DEATH_MURDER_DROWN "1" "Enable this multiple notification" @@ -657,8 +661,6 @@ seta notification_WEAPON_HAGAR_MURDER_SPRAY "1" "Enable this multiple notificati seta notification_WEAPON_HAGAR_SUICIDE "1" "Enable this multiple notification" seta notification_WEAPON_HLAC_MURDER "1" "Enable this multiple notification" seta notification_WEAPON_HLAC_SUICIDE "1" "Enable this multiple notification" -seta notification_WEAPON_HMG_MURDER_SNIPE "1" "Enable this multiple notification" -seta notification_WEAPON_HMG_MURDER_SPRAY "1" "Enable this multiple notification" seta notification_WEAPON_HOOK_MURDER "1" "Enable this multiple notification" seta notification_WEAPON_KLEINBOTTLE_MURDER "1" "Enable this multiple notification" seta notification_WEAPON_KLEINBOTTLE_SUICIDE "1" "Enable this multiple notification" @@ -671,14 +673,19 @@ seta notification_WEAPON_MORTAR_MURDER_BOUNCE "1" "Enable this multiple notifica seta notification_WEAPON_MORTAR_MURDER_EXPLODE "1" "Enable this multiple notification" seta notification_WEAPON_MORTAR_SUICIDE_BOUNCE "1" "Enable this multiple notification" seta notification_WEAPON_MORTAR_SUICIDE_EXPLODE "1" "Enable this multiple notification" +seta notification_WEAPON_OVERKILL_HMG_MURDER_SNIPE "1" "Enable this multiple notification" +seta notification_WEAPON_OVERKILL_HMG_MURDER_SPRAY "1" "Enable this multiple notification" +seta notification_WEAPON_OVERKILL_MACHINEGUN_MURDER "1" "Enable this multiple notification" +seta notification_WEAPON_OVERKILL_NEX_MURDER "1" "Enable this multiple notification" +seta notification_WEAPON_OVERKILL_RPC_MURDER_DIRECT "1" "Enable this multiple notification" +seta notification_WEAPON_OVERKILL_RPC_MURDER_SPLASH "1" "Enable this multiple notification" +seta notification_WEAPON_OVERKILL_RPC_SUICIDE_DIRECT "1" "Enable this multiple notification" +seta notification_WEAPON_OVERKILL_RPC_SUICIDE_SPLASH "1" "Enable this multiple notification" +seta notification_WEAPON_OVERKILL_SHOTGUN_MURDER "1" "Enable this multiple notification" seta notification_WEAPON_RIFLE_MURDER "1" "Enable this multiple notification" seta notification_WEAPON_RIFLE_MURDER_HAIL "1" "Enable this multiple notification" seta notification_WEAPON_RIFLE_MURDER_HAIL_PIERCING "1" "Enable this multiple notification" seta notification_WEAPON_RIFLE_MURDER_PIERCING "1" "Enable this multiple notification" -seta notification_WEAPON_RPC_MURDER_DIRECT "1" "Enable this multiple notification" -seta notification_WEAPON_RPC_MURDER_SPLASH "1" "Enable this multiple notification" -seta notification_WEAPON_RPC_SUICIDE_DIRECT "1" "Enable this multiple notification" -seta notification_WEAPON_RPC_SUICIDE_SPLASH "1" "Enable this multiple notification" seta notification_WEAPON_SEEKER_MURDER_SPRAY "1" "Enable this multiple notification" seta notification_WEAPON_SEEKER_MURDER_TAG "1" "Enable this multiple notification" seta notification_WEAPON_SEEKER_SUICIDE "1" "Enable this multiple notification" @@ -743,4 +750,4 @@ seta notification_show_sprees_info "3" "Show spree information in MSG_INFO messa seta notification_show_sprees_info_newline "1" "Show attacker spree information for MSG_INFO messages on a separate line than the death notification itself" seta notification_show_sprees_info_specialonly "1" "Don't show attacker spree information in MSG_INFO messages if it isn't an achievement" -// Notification counts (total = 834): MSG_ANNCE = 89, MSG_INFO = 329, MSG_CENTER = 235, MSG_MULTI = 153, MSG_CHOICE = 28 +// Notification counts (total = 837): MSG_ANNCE = 89, MSG_INFO = 329, MSG_CENTER = 235, MSG_MULTI = 156, MSG_CHOICE = 28 diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index 0195db43a4..4ad25b3fd8 100644 --- a/qcsrc/client/announcer.qc +++ b/qcsrc/client/announcer.qc @@ -115,7 +115,7 @@ void Announcer_Gamestart() previous_game_starttime = startTime; } -#define ANNOUNCER_CHECKMINUTE(minute) MACRO_BEGIN { \ +#define ANNOUNCER_CHECKMINUTE(minute) MACRO_BEGIN \ if(announcer_##minute##min) { \ if(timeleft > minute * 60) \ announcer_##minute##min = false; \ @@ -125,7 +125,7 @@ void Announcer_Gamestart() Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_##minute); \ } \ } \ -} MACRO_END +MACRO_END void Announcer_Time() { diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index db756608de..9300293408 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -381,6 +381,7 @@ float autocvar_hud_shownames_crosshairdistance_antioverlap; bool autocvar_hud_shownames_self; bool autocvar_hud_shownames_status; float autocvar_hud_shownames_statusbar_height; +float autocvar_hud_shownames_statusbar_highlight = 1; float autocvar_hud_shownames_aspect; float autocvar_hud_shownames_fontsize; int autocvar_hud_shownames_decolorize; diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 961fc77572..939e5d77fa 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -341,10 +341,10 @@ void CSQCPlayer_FallbackFrame_PostUpdate(entity this, bool isnew) // player "pops in" if(isnew) { -#define FIX_FRAMETIME(f,ft) MACRO_BEGIN { \ - if(IS_DEAD_FRAME(this.f) && this.ft != 0 && this.death_time != 0) \ - this.ft = this.death_time; \ -} MACRO_END +#define FIX_FRAMETIME(f,ft) MACRO_BEGIN \ + if(IS_DEAD_FRAME(this.f) && this.ft != 0 && this.death_time != 0) \ + this.ft = this.death_time; \ +MACRO_END FIX_FRAMETIME(frame, frame1time); FIX_FRAMETIME(frame2, frame2time); #ifdef CSQCMODEL_HAVE_TWO_FRAMES @@ -441,7 +441,7 @@ void CSQCModel_AutoTagIndex_Apply(entity this) LOG_TRACE("h_ model lacks weapon attachment, but v_ model is attached to it"); } } - else if(this.tag_entity.isplayermodel) + else if((this.tag_entity.isplayermodel & ISPLAYER_MODEL)) { skeleton_loadinfo(this.tag_entity); this.tag_index = this.tag_entity.bone_weapon; @@ -606,7 +606,7 @@ void CSQCModel_Hook_PreDraw(entity this, bool isplayer) else this.drawmask = MASK_NORMAL; - if(this.isplayermodel && this.drawmask) // this checks if it's a player MODEL! + if((this.isplayermodel & ISPLAYER_MODEL) && this.drawmask) // this checks if it's a player MODEL! { CSQCPlayer_ModelAppearance_Apply(this, (this.isplayermodel & ISPLAYER_LOCAL)); CSQCPlayer_LOD_Apply(this); @@ -697,7 +697,7 @@ void CSQCModel_Hook_PreUpdate(entity this, bool isnew, bool isplayer, bool isloc this.iflags |= IFLAG_V_ANGLE_X; // revert to values from server CSQCModel_Effects_PreUpdate(this); - if(this.isplayermodel) + if((this.isplayermodel & ISPLAYER_MODEL)) { if(!isplayer) CSQCPlayer_FallbackFrame_PreUpdate(this); @@ -713,7 +713,7 @@ void CSQCModel_Hook_PostUpdate(entity this, bool isnew, bool isplayer, bool islo this.isplayermodel = BITSET(this.isplayermodel, ISPLAYER_MODEL, is_playermodel); // save values set by server - if(this.isplayermodel) + if((this.isplayermodel & ISPLAYER_MODEL)) { CSQCPlayer_ModelAppearance_PostUpdate(this); if(isplayer) diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh index d2349a6a5c..b4596fbdfe 100644 --- a/qcsrc/client/hud/hud.qh +++ b/qcsrc/client/hud/hud.qh @@ -27,7 +27,7 @@ REGISTER_REGISTRY(hud_panels) #define HUD_PANEL(NAME) HUD_PANEL_##NAME // draw the background/borders -#define HUD_Panel_DrawBg() MACRO_BEGIN { \ +#define HUD_Panel_DrawBg() MACRO_BEGIN \ if(panel.current_panel_bg != "0" && panel.current_panel_bg != "") \ draw_BorderPicture( \ HUD_Shift(panel_pos - '1 1 0' * panel_bg_border), \ @@ -36,7 +36,7 @@ REGISTER_REGISTRY(hud_panels) panel_bg_color, panel_bg_alpha, \ HUD_Scale('1 1 0' * BORDER_MULTIPLIER * panel_bg_border) \ ); \ -} MACRO_END +MACRO_END int panel_order[hud_panels_MAX]; string hud_panelorder_prev; @@ -240,112 +240,112 @@ REGISTER_HUD_PANEL(SCOREBOARD, Scoreboard_Draw, PANEL_CONFIG_NO // Get value for panel.current_panel_bg: if "" fetch default, else use panel_bg_str // comment on last line of macro: // we probably want to see a background in config mode at all times... -#define HUD_Panel_GetBg() MACRO_BEGIN { \ - string panel_bg; \ - if (!autocvar__hud_configure && panel_bg_str == "0") { \ - panel_bg = "0"; \ - } else { \ - if (panel_bg_str == "") { \ - panel_bg_str = autocvar_hud_panel_bg; \ - } \ - if (panel_bg_str == "0" && !autocvar__hud_configure) { \ - panel_bg = "0"; \ - } else { \ - if (panel_bg_str == "0" && autocvar__hud_configure) \ - panel_bg_alpha_str = "0"; \ - panel_bg = strcat(hud_skin_path, "/", panel_bg_str); \ - if (precache_pic(panel_bg) == "") { \ - panel_bg = strcat(hud_skin_path, "/", "border_default"); \ - if (precache_pic(panel_bg) == "") { \ - panel_bg = strcat("gfx/hud/default/", "border_default"); \ - } \ - } \ - } \ - } \ - strcpy(panel.current_panel_bg, panel_bg); \ -} MACRO_END +#define HUD_Panel_GetBg() MACRO_BEGIN \ + string panel_bg; \ + if (!autocvar__hud_configure && panel_bg_str == "0") { \ + panel_bg = "0"; \ + } else { \ + if (panel_bg_str == "") { \ + panel_bg_str = autocvar_hud_panel_bg; \ + } \ + if (panel_bg_str == "0" && !autocvar__hud_configure) { \ + panel_bg = "0"; \ + } else { \ + if (panel_bg_str == "0" && autocvar__hud_configure) \ + panel_bg_alpha_str = "0"; \ + panel_bg = strcat(hud_skin_path, "/", panel_bg_str); \ + if (precache_pic(panel_bg) == "") { \ + panel_bg = strcat(hud_skin_path, "/", "border_default"); \ + if (precache_pic(panel_bg) == "") { \ + panel_bg = strcat("gfx/hud/default/", "border_default"); \ + } \ + } \ + } \ + } \ + strcpy(panel.current_panel_bg, panel_bg); \ +MACRO_END // Get value for panel_bg_color: if "" fetch default, else use panel_bg_color. Convert pants, shirt or teamcolor into a vector. -#define HUD_Panel_GetColor() MACRO_BEGIN { \ - if ((teamplay) && panel_bg_color_team > 0) { \ - if (autocvar__hud_configure && myteam == NUM_SPECTATOR) \ - panel_bg_color = '1 0 0' * panel_bg_color_team; \ - else \ - panel_bg_color = myteamcolors * panel_bg_color_team; \ - } else if (autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && panel_bg_color_team > 0) { \ - panel_bg_color = '1 0 0' * panel_bg_color_team; \ - } else { \ - if (panel_bg_color_str == "") { \ - panel_bg_color = autocvar_hud_panel_bg_color; \ - } else { \ - if (panel_bg_color_str == "shirt") { \ +#define HUD_Panel_GetColor() MACRO_BEGIN \ + if ((teamplay) && panel_bg_color_team > 0) { \ + if (autocvar__hud_configure && myteam == NUM_SPECTATOR) \ + panel_bg_color = '1 0 0' * panel_bg_color_team; \ + else \ + panel_bg_color = myteamcolors * panel_bg_color_team; \ + } else if (autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && panel_bg_color_team > 0) { \ + panel_bg_color = '1 0 0' * panel_bg_color_team; \ + } else { \ + if (panel_bg_color_str == "") { \ + panel_bg_color = autocvar_hud_panel_bg_color; \ + } else { \ + if (panel_bg_color_str == "shirt") { \ panel_bg_color = colormapPaletteColor(floor(entcs_GetClientColors(current_player) / 16), 0); \ - } else if (panel_bg_color_str == "pants") { \ + } else if (panel_bg_color_str == "pants") { \ panel_bg_color = colormapPaletteColor(entcs_GetClientColors(current_player) % 16, 1); \ - } else { \ - panel_bg_color = stov(panel_bg_color_str); \ - } \ - } \ - } \ -} MACRO_END + } else { \ + panel_bg_color = stov(panel_bg_color_str); \ + } \ + } \ + } \ +MACRO_END // Get value for panel_bg_color_team: if "" fetch default, else use panel_bg_color_team_str -#define HUD_Panel_GetColorTeam() MACRO_BEGIN { \ - if (panel_bg_color_team_str == "") { \ - panel_bg_color_team = autocvar_hud_panel_bg_color_team; \ - } else { \ - panel_bg_color_team = stof(panel_bg_color_team_str); \ - } \ -} MACRO_END +#define HUD_Panel_GetColorTeam() MACRO_BEGIN \ + if (panel_bg_color_team_str == "") { \ + panel_bg_color_team = autocvar_hud_panel_bg_color_team; \ + } else { \ + panel_bg_color_team = stof(panel_bg_color_team_str); \ + } \ +MACRO_END // Get value for panel_bg_alpha: if "" fetch default, else use panel_bg_alpha. Also do various menu dialog fadeout/in checks, and minalpha checks // comment on line 3 of macro: // do not set a minalpha cap when showing the config dialog for this panel -#define HUD_Panel_GetBgAlpha() MACRO_BEGIN { \ - if (panel_bg_alpha_str == "") { \ - panel_bg_alpha_str = ftos(autocvar_hud_panel_bg_alpha); \ - } \ - panel_bg_alpha = stof(panel_bg_alpha_str); \ - if (autocvar__hud_configure) { \ - if (!panel_enabled) \ - panel_bg_alpha = 0.25; \ - else if (hud_configure_menu_open == 2 && panel == highlightedPanel) \ +#define HUD_Panel_GetBgAlpha() MACRO_BEGIN \ + if (panel_bg_alpha_str == "") { \ + panel_bg_alpha_str = ftos(autocvar_hud_panel_bg_alpha); \ + } \ + panel_bg_alpha = stof(panel_bg_alpha_str); \ + if (autocvar__hud_configure) { \ + if (!panel_enabled) \ + panel_bg_alpha = 0.25; \ + else if (hud_configure_menu_open == 2 && panel == highlightedPanel) \ panel_bg_alpha = (1 - autocvar__menu_alpha) * max(cvar("hud_configure_bg_minalpha"), panel_bg_alpha) + autocvar__menu_alpha * panel_bg_alpha;\ - else \ - panel_bg_alpha = max(cvar("hud_configure_bg_minalpha"), panel_bg_alpha); \ - } \ -} MACRO_END + else \ + panel_bg_alpha = max(cvar("hud_configure_bg_minalpha"), panel_bg_alpha); \ + } \ +MACRO_END // Get value for panel_fg_alpha. Also do various minalpha checks // comment on line 2 of macro: // ALWAYS show disabled panels at 0.25 alpha when in config mode -#define HUD_Panel_GetFgAlpha() MACRO_BEGIN { \ - panel_fg_alpha = autocvar_hud_panel_fg_alpha; \ - if (autocvar__hud_configure && !panel_enabled) \ - panel_fg_alpha = 0.25; \ -} MACRO_END +#define HUD_Panel_GetFgAlpha() MACRO_BEGIN \ + panel_fg_alpha = autocvar_hud_panel_fg_alpha; \ + if (autocvar__hud_configure && !panel_enabled) \ + panel_fg_alpha = 0.25; \ +MACRO_END // Get border. See comments above, it's similar. -#define HUD_Panel_GetBorder() MACRO_BEGIN { \ - if (panel_bg_border_str == "") { \ - panel_bg_border = autocvar_hud_panel_bg_border; \ - } else { \ - panel_bg_border = stof(panel_bg_border_str); \ - } \ -} MACRO_END +#define HUD_Panel_GetBorder() MACRO_BEGIN \ + if (panel_bg_border_str == "") { \ + panel_bg_border = autocvar_hud_panel_bg_border; \ + } else { \ + panel_bg_border = stof(panel_bg_border_str); \ + } \ +MACRO_END // Get padding. See comments above, it's similar. // last line is a port of the old function, basically always make sure the panel contents are at least 5 pixels tall/wide, to disallow extreme padding values -#define HUD_Panel_GetPadding() MACRO_BEGIN { \ - if (panel_bg_padding_str == "") { \ - panel_bg_padding = autocvar_hud_panel_bg_padding; \ - } else { \ - panel_bg_padding = stof(panel_bg_padding_str); \ - } \ - panel_bg_padding = min(min(panel_size.x, panel_size.y)/2 - 5, panel_bg_padding); \ -} MACRO_END +#define HUD_Panel_GetPadding() MACRO_BEGIN \ + if (panel_bg_padding_str == "") { \ + panel_bg_padding = autocvar_hud_panel_bg_padding; \ + } else { \ + panel_bg_padding = stof(panel_bg_padding_str); \ + } \ + panel_bg_padding = min(min(panel_size.x, panel_size.y)/2 - 5, panel_bg_padding); \ +MACRO_END // return smoothly faded pos and size of given panel when a dialog is active // don't center too wide panels, it doesn't work with different resolutions -#define HUD_Panel_UpdatePosSize_ForMenu() MACRO_BEGIN { \ +#define HUD_Panel_UpdatePosSize_ForMenu() MACRO_BEGIN \ vector new_size = panel_size; \ float max_panel_width = 0.52 * vid_conwidth; \ if(panel_size.x > max_panel_width) \ @@ -356,13 +356,13 @@ REGISTER_HUD_PANEL(SCOREBOARD, Scoreboard_Draw, PANEL_CONFIG_NO vector new_pos = vec2(panel_bg_border + 0.5 * max_panel_width, 0.5 * vid_conheight) - 0.5 * new_size; \ panel_pos = (1 - autocvar__menu_alpha) * panel_pos + (autocvar__menu_alpha) * new_pos; \ panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * new_size; \ -} MACRO_END +MACRO_END // Scale the pos and size vectors to absolute coordinates -#define HUD_Panel_ScalePosSize() MACRO_BEGIN { \ - panel_pos.x *= vid_conwidth; panel_pos.y *= vid_conheight; \ - panel_size.x *= vid_conwidth; panel_size.y *= vid_conheight; \ -} MACRO_END +#define HUD_Panel_ScalePosSize() MACRO_BEGIN \ + panel_pos.x *= vid_conwidth; panel_pos.y *= vid_conheight; \ + panel_size.x *= vid_conwidth; panel_size.y *= vid_conheight; \ +MACRO_END float panel_fade_alpha; void HUD_Panel_LoadCvars(); @@ -371,17 +371,17 @@ void HUD_Panel_LoadCvars(); panel_enabled = ((panel.panel_configflags & PANEL_CONFIG_CANBEOFF) \ ? cvar(strcat("hud_panel_", panel.panel_name)) : true) -#define HUD_Panel_UpdatePosSize() MACRO_BEGIN { \ +#define HUD_Panel_UpdatePosSize() MACRO_BEGIN \ Hud_Panel_GetPanelEnabled(); \ - panel_pos = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_pos"))); \ - panel_size = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_size"))); \ - HUD_Panel_ScalePosSize(); \ - if (hud_configure_menu_open == 2 && panel == highlightedPanel) { \ - HUD_Panel_UpdatePosSize_ForMenu(); \ - } \ - panel_bg_border_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_border")); \ - HUD_Panel_GetBorder(); \ -} MACRO_END + panel_pos = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_pos"))); \ + panel_size = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_size"))); \ + HUD_Panel_ScalePosSize(); \ + if (hud_configure_menu_open == 2 && panel == highlightedPanel) { \ + HUD_Panel_UpdatePosSize_ForMenu(); \ + } \ + panel_bg_border_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_border")); \ + HUD_Panel_GetBorder(); \ +MACRO_END const int NOTIFY_MAX_ENTRIES = 10; const float NOTIFY_ICON_MARGIN = 0.02; diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc index ce700586ca..bd9aa1a21c 100644 --- a/qcsrc/client/hud/panel/ammo.qc +++ b/qcsrc/client/hud/panel/ammo.qc @@ -23,7 +23,7 @@ void DrawNadeProgressBar(vector myPos, vector mySize, float progress, vector col void DrawAmmoItem(vector myPos, vector mySize, int ammoType, bool isCurrent, bool isInfinite) { TC(bool, isCurrent); TC(bool, isInfinite); - if(ammoType == RESOURCE_NONE) + if(ammoType == RES_NONE) return; // Initialize variables @@ -31,7 +31,7 @@ void DrawAmmoItem(vector myPos, vector mySize, int ammoType, bool isCurrent, boo int ammo; if(autocvar__hud_configure) { - isCurrent = (ammoType == RESOURCE_ROCKETS); // Rockets always current + isCurrent = (ammoType == RES_ROCKETS); // Rockets always current ammo = 60; } else @@ -183,7 +183,7 @@ void HUD_Ammo() { if(autocvar__hud_configure) { - DrawAmmoItem(pos, ammo_size, RESOURCE_ROCKETS, true, false); + DrawAmmoItem(pos, ammo_size, RES_ROCKETS, true, false); } else { diff --git a/qcsrc/client/hud/panel/healtharmor.qc b/qcsrc/client/hud/panel/healtharmor.qc index 4c08ef900f..1e124dd942 100644 --- a/qcsrc/client/hud/panel/healtharmor.qc +++ b/qcsrc/client/hud/panel/healtharmor.qc @@ -86,9 +86,7 @@ void HUD_HealthArmor() int maxarmor = autocvar_hud_panel_healtharmor_maxarmor; if(autocvar_hud_panel_healtharmor_combined) // combined health and armor display { - vector v; - v = healtharmor_maxdamage(health, armor, armorblockpercent, DEATH_WEAPON.m_id); - + vector v = healtharmor_maxdamage(health, armor, armorblockpercent, DEATH_WEAPON.m_id); float hp = floor(v.x + 1); float maxtotal = maxhealth + maxarmor; diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc index f63ffb1dea..131d62efe9 100644 --- a/qcsrc/client/hud/panel/infomessages.qc +++ b/qcsrc/client/hud/panel/infomessages.qc @@ -50,10 +50,10 @@ vector InfoMessages_drawstring(string s, vector pos, vector sz, float a, vector return pos; } -#define InfoMessage(s) MACRO_BEGIN { \ +#define InfoMessage(s) MACRO_BEGIN \ pos = InfoMessages_drawstring(s, pos, mySize, ((img_curr_group >= 0) ? panel_fg_alpha * img_fade[img_curr_group] : panel_fg_alpha), fontsize); \ img_curr_group = -1; \ -} MACRO_END +MACRO_END void HUD_InfoMessages() { diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc index 6a905a8d5b..306bb6f8a3 100644 --- a/qcsrc/client/hud/panel/modicons.qc +++ b/qcsrc/client/hud/panel/modicons.qc @@ -41,8 +41,8 @@ void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, int layout, int if(layout) { - drawpic_aspect_skin(myPos, pic, vec2(0.7 * mySize.x, mySize.y), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawstring_aspect(myPos + eX * 0.7 * mySize.x, ftos(stat), vec2(0.3 * mySize.x, mySize.y), color, panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(myPos, pic, vec2(0.5 * mySize.x, mySize.y), '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring_aspect(myPos + eX * 0.5 * mySize.x, ftos(stat), vec2(0.5 * mySize.x, mySize.y), color, panel_fg_alpha, DRAWFLAG_NORMAL); } else drawstring_aspect(myPos, ftos(stat), mySize, color, panel_fg_alpha, DRAWFLAG_NORMAL); @@ -136,14 +136,14 @@ void HUD_Mod_CTF(vector pos, vector mySize) } // when status CHANGES, set old status into prevstatus and current status into status - #define X(team) MACRO_BEGIN { \ - if (team##flag != team##flag_prevframe) { \ - team##flag_statuschange_time = time; \ - team##flag_prevstatus = team##flag_prevframe; \ - team##flag_prevframe = team##flag; \ - } \ - team##flag_statuschange_elapsedtime = time - team##flag_statuschange_time; \ - } MACRO_END + #define X(team) MACRO_BEGIN \ + if (team##flag != team##flag_prevframe) { \ + team##flag_statuschange_time = time; \ + team##flag_prevstatus = team##flag_prevframe; \ + team##flag_prevframe = team##flag; \ + } \ + team##flag_statuschange_elapsedtime = time - team##flag_statuschange_time; \ + MACRO_END X(red); X(blue); X(yellow); @@ -164,7 +164,7 @@ void HUD_Mod_CTF(vector pos, vector mySize) string team##_icon = string_null, team##_icon_prevstatus = string_null; \ int team##_alpha, team##_alpha_prevstatus; \ team##_alpha = team##_alpha_prevstatus = 1; \ - MACRO_BEGIN { \ + MACRO_BEGIN \ switch (team##flag) { \ case 1: team##_icon = "flag_" #team "_taken"; break; \ case 2: team##_icon = "flag_" #team "_lost"; break; \ @@ -191,7 +191,7 @@ void HUD_Mod_CTF(vector pos, vector mySize) } \ break; \ } \ - } MACRO_END + MACRO_END X(red, myteam != NUM_TEAM_1 && (nteams & BIT(0))); X(blue, myteam != NUM_TEAM_2 && (nteams & BIT(1))); X(yellow, myteam != NUM_TEAM_3 && (nteams & BIT(2))); @@ -262,7 +262,7 @@ void HUD_Mod_CTF(vector pos, vector mySize) neutralflag_pos = pos; flag_size = e1 * fs * size1 + e2 * size2; - #define X(team) MACRO_BEGIN { \ + #define X(team) MACRO_BEGIN \ f = bound(0, team##flag_statuschange_elapsedtime * 2, 1); \ if (team##_icon && ctf_stalemate) \ drawpic_aspect_skin(team##flag_pos, "flag_stalemate", flag_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); \ @@ -270,7 +270,7 @@ void HUD_Mod_CTF(vector pos, vector mySize) drawpic_aspect_skin_expanding(team##flag_pos, team##_icon_prevstatus, flag_size, '1 1 1', panel_fg_alpha * team##_alpha_prevstatus, DRAWFLAG_NORMAL, f); \ if (team##_icon) \ drawpic_aspect_skin(team##flag_pos, team##_icon, flag_size, '1 1 1', panel_fg_alpha * team##_alpha * f, DRAWFLAG_NORMAL); \ - } MACRO_END + MACRO_END X(red); X(blue); X(yellow); diff --git a/qcsrc/client/hud/panel/pressedkeys.qc b/qcsrc/client/hud/panel/pressedkeys.qc index b4da1dd7d6..0bf9b8dd05 100644 --- a/qcsrc/client/hud/panel/pressedkeys.qc +++ b/qcsrc/client/hud/panel/pressedkeys.qc @@ -52,21 +52,21 @@ void HUD_PressedKeys() mySize = newSize; } - vector keysize = vec2(mySize.x / 3, mySize.y / (3 - !autocvar_hud_panel_pressedkeys_attack)); + vector keysize = vec2(mySize.x / (14/4), mySize.y / (3 - !autocvar_hud_panel_pressedkeys_attack)); int pressedkeys = STAT(PRESSED_KEYS); if(autocvar_hud_panel_pressedkeys_attack) { - drawpic_aspect_skin(pos + eX * keysize.x * 0.5, ((pressedkeys & KEY_ATCK) ? "key_atck_inv.tga" : "key_atck.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(pos + eX * keysize.x * 1.5, ((pressedkeys & KEY_ATCK2) ? "key_atck_inv.tga" : "key_atck.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * (3/4 * keysize.x), ((pressedkeys & KEY_ATCK) ? "key_atck_inv.tga" : "key_atck.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * (7/4 * keysize.x), ((pressedkeys & KEY_ATCK2) ? "key_atck2_inv.tga" : "key_atck2.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); pos.y += keysize.y; } drawpic_aspect_skin(pos, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(pos + eX * keysize.x, ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(pos + eX * keysize.x * 2, ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * (5/4 * keysize.x), ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * (10/4 * keysize.x), ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); pos.y += keysize.y; - drawpic_aspect_skin(pos, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(pos + eX * keysize.x, ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); - drawpic_aspect_skin(pos + eX * keysize.x * 2, ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * (1/4 * keysize.x), ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * (5/4 * keysize.x), ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + drawpic_aspect_skin(pos + eX * (9/4 * keysize.x), ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); } diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc index cd4551725b..ca1cb2a065 100644 --- a/qcsrc/client/hud/panel/radar.qc +++ b/qcsrc/client/hud/panel/radar.qc @@ -342,7 +342,7 @@ void HUD_Radar() IL_EACH(g_radaricons, it.teamradar_icon, { if ( hud_panel_radar_mouse ) - if ( GetResourceAmount(it, RESOURCE_HEALTH) >= 0 ) + if ( GetResource(it, RES_HEALTH) >= 0 ) if ( it.team == myteam + 1 || ISGAMETYPE(RACE) || !teamplay ) { vector coord = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(it.origin)); diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 54bb4671d3..c48390bcdb 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -74,52 +74,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; -// 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; @@ -306,41 +319,7 @@ void Cmd_Scoreboard_Help() 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" @@ -845,7 +824,7 @@ void Scoreboard_DrawItem(vector item_pos, vector rgb, entity pl, bool is_self, i { TC(bool, is_self); TC(int, pl_number); string str; - bool is_spec = (entcs_GetTeam(pl.sv_entnum) == NUM_SPECTATOR); + bool is_spec = entcs_IsSpectating(pl.sv_entnum); vector h_pos = item_pos; vector h_size = vec2(panel_size.x, hud_fontsize.y * 1.25); diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc index 8bf11cf1ac..3f67787020 100644 --- a/qcsrc/client/hud/panel/weapons.qc +++ b/qcsrc/client/hud/panel/weapons.qc @@ -26,7 +26,7 @@ int weaponorder_cmp(int i, int j, entity pass) return aj - ai; // the string is in REVERSE order (higher prio at the right is what we want, but higher prio first is the string) } -#define HUD_WEAPONS_GET_FULL_LAYOUT() MACRO_BEGIN { \ +#define HUD_WEAPONS_GET_FULL_LAYOUT() MACRO_BEGIN \ int nHidden = 0; \ FOREACH(Weapons, it != WEP_Null, { \ if (weapons_stat & WepSet_FromWeapon(it)) continue; \ @@ -37,7 +37,7 @@ int weaponorder_cmp(int i, int j, entity pass) rows = table_size.y; \ weapon_size.x = panel_size.x / columns; \ weapon_size.y = panel_size.y / rows; \ -} MACRO_END +MACRO_END void HUD_Weapons() { @@ -490,7 +490,7 @@ void HUD_Weapons() } // draw ammo status bar - if(!infinite_ammo && autocvar_hud_panel_weapons_ammo && (it.ammo_type != RESOURCE_NONE)) + if(!infinite_ammo && autocvar_hud_panel_weapons_ammo && (it.ammo_type != RES_NONE)) { float ammo_full; a = getstati(GetAmmoStat(it.ammo_type)); // how much ammo do we have? @@ -499,12 +499,12 @@ void HUD_Weapons() { switch (it.ammo_type) { - case RESOURCE_SHELLS: ammo_full = autocvar_hud_panel_weapons_ammo_full_shells; break; - case RESOURCE_BULLETS: ammo_full = autocvar_hud_panel_weapons_ammo_full_nails; break; - case RESOURCE_ROCKETS: ammo_full = autocvar_hud_panel_weapons_ammo_full_rockets; break; - case RESOURCE_CELLS: ammo_full = autocvar_hud_panel_weapons_ammo_full_cells; break; - case RESOURCE_PLASMA: ammo_full = autocvar_hud_panel_weapons_ammo_full_plasma; break; - case RESOURCE_FUEL: ammo_full = autocvar_hud_panel_weapons_ammo_full_fuel; break; + case RES_SHELLS: ammo_full = autocvar_hud_panel_weapons_ammo_full_shells; break; + case RES_BULLETS: ammo_full = autocvar_hud_panel_weapons_ammo_full_nails; break; + case RES_ROCKETS: ammo_full = autocvar_hud_panel_weapons_ammo_full_rockets; break; + case RES_CELLS: ammo_full = autocvar_hud_panel_weapons_ammo_full_cells; break; + case RES_PLASMA: ammo_full = autocvar_hud_panel_weapons_ammo_full_plasma; break; + case RES_FUEL: ammo_full = autocvar_hud_panel_weapons_ammo_full_fuel; break; default: ammo_full = 60; } diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index e32c0e8f57..96b3caa75e 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -801,7 +801,7 @@ NET_HANDLE(ENT_CLIENT_SPAWNEVENT, bool is_new) // The only parameter reflects if the entity is "new" to the client, meaning it just came into the client's PVS. void CSQC_Ent_Update(entity this, bool isnew) { - this.sourceLoc = __FILE__ ":" STR(__LINE__); + this.sourceLoc = __FILE__":"STR(__LINE__); int t = ReadByte(); // set up the "time" global for received entities to be correct for interpolation purposes diff --git a/qcsrc/client/miscfunctions.qh b/qcsrc/client/miscfunctions.qh index 0143d1a013..d259efe660 100644 --- a/qcsrc/client/miscfunctions.qh +++ b/qcsrc/client/miscfunctions.qh @@ -34,7 +34,7 @@ float PreviewExists(string name); vector Rotate(vector v, float a); -#define IS_DEAD(s) (((s).classname == "csqcmodel") ? (s).csqcmodel_isdead : (GetResourceAmount((s), RESOURCE_HEALTH) <= 0)) +#define IS_DEAD(s) (((s).classname == "csqcmodel") ? (s).csqcmodel_isdead : (GetResource((s), RES_HEALTH) <= 0)) // decolorizes and team colors the player name when needed @@ -110,7 +110,7 @@ vector _drawpic_sz; float _drawpic_oldsz; string _drawpic_picpath; #define drawpic_aspect(pos,pic,mySize,color,theAlpha,drawflag)\ - MACRO_BEGIN {\ + MACRO_BEGIN \ _drawpic_imgsize = draw_getimagesize(pic);\ if(_drawpic_imgsize != '0 0 0') {\ _drawpic_imgaspect = _drawpic_imgsize.x/_drawpic_imgsize.y;\ @@ -127,35 +127,35 @@ string _drawpic_picpath; drawpic(pos + eY * 0.5 * (_drawpic_oldsz - _drawpic_sz.y), pic, _drawpic_sz, color, theAlpha, drawflag);\ }\ }\ - } MACRO_END + MACRO_END // draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga #define drawpic_aspect_skin(pos,pic,sz,color,theAlpha,drawflag)\ - MACRO_BEGIN {\ + MACRO_BEGIN \ _drawpic_picpath = strcat(hud_skin_path, "/", pic);\ if(precache_pic(_drawpic_picpath) == "") {\ _drawpic_picpath = strcat("gfx/hud/default/", pic);\ }\ drawpic_aspect(pos, _drawpic_picpath, sz, color, theAlpha, drawflag);\ _drawpic_picpath = string_null;\ - } MACRO_END + MACRO_END // draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga #define drawpic_skin(pos,pic,sz,color,theAlpha,drawflag)\ - MACRO_BEGIN {\ + MACRO_BEGIN \ _drawpic_picpath = strcat(hud_skin_path, "/", pic);\ if(precache_pic(_drawpic_picpath) == "") {\ _drawpic_picpath = strcat("gfx/hud/default/", pic);\ }\ drawpic(pos, _drawpic_picpath, sz, color, theAlpha, drawflag);\ _drawpic_picpath = string_null;\ - } MACRO_END + MACRO_END void drawpic_aspect_skin_expanding(vector position, string pic, vector theScale, vector rgb, float theAlpha, float flag, float fadelerp); void drawpic_aspect_skin_expanding_two(vector position, string pic, vector theScale, vector rgb, float theAlpha, float flag, float fadelerp); -#define SET_POS_AND_SZ_Y_ASPECT(allow_colors) MACRO_BEGIN { \ +#define SET_POS_AND_SZ_Y_ASPECT(allow_colors) MACRO_BEGIN \ float textaspect, oldsz; \ vector dfs = drawfontscale; \ drawfontscale = '1 1 0'; \ @@ -170,7 +170,7 @@ void drawpic_aspect_skin_expanding_two(vector position, string pic, vector theSc sz.y = sz.x / textaspect; \ pos.y += (oldsz - sz.y) * 0.5; \ } \ -} MACRO_END +MACRO_END // drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box void drawstring_aspect(vector pos, string text, vector sz, vector color, float theAlpha, float drawflag); diff --git a/qcsrc/client/resources.qc b/qcsrc/client/resources.qc index 285ebad639..88a1fffc93 100644 --- a/qcsrc/client/resources.qc +++ b/qcsrc/client/resources.qc @@ -5,82 +5,79 @@ /// \brief Source file that contains implementation of the resource system. /// \copyright GNU GPLv2 or any later version. -float GetResourceAmount(entity e, int resource_type) +float GetResource(entity e, int res_type) { - .float resource_field = GetResourceField(resource_type); - return e.(resource_field); + return e.(GetResourceField(res_type)); } -bool SetResourceAmountExplicit(entity e, int resource_type, float amount) +bool SetResourceExplicit(entity e, int res_type, float amount) { - .float resource_field = GetResourceField(resource_type); - if (e.(resource_field) != amount) + .float res_field = GetResourceField(res_type); + if (e.(res_field) != amount) { - e.(resource_field) = amount; + e.(res_field) = amount; return true; } return false; } -void SetResourceAmount(entity e, int resource_type, float amount) +void SetResource(entity e, int res_type, float amount) { - SetResourceAmountExplicit(e, resource_type, amount); + SetResourceExplicit(e, res_type, amount); } -void TakeResource(entity receiver, int resource_type, float amount) +void TakeResource(entity receiver, int res_type, float amount) { if (amount == 0) { return; } - SetResourceAmount(receiver, resource_type, - GetResourceAmount(receiver, resource_type) - amount); + SetResource(receiver, res_type, GetResource(receiver, res_type) - amount); } -void TakeResourceWithLimit(entity receiver, int resource_type, float amount, - float limit) +void TakeResourceWithLimit(entity receiver, int res_type, float amount, float limit) { if (amount == 0) { return; } - float current_amount = GetResourceAmount(receiver, resource_type); + float current_amount = GetResource(receiver, res_type); if (current_amount - amount < limit) { amount = limit + current_amount; } - TakeResource(receiver, resource_type, amount); + TakeResource(receiver, res_type, amount); } -int GetResourceType(.float resource_field) +int GetResourceType(.float res_field) { - switch (resource_field) + switch (res_field) { - case health: { return RESOURCE_HEALTH; } - case armorvalue: { return RESOURCE_ARMOR; } - case ammo_shells: { return RESOURCE_SHELLS; } - case ammo_nails: { return RESOURCE_BULLETS; } - case ammo_rockets: { return RESOURCE_ROCKETS; } - case ammo_cells: { return RESOURCE_CELLS; } - case ammo_plasma: { return RESOURCE_PLASMA; } - case ammo_fuel: { return RESOURCE_FUEL; } + case health: { return RES_HEALTH; } + case armorvalue: { return RES_ARMOR; } + case ammo_shells: { return RES_SHELLS; } + case ammo_nails: { return RES_BULLETS; } + case ammo_rockets: { return RES_ROCKETS; } + case ammo_cells: { return RES_CELLS; } + case ammo_plasma: { return RES_PLASMA; } + case ammo_fuel: { return RES_FUEL; } } error("GetResourceType: Invalid field."); return 0; } -.float GetResourceField(int resource_type) +.float GetResourceField(int res_type) { - switch (resource_type) + switch (res_type) { - case RESOURCE_HEALTH: { return health; } - case RESOURCE_ARMOR: { return armorvalue; } - case RESOURCE_SHELLS: { return ammo_shells; } - case RESOURCE_BULLETS: { return ammo_nails; } - case RESOURCE_ROCKETS: { return ammo_rockets; } - case RESOURCE_CELLS: { return ammo_cells; } - case RESOURCE_PLASMA: { return ammo_plasma; } - case RESOURCE_FUEL: { return ammo_fuel; } + case RES_HEALTH: { return health; } + case RES_ARMOR: { return armorvalue; } + case RES_SHELLS: { return ammo_shells; } + case RES_BULLETS: { return ammo_nails; } + case RES_ROCKETS: { return ammo_rockets; } + case RES_CELLS: { return ammo_cells; } + case RES_PLASMA: { return ammo_plasma; } + case RES_FUEL: { return ammo_fuel; } } error("GetResourceField: Invalid resource type."); return health; diff --git a/qcsrc/client/resources.qh b/qcsrc/client/resources.qh index 3aaa8aab59..4b0eaa8e75 100644 --- a/qcsrc/client/resources.qh +++ b/qcsrc/client/resources.qh @@ -10,51 +10,50 @@ /// \brief Returns the current amount of resource the given entity has. /// \param[in] e Entity to check. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \return Current amount of resource the given entity has. -float GetResourceAmount(entity e, int resource_type); +float GetResource(entity e, int res_type); /// \brief Sets the resource amount of an entity without calling any hooks. /// \param[in,out] e Entity to adjust. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to set. /// \return Boolean for whether the ammo amount was changed -bool SetResourceAmountExplicit(entity e, int resource_type, float amount); +bool SetResourceExplicit(entity e, int res_type, float amount); /// \brief Sets the current amount of resource the given entity will have. /// \param[in,out] e Entity to adjust. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to set. /// \return No return. -void SetResourceAmount(entity e, int resource_type, float amount); +void SetResource(entity e, int res_type, float amount); /// \brief Takes an entity some resource. /// \param[in,out] receiver Entity to take resource from. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to take. /// \return No return. -void TakeResource(entity receiver, int resource_type, float amount); +void TakeResource(entity receiver, int res_type, float amount); /// \brief Takes an entity some resource but not less than a limit. /// \param[in,out] receiver Entity to take resource from. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to take. /// \param[in] limit Limit of resources to take. /// \return No return. -void TakeResourceWithLimit(entity receiver, int resource_type, float amount, - float limit); +void TakeResourceWithLimit(entity receiver, int res_type, float amount, float limit); // ===================== Legacy and/or internal API =========================== /// \brief Converts an entity field to resource type. -/// \param[in] resource_field Entity field to convert. -/// \return Resource type (a RESOURCE_* constant). -int GetResourceType(.float resource_field); +/// \param[in] res_field Entity field to convert. +/// \return Resource type (a RES_* constant). +int GetResourceType(.float res_field); -/// \brief Converts resource type (a RESOURCE_* constant) to entity field. -/// \param[in] resource_type Type of the resource. +/// \brief Converts resource type (a RES_* constant) to entity field. +/// \param[in] res_type Type of the resource. /// \return Entity field for that resource. -.float GetResourceField(int resource_type); +.float GetResourceField(int res_type); /// \brief Legacy fields for the resources. To be removed. .float health; diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc index 2fc1559494..74136906e4 100644 --- a/qcsrc/client/shownames.qc +++ b/qcsrc/client/shownames.qc @@ -162,16 +162,18 @@ void Draw_ShowNames(entity this) { vector pos = namepos + eY * autocvar_hud_shownames_fontsize * resize; vector sz = vec2(0.5 * mySize.x, resize * autocvar_hud_shownames_statusbar_height); + if (autocvar_hud_shownames_statusbar_highlight) + drawfill(pos + eX * 0.25 * mySize.x, sz, '0.7 0.7 0.7', a / 2, DRAWFLAG_NORMAL); if (this.healthvalue > 0) { HUD_Panel_DrawProgressBar(pos, sz, "nametag_statusbar", this.healthvalue / autocvar_hud_panel_healtharmor_maxhealth, false, 1, '1 0 0', a, DRAWFLAG_NORMAL); } - if (GetResourceAmount(this, RESOURCE_ARMOR) > 0) + if (GetResource(this, RES_ARMOR) > 0) { HUD_Panel_DrawProgressBar(pos + eX * 0.5 * mySize.x, sz, "nametag_statusbar", - GetResourceAmount(this, RESOURCE_ARMOR) / autocvar_hud_panel_healtharmor_maxarmor, false, 0, '0 1 0', a, + GetResource(this, RES_ARMOR) / autocvar_hud_panel_healtharmor_maxarmor, false, 0, '0 1 0', a, DRAWFLAG_NORMAL); } } @@ -204,13 +206,13 @@ void Draw_ShowNames_All() if (entcs.m_entcs_private) { it.healthvalue = entcs.healthvalue; - SetResourceAmountExplicit(it, RESOURCE_ARMOR, GetResourceAmount(entcs, RESOURCE_ARMOR)); + SetResourceExplicit(it, RES_ARMOR, GetResource(entcs, RES_ARMOR)); it.sameteam = true; } else { it.healthvalue = 0; - SetResourceAmountExplicit(it, RESOURCE_ARMOR, 0); + SetResourceExplicit(it, RES_ARMOR, 0); it.sameteam = false; } bool dead = entcs_IsDead(i) || entcs_IsSpectating(i); diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index e26f90894d..5efd863bd6 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -76,54 +76,46 @@ float autocvar_cl_leanmodel_lowpass = 0.05; ret = ref_store = ref_store * (1 - frac) + (value) * frac; #define lowpass_limited(value, frac, limit, ref_store, ret) MACRO_BEGIN \ -{ \ float __ignore; lowpass(value, frac, ref_store, __ignore); \ ret = ref_store = bound((value) - (limit), ref_store, (value) + (limit)); \ -} MACRO_END +MACRO_END #define highpass(value, frac, ref_store, ret) MACRO_BEGIN \ -{ \ float __f = 0; lowpass(value, frac, ref_store, __f); \ ret = (value) - __f; \ -} MACRO_END +MACRO_END #define highpass_limited(value, frac, limit, ref_store, ret) MACRO_BEGIN \ -{ \ float __f = 0; lowpass_limited(value, frac, limit, ref_store, __f); \ ret = (value) - __f; \ -} MACRO_END +MACRO_END #define lowpass2(value, frac, ref_store, ref_out) MACRO_BEGIN \ -{ \ lowpass(value.x, frac, ref_store.x, ref_out.x); \ lowpass(value.y, frac, ref_store.y, ref_out.y); \ -} MACRO_END +MACRO_END #define highpass2(value, frac, ref_store, ref_out) MACRO_BEGIN \ -{ \ highpass(value.x, frac, ref_store.x, ref_out.x); \ highpass(value.y, frac, ref_store.y, ref_out.y); \ -} MACRO_END +MACRO_END #define highpass2_limited(value, frac, limit, ref_store, ref_out) MACRO_BEGIN \ -{ \ highpass_limited(value.x, frac, limit, ref_store.x, ref_out.x); \ highpass_limited(value.y, frac, limit, ref_store.y, ref_out.y); \ -} MACRO_END +MACRO_END #define lowpass3(value, frac, ref_store, ref_out) MACRO_BEGIN \ -{ \ lowpass(value.x, frac, ref_store.x, ref_out.x); \ lowpass(value.y, frac, ref_store.y, ref_out.y); \ lowpass(value.z, frac, ref_store.z, ref_out.z); \ -} MACRO_END +MACRO_END #define highpass3(value, frac, ref_store, ref_out) MACRO_BEGIN \ -{ \ highpass(value.x, frac, ref_store.x, ref_out.x); \ highpass(value.y, frac, ref_store.y, ref_out.y); \ highpass(value.z, frac, ref_store.z, ref_out.z); \ -} MACRO_END +MACRO_END void calc_followmodel_ofs(entity view) { @@ -1356,7 +1348,7 @@ void HUD_Crosshair(entity this) } #define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ vector scaled_sz = sz * wcross_size; \ if(wcross_blur > 0) \ { \ @@ -1368,7 +1360,7 @@ void HUD_Crosshair(entity this) { \ M(0,0,sz,scaled_sz,wcross_name,wcross_alpha); \ } \ - } MACRO_END + MACRO_END #define CROSSHAIR_DRAW_SINGLE(i,j,sz,scaled_sz,wcross_name,wcross_alpha) \ drawpic(wcross_origin - ('0.5 0 0' * (scaled_sz.x + i * wcross_blur) + '0 0.5 0' * (scaled_sz.y + j * wcross_blur)), wcross_name, scaled_sz, wcross_color, wcross_alpha, DRAWFLAG_NORMAL) diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index 2cac0b1e5b..dcd8d95842 100644 --- a/qcsrc/common/command/generic.qc +++ b/qcsrc/common/command/generic.qc @@ -374,16 +374,25 @@ void GenericCommand_restartnotifs(int request) case CMD_REQUEST_COMMAND: { #ifdef GAMEQC - int NOTIF_ANNCE_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_ANNCE, { ++NOTIF_ANNCE_COUNT; }); - int NOTIF_INFO_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_INFO, { ++NOTIF_INFO_COUNT; }); - int NOTIF_CENTER_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_CENTER, { ++NOTIF_CENTER_COUNT; }); - int NOTIF_MULTI_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_MULTI, { ++NOTIF_MULTI_COUNT; }); - int NOTIF_CHOICE_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_CHOICE, { ++NOTIF_CHOICE_COUNT; }); + int NOTIF_ANNCE_COUNT = 0; + int NOTIF_INFO_COUNT = 0; + int NOTIF_CENTER_COUNT = 0; + int NOTIF_MULTI_COUNT = 0; + int NOTIF_CHOICE_COUNT = 0; + FOREACH(Notifications, true, { + switch (it.nent_type) + { + case MSG_ANNCE: ++NOTIF_ANNCE_COUNT; break; + case MSG_INFO: ++NOTIF_INFO_COUNT; break; + case MSG_CENTER: ++NOTIF_CENTER_COUNT; break; + case MSG_MULTI: ++NOTIF_MULTI_COUNT; break; + case MSG_CHOICE: ++NOTIF_CHOICE_COUNT; break; + } + }); + LOG_INFOF( - ( - "Restart_Notifications(): Restarting %d notifications... " - "Counts: MSG_ANNCE = %d, MSG_INFO = %d, MSG_CENTER = %d, MSG_MULTI = %d, MSG_CHOICE = %d" - ), + "Restart_Notifications(): Restarting %d notifications... " + "Counts: MSG_ANNCE = %d, MSG_INFO = %d, MSG_CENTER = %d, MSG_MULTI = %d, MSG_CHOICE = %d", ( NOTIF_ANNCE_COUNT + NOTIF_INFO_COUNT + diff --git a/qcsrc/common/command/markup.qc b/qcsrc/common/command/markup.qc index 95a3b53c54..1618f6e08f 100644 --- a/qcsrc/common/command/markup.qc +++ b/qcsrc/common/command/markup.qc @@ -66,7 +66,8 @@ string GenericCommand_markup(string s2) red = 0; ccase = 0; - for(i = 0; i < strlen(s2); ++i) + int len = strlen(s2); + for (i = 0; i < len; ++i) { for(j = 0; j < NUM_MARKUPS; ++j) { diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh index 583e626af7..55b634a624 100644 --- a/qcsrc/common/debug.qh +++ b/qcsrc/common/debug.qh @@ -205,8 +205,7 @@ GENERIC_COMMAND(bufstr_get, "Examine a string buffer object") { int bufhandle = stof(argv(1)); int string_index = stof(argv(2)); - string s = bufstr_get(bufhandle, string_index); - LOG_INFOF("%s", s); + LOG_INFO(bufstr_get(bufhandle, string_index)); return; } @@ -407,7 +406,7 @@ CLASS(DebugText3d, Object) CONSTRUCT(DebugText3d); this.origin = pos; this.message = strzone(msg); - SetResourceAmount(this, RESOURCE_HEALTH, align); + SetResource(this, RES_HEALTH, align); this.hit_time = time; this.fade_rate = fade_rate_; this.velocity = vel; @@ -432,7 +431,7 @@ CLASS(DebugText3d, Object) if (screen_pos.z < 0) return; // behind camera screen_pos.z = 0; - float align = GetResourceAmount(this, RESOURCE_HEALTH); + float align = GetResource(this, RES_HEALTH); string msg; vector msg_pos; diff --git a/qcsrc/common/effects/effectinfo.qc b/qcsrc/common/effects/effectinfo.qc index a1b2787305..68c245db4a 100644 --- a/qcsrc/common/effects/effectinfo.qc +++ b/qcsrc/common/effects/effectinfo.qc @@ -263,21 +263,19 @@ void effectinfo_read() void effectinfo_dump(int fh, bool alsoprint) { - #define WRITE(s) MACRO_BEGIN { \ - fputs(fh, s); \ - if (alsoprint) LOG_INFO(s); \ - } MACRO_END - WRITE("// ********************************************** //\n"); - WRITE("// ** WARNING - DO NOT MANUALLY EDIT THIS FILE ** //\n"); - WRITE("// ** ** //\n"); - WRITE("// ** This file is automatically generated by ** //\n"); - WRITE("// ** code with the command 'dumpeffectinfo'. ** //\n"); - WRITE("// ** ** //\n"); - WRITE("// ** If you modify an effect, please ** //\n"); - WRITE("// ** regenerate this file with that command. ** //\n"); - WRITE("// ** ** //\n"); - WRITE("// ********************************************** //\n"); - WRITE("\n"); + #define WRITE(str) write_String_To_File(fh, str, alsoprint) + WRITE( + "// ********************************************** //\n" + "// ** WARNING - DO NOT MANUALLY EDIT THIS FILE ** //\n" + "// ** ** //\n" + "// ** This file is automatically generated by ** //\n" + "// ** code with the command 'dumpeffectinfo'. ** //\n" + "// ** ** //\n" + "// ** If you modify an effect, please ** //\n" + "// ** regenerate this file with that command. ** //\n" + "// ** ** //\n" + "// ********************************************** //\n" + "\n"); for (EffectInfo it = NULL; (it = findfloat(it, instanceOfEffectInfo, true)); ) { if (it.classname == "vtbl") continue; diff --git a/qcsrc/common/effects/qc/damageeffects.qc b/qcsrc/common/effects/qc/damageeffects.qc index 7ab6697c34..9090977dad 100644 --- a/qcsrc/common/effects/qc/damageeffects.qc +++ b/qcsrc/common/effects/qc/damageeffects.qc @@ -78,7 +78,7 @@ void DamageEffect_Think(entity this) return; } this.state = this.owner.csqcmodel_isdead; - if(this.owner.isplayermodel && (this.owner.isplayermodel & ISPLAYER_LOCAL) && !autocvar_chase_active) + if((this.owner.isplayermodel & ISPLAYER_LOCAL) && !autocvar_chase_active) return; // if we aren't using a third person camera, hide our own effects // now generate the particles @@ -153,7 +153,7 @@ void DamageEffect(entity this, vector hitorg, float thedamage, int type, int spe if(substring(effectname, strlen(effectname) - 5, 5) == "BLOOD") { - if(this.isplayermodel) + if((this.isplayermodel & ISPLAYER_MODEL)) { specstr = species_prefix(specnum); specstr = substring(specstr, 0, strlen(specstr) - 1); @@ -250,7 +250,7 @@ NET_HANDLE(ENT_CLIENT_DAMAGEINFO, bool isNew) DamageEffect(it, w_org, thisdmg, w_deathtype, species); - if(it.isplayermodel) + if((it.isplayermodel & ISPLAYER_MODEL)) hitplayer = true; // this impact damaged a player }); diff --git a/qcsrc/common/effects/qc/globalsound.qc b/qcsrc/common/effects/qc/globalsound.qc index 8c0dfd5080..4653f4a956 100644 --- a/qcsrc/common/effects/qc/globalsound.qc +++ b/qcsrc/common/effects/qc/globalsound.qc @@ -337,12 +337,11 @@ { #define X() \ MACRO_BEGIN \ - { \ float atten = (CS(msg_entity).cvar_cl_voice_directional == 1) ? ATTEN_MIN : ATTEN_NONE; \ if (gs) globalsound(MSG_ONE, this, gs, r, chan, vol, atten); \ else if (ps) playersound(MSG_ONE, this, ps, r, chan, vol, atten); \ else soundto(MSG_ONE, this, chan, sample, vol, atten); \ - } MACRO_END + MACRO_END if (fake) { msg_entity = this; X(); } else @@ -367,7 +366,6 @@ if (voicetype == VOICETYPE_AUTOTAUNT) tauntrand = random(); #define X() \ MACRO_BEGIN \ - { \ if (voicetype != VOICETYPE_AUTOTAUNT || tauntrand < CS(msg_entity).cvar_cl_autotaunt) \ { \ float atten = (CS(msg_entity).cvar_cl_voice_directional >= 1) \ @@ -378,7 +376,7 @@ else if (ps) playersound(MSG_ONE, this, ps, r, chan, vol, atten); \ else soundto(MSG_ONE, this, chan, sample, vol, atten); \ } \ - } MACRO_END + MACRO_END if (fake) { msg_entity = this; diff --git a/qcsrc/common/effects/qc/globalsound.qh b/qcsrc/common/effects/qc/globalsound.qh index 8c6dd86ddc..8b1570f030 100644 --- a/qcsrc/common/effects/qc/globalsound.qh +++ b/qcsrc/common/effects/qc/globalsound.qh @@ -129,7 +129,6 @@ string GlobalSound_sample(string pair, float r); #define PlayerSound(this, def, chan, vol, voicetype) _GlobalSound(this, NULL, def, string_null, chan, vol, voicetype, false) #define VoiceMessage(this, def, msg) \ MACRO_BEGIN \ - { \ entity VM = def; \ int voicetype = VM.m_playersoundvt; \ bool ownteam = (voicetype == VOICETYPE_TEAMRADIO); \ @@ -139,7 +138,7 @@ string GlobalSound_sample(string pair, float r); else if (flood > 0) fake = false; \ else break; \ _GlobalSound(this, NULL, VM, string_null, CH_VOICE, VOL_BASEVOICE, voicetype, fake); \ - } MACRO_END + MACRO_END #endif diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc index 7b4c54f9f6..23790b5e48 100644 --- a/qcsrc/common/ent_cs.qc +++ b/qcsrc/common/ent_cs.qc @@ -10,7 +10,28 @@ REGISTRY(EntCSProps, BITS(16) - 1) REGISTER_REGISTRY(EntCSProps) REGISTRY_SORT(EntCSProps) REGISTRY_CHECK(EntCSProps) -STATIC_INIT(RegisterEntCSProps_renumber) { FOREACH(EntCSProps, true, it.m_id = i); } +STATIC_INIT(EntCSProps_renumber) { FOREACH(EntCSProps, true, it.m_id = i); } + +// these entcs_props ids need to be referenced directly +int ENTCS_PROP_ENTNUM_id = 0; +int ENTCS_PROP_ORIGIN_id = 0; +STATIC_INIT(EntCSProps_setglobalids) +{ + FOREACH(EntCSProps, true, { + if (it.registered_id == "ENTCS_PROP_ENTNUM") + ENTCS_PROP_ENTNUM_id = it.m_id; + if (it.registered_id == "ENTCS_PROP_ORIGIN") + ENTCS_PROP_ORIGIN_id = it.m_id; + }); +} + +#ifdef SVQC +// Force an origin update, for player sounds +void entcs_force_origin(entity player) +{ + CS(player).entcs.m_forceupdate = BIT(ENTCS_PROP_ORIGIN_id); +} +#endif .bool m_public; .bool(entity ent, entity player) m_check; @@ -19,8 +40,7 @@ STATIC_INIT(RegisterEntCSProps_renumber) { FOREACH(EntCSProps, true, it.m_id = i .void(entity ent) m_receive; #ifdef SVQC -#define ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) \ - bool id##_check(entity ent, entity player) { return (ent.(checkprop) != player.(checkprop)); } \ +#define _ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) \ void id##_set(entity ent, entity player) { setprop(ent.(checkprop), player.(checkprop)); } \ void id##_send(int chan, entity ent) { LAMBDA(svsend); } \ REGISTER(EntCSProps, ENTCS_PROP, id, m_id, new_pure(entcs_prop)) { \ @@ -29,6 +49,17 @@ STATIC_INIT(RegisterEntCSProps_renumber) { FOREACH(EntCSProps, true, it.m_id = i this.m_set = id##_set; \ this.m_send = id##_send; \ } + +#define ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) \ + bool id##_check(entity ent, entity player) { return (ent.(checkprop) != player.(checkprop)); } \ + _ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) + +#define ENTCS_PROP_CODED(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \ + bool id##_check(entity ent, entity player) { \ + return (floor(ent.(checkprop)) / decfactor != floor(player.(checkprop)) / decfactor); \ + } \ + _ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) + #elif defined(CSQC) #define ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) \ void id##_receive(entity ent) { LAMBDA(clreceive); } \ @@ -36,12 +67,17 @@ STATIC_INIT(RegisterEntCSProps_renumber) { FOREACH(EntCSProps, true, it.m_id = i this.m_public = ispublic; \ this.m_receive = id##_receive; \ } + +#define ENTCS_PROP_CODED(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \ + ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) #endif #ifdef SVQC -#define ENTCS_PROP_RESOURCE(id, ispublic, checkprop, setprop, svsend, clreceive) \ - bool id##_check(entity ent, entity player) { return (GetResourceAmount(ent, checkprop) != GetResourceAmount(player, checkprop)); } \ - void id##_set(entity ent, entity player) { SetResourceAmountExplicit(ent, checkprop, GetResourceAmount(player, checkprop)); } \ +#define ENTCS_PROP_RESOURCE(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \ + bool id##_check(entity ent, entity player) { \ + return (floor(GetResource(ent, checkprop) / decfactor) != floor(GetResource(player, checkprop) / decfactor)); \ + } \ + void id##_set(entity ent, entity player) { SetResourceExplicit(ent, checkprop, GetResource(player, checkprop)); } \ void id##_send(int chan, entity ent) { LAMBDA(svsend); } \ REGISTER(EntCSProps, ENTCS_PROP, id, m_id, new_pure(entcs_prop)) { \ this.m_public = ispublic; \ @@ -50,7 +86,7 @@ STATIC_INIT(RegisterEntCSProps_renumber) { FOREACH(EntCSProps, true, it.m_id = i this.m_send = id##_send; \ } #elif defined(CSQC) -#define ENTCS_PROP_RESOURCE(id, ispublic, checkprop, setprop, svsend, clreceive) \ +#define ENTCS_PROP_RESOURCE(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \ void id##_receive(entity ent) { LAMBDA(clreceive); } \ REGISTER(EntCSProps, ENTCS_PROP, id, m_id, new_pure(entcs_prop)) { \ this.m_public = ispublic; \ @@ -73,17 +109,22 @@ ENTCS_PROP(ORIGIN, false, origin, ENTCS_SET_NORMAL, { WriteVector(chan, ent.origin); }, { ent.has_sv_origin = true; vector v = ReadVector(); setorigin(ent, v); }) -ENTCS_PROP(ANGLES, false, angles_y, ENTCS_SET_NORMAL, - { WriteByte(chan, ent.angles.y / 360 * 256); }, - { vector v = '0 0 0'; v.y = ReadByte() / 256 * 360; ent.angles = v; }) +#define DEC_FACTOR (360 / 32) +ENTCS_PROP_CODED(ANGLES, false, angles_y, ENTCS_SET_NORMAL, DEC_FACTOR, + { WriteByte(chan, ent.angles.y / DEC_FACTOR); }, + { vector v = '0 0 0'; v.y = ReadByte() * DEC_FACTOR; ent.angles = v; }) +#undef DEC_FACTOR -ENTCS_PROP_RESOURCE(HEALTH, false, RESOURCE_HEALTH, ENTCS_SET_NORMAL, - { WriteByte(chan, bound(0, GetResourceAmount(ent, RESOURCE_HEALTH) / 10, 255)); /* FIXME: use a better scale? */ }, - { ent.healthvalue = ReadByte() * 10; }) +// FIXME: use a better scale? +#define DEC_FACTOR 10 +ENTCS_PROP_RESOURCE(HEALTH, false, RES_HEALTH, ENTCS_SET_NORMAL, DEC_FACTOR, + { WriteByte(chan, bound(0, GetResource(ent, RES_HEALTH) / DEC_FACTOR, 255)); }, + { ent.healthvalue = ReadByte() * DEC_FACTOR; }) -ENTCS_PROP_RESOURCE(ARMOR, false, RESOURCE_ARMOR, ENTCS_SET_NORMAL, - { WriteByte(chan, bound(0, GetResourceAmount(ent, RESOURCE_ARMOR) / 10, 255)); /* FIXME: use a better scale? */ }, - { SetResourceAmountExplicit(ent, RESOURCE_ARMOR, ReadByte() * 10); }) +ENTCS_PROP_RESOURCE(ARMOR, false, RES_ARMOR, ENTCS_SET_NORMAL, DEC_FACTOR, + { WriteByte(chan, bound(0, GetResource(ent, RES_ARMOR) / DEC_FACTOR, 255)); }, + { SetResourceExplicit(ent, RES_ARMOR, ReadByte() * DEC_FACTOR); }) +#undef DEC_FACTOR ENTCS_PROP(NAME, true, netname, ENTCS_SET_MUTABLE_STRING, { WriteString(chan, ent.netname); }, @@ -119,7 +160,7 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL, bool _entcs_send(entity this, entity to, int sf, int chan) { entity player = this.owner; - sf |= BIT(0); // assume private + sf |= BIT(ENTCS_PROP_ENTNUM_id); // assume private do { if (IS_PLAYER(player)) { @@ -140,6 +181,7 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL, WriteShort(chan, sf); FOREACH(EntCSProps, sf & BIT(it.m_id), { + it.m_set(this, player); it.m_send(chan, this); }); return true; @@ -156,10 +198,9 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL, entity o = this.owner; FOREACH(EntCSProps, it.m_check(this, o), { - it.m_set(this, o); this.SendFlags |= BIT(it.m_id); }); - setorigin(this, this.origin); // relink + setorigin(this, this.origin); // relink } void entcs_attach(entity player) @@ -169,11 +210,6 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL, setthink(e, entcs_think); e.nextthink = time; Net_LinkEntity(e, false, 0, entcs_send); - if (!IS_REAL_CLIENT(player)) return; - FOREACH_CLIENT(true, { - assert(CS(it).entcs); - _entcs_send(CS(it).entcs, msg_entity = player, BITS(23), MSG_ONE); - }); } void entcs_detach(entity player) @@ -242,7 +278,7 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL, e.sv_entnum = n; int sf = ReadShort(); e.has_sv_origin = false; - e.m_entcs_private = boolean(sf & BIT(0)); + e.m_entcs_private = boolean(sf & BIT(ENTCS_PROP_ENTNUM_id)); FOREACH(EntCSProps, sf & BIT(it.m_id), { it.m_receive(e); diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh index 3a9f084bcf..c46d31b12b 100644 --- a/qcsrc/common/ent_cs.qh +++ b/qcsrc/common/ent_cs.qh @@ -36,14 +36,13 @@ REGISTER_NET_TEMP(CLIENT_ENTCS) void entcs_think(entity this); - void entcs_attach(entity e); + void entcs_attach(entity player); - void entcs_detach(entity e); + void entcs_detach(entity player); .int m_forceupdate; -/** Force an origin update, for player sounds */ - #define entcs_force_origin(e) (CS(e).entcs.m_forceupdate = BIT(2)) + void entcs_force_origin(entity player); #endif diff --git a/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc b/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc index 95dd412f49..14266c8a74 100644 --- a/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc +++ b/qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc @@ -17,7 +17,7 @@ STATIC_INIT(g_assault) void assault_objective_use(entity this, entity actor, entity trigger) { // activate objective - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 100); + SetResourceExplicit(this, RES_HEALTH, 100); //print("^2Activated objective ", this.targetname, "=", etos(this), "\n"); //print("Activator is ", actor.classname, "\n"); @@ -29,7 +29,7 @@ void assault_objective_use(entity this, entity actor, entity trigger) vector target_objective_spawn_evalfunc(entity this, entity player, entity spot, vector current) { - float hlth = GetResourceAmount(this, RESOURCE_HEALTH); + float hlth = GetResource(this, RES_HEALTH); if (hlth < 0 || hlth >= ASSAULT_VALUE_INACTIVE) return '-1 0 0'; return current; @@ -39,7 +39,7 @@ vector target_objective_spawn_evalfunc(entity this, entity player, entity spot, // and when a new round starts void assault_objective_reset(entity this) { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, ASSAULT_VALUE_INACTIVE); + SetResourceExplicit(this, RES_HEALTH, ASSAULT_VALUE_INACTIVE); } // decrease the health of targeted objectives @@ -60,19 +60,19 @@ void assault_objective_decrease_use(entity this, entity actor, entity trigger) else return; // already activated! cannot activate again! - float hlth = GetResourceAmount(this.enemy, RESOURCE_HEALTH); + float hlth = GetResource(this.enemy, RES_HEALTH); if (hlth < ASSAULT_VALUE_INACTIVE) { if (hlth - this.dmg > 0.5) { GameRules_scoring_add_team(actor, SCORE, this.dmg); - TakeResource(this.enemy, RESOURCE_HEALTH, this.dmg); + TakeResource(this.enemy, RES_HEALTH, this.dmg); } else { GameRules_scoring_add_team(actor, SCORE, hlth); GameRules_scoring_add_team(actor, ASSAULT_OBJECTIVES, 1); - SetResourceAmountExplicit(this.enemy, RESOURCE_HEALTH, -1); + SetResourceExplicit(this.enemy, RES_HEALTH, -1); if(this.enemy.message) FOREACH_CLIENT(IS_PLAYER(it), { centerprint(it, this.enemy.message); }); @@ -99,7 +99,7 @@ void assault_setenemytoobjective(entity this) bool assault_decreaser_sprite_visible(entity this, entity player, entity view) { - if(GetResourceAmount(this.assault_decreaser.enemy, RESOURCE_HEALTH) >= ASSAULT_VALUE_INACTIVE) + if(GetResource(this.assault_decreaser.enemy, RES_HEALTH) >= ASSAULT_VALUE_INACTIVE) return false; return true; @@ -127,7 +127,7 @@ void target_objective_decrease_activate(entity this) { WaypointSprite_UpdateSprites(spr, WP_AssaultDefend, WP_AssaultDestroy, WP_AssaultDestroy); WaypointSprite_UpdateMaxHealth(spr, it.max_health); - WaypointSprite_UpdateHealth(spr, GetResourceAmount(it, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(spr, GetResource(it, RES_HEALTH)); it.sprite = spr; } else @@ -176,7 +176,7 @@ void assault_roundstart_use_this(entity this) void assault_wall_think(entity this) { - if(GetResourceAmount(this.enemy, RESOURCE_HEALTH) < 0) + if(GetResource(this.enemy, RES_HEALTH) < 0) { this.model = ""; this.solid = SOLID_NOT; @@ -323,7 +323,7 @@ spawnfunc(target_objective_decrease) this.dmg = 101; this.use = assault_objective_decrease_use; - SetResourceAmountExplicit(this, RESOURCE_HEALTH, ASSAULT_VALUE_INACTIVE); + SetResourceExplicit(this, RES_HEALTH, ASSAULT_VALUE_INACTIVE); this.max_health = ASSAULT_VALUE_INACTIVE; this.enemy = NULL; @@ -333,15 +333,15 @@ spawnfunc(target_objective_decrease) // destructible walls that can be used to trigger target_objective_decrease bool destructible_heal(entity targ, entity inflictor, float amount, float limit) { - float true_limit = ((limit != RESOURCE_LIMIT_NONE) ? limit : targ.max_health); - float hlth = GetResourceAmount(targ, RESOURCE_HEALTH); + float true_limit = ((limit != RES_LIMIT_NONE) ? limit : targ.max_health); + float hlth = GetResource(targ, RES_HEALTH); if (hlth <= 0 || hlth >= true_limit) return false; - GiveResourceWithLimit(targ, RESOURCE_HEALTH, amount, true_limit); + GiveResourceWithLimit(targ, RES_HEALTH, amount, true_limit); if(targ.sprite) { - WaypointSprite_UpdateHealth(targ.sprite, GetResourceAmount(targ, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(targ.sprite, GetResource(targ, RES_HEALTH)); } func_breakable_colormod(targ); return true; @@ -412,7 +412,7 @@ void havocbot_goalrating_ast_targets(entity this, float ratingscale) entity destr = it; IL_EACH(g_assault_objectivedecreasers, it.targetname == destr.target, { - float hlth = GetResourceAmount(it.enemy, RESOURCE_HEALTH); + float hlth = GetResource(it.enemy, RES_HEALTH); if (hlth > 0 && hlth < ASSAULT_VALUE_INACTIVE) { found = true; diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc index 2bbed4a9ab..56cfabc501 100644 --- a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc +++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc @@ -62,7 +62,6 @@ int CA_GetWinnerTeam() void nades_Clear(entity player); -#define CA_ALIVE_TEAMS_OK() (Team_GetNumberOfAliveTeams() == NumTeams(ca_teams)) float CA_CheckWinner() { if(round_handler_GetEndTime() > 0 && round_handler_GetEndTime() - time <= 0) @@ -115,7 +114,7 @@ bool CA_CheckTeams() static int prev_missing_teams_mask; allowed_to_spawn = true; CA_count_alive_players(); - if(CA_ALIVE_TEAMS_OK()) + if (Team_GetNumberOfAliveTeams() == NumTeams(ca_teams)) { if(prev_missing_teams_mask > 0) Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_MISSING_TEAMS); @@ -164,7 +163,7 @@ entity CA_SpectateNext(entity player, entity start) { if (SAME_TEAM(player, e)) return e; } - // restart from begining + // restart from the beginning for (entity e = NULL; (e = find(e, classname, STR_PLAYER)); ) { if (SAME_TEAM(player, e)) return e; @@ -253,12 +252,13 @@ entity ca_LastPlayerForTeam(entity this) { entity last_pl = NULL; FOREACH_CLIENT(IS_PLAYER(it) && it != this, { - if (!IS_DEAD(it)) - if (SAME_TEAM(this, it)) - if (!last_pl) - last_pl = it; - else - return NULL; + if (!IS_DEAD(it) && SAME_TEAM(this, it)) + { + if (!last_pl) + last_pl = it; + else + return NULL; + } }); return last_pl; } @@ -380,8 +380,8 @@ MUTATOR_HOOKFUNCTION(ca, PlayerDamage_SplitHealthArmor) entity frag_attacker = M_ARGV(1, entity); entity frag_target = M_ARGV(2, entity); float frag_damage = M_ARGV(7, float); - float damage_take = bound(0, M_ARGV(4, float), GetResourceAmount(frag_target, RESOURCE_HEALTH)); - float damage_save = bound(0, M_ARGV(5, float), GetResourceAmount(frag_target, RESOURCE_ARMOR)); + float damage_take = bound(0, M_ARGV(4, float), GetResource(frag_target, RES_HEALTH)); + float damage_save = bound(0, M_ARGV(5, float), GetResource(frag_target, RES_ARMOR)); float excess = max(0, frag_damage - damage_take - damage_save); @@ -421,7 +421,8 @@ MUTATOR_HOOKFUNCTION(ca, SpectateNext) { entity client = M_ARGV(0, entity); - if (!autocvar_g_ca_spectate_enemies && client.caplayer) + if (!autocvar_g_ca_spectate_enemies && client.caplayer + && Team_GetNumberOfAlivePlayers(Entity_GetTeam(client))) { entity targ = M_ARGV(1, entity); M_ARGV(1, entity) = CA_SpectateNext(client, targ); @@ -435,7 +436,8 @@ MUTATOR_HOOKFUNCTION(ca, SpectatePrev) entity targ = M_ARGV(1, entity); entity first = M_ARGV(2, entity); - if (!autocvar_g_ca_spectate_enemies && client.caplayer) + if (!autocvar_g_ca_spectate_enemies && client.caplayer + && Team_GetNumberOfAlivePlayers(Entity_GetTeam(client))) { do { targ = targ.chain; } while(targ && DIFF_TEAM(targ, client)); @@ -448,6 +450,8 @@ MUTATOR_HOOKFUNCTION(ca, SpectatePrev) return MUT_SPECPREV_RETURN; } } + else + return MUT_SPECPREV_CONTINUE; M_ARGV(1, entity) = targ; diff --git a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc index 2696a4e878..6dd1b1e902 100644 --- a/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc +++ b/qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc @@ -144,8 +144,8 @@ bool ctf_Return_Customize(entity this, entity client) void ctf_FlagcarrierWaypoints(entity player) { WaypointSprite_Spawn(WP_FlagCarrier, 0, 0, player, FLAG_WAYPOINT_OFFSET, NULL, player.team, player, wps_flagcarrier, true, RADARICON_FLAG); - WaypointSprite_UpdateMaxHealth(player.wps_flagcarrier, '1 0 0' * healtharmor_maxdamage(start_health, start_armorvalue, autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id) * 2); - WaypointSprite_UpdateHealth(player.wps_flagcarrier, '1 0 0' * healtharmor_maxdamage(GetResourceAmount(player, RESOURCE_HEALTH), GetResourceAmount(player, RESOURCE_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id)); + WaypointSprite_UpdateMaxHealth(player.wps_flagcarrier, 2 * healtharmor_maxdamage(start_health, start_armorvalue, autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id).x); + WaypointSprite_UpdateHealth(player.wps_flagcarrier, healtharmor_maxdamage(GetResource(player, RES_HEALTH), GetResource(player, RES_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id).x); WaypointSprite_UpdateTeamRadar(player.wps_flagcarrier, RADARICON_FLAGCARRIER, WPCOLOR_FLAGCARRIER(player.team)); if(player.flagcarried && CTF_SAMETEAM(player, player.flagcarried)) @@ -341,7 +341,7 @@ void ctf_Handle_Drop(entity flag, entity player, int droptype) set_movetype(flag, MOVETYPE_TOSS); flag.takedamage = DAMAGE_YES; flag.angles = '0 0 0'; - SetResourceAmountExplicit(flag, RESOURCE_HEALTH, flag.max_flag_health); + SetResourceExplicit(flag, RES_HEALTH, flag.max_flag_health); flag.ctf_droptime = time; flag.ctf_dropper = player; flag.ctf_status = FLAG_DROPPED; @@ -364,7 +364,7 @@ void ctf_Handle_Drop(entity flag, entity player, int droptype) if(autocvar_g_ctf_flag_return_time || (autocvar_g_ctf_flag_return_damage && autocvar_g_ctf_flag_health)) { WaypointSprite_UpdateMaxHealth(flag.wps_flagdropped, flag.max_flag_health); - WaypointSprite_UpdateHealth(flag.wps_flagdropped, GetResourceAmount(flag, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(flag.wps_flagdropped, GetResource(flag, RES_HEALTH)); } player.throw_antispam = time + autocvar_g_ctf_pass_wait; @@ -679,7 +679,7 @@ void ctf_Handle_Pickup(entity flag, entity player, int pickuptype) switch(pickuptype) { case PICKUP_BASE: flag.ctf_pickuptime = time; break; // used for timing runs - case PICKUP_DROPPED: SetResourceAmountExplicit(flag, RESOURCE_HEALTH, flag.max_flag_health); break; // reset health/return timelimit + case PICKUP_DROPPED: SetResourceExplicit(flag, RES_HEALTH, flag.max_flag_health); break; // reset health/return timelimit default: break; } @@ -702,10 +702,12 @@ void ctf_Handle_Pickup(entity flag, entity player, int pickuptype) if(flag.team) FOREACH_CLIENT(IS_PLAYER(it) && it != player, { if(CTF_SAMETEAM(flag, it)) - if(SAME_TEAM(player, it)) - Send_Notification(NOTIF_ONE, it, MSG_CHOICE, APP_TEAM_NUM(flag.team, CHOICE_CTF_PICKUP_TEAM), Team_ColorCode(player.team), player.netname); - else - Send_Notification(NOTIF_ONE, it, MSG_CHOICE, ((SAME_TEAM(flag, player)) ? CHOICE_CTF_PICKUP_ENEMY_TEAM : CHOICE_CTF_PICKUP_ENEMY), Team_ColorCode(player.team), player.netname); + { + if(SAME_TEAM(player, it)) + Send_Notification(NOTIF_ONE, it, MSG_CHOICE, APP_TEAM_NUM(flag.team, CHOICE_CTF_PICKUP_TEAM), Team_ColorCode(player.team), player.netname); + else + Send_Notification(NOTIF_ONE, it, MSG_CHOICE, ((SAME_TEAM(flag, player)) ? CHOICE_CTF_PICKUP_ENEMY_TEAM : CHOICE_CTF_PICKUP_ENEMY), Team_ColorCode(player.team), player.netname); + } }); _sound(player, CH_TRIGGER, flag.snd_flag_taken, VOL_BASE, ATTEN_NONE); @@ -761,9 +763,9 @@ void ctf_CheckFlagReturn(entity flag, int returntype) { if((flag.ctf_status == FLAG_DROPPED) || (flag.ctf_status == FLAG_PASSING)) { - if(flag.wps_flagdropped) { WaypointSprite_UpdateHealth(flag.wps_flagdropped, GetResourceAmount(flag, RESOURCE_HEALTH)); } + if(flag.wps_flagdropped) { WaypointSprite_UpdateHealth(flag.wps_flagdropped, GetResource(flag, RES_HEALTH)); } - if((GetResourceAmount(flag, RESOURCE_HEALTH) <= 0) || (time >= flag.ctf_droptime + autocvar_g_ctf_flag_return_time)) + if((GetResource(flag, RES_HEALTH) <= 0) || (time >= flag.ctf_droptime + autocvar_g_ctf_flag_return_time)) { switch(returntype) { @@ -874,7 +876,7 @@ void ctf_FlagDamage(entity this, entity inflictor, entity attacker, float damage this.ctf_flagdamaged_byworld = true; else { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 0); + SetResourceExplicit(this, RES_HEALTH, 0); ctf_CheckFlagReturn(this, RETURN_NEEDKILL); } return; @@ -882,7 +884,7 @@ void ctf_FlagDamage(entity this, entity inflictor, entity attacker, float damage if(autocvar_g_ctf_flag_return_damage) { // reduce health and check if it should be returned - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); ctf_CheckFlagReturn(this, RETURN_DAMAGE); return; } @@ -945,20 +947,20 @@ void ctf_FlagThink(entity this) { if((vdist(this.origin - this.ctf_spawnorigin, <=, autocvar_g_ctf_flag_return_dropped)) || (autocvar_g_ctf_flag_return_dropped == -1)) { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 0); + SetResourceExplicit(this, RES_HEALTH, 0); ctf_CheckFlagReturn(this, RETURN_DROPPED); return; } } if(this.ctf_flagdamaged_byworld) { - TakeResource(this, RESOURCE_HEALTH, ((this.max_flag_health / autocvar_g_ctf_flag_return_damage_delay) * FLAG_THINKRATE)); + TakeResource(this, RES_HEALTH, ((this.max_flag_health / autocvar_g_ctf_flag_return_damage_delay) * FLAG_THINKRATE)); ctf_CheckFlagReturn(this, RETURN_NEEDKILL); return; } else if(autocvar_g_ctf_flag_return_time) { - TakeResource(this, RESOURCE_HEALTH, ((this.max_flag_health / autocvar_g_ctf_flag_return_time) * FLAG_THINKRATE)); + TakeResource(this, RES_HEALTH, ((this.max_flag_health / autocvar_g_ctf_flag_return_time) * FLAG_THINKRATE)); ctf_CheckFlagReturn(this, RETURN_TIMEOUT); return; } @@ -969,7 +971,7 @@ void ctf_FlagThink(entity this) { if(this.speedrunning && ctf_captimerecord && (time >= this.ctf_pickuptime + ctf_captimerecord)) { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 0); + SetResourceExplicit(this, RES_HEALTH, 0); ctf_CheckFlagReturn(this, RETURN_SPEEDRUN); CS(this.owner).impulse = CHIMPULSE_SPEEDRUN.impulse; // move the player back to the waypoint they set @@ -1038,7 +1040,7 @@ METHOD(Flag, giveTo, bool(Flag this, entity flag, entity toucher)) { if(!autocvar_g_ctf_flag_return_damage_delay) { - SetResourceAmountExplicit(flag, RESOURCE_HEALTH, 0); + SetResourceExplicit(flag, RES_HEALTH, 0); ctf_CheckFlagReturn(flag, RETURN_NEEDKILL); } if(!flag.ctf_flagdamaged_byworld) { return; } @@ -1162,7 +1164,7 @@ void ctf_RespawnFlag(entity flag) set_movetype(flag, ((flag.noalign) ? MOVETYPE_NONE : MOVETYPE_TOSS)); flag.takedamage = DAMAGE_NO; - SetResourceAmountExplicit(flag, RESOURCE_HEALTH, flag.max_flag_health); + SetResourceExplicit(flag, RES_HEALTH, flag.max_flag_health); flag.solid = SOLID_TRIGGER; flag.velocity = '0 0 0'; flag.angles = flag.mangle; @@ -1249,7 +1251,7 @@ void ctf_FlagSetup(int teamnumber, entity flag) // called when spawning a flag e flag.takedamage = DAMAGE_NO; flag.damageforcescale = autocvar_g_ctf_flag_damageforcescale; flag.max_flag_health = ((autocvar_g_ctf_flag_return_damage && autocvar_g_ctf_flag_health) ? autocvar_g_ctf_flag_health : 100); - SetResourceAmountExplicit(flag, RESOURCE_HEALTH, flag.max_flag_health); + SetResourceExplicit(flag, RES_HEALTH, flag.max_flag_health); flag.event_damage = ctf_FlagDamage; flag.pushable = true; flag.teleportable = TELEPORT_NORMAL; @@ -1519,7 +1521,7 @@ void havocbot_goalrating_ctf_enemyflag(entity this, float ratingscale) { // adjust rating of our flag carrier depending on his health head = head.tag_entity; - float f = bound(0, (GetResourceAmount(head, RESOURCE_HEALTH) + GetResourceAmount(head, RESOURCE_ARMOR)) / 100, 2) - 1; + float f = bound(0, (GetResource(head, RES_HEALTH) + GetResource(head, RES_ARMOR)) / 100, 2) - 1; ratingscale += ratingscale * f * 0.1; } navigation_routerating(this, head, ratingscale, 10000); @@ -2166,7 +2168,7 @@ MUTATOR_HOOKFUNCTION(ctf, PlayerPreThink) // update the health of the flag carrier waypointsprite if(player.wps_flagcarrier) - WaypointSprite_UpdateHealth(player.wps_flagcarrier, '1 0 0' * healtharmor_maxdamage(GetResourceAmount(player, RESOURCE_HEALTH), GetResourceAmount(player, RESOURCE_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id)); + WaypointSprite_UpdateHealth(player.wps_flagcarrier, healtharmor_maxdamage(GetResource(player, RES_HEALTH), GetResource(player, RES_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id).x); } MUTATOR_HOOKFUNCTION(ctf, Damage_Calculate) // for changing damage and force values that are applied to players in g_damage.qc @@ -2194,8 +2196,8 @@ MUTATOR_HOOKFUNCTION(ctf, Damage_Calculate) // for changing damage and force val } else if(frag_target.flagcarried && !IS_DEAD(frag_target) && CTF_DIFFTEAM(frag_target, frag_attacker)) // if the target is a flagcarrier { - if(autocvar_g_ctf_flagcarrier_auto_helpme_damage > ('1 0 0' * healtharmor_maxdamage(GetResourceAmount(frag_target, RESOURCE_HEALTH), GetResourceAmount(frag_target, RESOURCE_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id))) - if(time > frag_target.wps_helpme_time + autocvar_g_ctf_flagcarrier_auto_helpme_time) + if(autocvar_g_ctf_flagcarrier_auto_helpme_damage > healtharmor_maxdamage(GetResource(frag_target, RES_HEALTH), GetResource(frag_target, RES_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id).x + && time > frag_target.wps_helpme_time + autocvar_g_ctf_flagcarrier_auto_helpme_time) { frag_target.wps_helpme_time = time; WaypointSprite_HelpMePing(frag_target.wps_flagcarrier); diff --git a/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc b/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc index 78ff64e514..32e39e204d 100644 --- a/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc +++ b/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc @@ -69,10 +69,12 @@ void dompoint_captured(entity this) this.enemy = NULL; if (head.noise != "") + { if(this.enemy) _sound(this.enemy, CH_TRIGGER, head.noise, VOL_BASE, ATTEN_NORM); else _sound(this, CH_TRIGGER, head.noise, VOL_BASE, ATTEN_NORM); + } if (head.noise1 != "") play2all(head.noise1); @@ -188,7 +190,7 @@ void dompointtouch(entity this, entity toucher) { if(!IS_PLAYER(toucher)) return; - if(GetResourceAmount(toucher, RESOURCE_HEALTH) < 1) + if(GetResource(toucher, RES_HEALTH) < 1) return; if(round_handler_IsActive() && !round_handler_IsRoundStarted()) @@ -466,10 +468,7 @@ MUTATOR_HOOKFUNCTION(dom, PlayerSpawn) entity player = M_ARGV(0, entity); if(domination_roundbased) - if(!round_handler_IsRoundStarted()) - player.player_blocked = 1; - else - player.player_blocked = 0; + player.player_blocked = !round_handler_IsRoundStarted(); } MUTATOR_HOOKFUNCTION(dom, ClientConnect) diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc index bb9784d022..c42c7443ba 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc +++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc @@ -19,7 +19,7 @@ void freezetag_count_alive_players() FOREACH_CLIENT(IS_PLAYER(it) && Entity_HasValidTeam(it), { ++total_players; - if (GetResourceAmount(it, RESOURCE_HEALTH) < 1 || STAT(FROZEN, it) == FROZEN_NORMAL) + if (GetResource(it, RES_HEALTH) < 1 || STAT(FROZEN, it) == FROZEN_NORMAL) { continue; } @@ -43,12 +43,10 @@ void freezetag_count_alive_players() eliminatedPlayers.SendFlags |= 1; } -#define FREEZETAG_ALIVE_TEAMS_OK() (Team_GetNumberOfAliveTeams() == NumTeams(freezetag_teams)) - bool freezetag_CheckTeams() { static float prev_missing_teams_mask; - if(FREEZETAG_ALIVE_TEAMS_OK()) + if (Team_GetNumberOfAliveTeams() == NumTeams(freezetag_teams)) { if(prev_missing_teams_mask > 0) Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_MISSING_TEAMS); @@ -154,7 +152,7 @@ entity freezetag_LastPlayerForTeam(entity this) { entity last_pl = NULL; FOREACH_CLIENT(IS_PLAYER(it) && it != this && SAME_TEAM(it, this), { - if (STAT(FROZEN, it) != FROZEN_NORMAL && GetResourceAmount(it, RESOURCE_HEALTH) >= 1) + if (STAT(FROZEN, it) != FROZEN_NORMAL && GetResource(it, RES_HEALTH) >= 1) { if (!last_pl) last_pl = it; @@ -237,7 +235,7 @@ void havocbot_goalrating_ft_freeplayers(entity this, float ratingscale, vector o navigation_routerating(this, it, ratingscale, 2000); } else if (best_dist2 - && GetResourceAmount(it, RESOURCE_HEALTH) < GetResourceAmount(this, RESOURCE_HEALTH) + 30 + && GetResource(it, RES_HEALTH) < GetResource(this, RES_HEALTH) + 30 && vlen2(it.origin - org) < best_dist2) { // If teamate is not frozen still seek them out as fight better @@ -332,7 +330,7 @@ void ft_RemovePlayer(entity this) freezetag_LastPlayerForTeam_Notify(this); Unfreeze(this, false); - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 0); // neccessary to correctly count alive players + SetResourceExplicit(this, RES_HEALTH, 0); // neccessary to correctly count alive players freezetag_count_alive_players(); } @@ -504,7 +502,7 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST) if (STAT(FROZEN, player) == FROZEN_NORMAL) { STAT(REVIVE_PROGRESS, player) = bound(0, STAT(REVIVE_PROGRESS, player) - frametime * autocvar_g_freezetag_revive_clearspeed, 1); - SetResourceAmountExplicit(player, RESOURCE_HEALTH, max(1, STAT(REVIVE_PROGRESS, player) * ((warmup_stage) ? warmup_start_health : start_health))); + SetResourceExplicit(player, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, player) * ((warmup_stage) ? warmup_start_health : start_health))); } else if (!STAT(FROZEN, player)) STAT(REVIVE_PROGRESS, player) = 0; // thawing nobody @@ -512,7 +510,7 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST) else if (STAT(FROZEN, player) == FROZEN_NORMAL) // OK, there is at least one teammate reviving us { STAT(REVIVE_PROGRESS, player) = bound(0, STAT(REVIVE_PROGRESS, player) + frametime * max(1/60, autocvar_g_freezetag_revive_speed), 1); - SetResourceAmountExplicit(player, RESOURCE_HEALTH, max(1, STAT(REVIVE_PROGRESS, player) * ((warmup_stage) ? warmup_start_health : start_health))); + SetResourceExplicit(player, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, player) * ((warmup_stage) ? warmup_start_health : start_health))); if(STAT(REVIVE_PROGRESS, player) >= 1) { @@ -605,7 +603,7 @@ MUTATOR_HOOKFUNCTION(ft, FragCenterMessage) Send_Notification(NOTIF_ONE, frag_attacker, MSG_CHOICE, CHOICE_FRAG_FREEZE, frag_target.netname, kill_count_to_attacker, (IS_BOT_CLIENT(frag_target) ? -1 : CS(frag_target).ping)); Send_Notification(NOTIF_ONE, frag_target, MSG_CHOICE, CHOICE_FRAGGED_FREEZE, frag_attacker.netname, kill_count_to_target, - GetResourceAmount(frag_attacker, RESOURCE_HEALTH), GetResourceAmount(frag_attacker, RESOURCE_ARMOR), (IS_BOT_CLIENT(frag_attacker) ? -1 : CS(frag_attacker).ping)); + GetResource(frag_attacker, RES_HEALTH), GetResource(frag_attacker, RES_ARMOR), (IS_BOT_CLIENT(frag_attacker) ? -1 : CS(frag_attacker).ping)); return true; } diff --git a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc index c9670a150c..31c5711424 100644 --- a/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc +++ b/qcsrc/common/gamemodes/gamemode/invasion/sv_invasion.qc @@ -288,7 +288,7 @@ bool Invasion_CheckWinner() float total_alive_monsters = 0, supermonster_count = 0, red_alive = 0, blue_alive = 0, yellow_alive = 0, pink_alive = 0; - IL_EACH(g_monsters, GetResourceAmount(it, RESOURCE_HEALTH) > 0, + IL_EACH(g_monsters, GetResource(it, RES_HEALTH) > 0, { if((get_monsterinfo(it.monsterid)).spawnflags & MON_FLAG_SUPERMONSTER) ++supermonster_count; @@ -334,14 +334,20 @@ bool Invasion_CheckWinner() { if(red_alive > 0) { winner_team = NUM_TEAM_1; } if(blue_alive > 0) - if(winner_team) { winner_team = 0; } - else { winner_team = NUM_TEAM_2; } + { + if(winner_team) { winner_team = 0; } + else { winner_team = NUM_TEAM_2; } + } if(yellow_alive > 0) - if(winner_team) { winner_team = 0; } - else { winner_team = NUM_TEAM_3; } + { + if(winner_team) { winner_team = 0; } + else { winner_team = NUM_TEAM_3; } + } if(pink_alive > 0) - if(winner_team) { winner_team = 0; } - else { winner_team = NUM_TEAM_4; } + { + if(winner_team) { winner_team = 0; } + else { winner_team = NUM_TEAM_4; } + } } else { @@ -429,13 +435,15 @@ MUTATOR_HOOKFUNCTION(inv, MonsterDies) if(teamplay) { inv_monsters_perteam[frag_target.team] -= 1; } if(IS_PLAYER(frag_attacker)) - if(SAME_TEAM(frag_attacker, frag_target)) // in non-teamplay modes, same team = same player, so this works - GameRules_scoring_add(frag_attacker, KILLS, -1); - else { - GameRules_scoring_add(frag_attacker, KILLS, +1); - if(teamplay) - TeamScore_AddToTeam(frag_attacker.team, ST_INV_KILLS, +1); + if(SAME_TEAM(frag_attacker, frag_target)) // in non-teamplay modes, same team = same player, so this works + GameRules_scoring_add(frag_attacker, KILLS, -1); + else + { + GameRules_scoring_add(frag_attacker, KILLS, +1); + if(teamplay) + TeamScore_AddToTeam(frag_attacker.team, ST_INV_KILLS, +1); + } } } } diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc b/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc index f8456734ca..d33696ad37 100644 --- a/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc +++ b/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc @@ -686,10 +686,12 @@ LABEL(not_winning) kh_interferemsg_time = 0; FOREACH_CLIENT(IS_PLAYER(it), { if(it.team == kh_interferemsg_team) + { if(it.kh_next) Send_Notification(NOTIF_ONE, it, MSG_CENTER, CENTER_KEYHUNT_MEET); else Send_Notification(NOTIF_ONE, it, MSG_CENTER, CENTER_KEYHUNT_HELP); + } else Send_Notification(NOTIF_ONE, it, MSG_CENTER, APP_TEAM_NUM(kh_interferemsg_team, CENTER_KEYHUNT_INTERFERE)); }); diff --git a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc index 58582d290d..e30d958a14 100644 --- a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc +++ b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc @@ -225,10 +225,12 @@ void lms_RemovePlayer(entity player) } if (CS(player).killcount != FRAGS_SPECTATOR && player.lms_spectate_warning < 3) + { if (GameRules_scoring_add(player, LMS_RANK, 0) > 0 && player.lms_spectate_warning < 2) Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_LMS_NOLIVES, player.netname); else Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_LMS_FORFEIT, player.netname); + } } MUTATOR_HOOKFUNCTION(lms, ClientDisconnect) diff --git a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc index 65c5bcd8a0..f9885fefd4 100644 --- a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc +++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc @@ -308,7 +308,7 @@ void football_touch(entity this, entity toucher) } if (!IS_PLAYER(toucher)) return; - if(GetResourceAmount(toucher, RESOURCE_HEALTH) < 1) + if(GetResource(toucher, RES_HEALTH) < 1) return; if(!this.cnt) this.nextthink = time + autocvar_g_nexball_delay_idle; @@ -348,7 +348,7 @@ void basketball_touch(entity this, entity toucher) } if(!this.cnt && IS_PLAYER(toucher) && !STAT(FROZEN, toucher) && !IS_DEAD(toucher) && (toucher != this.nb_dropper || time > this.nb_droptime + autocvar_g_nexball_delay_collect)) { - if(GetResourceAmount(toucher, RESOURCE_HEALTH) < 1) + if(GetResource(toucher, RES_HEALTH) < 1) return; LogNB("caught", toucher); GiveBall(toucher, this); diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/cl_controlpoint.qc b/qcsrc/common/gamemodes/gamemode/onslaught/cl_controlpoint.qc index b8d49b10f2..2e05794da5 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/cl_controlpoint.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/cl_controlpoint.qc @@ -30,7 +30,7 @@ void cpicon_draw(entity this) this.cp_bob_spd = this.cp_bob_spd + 1.875 * frametime; this.colormod = '1 1 1' * (2 - bound(0, (this.pain_finished - time) / 10, 1)); - if(!this.iscaptured) this.alpha = GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health; + if(!this.iscaptured) this.alpha = GetResource(this, RES_HEALTH) / this.max_health; if(this.iscaptured) { @@ -165,14 +165,14 @@ NET_HANDLE(ENT_CLIENT_CONTROLPOINT_ICON, bool isnew) this.origin = ReadVector(); setorigin(this, this.origin); - SetResourceAmountExplicit(this, RESOURCE_HEALTH, ReadByte()); + SetResourceExplicit(this, RES_HEALTH, ReadByte()); this.max_health = ReadByte(); this.count = ReadByte(); this.team = ReadByte(); this.iscaptured = ReadByte(); if(!this.count) - this.count = (GetResourceAmount(this, RESOURCE_HEALTH) - this.max_health) * frametime; + this.count = (GetResource(this, RES_HEALTH) - this.max_health) * frametime; cpicon_changeteam(this); cpicon_construct(this, isnew); @@ -189,9 +189,9 @@ NET_HANDLE(ENT_CLIENT_CONTROLPOINT_ICON, bool isnew) _tmp = ReadByte(); - if(_tmp != GetResourceAmount(this, RESOURCE_HEALTH)) + if(_tmp != GetResource(this, RES_HEALTH)) cpicon_damage(this, _tmp); - SetResourceAmountExplicit(this, RESOURCE_HEALTH, _tmp); + SetResourceExplicit(this, RES_HEALTH, _tmp); } } diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/cl_generator.qc b/qcsrc/common/gamemodes/gamemode/onslaught/cl_generator.qc index 9d12c5548e..3a72c8d497 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/cl_generator.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/cl_generator.qc @@ -48,10 +48,10 @@ void generator_draw(entity this) if(time < this.move_time) return; - if(GetResourceAmount(this, RESOURCE_HEALTH) > 0) + if(GetResource(this, RES_HEALTH) > 0) { // damaged fx (less probable the more damaged is the generator) - if(random() < 0.9 - GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health) + if(random() < 0.9 - GetResource(this, RES_HEALTH) / this.max_health) if(random() < 0.01) { pointparticles(EFFECT_ELECTRO_BALLEXPLODE, this.origin + randompos('-50 -50 -20', '50 50 50'), '0 0 0', 1); @@ -195,7 +195,7 @@ NET_HANDLE(ENT_CLIENT_GENERATOR, bool isnew) this.origin = ReadVector(); setorigin(this, this.origin); - SetResourceAmountExplicit(this, RESOURCE_HEALTH, ReadByte()); + SetResourceExplicit(this, RES_HEALTH, ReadByte()); this.max_health = ReadByte(); this.count = ReadByte(); this.team = ReadByte(); @@ -219,9 +219,9 @@ NET_HANDLE(ENT_CLIENT_GENERATOR, bool isnew) _tmp = ReadByte(); - if(_tmp != GetResourceAmount(this, RESOURCE_HEALTH)) + if(_tmp != GetResource(this, RES_HEALTH)) generator_damage(this, _tmp); - SetResourceAmountExplicit(this, RESOURCE_HEALTH, _tmp); + SetResourceExplicit(this, RES_HEALTH, _tmp); } } diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc index 5deef7ec22..66ae14db42 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc @@ -36,7 +36,7 @@ MUTATOR_HOOKFUNCTION(cl_ons, WantEventchase) entity gen = NULL; if(ons_roundlost) { - IL_EACH(g_onsgenerators, GetResourceAmount(it, RESOURCE_HEALTH) <= 0, + IL_EACH(g_onsgenerators, GetResource(it, RES_HEALTH) <= 0, { gen = it; break; diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_controlpoint.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_controlpoint.qc index a00af18ff8..fde9ed6fd7 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_controlpoint.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_controlpoint.qc @@ -12,7 +12,7 @@ bool cpicon_send(entity this, entity to, int sf) { WriteVector(MSG_ENTITY, this.origin); - WriteByte(MSG_ENTITY, GetResourceAmount(this, RESOURCE_HEALTH)); + WriteByte(MSG_ENTITY, GetResource(this, RES_HEALTH)); WriteByte(MSG_ENTITY, this.max_health); WriteByte(MSG_ENTITY, this.count); WriteByte(MSG_ENTITY, this.team); @@ -23,10 +23,10 @@ bool cpicon_send(entity this, entity to, int sf) { WriteByte(MSG_ENTITY, this.team); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) WriteByte(MSG_ENTITY, 0); else - WriteByte(MSG_ENTITY, ceil((GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health) * 255)); + WriteByte(MSG_ENTITY, ceil((GetResource(this, RES_HEALTH) / this.max_health) * 255)); } return true; @@ -36,5 +36,5 @@ void onslaught_controlpoint_icon_link(entity e, void(entity this) spawnproc) { Net_LinkEntity(e, true, 0, cpicon_send); setthink(e, spawnproc); - e.nextthink = time * sys_frametime; + e.nextthink = time + sys_frametime; } diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_generator.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_generator.qc index a33a430124..eb8c13c39c 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_generator.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_generator.qc @@ -8,7 +8,7 @@ bool generator_send(entity this, entity to, int sf) { WriteVector(MSG_ENTITY, this.origin); - WriteByte(MSG_ENTITY, GetResourceAmount(this, RESOURCE_HEALTH)); + WriteByte(MSG_ENTITY, GetResource(this, RES_HEALTH)); WriteByte(MSG_ENTITY, this.max_health); WriteByte(MSG_ENTITY, this.count); WriteByte(MSG_ENTITY, this.team); @@ -18,10 +18,10 @@ bool generator_send(entity this, entity to, int sf) { WriteByte(MSG_ENTITY, this.team); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) WriteByte(MSG_ENTITY, 0); else - WriteByte(MSG_ENTITY, ceil((GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health) * 255)); + WriteByte(MSG_ENTITY, ceil((GetResource(this, RES_HEALTH) / this.max_health) * 255)); } return true; diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc index 854e37e5eb..d4303efbd9 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc @@ -393,11 +393,11 @@ void ons_ControlPoint_Icon_Damage(entity this, entity inflictor, entity attacker ons_notification_time[this.team] = time; } - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); if(this.owner.iscaptured) - WaypointSprite_UpdateHealth(this.owner.sprite, GetResourceAmount(this, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(this.owner.sprite, GetResource(this, RES_HEALTH)); else - WaypointSprite_UpdateBuildFinished(this.owner.sprite, time + (this.max_health - GetResourceAmount(this, RESOURCE_HEALTH)) / (this.count / ONS_CP_THINKRATE)); + WaypointSprite_UpdateBuildFinished(this.owner.sprite, time + (this.max_health - GetResource(this, RES_HEALTH)) / (this.count / ONS_CP_THINKRATE)); this.pain_finished = time + 1; // particles on every hit pointparticles(EFFECT_SPARKS, hitloc, force*-1, 1); @@ -407,7 +407,7 @@ void ons_ControlPoint_Icon_Damage(entity this, entity inflictor, entity attacker else sound(this, CH_TRIGGER, SND_ONS_HIT2, VOL_BASE+0.3, ATTEN_NORM); - if (GetResourceAmount(this, RESOURCE_HEALTH) < 0) + if (GetResource(this, RES_HEALTH) < 0) { sound(this, CH_TRIGGER, SND_GRENADE_IMPACT, VOL_BASE, ATTEN_NORM); pointparticles(EFFECT_ROCKET_EXPLODE, this.origin, '0 0 0', 1); @@ -442,13 +442,13 @@ void ons_ControlPoint_Icon_Damage(entity this, entity inflictor, entity attacker bool ons_ControlPoint_Icon_Heal(entity targ, entity inflictor, float amount, float limit) { - float hlth = GetResourceAmount(targ, RESOURCE_HEALTH); - float true_limit = ((limit != RESOURCE_LIMIT_NONE) ? limit : targ.max_health); + float hlth = GetResource(targ, RES_HEALTH); + float true_limit = ((limit != RES_LIMIT_NONE) ? limit : targ.max_health); if (hlth <= 0 || hlth >= true_limit) return false; - GiveResourceWithLimit(targ, RESOURCE_HEALTH, amount, true_limit); - hlth = GetResourceAmount(targ, RESOURCE_HEALTH); + GiveResourceWithLimit(targ, RES_HEALTH, amount, true_limit); + hlth = GetResource(targ, RES_HEALTH); if(targ.owner.iscaptured) WaypointSprite_UpdateHealth(targ.owner.sprite, hlth); else @@ -479,9 +479,9 @@ void ons_ControlPoint_Icon_Think(entity this) _friendly_count = _friendly_count * (autocvar_g_onslaught_cp_proxydecap_dps * ONS_CP_THINKRATE); _enemy_count = _enemy_count * (autocvar_g_onslaught_cp_proxydecap_dps * ONS_CP_THINKRATE); - GiveResourceWithLimit(this, RESOURCE_HEALTH, (_friendly_count - _enemy_count), this.max_health); + GiveResourceWithLimit(this, RES_HEALTH, (_friendly_count - _enemy_count), this.max_health); this.SendFlags |= CPSF_STATUS; - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) { ons_ControlPoint_Icon_Damage(this, this, this, 1, 0, DMG_NOWEP, this.origin, '0 0 0'); return; @@ -490,10 +490,10 @@ void ons_ControlPoint_Icon_Think(entity this) if (time > this.pain_finished + 5) { - if(GetResourceAmount(this, RESOURCE_HEALTH) < this.max_health) + if(GetResource(this, RES_HEALTH) < this.max_health) { - GiveResourceWithLimit(this, RESOURCE_HEALTH, this.count, this.max_health); - WaypointSprite_UpdateHealth(this.owner.sprite, GetResourceAmount(this, RESOURCE_HEALTH)); + GiveResourceWithLimit(this, RES_HEALTH, this.count, this.max_health); + WaypointSprite_UpdateHealth(this.owner.sprite, GetResource(this, RES_HEALTH)); } } @@ -512,7 +512,7 @@ void ons_ControlPoint_Icon_Think(entity this) } // damaged fx - if(random() < 0.6 - GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health) + if(random() < 0.6 - GetResource(this, RES_HEALTH) / this.max_health) { Send_Effect(EFFECT_ELECTRIC_SPARKS, this.origin + randompos('-10 -10 -20', '10 10 20'), '0 0 0', 1); @@ -534,13 +534,13 @@ void ons_ControlPoint_Icon_BuildThink(entity this) if(!a) return; - GiveResource(this, RESOURCE_HEALTH, this.count); + GiveResource(this, RES_HEALTH, this.count); this.SendFlags |= CPSF_STATUS; - if (GetResourceAmount(this, RESOURCE_HEALTH) >= this.max_health) + if (GetResource(this, RES_HEALTH) >= this.max_health) { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, this.max_health); + SetResourceExplicit(this, RES_HEALTH, this.max_health); this.count = autocvar_g_onslaught_cp_regen * ONS_CP_THINKRATE; // slow repair rate from now on setthink(this, ons_ControlPoint_Icon_Think); sound(this, CH_TRIGGER, SND_ONS_CONTROLPOINT_BUILT, VOL_BASE, ATTEN_NORM); @@ -550,7 +550,7 @@ void ons_ControlPoint_Icon_BuildThink(entity this) Send_Effect(EFFECT_CAP(this.owner.team), this.owner.origin, '0 0 0', 1); WaypointSprite_UpdateMaxHealth(this.owner.sprite, this.max_health); - WaypointSprite_UpdateHealth(this.owner.sprite, GetResourceAmount(this, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(this.owner.sprite, GetResource(this, RES_HEALTH)); if(IS_PLAYER(this.owner.ons_toucher)) { @@ -573,7 +573,7 @@ void ons_ControlPoint_Icon_BuildThink(entity this) if(this.owner.model != MDL_ONS_CP_PAD2.model_str()) setmodel(this.owner, MDL_ONS_CP_PAD2); - if(random() < 0.9 - GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health) + if(random() < 0.9 - GetResource(this, RES_HEALTH) / this.max_health) Send_Effect(EFFECT_RAGE, this.origin + 10 * randomvec(), '0 0 -1', 1); } @@ -588,7 +588,7 @@ void ons_ControlPoint_Icon_Spawn(entity cp, entity player) e.owner = cp; e.max_health = autocvar_g_onslaught_cp_health; - SetResourceAmountExplicit(e, RESOURCE_HEALTH, autocvar_g_onslaught_cp_buildhealth); + SetResourceExplicit(e, RES_HEALTH, autocvar_g_onslaught_cp_buildhealth); e.solid = SOLID_NOT; e.takedamage = DAMAGE_AIM; e.bot_attack = true; @@ -597,7 +597,7 @@ void ons_ControlPoint_Icon_Spawn(entity cp, entity player) e.event_heal = ons_ControlPoint_Icon_Heal; e.team = player.team; e.colormap = 1024 + (e.team - 1) * 17; - e.count = (e.max_health - GetResourceAmount(e, RESOURCE_HEALTH)) * ONS_CP_THINKRATE / autocvar_g_onslaught_cp_buildtime; // how long it takes to build + e.count = (e.max_health - GetResource(e, RES_HEALTH)) * ONS_CP_THINKRATE / autocvar_g_onslaught_cp_buildtime; // how long it takes to build sound(e, CH_TRIGGER, SND_ONS_CONTROLPOINT_BUILD, VOL_BASE, ATTEN_NORM); @@ -607,7 +607,7 @@ void ons_ControlPoint_Icon_Spawn(entity cp, entity player) Send_Effect(EFFECT_FLAG_TOUCH(player.team), e.origin, '0 0 0', 1); - WaypointSprite_UpdateBuildFinished(cp.sprite, time + (e.max_health - GetResourceAmount(e, RESOURCE_HEALTH)) / (e.count / ONS_CP_THINKRATE)); + WaypointSprite_UpdateBuildFinished(cp.sprite, time + (e.max_health - GetResource(e, RES_HEALTH)) / (e.count / ONS_CP_THINKRATE)); WaypointSprite_UpdateRule(cp.sprite,cp.team,SPRITERULE_TEAMPLAY); cp.sprite.SendFlags |= 16; @@ -649,7 +649,7 @@ void ons_ControlPoint_UpdateSprite(entity e) else { WaypointSprite_UpdateMaxHealth(e.sprite, e.goalentity.max_health); - WaypointSprite_UpdateHealth(e.sprite, GetResourceAmount(e.goalentity, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(e.sprite, GetResource(e.goalentity, RES_HEALTH)); } } if(e.lastshielded) @@ -679,10 +679,11 @@ void ons_ControlPoint_Touch(entity this, entity toucher) int attackable; if(IS_VEHICLE(toucher) && toucher.owner) - if(autocvar_g_onslaught_allow_vehicle_touch) + { + if (!autocvar_g_onslaught_allow_vehicle_touch) + return; toucher = toucher.owner; - else - return; + } if(!IS_PLAYER(toucher)) { return; } if(STAT(FROZEN, toucher)) { return; } @@ -898,8 +899,8 @@ void ons_GeneratorDamage(entity this, entity inflictor, entity attacker, float d play2team(this.team, SND(ONS_GENERATOR_UNDERATTACK)); } } - TakeResource(this, RESOURCE_HEALTH, damage); - float hlth = GetResourceAmount(this, RESOURCE_HEALTH); + TakeResource(this, RES_HEALTH, damage); + float hlth = GetResource(this, RES_HEALTH); WaypointSprite_UpdateHealth(this.sprite, hlth); // choose an animation frame based on health this.frame = 10 * bound(0, (1 - hlth / this.max_health), 1); @@ -959,13 +960,13 @@ void ons_GeneratorDamage(entity this, entity inflictor, entity attacker, float d bool ons_GeneratorHeal(entity targ, entity inflictor, float amount, float limit) { - float true_limit = ((limit != RESOURCE_LIMIT_NONE) ? limit : targ.max_health); - float hlth = GetResourceAmount(targ, RESOURCE_HEALTH); + float true_limit = ((limit != RES_LIMIT_NONE) ? limit : targ.max_health); + float hlth = GetResource(targ, RES_HEALTH); if (hlth <= 0 || hlth >= true_limit) return false; - GiveResourceWithLimit(targ, RESOURCE_HEALTH, amount, true_limit); - hlth = GetResourceAmount(targ, RESOURCE_HEALTH); + GiveResourceWithLimit(targ, RES_HEALTH, amount, true_limit); + hlth = GetResource(targ, RES_HEALTH); WaypointSprite_UpdateHealth(targ.sprite, hlth); targ.frame = 10 * bound(0, (1 - hlth / targ.max_health), 1); targ.lasthealth = hlth; @@ -997,7 +998,7 @@ void ons_GeneratorThink(entity this) void ons_GeneratorReset(entity this) { this.team = this.team_saved; - SetResourceAmountExplicit(this, RESOURCE_HEALTH, autocvar_g_onslaught_gen_health); + SetResourceExplicit(this, RES_HEALTH, autocvar_g_onslaught_gen_health); this.lasthealth = this.max_health = autocvar_g_onslaught_gen_health; this.takedamage = DAMAGE_AIM; this.bot_attack = true; @@ -1017,7 +1018,7 @@ void ons_GeneratorReset(entity this) this.SendFlags |= GSF_STATUS; WaypointSprite_UpdateMaxHealth(this.sprite, this.max_health); - WaypointSprite_UpdateHealth(this.sprite, GetResourceAmount(this, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(this.sprite, GetResource(this, RES_HEALTH)); WaypointSprite_UpdateRule(this.sprite,this.team,SPRITERULE_TEAMPLAY); onslaught_updatelinks(); @@ -1065,7 +1066,7 @@ void ons_GeneratorSetup(entity gen) // called when spawning a generator entity o IL_PUSH(g_saved_team, gen); set_movetype(gen, MOVETYPE_NONE); gen.lasthealth = gen.max_health = autocvar_g_onslaught_gen_health; - SetResourceAmountExplicit(gen, RESOURCE_HEALTH, autocvar_g_onslaught_gen_health); + SetResourceExplicit(gen, RES_HEALTH, autocvar_g_onslaught_gen_health); gen.takedamage = DAMAGE_AIM; gen.bot_attack = true; IL_PUSH(g_bot_targets, gen); @@ -1092,7 +1093,7 @@ void ons_GeneratorSetup(entity gen) // called when spawning a generator entity o WaypointSprite_SpawnFixed(WP_Null, gen.origin + CPGEN_WAYPOINT_OFFSET, gen, sprite, RADARICON_NONE); WaypointSprite_UpdateRule(gen.sprite, gen.team, SPRITERULE_TEAMPLAY); WaypointSprite_UpdateMaxHealth(gen.sprite, gen.max_health); - WaypointSprite_UpdateHealth(gen.sprite, GetResourceAmount(gen, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(gen.sprite, GetResource(gen, RES_HEALTH)); InitializeEntity(gen, ons_DelayedGeneratorSetup, INITPRIO_SETLOCATION); } @@ -1114,7 +1115,7 @@ void Onslaught_count_generators() for(e = ons_worldgeneratorlist; e; e = e.ons_worldgeneratornext) { ++total_generators; - if (GetResourceAmount(e, RESOURCE_HEALTH) < 1) + if (GetResource(e, RES_HEALTH) < 1) { continue; } @@ -1716,10 +1717,12 @@ MUTATOR_HOOKFUNCTION(ons, PlayerSpawn) for(tmp_entity = ons_worldcplist; tmp_entity; tmp_entity = tmp_entity.ons_worldcpnext) { if(SAME_TEAM(tmp_entity, player)) - if(random_target) - RandomSelection_AddEnt(tmp_entity, 1, 1); - else if(vlen2(tmp_entity.origin - spawn_loc) <= vlen2(closest_target.origin - spawn_loc) || closest_target == NULL) - closest_target = tmp_entity; + { + if(random_target) + RandomSelection_AddEnt(tmp_entity, 1, 1); + else if(vlen2(tmp_entity.origin - spawn_loc) <= vlen2(closest_target.origin - spawn_loc) || closest_target == NULL) + closest_target = tmp_entity; + } } if(random_target) { closest_target = RandomSelection_chosen_ent; } @@ -1950,7 +1953,7 @@ MUTATOR_HOOKFUNCTION(ons, SV_ParseClientCommand) { entity source_point = ons_Nearest_ControlPoint(player, player.origin, autocvar_g_onslaught_teleport_radius); - if ( !source_point && GetResourceAmount(player, RESOURCE_HEALTH) > 0 ) + if ( !source_point && GetResource(player, RES_HEALTH) > 0 ) { sprint(player, "\nYou need to be next to a control point\n"); return true; @@ -1965,7 +1968,7 @@ MUTATOR_HOOKFUNCTION(ons, SV_ParseClientCommand) return true; } - if ( GetResourceAmount(player, RESOURCE_HEALTH) <= 0 ) + if ( GetResource(player, RES_HEALTH) <= 0 ) { player.ons_spawn_by = closest_target; player.respawn_flags = player.respawn_flags | RESPAWN_FORCE; @@ -2031,14 +2034,14 @@ MUTATOR_HOOKFUNCTION(ons, SendWaypoint) { entity wp_owner = wp.owner; entity e = WaypointSprite_getviewentity(to); - if(SAME_TEAM(e, wp_owner) && GetResourceAmount(wp_owner.goalentity, RESOURCE_HEALTH) >= wp_owner.goalentity.max_health) { wp_flag |= 2; } + if(SAME_TEAM(e, wp_owner) && GetResource(wp_owner.goalentity, RES_HEALTH) >= wp_owner.goalentity.max_health) { wp_flag |= 2; } if(!ons_ControlPoint_Attackable(wp_owner, e.team)) { wp_flag |= 2; } } if(wp.owner.classname == "onslaught_generator") { entity wp_owner = wp.owner; - if(wp_owner.isshielded && GetResourceAmount(wp_owner, RESOURCE_HEALTH) >= wp_owner.max_health) { wp_flag |= 2; } - if(GetResourceAmount(wp_owner, RESOURCE_HEALTH) <= 0) { wp_flag |= 2; } + if(wp_owner.isshielded && GetResource(wp_owner, RES_HEALTH) >= wp_owner.max_health) { wp_flag |= 2; } + if(GetResource(wp_owner, RES_HEALTH) <= 0) { wp_flag |= 2; } } } diff --git a/qcsrc/common/gamemodes/gamemode/race/sv_race.qc b/qcsrc/common/gamemodes/gamemode/race/sv_race.qc index 31309f285d..66b23f6a68 100644 --- a/qcsrc/common/gamemodes/gamemode/race/sv_race.qc +++ b/qcsrc/common/gamemodes/gamemode/race/sv_race.qc @@ -259,10 +259,12 @@ MUTATOR_HOOKFUNCTION(rc, MakePlayerObserver) entity player = M_ARGV(0, entity); if(g_race_qualifying) - if(GameRules_scoring_add(player, RACE_FASTEST, 0)) - player.frags = FRAGS_LMS_LOSER; - else - player.frags = FRAGS_SPECTATOR; + { + if(GameRules_scoring_add(player, RACE_FASTEST, 0)) + player.frags = FRAGS_LMS_LOSER; + else + player.frags = FRAGS_SPECTATOR; + } race_PreparePlayer(player); player.race_checkpoint = -1; diff --git a/qcsrc/common/gamemodes/sv_rules.qh b/qcsrc/common/gamemodes/sv_rules.qh index f8950684b4..1b0f8a7bd8 100644 --- a/qcsrc/common/gamemodes/sv_rules.qh +++ b/qcsrc/common/gamemodes/sv_rules.qh @@ -31,14 +31,14 @@ void GameRules_limit_fallbacks(); * @param spprio player score priority (if frags aren't enabled) * @param stprio team score priority (if frags aren't enabled) */ -#define GameRules_scoring(teams, spprio, stprio, fields) MACRO_BEGIN { \ +#define GameRules_scoring(teams, spprio, stprio, fields) MACRO_BEGIN \ _GameRules_scoring_begin((teams), (spprio), (stprio)); \ noref void(entity, string, float) field = _GameRules_scoring_field; \ /* todo: just have the one `field` function */ \ noref void(int, string, float) field_team = _GameRules_scoring_field_team; \ LAMBDA(fields); \ _GameRules_scoring_end(); \ -} MACRO_END +MACRO_END void _GameRules_scoring_begin(int teams, float spprio, float stprio); void _GameRules_scoring_field(entity i, string label, int scoreflags); diff --git a/qcsrc/common/impulses/all.qh b/qcsrc/common/impulses/all.qh index 8bd0c41dab..e5a2b7b601 100644 --- a/qcsrc/common/impulses/all.qh +++ b/qcsrc/common/impulses/all.qh @@ -27,10 +27,17 @@ REGISTRY_CHECK(IMPULSES) #define LEGACY_IMPULSE_ID(alias, id) LEGACY_IMPULSE(alias, id, sprintf("impulse %d", IMP_##alias.impulse)) +void _impCheck(string s, string alias) +{ + // this is inside a function to avoid expanding it on compilation everytime + if (s == alias) + LOG_FATALF("LEGACY_IMPULSE: would define a recursive alias for '%s', use LEGACY_IMPULSE_ID instead", s); +} + #define LEGACY_IMPULSE(alias, id, new) \ STATIC_INIT(legacy_##alias) { \ string s = new; \ - if (s == #alias) LOG_FATALF("LEGACY_IMPULSE: would define a recursive alias for '%s', use LEGACY_IMPULSE_ID instead", s); \ + _impCheck(s, #alias); \ IMPULSE_ALIAS(alias, s); \ } \ SHUTDOWN(legacy_##alias) { IMPULSE_ALIAS(alias, "impulse " #id); } diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh index 030b4db1c0..cf4e288ba6 100644 --- a/qcsrc/common/items/item.qh +++ b/qcsrc/common/items/item.qh @@ -48,8 +48,8 @@ const int IT_UNLIMITED_AMMO = IT_UNLIMITED_WEAPON_AMMO | IT_UNLIMITE const int IT_PICKUPMASK = IT_UNLIMITED_AMMO | IT_JETPACK | IT_FUEL_REGEN; // strength and invincible are handled separately #ifdef SVQC -.float strength_finished = _STAT(STRENGTH_FINISHED); -.float invincible_finished = _STAT(INVINCIBLE_FINISHED); +const .float strength_finished = _STAT(STRENGTH_FINISHED); +const .float invincible_finished = _STAT(INVINCIBLE_FINISHED); #define spawnfunc_body(item) \ if (!Item_IsDefinitionAllowed(item)) \ diff --git a/qcsrc/common/items/item/ammo.qh b/qcsrc/common/items/item/ammo.qh index 3249f07bca..936d42f1f2 100644 --- a/qcsrc/common/items/item/ammo.qh +++ b/qcsrc/common/items/item/ammo.qh @@ -14,8 +14,8 @@ .int ammo_rockets; .int ammo_cells; #ifdef SVQC -.int ammo_plasma = _STAT(PLASMA); -.int ammo_fuel = _STAT(FUEL); +const .int ammo_plasma = _STAT(PLASMA); +const .int ammo_fuel = _STAT(FUEL); #else .int ammo_plasma; .int ammo_fuel; @@ -48,8 +48,8 @@ MODEL(Bullets_ITEM, Item_Model("a_bullets.mdl")); PROPERTY(int, g_pickup_nails); void ammo_bullets_init(Pickup this, entity item) { - if(!GetResourceAmount(item, RESOURCE_BULLETS)) - SetResourceAmountExplicit(item, RESOURCE_BULLETS, g_pickup_nails); + if(!GetResource(item, RES_BULLETS)) + SetResourceExplicit(item, RES_BULLETS, g_pickup_nails); } #endif @@ -82,8 +82,8 @@ MODEL(Cells_ITEM, Item_Model("a_cells.md3")); PROPERTY(int, g_pickup_cells); void ammo_cells_init(Pickup this, entity item) { - if(!GetResourceAmount(item, RESOURCE_CELLS)) - SetResourceAmountExplicit(item, RESOURCE_CELLS, g_pickup_cells); + if(!GetResource(item, RES_CELLS)) + SetResourceExplicit(item, RES_CELLS, g_pickup_cells); } #endif REGISTER_ITEM(Cells, Ammo) { @@ -112,8 +112,8 @@ MODEL(Plasma_ITEM, Item_Model("a_cells.md3")); PROPERTY(int, g_pickup_plasma); void ammo_plasma_init(Pickup this, entity item) { - if(!GetResourceAmount(item, RESOURCE_PLASMA)) - SetResourceAmountExplicit(item, RESOURCE_PLASMA, g_pickup_plasma); + if(!GetResource(item, RES_PLASMA)) + SetResourceExplicit(item, RES_PLASMA, g_pickup_plasma); } #endif REGISTER_ITEM(Plasma, Ammo) { @@ -142,8 +142,8 @@ MODEL(Rockets_ITEM, Item_Model("a_rockets.md3")); PROPERTY(int, g_pickup_rockets); void ammo_rockets_init(Pickup this, entity item) { - if(!GetResourceAmount(item, RESOURCE_ROCKETS)) - SetResourceAmountExplicit(item, RESOURCE_ROCKETS, g_pickup_rockets); + if(!GetResource(item, RES_ROCKETS)) + SetResourceExplicit(item, RES_ROCKETS, g_pickup_rockets); } #endif REGISTER_ITEM(Rockets, Ammo) { @@ -172,8 +172,8 @@ MODEL(Shells_ITEM, Item_Model("a_shells.md3")); PROPERTY(int, g_pickup_shells); void ammo_shells_init(Pickup this, entity item) { - if(!GetResourceAmount(item, RESOURCE_SHELLS)) - SetResourceAmountExplicit(item, RESOURCE_SHELLS, g_pickup_shells); + if(!GetResource(item, RES_SHELLS)) + SetResourceExplicit(item, RES_SHELLS, g_pickup_shells); } #endif diff --git a/qcsrc/common/items/item/armor.qh b/qcsrc/common/items/item/armor.qh index 2ecd835571..be6c52af59 100644 --- a/qcsrc/common/items/item/armor.qh +++ b/qcsrc/common/items/item/armor.qh @@ -26,8 +26,8 @@ void item_armorsmall_init(Pickup this, entity item) { if(!item.max_armorvalue) item.max_armorvalue = g_pickup_armorsmall_max; - if(!GetResourceAmount(item, RESOURCE_ARMOR)) - SetResourceAmountExplicit(item, RESOURCE_ARMOR, g_pickup_armorsmall); + if(!GetResource(item, RES_ARMOR)) + SetResourceExplicit(item, RES_ARMOR, g_pickup_armorsmall); } #endif @@ -64,8 +64,8 @@ void item_armormedium_init(Pickup this, entity item) { if(!item.max_armorvalue) item.max_armorvalue = g_pickup_armormedium_max; - if(!GetResourceAmount(item, RESOURCE_ARMOR)) - SetResourceAmountExplicit(item, RESOURCE_ARMOR, g_pickup_armormedium); + if(!GetResource(item, RES_ARMOR)) + SetResourceExplicit(item, RES_ARMOR, g_pickup_armormedium); } #endif @@ -102,8 +102,8 @@ void item_armorbig_init(Pickup this, entity item) { if(!item.max_armorvalue) item.max_armorvalue = g_pickup_armorbig_max; - if(!GetResourceAmount(item, RESOURCE_ARMOR)) - SetResourceAmountExplicit(item, RESOURCE_ARMOR, g_pickup_armorbig); + if(!GetResource(item, RES_ARMOR)) + SetResourceExplicit(item, RES_ARMOR, g_pickup_armorbig); } #endif @@ -142,8 +142,8 @@ void item_armormega_init(Pickup this, entity item) { if(!item.max_armorvalue) item.max_armorvalue = g_pickup_armormega_max; - if(!GetResourceAmount(item, RESOURCE_ARMOR)) - SetResourceAmountExplicit(item, RESOURCE_ARMOR, g_pickup_armormega); + if(!GetResource(item, RES_ARMOR)) + SetResourceExplicit(item, RES_ARMOR, g_pickup_armormega); } #endif diff --git a/qcsrc/common/items/item/health.qh b/qcsrc/common/items/item/health.qh index e6a9dd9883..14e942a085 100644 --- a/qcsrc/common/items/item/health.qh +++ b/qcsrc/common/items/item/health.qh @@ -26,8 +26,8 @@ void item_healthsmall_init(Pickup this, entity item) { if(!item.max_health) item.max_health = g_pickup_healthsmall_max; - if(!GetResourceAmount(item, RESOURCE_HEALTH)) - SetResourceAmountExplicit(item, RESOURCE_HEALTH, g_pickup_healthsmall); + if(!GetResource(item, RES_HEALTH)) + SetResourceExplicit(item, RES_HEALTH, g_pickup_healthsmall); } #endif @@ -64,8 +64,8 @@ void item_healthmedium_init(Pickup this, entity item) { if(!item.max_health) item.max_health = g_pickup_healthmedium_max; - if(!GetResourceAmount(item, RESOURCE_HEALTH)) - SetResourceAmountExplicit(item, RESOURCE_HEALTH, g_pickup_healthmedium); + if(!GetResource(item, RES_HEALTH)) + SetResourceExplicit(item, RES_HEALTH, g_pickup_healthmedium); } #endif @@ -102,8 +102,8 @@ void item_healthbig_init(Pickup this, entity item) { if(!item.max_health) item.max_health = g_pickup_healthbig_max; - if(!GetResourceAmount(item, RESOURCE_HEALTH)) - SetResourceAmountExplicit(item, RESOURCE_HEALTH, g_pickup_healthbig); + if(!GetResource(item, RES_HEALTH)) + SetResourceExplicit(item, RES_HEALTH, g_pickup_healthbig); } #endif @@ -142,8 +142,8 @@ void item_healthmega_init(Pickup this, entity item) { if(!item.max_health) item.max_health = g_pickup_healthmega_max; - if(!GetResourceAmount(item, RESOURCE_HEALTH)) - SetResourceAmountExplicit(item, RESOURCE_HEALTH, g_pickup_healthmega); + if(!GetResource(item, RES_HEALTH)) + SetResourceExplicit(item, RES_HEALTH, g_pickup_healthmega); } #endif diff --git a/qcsrc/common/items/item/jetpack.qh b/qcsrc/common/items/item/jetpack.qh index 24d040d56b..8440975d02 100644 --- a/qcsrc/common/items/item/jetpack.qh +++ b/qcsrc/common/items/item/jetpack.qh @@ -19,8 +19,8 @@ MODEL(Jetpack_ITEM, Item_Model("g_jetpack.md3")); PROPERTY(int, g_pickup_fuel_jetpack); void powerup_jetpack_init(Pickup this, entity item) { - if(!GetResourceAmount(item, RESOURCE_FUEL)) - SetResourceAmountExplicit(item, RESOURCE_FUEL, g_pickup_fuel_jetpack); + if(!GetResource(item, RES_FUEL)) + SetResourceExplicit(item, RES_FUEL, g_pickup_fuel_jetpack); } #endif @@ -57,8 +57,8 @@ MODEL(JetpackFuel_ITEM, Item_Model("g_fuel.md3")); PROPERTY(int, g_pickup_fuel); void ammo_fuel_init(Pickup this, entity item) { - if(!GetResourceAmount(item, RESOURCE_FUEL)) - SetResourceAmountExplicit(item, RESOURCE_FUEL, g_pickup_fuel); + if(!GetResource(item, RES_FUEL)) + SetResourceExplicit(item, RES_FUEL, g_pickup_fuel); } #endif REGISTER_ITEM(JetpackFuel, Ammo) { diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index 68c548aaef..307eb2773b 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -10,6 +10,11 @@ #endif bool autocvar_g_mapinfo_ignore_warnings; +#ifdef MENUQC +#define WARN_COND (!autocvar_g_mapinfo_ignore_warnings) +#else +#define WARN_COND (!autocvar_g_mapinfo_ignore_warnings && MapInfo_Map_bspname == mi_shortname) +#endif // generic string stuff @@ -528,7 +533,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThis if (sa == "") continue; int p = strstrofs(sa, "=", 0); if (p < 0) { - if(!autocvar_g_mapinfo_ignore_warnings) + if(WARN_COND) LOG_WARNF("Invalid gametype setting in mapinfo for gametype %s: %s", MapInfo_Type_ToString(pWantedType), sa); continue; } @@ -568,7 +573,7 @@ void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThis } } FOREACH(Gametypes, true, handled |= it.m_parse_mapinfo(k, v)); - if (!handled && !autocvar_g_mapinfo_ignore_warnings) + if (!handled && WARN_COND) LOG_WARNF("Invalid gametype setting in mapinfo for gametype %s: %s", MapInfo_Type_ToString(pWantedType), sa); } @@ -584,25 +589,25 @@ void _MapInfo_Map_ApplyGametypeEx(string s, Gametype pWantedType, Gametype pThis } } -Gametype MapInfo_Type_FromString(string t) +Gametype MapInfo_Type_FromString(string str) { -#define deprecate(from, to) MACRO_BEGIN { \ - if (t == #from) { \ - string replacement = #to; \ - if(!autocvar_g_mapinfo_ignore_warnings) \ - LOG_WARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.", MapInfo_Map_bspname, t, replacement); \ - t = replacement; \ - } \ -} MACRO_END - deprecate(nexball, nb); - deprecate(freezetag, ft); - deprecate(keepaway, ka); - deprecate(invasion, inv); - deprecate(assault, as); - deprecate(race, rc); - FOREACH(Gametypes, it.mdl == t, return it); + string replacement = ""; + switch (str) + { + case "nexball": replacement = "nb"; break; + case "freezetag": replacement = "ft"; break; + case "keepaway": replacement = "ka"; break; + case "invasion": replacement = "inv"; break; + case "assault": replacement = "as"; break; + case "race": replacement = "rc"; break; + } + if (replacement != "" && WARN_COND) + { + LOG_WARNF("MapInfo_Type_FromString (probably %s): using deprecated name '%s'. Should use '%s'.", MapInfo_Map_bspname, str, replacement); + str = replacement; + } + FOREACH(Gametypes, it.mdl == str, return it); return NULL; -#undef deprecate } string MapInfo_Type_Description(Gametype t) @@ -660,7 +665,10 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, { fh = fopen(s, FILE_READ); if(fh < 0) - LOG_WARN("Map ", pFilename, " references not existing config file ", s); + { + if(WARN_COND) + LOG_WARN("Map ", pFilename, " references not existing config file ", s); + } else { for (;;) @@ -688,19 +696,22 @@ void _MapInfo_Parse_Settemp(string pFilename, string acl, float type, string s, fclose(fh); } } - else + else if(WARN_COND) LOG_WARN("Map ", pFilename, " uses too many levels of inclusion"); } - else if(t == "") - LOG_WARN("Map ", pFilename, " contains a potentially harmful setting, ignored"); - else if (!cvar_value_issafe(t)) - LOG_WARN("Map ", pFilename, " contains a potentially harmful setting, ignored"); - else if (!cvar_value_issafe(s)) - LOG_WARN("Map ", pFilename, " contains a potentially harmful setting, ignored"); - else if(matchacl(MAPINFO_SETTEMP_ACL_SYSTEM, t) <= 0) - LOG_WARN("Map ", pFilename, " contains a potentially harmful setting, ignored"); + else if(t == "" + || !cvar_value_issafe(t) + || !cvar_value_issafe(s) + || matchacl(MAPINFO_SETTEMP_ACL_SYSTEM, t) <= 0) + { + if (WARN_COND) + LOG_WARN("Map ", pFilename, " contains a potentially harmful setting, ignored"); + } else if(matchacl(acl, t) <= 0) - LOG_WARN("Map ", pFilename, " contains a denied setting, ignored"); + { + if (WARN_COND) + LOG_WARN("Map ", pFilename, " contains a denied setting, ignored"); + } else { if(type == 0) // server set @@ -850,7 +861,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet error("... but I just wrote it!"); } - if(!autocvar_g_mapinfo_ignore_warnings) + if(WARN_COND) LOG_WARN("autogenerated mapinfo file ", fn, " has been loaded; please edit that file and move it to maps/", pFilename, ".mapinfo"); } @@ -889,7 +900,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet else if(t == "vehicles") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_VEHICLES; else if(t == "monsters") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_MONSTERS; else if(t == "new_toys") MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_WEAPONS; - else + else if(WARN_COND) LOG_WARN("Map ", pFilename, " supports unknown feature ", t, ", ignored"); } else if(t == "hidden") @@ -917,11 +928,11 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet { t = car(s); s = cdr(s); Gametype f = MapInfo_Type_FromString(t); - //if(!autocvar_g_mapinfo_ignore_warnings) + //if(WARN_COND) //LOG_WARN("Map ", pFilename, " contains the legacy 'type' keyword which is deprecated and will be removed in the future. Please migrate the mapinfo file to 'gametype'."); if(f) _MapInfo_Map_ApplyGametype (s, pGametypeToSet, f, true); - else if(!autocvar_g_mapinfo_ignore_warnings) + else if(WARN_COND) LOG_DEBUG("Map ", pFilename, " supports unknown game type ", t, ", ignored"); } else if(t == "gametype") @@ -930,7 +941,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet Gametype f = MapInfo_Type_FromString(t); if(f) _MapInfo_Map_ApplyGametypeEx (s, pGametypeToSet, f); - else if(!autocvar_g_mapinfo_ignore_warnings) + else if(WARN_COND) LOG_DEBUG("Map ", pFilename, " supports unknown game type ", t, ", ignored"); } else if(t == "size") @@ -942,16 +953,25 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet t = car(s); s = cdr(s); d = stof(t); t = car(s); s = cdr(s); e = stof(t); if(s == "") - LOG_WARN("Map ", pFilename, " contains an incorrect size line (not enough params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z"); + { + if(WARN_COND) + LOG_WARN("Map ", pFilename, " contains an incorrect size line (not enough params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z"); + } else { t = car(s); s = cdr(s); f = stof(t); if(s != "") - LOG_WARN("Map ", pFilename, " contains an incorrect size line (too many params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z"); + { + if(WARN_COND) + LOG_WARN("Map ", pFilename, " contains an incorrect size line (too many params), syntax: size mins_x mins_y mins_z maxs_x maxs_y maxs_z"); + } else { if(a >= d || b >= e || c >= f) - LOG_WARN("Map ", pFilename, " contains an incorrect size line, mins have to be < maxs"); + { + if(WARN_COND) + LOG_WARN("Map ", pFilename, " contains an incorrect size line, mins have to be < maxs"); + } else { MapInfo_Map_mins.x = a; @@ -1001,7 +1021,10 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet else if(t == "fog") { if (!cvar_value_issafe(s)) - LOG_WARN("Map ", pFilename, " contains a potentially harmful fog setting, ignored"); + { + if(WARN_COND) + LOG_WARN("Map ", pFilename, " contains a potentially harmful fog setting, ignored"); + } else MapInfo_Map_fog = s; } @@ -1017,14 +1040,17 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet if(pGametypeToSet) { if (!cvar_value_issafe(t)) - LOG_WARN("Map ", pFilename, " contains a potentially harmful cdtrack, ignored"); + { + if(WARN_COND) + LOG_WARN("Map ", pFilename, " contains a potentially harmful cdtrack, ignored"); + } else MapInfo_Map_clientstuff = strcat( MapInfo_Map_clientstuff, "cd loop \"", t, "\"\n" ); } } - else if(!autocvar_g_mapinfo_ignore_warnings) + else if(WARN_COND) LOG_WARN("Map ", pFilename, " provides unknown info item ", t, ", ignored"); } fclose(fh); @@ -1039,7 +1065,8 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, Gamet MapInfo_Cache_Store(); if(MapInfo_Map_supportedGametypes != 0) return r; - LOG_WARN("Map ", pFilename, " supports no game types, ignored"); + if (WARN_COND) + LOG_WARN("Map ", pFilename, " supports no game types, ignored"); return 0; } int MapInfo_Get_ByName(string pFilename, float pAllowGenerate, Gametype pGametypeToSet) diff --git a/qcsrc/common/mapobjects/func/breakable.qc b/qcsrc/common/mapobjects/func/breakable.qc index cb17ac442c..32926d4908 100644 --- a/qcsrc/common/mapobjects/func/breakable.qc +++ b/qcsrc/common/mapobjects/func/breakable.qc @@ -83,7 +83,7 @@ void func_breakable_colormod(entity this) float h; if (!(this.spawnflags & BREAKABLE_INDICATE_DAMAGE)) return; - h = GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health; + h = GetResource(this, RES_HEALTH) / this.max_health; if(h < 0.25) this.colormod = '1 0 0'; else if(h <= 0.75) @@ -129,7 +129,7 @@ void func_breakable_look_restore(entity this) void func_breakable_behave_destroyed(entity this) { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, this.max_health); + SetResourceExplicit(this, RES_HEALTH, this.max_health); this.takedamage = DAMAGE_NO; if(this.bot_attack) IL_REMOVE(g_bot_targets, this); @@ -157,11 +157,11 @@ void func_breakable_think(entity this) void func_breakable_destroy(entity this, entity actor, entity trigger); void func_breakable_behave_restore(entity this) { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, this.max_health); + SetResourceExplicit(this, RES_HEALTH, this.max_health); if(this.sprite) { WaypointSprite_UpdateMaxHealth(this.sprite, this.max_health); - WaypointSprite_UpdateHealth(this.sprite, GetResourceAmount(this, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(this.sprite, GetResource(this, RES_HEALTH)); } if(!(this.spawnflags & BREAKABLE_NODAMAGE)) { @@ -272,15 +272,15 @@ void func_breakable_damage(entity this, entity inflictor, entity attacker, float if(attacker.team == this.team) return; this.pain_finished = time; - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); if(this.sprite) { WaypointSprite_Ping(this.sprite); - WaypointSprite_UpdateHealth(this.sprite, GetResourceAmount(this, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(this.sprite, GetResource(this, RES_HEALTH)); } func_breakable_colormod(this); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) { debrisforce = force; @@ -315,9 +315,9 @@ void func_breakable_reset(entity this) spawnfunc(func_breakable) { float n, i; - if(!GetResourceAmount(this, RESOURCE_HEALTH)) - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 100); - this.max_health = GetResourceAmount(this, RESOURCE_HEALTH); + if(!GetResource(this, RES_HEALTH)) + SetResourceExplicit(this, RES_HEALTH, 100); + this.max_health = GetResource(this, RES_HEALTH); // yes, I know, MOVETYPE_NONE is not available here, not that one would want it here anyway if(!this.debrismovetype) this.debrismovetype = MOVETYPE_BOUNCE; diff --git a/qcsrc/common/mapobjects/func/button.qc b/qcsrc/common/mapobjects/func/button.qc index 024d5cfd87..56bfd4148d 100644 --- a/qcsrc/common/mapobjects/func/button.qc +++ b/qcsrc/common/mapobjects/func/button.qc @@ -68,7 +68,7 @@ void button_return(entity this) this.state = STATE_DOWN; SUB_CalcMove (this, this.pos1, TSPEED_LINEAR, this.speed, button_done); this.frame = 0; // use normal textures - if (GetResourceAmount(this, RESOURCE_HEALTH)) + if (GetResource(this, RES_HEALTH)) this.takedamage = DAMAGE_YES; // can be shot again this.wait_remaining = -1; this.activation_time = -1; @@ -83,7 +83,7 @@ void button_blocked(entity this, entity blocker) void button_fire(entity this) { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, this.max_health); + SetResourceExplicit(this, RES_HEALTH, this.max_health); this.takedamage = DAMAGE_NO; // will be reset upon return if (this.state == STATE_UP || this.state == STATE_TOP) @@ -100,7 +100,7 @@ void button_fire(entity this) void button_reset(entity this) { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, this.max_health); + SetResourceExplicit(this, RES_HEALTH, this.max_health); setorigin(this, this.pos1); this.frame = 0; // use normal textures this.state = STATE_BOTTOM; @@ -110,7 +110,7 @@ void button_reset(entity this) this.active = ACTIVE_ACTIVE; setthink(this, func_null); this.nextthink = 0; - if (GetResourceAmount(this, RESOURCE_HEALTH)) + if (GetResource(this, RES_HEALTH)) this.takedamage = DAMAGE_YES; // can be shot again } @@ -148,7 +148,7 @@ void button_damage(entity this, entity inflictor, entity attacker, float damage, return; if (this.spawnflags & BUTTON_DONTACCUMULATEDMG) { - if (GetResourceAmount(this, RESOURCE_HEALTH) <= damage) + if (GetResource(this, RES_HEALTH) <= damage) { this.enemy = attacker; button_fire(this); @@ -156,8 +156,8 @@ void button_damage(entity this, entity inflictor, entity attacker, float damage, } else { - TakeResource(this, RESOURCE_HEALTH, damage); - if (GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + TakeResource(this, RES_HEALTH, damage); + if (GetResource(this, RES_HEALTH) <= 0) { this.enemy = attacker; button_fire(this); @@ -190,9 +190,9 @@ spawnfunc(func_button) // if (this.health == 0) // all buttons are now shootable // this.health = 10; - if (GetResourceAmount(this, RESOURCE_HEALTH)) + if (GetResource(this, RES_HEALTH)) { - this.max_health = GetResourceAmount(this, RESOURCE_HEALTH); + this.max_health = GetResource(this, RES_HEALTH); this.event_damage = button_damage; this.takedamage = DAMAGE_YES; } diff --git a/qcsrc/common/mapobjects/func/door.qc b/qcsrc/common/mapobjects/func/door.qc index 1ba7bad3aa..aa5b54a60e 100644 --- a/qcsrc/common/mapobjects/func/door.qc +++ b/qcsrc/common/mapobjects/func/door.qc @@ -113,7 +113,7 @@ void door_go_down(entity this) if (this.max_health) { this.takedamage = DAMAGE_YES; - SetResourceAmountExplicit(this, RESOURCE_HEALTH, this.max_health); + SetResourceExplicit(this, RES_HEALTH, this.max_health); } this.state = STATE_DOWN; @@ -265,7 +265,7 @@ void door_damage(entity this, entity inflictor, entity attacker, float damage, i if(this.spawnflags & NOSPLASH) if(!(DEATH_ISSPECIAL(deathtype)) && (deathtype & HITTYPE_SPLASH)) return; - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); if (this.itemkeys) { @@ -273,9 +273,9 @@ void door_damage(entity this, entity inflictor, entity attacker, float damage, i return; } - if (GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if (GetResource(this, RES_HEALTH) <= 0) { - SetResourceAmountExplicit(this.owner, RESOURCE_HEALTH, this.owner.max_health); + SetResourceExplicit(this.owner, RES_HEALTH, this.owner.max_health); this.owner.takedamage = DAMAGE_NO; // will be reset upon return door_use(this.owner, attacker, NULL); } @@ -357,7 +357,7 @@ Spawned if a door lacks a real activator void door_trigger_touch(entity this, entity toucher) { - if (GetResourceAmount(toucher, RESOURCE_HEALTH) < 1) + if (GetResource(toucher, RES_HEALTH) < 1) #ifdef SVQC if (!((toucher.iscreature || (toucher.flags & FL_PROJECTILE)) && !IS_DEAD(toucher))) #elif defined(CSQC) @@ -441,7 +441,7 @@ void LinkDoors(entity this) { this.owner = this.enemy = this; - if (GetResourceAmount(this, RESOURCE_HEALTH)) + if (GetResource(this, RES_HEALTH)) return; IFTARGETED return; @@ -474,8 +474,8 @@ void LinkDoors(entity this) cmaxs = this.absmax; for(t = this; ; t = t.enemy) { - if(GetResourceAmount(t, RESOURCE_HEALTH) && !GetResourceAmount(this, RESOURCE_HEALTH)) - SetResourceAmountExplicit(this, RESOURCE_HEALTH, GetResourceAmount(t, RESOURCE_HEALTH)); + if(GetResource(t, RES_HEALTH) && !GetResource(this, RES_HEALTH)) + SetResourceExplicit(this, RES_HEALTH, GetResource(t, RES_HEALTH)); if((t.targetname != "") && (this.targetname == "")) this.targetname = t.targetname; if((t.message != "") && (this.message == "")) @@ -499,7 +499,7 @@ void LinkDoors(entity this) // distribute health, targetname, message for(t = this; t; t = t.enemy) { - SetResourceAmountExplicit(t, RESOURCE_HEALTH, GetResourceAmount(this, RESOURCE_HEALTH)); + SetResourceExplicit(t, RES_HEALTH, GetResource(this, RES_HEALTH)); t.targetname = this.targetname; t.message = this.message; if(t.enemy == this) @@ -509,7 +509,7 @@ void LinkDoors(entity this) // shootable, or triggered doors just needed the owner/enemy links, // they don't spawn a field - if (GetResourceAmount(this, RESOURCE_HEALTH)) + if (GetResource(this, RES_HEALTH)) return; IFTARGETED return; @@ -628,7 +628,7 @@ void door_reset(entity this) // common code for func_door and func_door_rotating spawnfuncs void door_init_shared(entity this) { - this.max_health = GetResourceAmount(this, RESOURCE_HEALTH); + this.max_health = GetResource(this, RES_HEALTH); // unlock sound if(this.noise == "") @@ -681,7 +681,7 @@ void door_init_shared(entity this) this.state = STATE_BOTTOM; - if (GetResourceAmount(this, RESOURCE_HEALTH)) + if (GetResource(this, RES_HEALTH)) { //this.canteamdamage = true; // TODO this.takedamage = DAMAGE_YES; diff --git a/qcsrc/common/mapobjects/func/door_rotating.qc b/qcsrc/common/mapobjects/func/door_rotating.qc index 39c02a8669..29fd1d05f9 100644 --- a/qcsrc/common/mapobjects/func/door_rotating.qc +++ b/qcsrc/common/mapobjects/func/door_rotating.qc @@ -58,7 +58,7 @@ void door_rotating_go_down(entity this) if (this.max_health) { this.takedamage = DAMAGE_YES; - SetResourceAmountExplicit(this, RESOURCE_HEALTH, this.max_health); + SetResourceExplicit(this, RES_HEALTH, this.max_health); } this.state = STATE_DOWN; diff --git a/qcsrc/common/mapobjects/func/door_secret.qc b/qcsrc/common/mapobjects/func/door_secret.qc index f06f39e911..c008e500dc 100644 --- a/qcsrc/common/mapobjects/func/door_secret.qc +++ b/qcsrc/common/mapobjects/func/door_secret.qc @@ -13,7 +13,7 @@ void fd_secret_use(entity this, entity actor, entity trigger) float temp; string message_save; - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 10000); + SetResourceExplicit(this, RES_HEALTH, 10000); if(!this.bot_attack) IL_PUSH(g_bot_targets, this); this.bot_attack = true; @@ -122,7 +122,7 @@ void fd_secret_done(entity this) { if (this.spawnflags&DOOR_SECRET_YES_SHOOT) { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 10000); + SetResourceExplicit(this, RES_HEALTH, 10000); this.takedamage = DAMAGE_YES; //this.th_pain = fd_secret_use; } @@ -168,7 +168,7 @@ void secret_reset(entity this) { if (this.spawnflags & DOOR_SECRET_YES_SHOOT) { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 10000); + SetResourceExplicit(this, RES_HEALTH, 10000); this.takedamage = DAMAGE_YES; } setorigin(this, this.oldorigin); @@ -253,7 +253,7 @@ spawnfunc(func_door_secret) if (this.spawnflags & DOOR_SECRET_YES_SHOOT) { //this.canteamdamage = true; // TODO - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 10000); + SetResourceExplicit(this, RES_HEALTH, 10000); this.takedamage = DAMAGE_YES; this.event_damage = fd_secret_damage; } diff --git a/qcsrc/common/mapobjects/func/ladder.qc b/qcsrc/common/mapobjects/func/ladder.qc index 020ecca085..6fb3a435aa 100644 --- a/qcsrc/common/mapobjects/func/ladder.qc +++ b/qcsrc/common/mapobjects/func/ladder.qc @@ -9,7 +9,7 @@ void func_ladder_touch(entity this, entity toucher) if(IS_VEHICLE(toucher)) return; #elif defined(CSQC) - if(!toucher.isplayermodel) + if(!IS_PLAYER(toucher)) // don't allow non-player predicted entities! return; #endif diff --git a/qcsrc/common/mapobjects/models.qc b/qcsrc/common/mapobjects/models.qc index 10c3900408..44a13522a4 100644 --- a/qcsrc/common/mapobjects/models.qc +++ b/qcsrc/common/mapobjects/models.qc @@ -166,21 +166,24 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf) #define G_MODEL_INIT(ent,sol) \ - if(ent.geomtype) if(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")) set_movetype(ent, MOVETYPE_PHYSICS); \ + if(ent.geomtype && autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")) set_movetype(ent, MOVETYPE_PHYSICS); \ if(!ent.scale) ent.scale = ent.modelscale; \ SetBrushEntityModel(ent); \ ent.use = g_model_setcolormaptoactivator; \ InitializeEntity(ent, g_model_dropbyspawnflags, INITPRIO_DROPTOFLOOR); \ - if(!ent.solid) ent.solid = (sol); else if(ent.solid < 0) ent.solid = SOLID_NOT; + if(!ent.solid) ent.solid = (sol); \ + else if(ent.solid < 0) ent.solid = SOLID_NOT; #define G_CLIENTMODEL_INIT(ent,sol) \ - if(ent.geomtype) if(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")) set_movetype(ent, MOVETYPE_PHYSICS); \ + if(ent.geomtype && autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")) set_movetype(ent, MOVETYPE_PHYSICS); \ if(!ent.scale) ent.scale = ent.modelscale; \ SetBrushEntityModel(ent); \ ent.use = g_clientmodel_use; \ InitializeEntity(ent, g_clientmodel_dropbyspawnflags, INITPRIO_DROPTOFLOOR); \ - if(!ent.solid) ent.solid = (sol); else if(ent.solid < 0) ent.solid = SOLID_NOT; \ - if(!ent.bgmscriptsustain) ent.bgmscriptsustain = 1; else if(ent.bgmscriptsustain < 0) ent.bgmscriptsustain = 0; \ + if(!ent.solid) ent.solid = (sol); \ + else if(ent.solid < 0) ent.solid = SOLID_NOT; \ + if(!ent.bgmscriptsustain) ent.bgmscriptsustain = 1; \ + else if(ent.bgmscriptsustain < 0) ent.bgmscriptsustain = 0; \ Net_LinkEntity(ent, true, 0, g_clientmodel_genericsendentity); \ ent.default_solid = sol; diff --git a/qcsrc/common/mapobjects/platforms.qc b/qcsrc/common/mapobjects/platforms.qc index cc909e5c56..832b25b6b4 100644 --- a/qcsrc/common/mapobjects/platforms.qc +++ b/qcsrc/common/mapobjects/platforms.qc @@ -93,7 +93,7 @@ void plat_center_touch(entity this, entity toucher) if (!toucher.iscreature) return; - if (GetResourceAmount(toucher, RESOURCE_HEALTH) <= 0) + if (GetResource(toucher, RES_HEALTH) <= 0) return; #elif defined(CSQC) if (!IS_PLAYER(toucher)) @@ -114,7 +114,7 @@ void plat_outside_touch(entity this, entity toucher) if (!toucher.iscreature) return; - if (GetResourceAmount(toucher, RESOURCE_HEALTH) <= 0) + if (GetResource(toucher, RES_HEALTH) <= 0) return; #elif defined(CSQC) if (!IS_PLAYER(toucher)) diff --git a/qcsrc/common/mapobjects/teleporters.qc b/qcsrc/common/mapobjects/teleporters.qc index 6482a3d787..339ade52a7 100644 --- a/qcsrc/common/mapobjects/teleporters.qc +++ b/qcsrc/common/mapobjects/teleporters.qc @@ -44,12 +44,12 @@ void tdeath(entity player, entity teleporter, entity telefragger, vector telefra { TDEATHLOOP(player.origin) { - if (IS_PLAYER(player) && GetResourceAmount(player, RESOURCE_HEALTH) >= 1) + if (IS_PLAYER(player) && GetResource(player, RES_HEALTH) >= 1) { if (!(teamplay && autocvar_g_telefrags_teamplay && head.team == player.team)) { if(IS_PLAYER(head)) - if(GetResourceAmount(head, RESOURCE_HEALTH) >= 1) + if(GetResource(head, RES_HEALTH) >= 1) ++tdeath_hit; Damage (head, teleporter, telefragger, 10000, DEATH_TELEFRAG.m_id, DMG_NOWEP, head.origin, '0 0 0'); } diff --git a/qcsrc/common/mapobjects/trigger/heal.qc b/qcsrc/common/mapobjects/trigger/heal.qc index 866fd88a56..94abd4041d 100644 --- a/qcsrc/common/mapobjects/trigger/heal.qc +++ b/qcsrc/common/mapobjects/trigger/heal.qc @@ -18,7 +18,7 @@ void trigger_heal_touch(entity this, entity toucher) toucher.triggerhealtime = time + this.delay; bool playthesound = (this.spawnflags & HEAL_SOUND_ALWAYS); - bool healed = Heal(toucher, this, GetResourceAmount(this, RESOURCE_HEALTH), this.max_health); + bool healed = Heal(toucher, this, GetResource(this, RES_HEALTH), this.max_health); if(playthesound || healed) _sound (toucher, CH_TRIGGER, this.noise, VOL_BASE, ATTEN_NORM); @@ -36,8 +36,8 @@ void trigger_heal_init(entity this) this.active = ACTIVE_ACTIVE; if(!this.delay) this.delay = 1; - if(!GetResourceAmount(this, RESOURCE_HEALTH)) - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 10); // TODO: use a special field for this, it doesn't have actual health! + if(!GetResource(this, RES_HEALTH)) + SetResourceExplicit(this, RES_HEALTH, 10); // TODO: use a special field for this, it doesn't have actual health! if(!this.max_health) this.max_health = 200; // max health topoff for field if(this.noise == "") diff --git a/qcsrc/common/mapobjects/trigger/multi.qc b/qcsrc/common/mapobjects/trigger/multi.qc index bc6049e19f..c71dc37948 100644 --- a/qcsrc/common/mapobjects/trigger/multi.qc +++ b/qcsrc/common/mapobjects/trigger/multi.qc @@ -7,7 +7,7 @@ void multi_wait(entity this) { if (this.max_health) { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, this.max_health); + SetResourceExplicit(this, RES_HEALTH, this.max_health); this.takedamage = DAMAGE_YES; this.solid = SOLID_BBOX; } @@ -120,8 +120,8 @@ void multi_eventdamage(entity this, entity inflictor, entity attacker, float dam if(this.team) if(((this.spawnflags & INVERT_TEAMS) == 0) == (this.team != attacker.team)) return; - TakeResource(this, RESOURCE_HEALTH, damage); - if (GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + TakeResource(this, RES_HEALTH, damage); + if (GetResource(this, RES_HEALTH) <= 0) { this.enemy = attacker; this.goalentity = inflictor; @@ -135,7 +135,7 @@ void multi_reset(entity this) settouch(this, multi_touch); if (this.max_health) { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, this.max_health); + SetResourceExplicit(this, RES_HEALTH, this.max_health); this.takedamage = DAMAGE_YES; this.solid = SOLID_BBOX; } @@ -181,12 +181,12 @@ spawnfunc(trigger_multiple) this.team_saved = this.team; IL_PUSH(g_saved_team, this); - if (GetResourceAmount(this, RESOURCE_HEALTH)) + if (GetResource(this, RES_HEALTH)) { if (this.spawnflags & SPAWNFLAG_NOTOUCH) objerror (this, "health and notouch don't make sense\n"); this.canteamdamage = true; - this.max_health = GetResourceAmount(this, RESOURCE_HEALTH); + this.max_health = GetResource(this, RES_HEALTH); this.event_damage = multi_eventdamage; this.takedamage = DAMAGE_YES; this.solid = SOLID_BBOX; diff --git a/qcsrc/common/mapobjects/trigger/secret.qc b/qcsrc/common/mapobjects/trigger/secret.qc index 5d7c5b6f46..e532f713c4 100644 --- a/qcsrc/common/mapobjects/trigger/secret.qc +++ b/qcsrc/common/mapobjects/trigger/secret.qc @@ -73,7 +73,7 @@ spawnfunc(trigger_secret) this.targetname = ""; // you can't just shoot a room to find it, can you? - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 0); + SetResourceExplicit(this, RES_HEALTH, 0); // a secret can not be delayed this.delay = 0; diff --git a/qcsrc/common/mapobjects/trigger/swamp.qc b/qcsrc/common/mapobjects/trigger/swamp.qc index 8e3fd739de..0717f4bead 100644 --- a/qcsrc/common/mapobjects/trigger/swamp.qc +++ b/qcsrc/common/mapobjects/trigger/swamp.qc @@ -44,7 +44,7 @@ void swampslug_think(entity this) this.swamp_lifetime -= 1; //Slug dead? then remove curses. - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) { this.owner.in_swamp = 0; delete(this); diff --git a/qcsrc/common/minigames/minigame/bd.qc b/qcsrc/common/minigames/minigame/bd.qc index 91fa9cbda9..8ab37af13c 100644 --- a/qcsrc/common/minigames/minigame/bd.qc +++ b/qcsrc/common/minigames/minigame/bd.qc @@ -727,11 +727,13 @@ bool bd_save_level(entity minigame) int target_count = 0, boulder_count = 0; entity piece = NULL; while((piece = findentity(piece,owner,minigame))) - if(piece.classname == "minigame_board_piece") - if(piece.bd_tiletype == BD_TILE_BOULDER) - ++boulder_count; - else if(piece.bd_tiletype == BD_TILE_TARGET) - ++target_count; + if(piece.classname == "minigame_board_piece") + { + if(piece.bd_tiletype == BD_TILE_BOULDER) + ++boulder_count; + else if(piece.bd_tiletype == BD_TILE_TARGET) + ++target_count; + } if(boulder_count != target_count) { @@ -1162,10 +1164,12 @@ string bd_turn_to_string(int turnflags) return _("Better luck next time!"); if ( turnflags & BD_TURN_WIN ) + { if(random() > 0.5) return _("Tubular! Press \"Next Level\" to continue!"); else return _("Wicked! Press \"Next Level\" to continue!"); + } if( turnflags & BD_TURN_EDIT ) return _("Press the space bar to change your currently selected tile"); diff --git a/qcsrc/common/minigames/minigame/ps.qc b/qcsrc/common/minigames/minigame/ps.qc index b5b900b8a1..6850bd834b 100644 --- a/qcsrc/common/minigames/minigame/ps.qc +++ b/qcsrc/common/minigames/minigame/ps.qc @@ -39,15 +39,19 @@ bool ps_tile_blacklisted(string tile) int number = minigame_tile_number(tile); int letter = minigame_tile_letter(tile); if(letter < 2) + { if(number < 2) return true; else if(number > PS_NUM_CNT - 3) return true; + } if(letter > PS_LET_CNT - 3) + { if(number < 2) return true; else if(number > PS_NUM_CNT - 3) return true; + } return false; } diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc index 88120a0ea7..86e780e0a4 100644 --- a/qcsrc/common/monsters/monster/mage.qc +++ b/qcsrc/common/monsters/monster/mage.qc @@ -87,31 +87,31 @@ bool M_Mage_Defend_Heal_Check(entity this, entity targ) { if(targ == NULL) return false; - if(GetResourceAmount(targ, RESOURCE_HEALTH) <= 0) + if(GetResource(targ, RES_HEALTH) <= 0) return false; if(DIFF_TEAM(targ, this) && targ != this.monster_follow) return false; if(STAT(FROZEN, targ)) return false; if(!IS_PLAYER(targ)) - return (IS_MONSTER(targ) && GetResourceAmount(targ, RESOURCE_HEALTH) < targ.max_health); + return (IS_MONSTER(targ) && GetResource(targ, RES_HEALTH) < targ.max_health); if(targ.items & ITEM_Shield.m_itemid) return false; switch(this.skin) { - case 0: return (GetResourceAmount(targ, RESOURCE_HEALTH) < autocvar_g_balance_health_regenstable); + case 0: return (GetResource(targ, RES_HEALTH) < autocvar_g_balance_health_regenstable); case 1: { - return ((GetResourceAmount(targ, RESOURCE_CELLS) && GetResourceAmount(targ, RESOURCE_CELLS) < g_pickup_cells_max) - || (GetResourceAmount(targ, RESOURCE_PLASMA) && GetResourceAmount(targ, RESOURCE_PLASMA) < g_pickup_plasma_max) - || (GetResourceAmount(targ, RESOURCE_ROCKETS) && GetResourceAmount(targ, RESOURCE_ROCKETS) < g_pickup_rockets_max) - || (GetResourceAmount(targ, RESOURCE_BULLETS) && GetResourceAmount(targ, RESOURCE_BULLETS) < g_pickup_nails_max) - || (GetResourceAmount(targ, RESOURCE_SHELLS) && GetResourceAmount(targ, RESOURCE_SHELLS) < g_pickup_shells_max) + return ((GetResource(targ, RES_CELLS) && GetResource(targ, RES_CELLS) < g_pickup_cells_max) + || (GetResource(targ, RES_PLASMA) && GetResource(targ, RES_PLASMA) < g_pickup_plasma_max) + || (GetResource(targ, RES_ROCKETS) && GetResource(targ, RES_ROCKETS) < g_pickup_rockets_max) + || (GetResource(targ, RES_BULLETS) && GetResource(targ, RES_BULLETS) < g_pickup_nails_max) + || (GetResource(targ, RES_SHELLS) && GetResource(targ, RES_SHELLS) < g_pickup_shells_max) ); } - case 2: return (GetResourceAmount(targ, RESOURCE_ARMOR) < autocvar_g_balance_armor_regenstable); - case 3: return (GetResourceAmount(targ, RESOURCE_HEALTH) > 0); + case 2: return (GetResource(targ, RES_ARMOR) < autocvar_g_balance_armor_regenstable); + case 3: return (GetResource(targ, RES_HEALTH) > 0); } return false; @@ -144,7 +144,7 @@ void M_Mage_Attack_Spike_Touch(entity this, entity toucher) // copied from W_Seeker_Think void M_Mage_Attack_Spike_Think(entity this) { - if (time > this.ltime || (this.enemy && GetResourceAmount(this.enemy, RESOURCE_HEALTH) <= 0) || GetResourceAmount(this.owner, RESOURCE_HEALTH) <= 0) { + if (time > this.ltime || (this.enemy && GetResource(this.enemy, RES_HEALTH) <= 0) || GetResource(this.owner, RES_HEALTH) <= 0) { this.projectiledeathtype |= HITTYPE_SPLASH; M_Mage_Attack_Spike_Explode(this, NULL); } @@ -241,25 +241,25 @@ void M_Mage_Defend_Heal(entity this) } case 1: { - if(GetResourceAmount(this, RESOURCE_CELLS)) GiveResourceWithLimit(it, RESOURCE_CELLS, 1, g_pickup_cells_max); - if(GetResourceAmount(this, RESOURCE_PLASMA)) GiveResourceWithLimit(it, RESOURCE_PLASMA, 1, g_pickup_plasma_max); - if(GetResourceAmount(this, RESOURCE_ROCKETS)) GiveResourceWithLimit(it, RESOURCE_ROCKETS, 1, g_pickup_rockets_max); - if(GetResourceAmount(this, RESOURCE_SHELLS)) GiveResourceWithLimit(it, RESOURCE_SHELLS, 2, g_pickup_shells_max); - if(GetResourceAmount(this, RESOURCE_BULLETS)) GiveResourceWithLimit(it, RESOURCE_BULLETS, 5, g_pickup_nails_max); + if(GetResource(this, RES_CELLS)) GiveResourceWithLimit(it, RES_CELLS, 1, g_pickup_cells_max); + if(GetResource(this, RES_PLASMA)) GiveResourceWithLimit(it, RES_PLASMA, 1, g_pickup_plasma_max); + if(GetResource(this, RES_ROCKETS)) GiveResourceWithLimit(it, RES_ROCKETS, 1, g_pickup_rockets_max); + if(GetResource(this, RES_SHELLS)) GiveResourceWithLimit(it, RES_SHELLS, 2, g_pickup_shells_max); + if(GetResource(this, RES_BULLETS)) GiveResourceWithLimit(it, RES_BULLETS, 5, g_pickup_nails_max); // TODO: fuel? fx = EFFECT_AMMO_REGEN; break; } case 2: - if(GetResourceAmount(it, RESOURCE_ARMOR) < autocvar_g_balance_armor_regenstable) + if(GetResource(it, RES_ARMOR) < autocvar_g_balance_armor_regenstable) { - GiveResourceWithLimit(it, RESOURCE_ARMOR, autocvar_g_monster_mage_heal_allies, autocvar_g_balance_armor_regenstable); + GiveResourceWithLimit(it, RES_ARMOR, autocvar_g_monster_mage_heal_allies, autocvar_g_balance_armor_regenstable); fx = EFFECT_ARMOR_REPAIR; } break; case 3: float hp = ((it == this) ? autocvar_g_monster_mage_heal_self : autocvar_g_monster_mage_heal_allies); - TakeResource(it, RESOURCE_HEALTH, hp); // TODO: use regular damage functions? needs a way to bypass friendly fire checks + TakeResource(it, RES_HEALTH, hp); // TODO: use regular damage functions? needs a way to bypass friendly fire checks fx = EFFECT_RAGE; break; } @@ -269,9 +269,9 @@ void M_Mage_Defend_Heal(entity this) else { Send_Effect(EFFECT_HEALING, it.origin, '0 0 0', 1); - Heal(it, this, autocvar_g_monster_mage_heal_allies, RESOURCE_LIMIT_NONE); + Heal(it, this, autocvar_g_monster_mage_heal_allies, RES_LIMIT_NONE); if(!(it.spawnflags & MONSTERFLAG_INVINCIBLE) && it.sprite) - WaypointSprite_UpdateHealth(it.sprite, GetResourceAmount(it, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(it.sprite, GetResource(it, RES_HEALTH)); } }); @@ -325,14 +325,14 @@ void M_Mage_Attack_Teleport(entity this, entity targ) void M_Mage_Defend_Shield_Remove(entity this) { this.effects &= ~(EF_ADDITIVE | EF_BLUE); - SetResourceAmountExplicit(this, RESOURCE_ARMOR, autocvar_g_monsters_armor_blockpercent); + SetResourceExplicit(this, RES_ARMOR, autocvar_g_monsters_armor_blockpercent); } void M_Mage_Defend_Shield(entity this) { this.effects |= (EF_ADDITIVE | EF_BLUE); this.mage_shield_delay = time + (autocvar_g_monster_mage_shield_delay); - SetResourceAmountExplicit(this, RESOURCE_ARMOR, autocvar_g_monster_mage_shield_blockpercent); + SetResourceExplicit(this, RES_ARMOR, autocvar_g_monster_mage_shield_blockpercent); this.mage_shield_time = time + (autocvar_g_monster_mage_shield_time); setanim(this, this.anim_shoot, true, true, true); this.attack_finished_single[0] = time + 1; @@ -419,16 +419,16 @@ METHOD(Mage, mr_think, bool(Mage thismon, entity actor)) }); } - if(GetResourceAmount(actor, RESOURCE_HEALTH) < (autocvar_g_monster_mage_heal_minhealth) || need_help) + if(GetResource(actor, RES_HEALTH) < (autocvar_g_monster_mage_heal_minhealth) || need_help) if(time >= actor.attack_finished_single[0]) if(random() < 0.5) M_Mage_Defend_Heal(actor); - if(time >= actor.mage_shield_time && GetResourceAmount(actor, RESOURCE_ARMOR)) + if(time >= actor.mage_shield_time && GetResource(actor, RES_ARMOR)) M_Mage_Defend_Shield_Remove(actor); if(actor.enemy) - if(GetResourceAmount(actor, RESOURCE_HEALTH) < actor.max_health) + if(GetResource(actor, RES_HEALTH) < actor.max_health) if(time >= actor.mage_shield_delay) if(random() < 0.5) M_Mage_Defend_Shield(actor); @@ -469,7 +469,7 @@ METHOD(Mage, mr_anim, bool(Mage this, entity actor)) METHOD(Mage, mr_setup, bool(Mage this, entity actor)) { TC(Mage, this); - if(!GetResourceAmount(this, RESOURCE_HEALTH)) SetResourceAmountExplicit(actor, RESOURCE_HEALTH, autocvar_g_monster_mage_health); + if(!GetResource(this, RES_HEALTH)) SetResourceExplicit(actor, RES_HEALTH, autocvar_g_monster_mage_health); if(!actor.speed) { actor.speed = (autocvar_g_monster_mage_speed_walk); } if(!actor.speed2) { actor.speed2 = (autocvar_g_monster_mage_speed_run); } if(!actor.stopspeed) { actor.stopspeed = (autocvar_g_monster_mage_speed_stop); } diff --git a/qcsrc/common/monsters/monster/shambler.qc b/qcsrc/common/monsters/monster/shambler.qc index 9981474f9b..9390f5d23a 100644 --- a/qcsrc/common/monsters/monster/shambler.qc +++ b/qcsrc/common/monsters/monster/shambler.qc @@ -85,15 +85,15 @@ void M_Shambler_Attack_Lightning_Explode_use(entity this, entity actor, entity t void M_Shambler_Attack_Lightning_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - if (GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if (GetResource(this, RES_HEALTH) <= 0) return; if (!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, -1)) // no exceptions return; // g_projectiles_damage says to halt - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); - if (GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if (GetResource(this, RES_HEALTH) <= 0) W_PrepareExplosionByDamage(this, attacker, adaptor_think2use); } @@ -136,7 +136,7 @@ void M_Shambler_Attack_Lightning(entity this) settouch(gren, M_Shambler_Attack_Lightning_Touch); gren.takedamage = DAMAGE_YES; - SetResourceAmountExplicit(gren, RESOURCE_HEALTH, 50); + SetResourceExplicit(gren, RES_HEALTH, 50); gren.damageforcescale = 0; gren.event_damage = M_Shambler_Attack_Lightning_Damage; gren.damagedbycontents = true; @@ -246,7 +246,7 @@ METHOD(Shambler, mr_anim, bool(Shambler this, entity actor)) METHOD(Shambler, mr_setup, bool(Shambler this, entity actor)) { TC(Shambler, this); - if(!GetResourceAmount(this, RESOURCE_HEALTH)) SetResourceAmountExplicit(actor, RESOURCE_HEALTH, autocvar_g_monster_shambler_health); + if(!GetResource(this, RES_HEALTH)) SetResourceExplicit(actor, RES_HEALTH, autocvar_g_monster_shambler_health); if(!actor.attack_range) actor.attack_range = 150; if(!actor.speed) { actor.speed = (autocvar_g_monster_shambler_speed_walk); } if(!actor.speed2) { actor.speed2 = (autocvar_g_monster_shambler_speed_run); } diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc index d847cf4e6c..52bf37f7d2 100644 --- a/qcsrc/common/monsters/monster/spider.qc +++ b/qcsrc/common/monsters/monster/spider.qc @@ -103,7 +103,7 @@ void M_Spider_Attack_Web_Explode(entity this) Send_Effect(EFFECT_ELECTRO_IMPACT, this.origin, '0 0 0', 1); RadiusDamage(this, this.realowner, 0, 0, 25, NULL, NULL, 25, this.projectiledeathtype, DMG_NOWEP, NULL); - FOREACH_ENTITY_RADIUS(this.origin, 25, it != this && it.takedamage && !IS_DEAD(it) && GetResourceAmount(it, RESOURCE_HEALTH) > 0 && it.monsterid != MON_SPIDER.monsterid, + FOREACH_ENTITY_RADIUS(this.origin, 25, it != this && it.takedamage && !IS_DEAD(it) && GetResource(it, RES_HEALTH) > 0 && it.monsterid != MON_SPIDER.monsterid, { it.spider_slowness = time + (autocvar_g_monster_spider_attack_web_damagetime); }); @@ -151,7 +151,7 @@ void M_Spider_Attack_Web(entity this) setsize(proj, '-4 -4 -4', '4 4 4'); proj.takedamage = DAMAGE_NO; proj.damageforcescale = 0; - SetResourceAmountExplicit(proj, RESOURCE_HEALTH, 500); + SetResourceExplicit(proj, RES_HEALTH, 500); proj.event_damage = func_null; proj.flags = FL_PROJECTILE; IL_PUSH(g_projectiles, proj); @@ -227,7 +227,7 @@ METHOD(Spider, mr_anim, bool(Spider this, entity actor)) METHOD(Spider, mr_setup, bool(Spider this, entity actor)) { TC(Spider, this); - if(!GetResourceAmount(this, RESOURCE_HEALTH)) SetResourceAmountExplicit(actor, RESOURCE_HEALTH, autocvar_g_monster_spider_health); + if(!GetResource(this, RES_HEALTH)) SetResourceExplicit(actor, RES_HEALTH, autocvar_g_monster_spider_health); if(!actor.speed) { actor.speed = (autocvar_g_monster_spider_speed_walk); } if(!actor.speed2) { actor.speed2 = (autocvar_g_monster_spider_speed_run); } if(!actor.stopspeed) { actor.stopspeed = (autocvar_g_monster_spider_speed_stop); } diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc index f6c905d6d1..8a4ad16056 100644 --- a/qcsrc/common/monsters/monster/wyvern.qc +++ b/qcsrc/common/monsters/monster/wyvern.qc @@ -152,7 +152,7 @@ METHOD(Wyvern, mr_anim, bool(Wyvern this, entity actor)) METHOD(Wyvern, mr_setup, bool(Wyvern this, entity actor)) { TC(Wyvern, this); - if(!GetResourceAmount(this, RESOURCE_HEALTH)) SetResourceAmountExplicit(actor, RESOURCE_HEALTH, autocvar_g_monster_wyvern_health); + if(!GetResource(this, RES_HEALTH)) SetResourceExplicit(actor, RES_HEALTH, autocvar_g_monster_wyvern_health); if(!actor.speed) { actor.speed = (autocvar_g_monster_wyvern_speed_walk); } if(!actor.speed2) { actor.speed2 = (autocvar_g_monster_wyvern_speed_run); } if(!actor.stopspeed) { actor.stopspeed = (autocvar_g_monster_wyvern_speed_stop); } diff --git a/qcsrc/common/monsters/monster/zombie.qc b/qcsrc/common/monsters/monster/zombie.qc index aaa27d21b2..3b2c0451b8 100644 --- a/qcsrc/common/monsters/monster/zombie.qc +++ b/qcsrc/common/monsters/monster/zombie.qc @@ -51,7 +51,7 @@ const float zombie_anim_spawn = 30; void M_Zombie_Attack_Leap_Touch(entity this, entity toucher) { - if (GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if (GetResource(this, RES_HEALTH) <= 0) return; vector angles_face; @@ -74,16 +74,16 @@ void M_Zombie_Attack_Leap_Touch(entity this, entity toucher) void M_Zombie_Defend_Block_End(entity this) { - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) return; setanim(this, this.anim_blockend, false, true, true); - SetResourceAmountExplicit(this, RESOURCE_ARMOR, autocvar_g_monsters_armor_blockpercent); + SetResourceExplicit(this, RES_ARMOR, autocvar_g_monsters_armor_blockpercent); } bool M_Zombie_Defend_Block(entity this) { - SetResourceAmountExplicit(this, RESOURCE_ARMOR, 0.9); + SetResourceExplicit(this, RES_ARMOR, 0.9); this.state = MONSTER_ATTACK_MELEE; // freeze monster this.attack_finished_single[0] = time + 2.1; this.anim_finished = this.attack_finished_single[0]; @@ -100,7 +100,7 @@ bool M_Zombie_Attack(int attack_type, entity actor, entity targ, .entity weapone { case MONSTER_ATTACK_MELEE: { - if(random() < 0.3 && GetResourceAmount(actor, RESOURCE_HEALTH) < 75 && GetResourceAmount(actor.enemy, RESOURCE_HEALTH) > 10) + if(random() < 0.3 && GetResource(actor, RES_HEALTH) < 75 && GetResource(actor.enemy, RES_HEALTH) > 10) return M_Zombie_Defend_Block(actor); float anim_chance = random(); @@ -148,7 +148,7 @@ METHOD(Zombie, mr_pain, float(Zombie this, entity actor, float damage_take, enti METHOD(Zombie, mr_death, bool(Zombie this, entity actor)) { TC(Zombie, this); - SetResourceAmountExplicit(actor, RESOURCE_ARMOR, autocvar_g_monsters_armor_blockpercent); + SetResourceExplicit(actor, RES_ARMOR, autocvar_g_monsters_armor_blockpercent); setanim(actor, ((random() > 0.5) ? actor.anim_die1 : actor.anim_die2), false, true, true); return true; @@ -180,7 +180,7 @@ METHOD(Zombie, mr_anim, bool(Zombie this, entity actor)) METHOD(Zombie, mr_setup, bool(Zombie this, entity actor)) { TC(Zombie, this); - if(!GetResourceAmount(actor, RESOURCE_HEALTH)) SetResourceAmountExplicit(actor, RESOURCE_HEALTH, autocvar_g_monster_zombie_health); + if(!GetResource(actor, RES_HEALTH)) SetResourceExplicit(actor, RES_HEALTH, autocvar_g_monster_zombie_health); if(!actor.speed) { actor.speed = (autocvar_g_monster_zombie_speed_walk); } if(!actor.speed2) { actor.speed2 = (autocvar_g_monster_zombie_speed_run); } if(!actor.stopspeed) { actor.stopspeed = (autocvar_g_monster_zombie_speed_stop); } diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index 004fbf92b6..97a68b5f8f 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -84,7 +84,7 @@ bool Monster_ValidTarget(entity this, entity targ) || (game_stopped) || (targ.items & IT_INVISIBILITY) || (IS_SPEC(targ) || IS_OBSERVER(targ)) // don't attack spectators - || (!IS_VEHICLE(targ) && (IS_DEAD(targ) || IS_DEAD(this) || GetResourceAmount(targ, RESOURCE_HEALTH) <= 0 || GetResourceAmount(this, RESOURCE_HEALTH) <= 0)) + || (!IS_VEHICLE(targ) && (IS_DEAD(targ) || IS_DEAD(this) || GetResource(targ, RES_HEALTH) <= 0 || GetResource(this, RES_HEALTH) <= 0)) || (this.monster_follow == targ || targ.monster_follow == this) || (!IS_VEHICLE(targ) && (targ.flags & FL_NOTARGET)) || (!autocvar_g_monsters_typefrag && PHYS_INPUT_BUTTON_CHAT(targ)) @@ -375,7 +375,7 @@ bool Monster_Attack_Leap_Check(entity this, vector vel) return false; // already attacking if(!IS_ONGROUND(this)) return false; // not on the ground - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0 || IS_DEAD(this)) + if(GetResource(this, RES_HEALTH) <= 0 || IS_DEAD(this)) return false; // called when dead? if(time < this.attack_finished_single[0]) return false; // still attacking @@ -486,7 +486,7 @@ void Monster_Miniboss_Check(entity this) // g_monsters_miniboss_chance cvar or spawnflags 64 causes a monster to be a miniboss if ((this.spawnflags & MONSTERFLAG_MINIBOSS) || (chance < autocvar_g_monsters_miniboss_chance)) { - GiveResource(this, RESOURCE_HEALTH, autocvar_g_monsters_miniboss_healthboost); + GiveResource(this, RES_HEALTH, autocvar_g_monsters_miniboss_healthboost); this.effects |= EF_RED; if(!this.weapon) this.weapon = WEP_VORTEX.m_id; @@ -531,7 +531,7 @@ void Monster_Dead_Fade(entity this) this.takedamage = DAMAGE_NO; setorigin(this, this.pos1); this.angles = this.pos2; - SetResourceAmountExplicit(this, RESOURCE_HEALTH, this.max_health); + SetResourceExplicit(this, RES_HEALTH, this.max_health); setmodel(this, MDL_Null); } else @@ -560,7 +560,7 @@ vector Monster_Move_Target(entity this, entity targ) // cases where the enemy may have changed their state (don't need to check everything here) if((!this.enemy) - || (IS_DEAD(this.enemy) || GetResourceAmount(this.enemy, RESOURCE_HEALTH) < 1) + || (IS_DEAD(this.enemy) || GetResource(this.enemy, RES_HEALTH) < 1) || (STAT(FROZEN, this.enemy)) || (this.enemy.flags & FL_NOTARGET) || (this.enemy.alpha < 0.5 && this.enemy.alpha != 0) @@ -803,10 +803,12 @@ void Monster_Move(entity this, float runspeed, float walkspeed, float stpspeed) if(time > this.pain_finished && time > this.anim_finished) // TODO: use anim_finished instead!? if(!this.state) - if(vdist(this.velocity, >, 10)) - setanim(this, ((do_run) ? this.anim_run : this.anim_walk), true, false, false); - else - setanim(this, this.anim_idle, true, false, false); + { + if(vdist(this.velocity, >, 10)) + setanim(this, ((do_run) ? this.anim_run : this.anim_walk), true, false, false); + else + setanim(this, this.anim_idle, true, false, false); + } } else { @@ -896,7 +898,7 @@ void Monster_Reset(entity this) Unfreeze(this, false); // remove any icy remains - SetResourceAmountExplicit(this, RESOURCE_HEALTH, this.max_health); + SetResourceExplicit(this, RES_HEALTH, this.max_health); this.velocity = '0 0 0'; this.enemy = NULL; this.goalentity = NULL; @@ -906,11 +908,11 @@ void Monster_Reset(entity this) void Monster_Dead_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, this, attacker); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= -50) // 100 health until gone? + if(GetResource(this, RES_HEALTH) <= -50) // 100 health until gone? { Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, this, attacker); @@ -998,7 +1000,7 @@ void Monster_Damage(entity this, entity inflictor, entity attacker, float damage if(deathtype == DEATH_FALL.m_id && this.draggedby != NULL) return; - vector v = healtharmor_applydamage(100, GetResourceAmount(this, RESOURCE_ARMOR) / 100, deathtype, damage); + vector v = healtharmor_applydamage(100, GetResource(this, RES_ARMOR) / 100, deathtype, damage); float take = v.x; //float save = v.y; @@ -1007,12 +1009,12 @@ void Monster_Damage(entity this, entity inflictor, entity attacker, float damage if(take) { - TakeResource(this, RESOURCE_HEALTH, take); + TakeResource(this, RES_HEALTH, take); Monster_Sound(this, monstersound_pain, 1.2, true, CH_PAIN); } if(this.sprite) - WaypointSprite_UpdateHealth(this.sprite, GetResourceAmount(this, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(this.sprite, GetResource(this, RES_HEALTH)); this.dmg_time = time; @@ -1030,7 +1032,7 @@ void Monster_Damage(entity this, entity inflictor, entity attacker, float damage Violence_GibSplash_At(hitloc, force * -0.2, 3, 1, this, attacker); } - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) { if(deathtype == DEATH_KILL.m_id) this.candrop = false; // killed by mobkill command @@ -1039,13 +1041,13 @@ void Monster_Damage(entity this, entity inflictor, entity attacker, float damage SUB_UseTargets(this, attacker, this.enemy); this.target2 = this.oldtarget2; // reset to original target on death, incase we respawn - Monster_Dead(this, attacker, (GetResourceAmount(this, RESOURCE_HEALTH) <= -100 || deathtype == DEATH_KILL.m_id)); + Monster_Dead(this, attacker, (GetResource(this, RES_HEALTH) <= -100 || deathtype == DEATH_KILL.m_id)); WaypointSprite_Kill(this.sprite); MUTATOR_CALLHOOK(MonsterDies, this, attacker, deathtype); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= -100 || deathtype == DEATH_KILL.m_id) // check if we're already gibbed + if(GetResource(this, RES_HEALTH) <= -100 || deathtype == DEATH_KILL.m_id) // check if we're already gibbed { Violence_GibSplash(this, 1, 0.5, attacker); @@ -1057,13 +1059,13 @@ void Monster_Damage(entity this, entity inflictor, entity attacker, float damage bool Monster_Heal(entity targ, entity inflictor, float amount, float limit) { - float true_limit = ((limit != RESOURCE_LIMIT_NONE) ? limit : targ.max_health); - if(GetResourceAmount(targ, RESOURCE_HEALTH) <= 0 || GetResourceAmount(targ, RESOURCE_HEALTH) >= true_limit) + float true_limit = ((limit != RES_LIMIT_NONE) ? limit : targ.max_health); + if(GetResource(targ, RES_HEALTH) <= 0 || GetResource(targ, RES_HEALTH) >= true_limit) return false; - GiveResourceWithLimit(targ, RESOURCE_HEALTH, amount, true_limit); + GiveResourceWithLimit(targ, RES_HEALTH, amount, true_limit); if(targ.sprite) - WaypointSprite_UpdateHealth(targ.sprite, GetResourceAmount(targ, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(targ.sprite, GetResource(targ, RES_HEALTH)); return true; } @@ -1112,10 +1114,12 @@ void Monster_Move_2D(entity this, float mspeed, bool allow_jumpoff) movelib_move_simple_gravity(this, v_forward, mspeed, 1); if(time > this.pain_finished && time > this.attack_finished_single[0]) - if(vdist(this.velocity, >, 10)) - setanim(this, this.anim_walk, true, false, false); - else - setanim(this, this.anim_idle, true, false, false); + { + if(vdist(this.velocity, >, 10)) + setanim(this, this.anim_walk, true, false, false); + else + setanim(this, this.anim_idle, true, false, false); + } } void Monster_Anim(entity this) @@ -1160,11 +1164,11 @@ void Monster_Frozen_Think(entity this) if (STAT(FROZEN, this) == FROZEN_TEMP_REVIVING) { STAT(REVIVE_PROGRESS, this) = bound(0, STAT(REVIVE_PROGRESS, this) + this.ticrate * this.revive_speed, 1); - SetResourceAmountExplicit(this, RESOURCE_HEALTH, max(1, STAT(REVIVE_PROGRESS, this) * this.max_health)); + SetResourceExplicit(this, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, this) * this.max_health)); this.iceblock.alpha = bound(0.2, 1 - STAT(REVIVE_PROGRESS, this), 1); if(!(this.spawnflags & MONSTERFLAG_INVINCIBLE) && this.sprite) - WaypointSprite_UpdateHealth(this.sprite, GetResourceAmount(this, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(this.sprite, GetResource(this, RES_HEALTH)); if(STAT(REVIVE_PROGRESS, this) >= 1) Unfreeze(this, false); @@ -1172,12 +1176,12 @@ void Monster_Frozen_Think(entity this) else if (STAT(FROZEN, this) == FROZEN_TEMP_DYING) { STAT(REVIVE_PROGRESS, this) = bound(0, STAT(REVIVE_PROGRESS, this) - this.ticrate * this.revive_speed, 1); - SetResourceAmountExplicit(this, RESOURCE_HEALTH, max(0, autocvar_g_nades_ice_health + (this.max_health-autocvar_g_nades_ice_health) * STAT(REVIVE_PROGRESS, this))); + SetResourceExplicit(this, RES_HEALTH, max(0, autocvar_g_nades_ice_health + (this.max_health-autocvar_g_nades_ice_health) * STAT(REVIVE_PROGRESS, this))); if(!(this.spawnflags & MONSTERFLAG_INVINCIBLE) && this.sprite) - WaypointSprite_UpdateHealth(this.sprite, GetResourceAmount(this, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(this.sprite, GetResource(this, RES_HEALTH)); - if(GetResourceAmount(this, RESOURCE_HEALTH) < 1) + if(GetResource(this, RES_HEALTH) < 1) { Unfreeze(this, false); if(this.event_damage) @@ -1218,7 +1222,7 @@ void Monster_Think(entity this) if(this.monster_lifetime && time >= this.monster_lifetime) { - Damage(this, this, this, GetResourceAmount(this, RESOURCE_HEALTH) + this.max_health, DEATH_KILL.m_id, DMG_NOWEP, this.origin, this.origin); + Damage(this, this, this, GetResource(this, RES_HEALTH) + this.max_health, DEATH_KILL.m_id, DMG_NOWEP, this.origin, this.origin); return; } @@ -1250,8 +1254,8 @@ bool Monster_Spawn_Setup(entity this) mon.mr_setup(mon, this); // ensure some basic needs are met - if(!GetResourceAmount(this, RESOURCE_HEALTH)) { SetResourceAmountExplicit(this, RESOURCE_HEALTH, 100); } - if(!GetResourceAmount(this, RESOURCE_ARMOR)) { SetResourceAmountExplicit(this, RESOURCE_ARMOR, bound(0.2, 0.5 * MONSTER_SKILLMOD(this), 0.9)); } + if(!GetResource(this, RES_HEALTH)) { SetResourceExplicit(this, RES_HEALTH, 100); } + if(!GetResource(this, RES_ARMOR)) { SetResourceExplicit(this, RES_ARMOR, bound(0.2, 0.5 * MONSTER_SKILLMOD(this), 0.9)); } if(!this.target_range) { this.target_range = autocvar_g_monsters_target_range; } if(!this.respawntime) { this.respawntime = autocvar_g_monsters_respawn_delay; } if(!this.monster_moveflags) { this.monster_moveflags = MONSTER_MOVE_WANDER; } @@ -1261,13 +1265,13 @@ bool Monster_Spawn_Setup(entity this) if(!(this.spawnflags & MONSTERFLAG_RESPAWNED)) { Monster_Miniboss_Check(this); - SetResourceAmountExplicit(this, RESOURCE_HEALTH, GetResourceAmount(this, RESOURCE_HEALTH) * MONSTER_SKILLMOD(this)); + SetResourceExplicit(this, RES_HEALTH, GetResource(this, RES_HEALTH) * MONSTER_SKILLMOD(this)); if(!this.skin) this.skin = rint(random() * 4); } - this.max_health = GetResourceAmount(this, RESOURCE_HEALTH); + this.max_health = GetResource(this, RES_HEALTH); this.pain_finished = this.nextthink; if(IS_PLAYER(this.monster_follow)) @@ -1296,7 +1300,7 @@ bool Monster_Spawn_Setup(entity this) if(!(this.spawnflags & MONSTERFLAG_INVINCIBLE)) { WaypointSprite_UpdateMaxHealth(this.sprite, this.max_health); - WaypointSprite_UpdateHealth(this.sprite, GetResourceAmount(this, RESOURCE_HEALTH)); + WaypointSprite_UpdateHealth(this.sprite, GetResource(this, RES_HEALTH)); } } diff --git a/qcsrc/common/mutators/base.qh b/qcsrc/common/mutators/base.qh index 163960ba5f..c1d658576e 100644 --- a/qcsrc/common/mutators/base.qh +++ b/qcsrc/common/mutators/base.qh @@ -259,15 +259,15 @@ void Mutator_Remove(Mutator mut) } #define REGISTER_MUTATOR(id, dependence) \ - bool MUTATORFUNCTION_##id##_hooks(int mode) { return = false; } \ - bool MUTATORFUNCTION_##id(int mode) { \ + bool MUTATORFUNC_##id##_hooks(int mode) { return = false; } \ + bool MUTATORFUNC_##id(int mode) { \ return = false; \ - bool ret = MUTATORFUNCTION_##id##_hooks(mode); if (ret) return ret; \ + bool ret = MUTATORFUNC_##id##_hooks(mode); if (ret) return ret; \ } \ bool MUTATOR_##id##_check() { return dependence; } \ - REGISTER(Mutators, MUTATOR, id, m_id, NEW(Mutator, #id, MUTATORFUNCTION_##id)) \ + REGISTER(Mutators, MUTATOR, id, m_id, NEW(Mutator, #id, MUTATORFUNC_##id)) \ { this.mutatorcheck = MUTATOR_##id##_check; } \ - ACCUMULATE bool MUTATORFUNCTION_##id(int mode) + ACCUMULATE bool MUTATORFUNC_##id(int mode) STATIC_INIT(Mutators) { RegisterHooks(); @@ -283,7 +283,7 @@ STATIC_INIT_LATE(Mutators) { #define MUTATOR_ONREMOVE if (mode == MUTATOR_REMOVING) #define MUTATOR_ONROLLBACK_OR_REMOVE if (mode == MUTATOR_REMOVING || mode == MUTATOR_ROLLING_BACK) -#define MUTATOR_STATIC() MACRO_BEGIN { \ +#define MUTATOR_STATIC() MACRO_BEGIN \ MUTATOR_ONADD { \ /* game loads at time 1 */ \ if (time > 1) { \ @@ -294,16 +294,16 @@ STATIC_INIT_LATE(Mutators) { LOG_INFO("This is a game type and it cannot be removed at runtime."); \ return -1; \ } \ -} MACRO_END +MACRO_END #define MUTATOR_ADD(name) Mutator_Add(MUTATOR_##name) #define MUTATOR_REMOVE(name) Mutator_Remove(MUTATOR_##name) #define MUTATOR_RETURNVALUE CallbackChain_ReturnValue #define _MUTATOR_CALLBACK(name, func) \ - Callback CALLBACK_##name; \ + Callback CB_##name; \ bool func(); \ - ACCUMULATE void RegisterCallbacks() { CALLBACK_##name = NEW(Callback, func); } + ACCUMULATE void RegisterCallbacks() { CB_##name = NEW(Callback, func); } #define MUTATOR_HOOKFUNCTION(...) \ EVAL_MUTATOR_HOOKFUNCTION(OVERLOAD(MUTATOR_HOOKFUNCTION, __VA_ARGS__)) @@ -314,20 +314,26 @@ STATIC_INIT_LATE(Mutators) { #define MUTATOR_HOOKFUNCTION_3(mut, cb, order) \ _MUTATOR_CALLBACK(mut##_##cb, mut##_##cb) \ - ACCUMULATE bool MUTATORFUNCTION_##mut##_hooks(int mode) { MUTATOR_HOOK(cb, mut##_##cb, order); } \ + ACCUMULATE bool MUTATORFUNC_##mut##_hooks(int mode) { MUTATOR_HOOK(cb, mut##_##cb, order); } \ bool mut##_##cb() { return = false; } \ ACCUMULATE bool mut##_##cb() -#define MUTATOR_HOOK(cb, func, order) MACRO_BEGIN { \ - MUTATOR_ONADD { \ - if (!CallbackChain_Add(HOOK_##cb, CALLBACK_##func, order)) { \ - LOG_INFO("HOOK FAILED: ", #cb, ":", #func); \ - return true; \ - } \ - } \ - MUTATOR_ONROLLBACK_OR_REMOVE { \ - CallbackChain_Remove(HOOK_##cb, CALLBACK_##func); \ - } \ -} MACRO_END +void _mutPrintFail(string cb, string func) +{ + // this is inside a function to avoid expanding it on compilation everytime + LOG_INFO("HOOK FAILED: ", cb, ":", func); +} + +#define MUTATOR_HOOK(cb, func, order) MACRO_BEGIN \ + MUTATOR_ONADD { \ + if (!CallbackChain_Add(HOOK_##cb, CB_##func, order)) { \ + _mutPrintFail(#cb, #func); \ + return true; \ + } \ + } \ + MUTATOR_ONROLLBACK_OR_REMOVE { \ + CallbackChain_Remove(HOOK_##cb, CB_##func); \ + } \ +MACRO_END #include "events.qh" diff --git a/qcsrc/common/mutators/mutator/bloodloss/sv_bloodloss.qc b/qcsrc/common/mutators/mutator/bloodloss/sv_bloodloss.qc index 99093d16b1..a89691d201 100644 --- a/qcsrc/common/mutators/mutator/bloodloss/sv_bloodloss.qc +++ b/qcsrc/common/mutators/mutator/bloodloss/sv_bloodloss.qc @@ -10,7 +10,7 @@ MUTATOR_HOOKFUNCTION(bloodloss, PlayerPreThink) entity player = M_ARGV(0, entity); if(IS_PLAYER(player)) - if(GetResourceAmount(player, RESOURCE_HEALTH) <= autocvar_g_bloodloss && !IS_DEAD(player)) + if(GetResource(player, RES_HEALTH) <= autocvar_g_bloodloss && !IS_DEAD(player)) { PHYS_INPUT_BUTTON_CROUCH(player) = true; @@ -29,7 +29,7 @@ MUTATOR_HOOKFUNCTION(bloodloss, PlayerJump) { entity player = M_ARGV(0, entity); - if(GetResourceAmount(player, RESOURCE_HEALTH) <= autocvar_g_bloodloss) + if(GetResource(player, RES_HEALTH) <= autocvar_g_bloodloss) return true; } diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc index 95216fe548..58663be1ac 100644 --- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc +++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc @@ -427,13 +427,13 @@ void buff_Medic_Heal(entity this) { continue; } - float hp = GetResourceAmount(it, RESOURCE_HEALTH); + float hp = GetResource(it, RES_HEALTH); if(hp >= autocvar_g_balance_health_regenstable) { continue; } Send_Effect(EFFECT_HEALING, it.origin, '0 0 0', 1); - SetResourceAmount(it, RESOURCE_HEALTH, bound(0, hp + autocvar_g_buffs_medic_heal_amount, autocvar_g_balance_health_regenstable)); + SetResource(it, RES_HEALTH, bound(0, hp + autocvar_g_buffs_medic_heal_amount, autocvar_g_balance_health_regenstable)); }); } @@ -464,11 +464,11 @@ MUTATOR_HOOKFUNCTION(buffs, Damage_Calculate) frag_damage *= autocvar_g_buffs_speed_damage_take; if(STAT(BUFFS, frag_target) & BUFF_MEDIC.m_itemid) - if((GetResourceAmount(frag_target, RESOURCE_HEALTH) - frag_damage) <= 0) + if((GetResource(frag_target, RES_HEALTH) - frag_damage) <= 0) if(!ITEM_DAMAGE_NEEDKILL(frag_deathtype)) if(frag_attacker) if(random() <= autocvar_g_buffs_medic_survive_chance) - frag_damage = max(5, GetResourceAmount(frag_target, RESOURCE_HEALTH) - autocvar_g_buffs_medic_survive_health); + frag_damage = max(5, GetResource(frag_target, RES_HEALTH) - autocvar_g_buffs_medic_survive_health); if(STAT(BUFFS, frag_target) & BUFF_JUMP.m_itemid) if(frag_deathtype == DEATH_FALL.m_id) @@ -494,10 +494,12 @@ MUTATOR_HOOKFUNCTION(buffs, Damage_Calculate) if(STAT(BUFFS, frag_attacker) & BUFF_BASH.m_itemid) if(frag_force) - if(frag_attacker == frag_target) - frag_force *= autocvar_g_buffs_bash_force_self; - else - frag_force *= autocvar_g_buffs_bash_force; + { + if(frag_attacker == frag_target) + frag_force *= autocvar_g_buffs_bash_force_self; + else + frag_force *= autocvar_g_buffs_bash_force; + } if(STAT(BUFFS, frag_attacker) & BUFF_DISABILITY.m_itemid) if(frag_target != frag_attacker) @@ -542,13 +544,13 @@ MUTATOR_HOOKFUNCTION(buffs, Damage_Calculate) if(DIFF_TEAM(frag_attacker, frag_target)) { float amount = bound(0, frag_damage * autocvar_g_buffs_vampire_damage_steal, - GetResourceAmount(frag_target, RESOURCE_HEALTH)); - GiveResourceWithLimit(frag_attacker, RESOURCE_HEALTH, amount, g_pickup_healthsmall_max); - if (GetResourceAmount(frag_target, RESOURCE_ARMOR)) + GetResource(frag_target, RES_HEALTH)); + GiveResourceWithLimit(frag_attacker, RES_HEALTH, amount, g_pickup_healthsmall_max); + if (GetResource(frag_target, RES_ARMOR)) { amount = bound(0, frag_damage * autocvar_g_buffs_vampire_damage_steal, - GetResourceAmount(frag_target, RESOURCE_ARMOR)); - GiveResourceWithLimit(frag_attacker, RESOURCE_ARMOR, amount, g_pickup_armorsmall_max); + GetResource(frag_target, RES_ARMOR)); + GiveResourceWithLimit(frag_attacker, RES_ARMOR, amount, g_pickup_armorsmall_max); } } diff --git a/qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc b/qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc index 8fbfa533dd..e56d044669 100644 --- a/qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc +++ b/qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc @@ -65,7 +65,7 @@ MUTATOR_HOOKFUNCTION(campcheck, PlayerPreThink) if(player.vehicle) Damage(player.vehicle, NULL, NULL, autocvar_g_campcheck_damage * 2, DEATH_CAMP.m_id, DMG_NOWEP, player.vehicle.origin, '0 0 0'); else - Damage(player, NULL, NULL, bound(0, autocvar_g_campcheck_damage, GetResourceAmount(player, RESOURCE_HEALTH) + GetResourceAmount(player, RESOURCE_ARMOR) * autocvar_g_balance_armor_blockpercent + 5), DEATH_CAMP.m_id, DMG_NOWEP, player.origin, '0 0 0'); + Damage(player, NULL, NULL, bound(0, autocvar_g_campcheck_damage, GetResource(player, RES_HEALTH) + GetResource(player, RES_ARMOR) * autocvar_g_balance_armor_blockpercent + 5), DEATH_CAMP.m_id, DMG_NOWEP, player.origin, '0 0 0'); } player.campcheck_nextcheck = time + autocvar_g_campcheck_interval; player.campcheck_traveled_distance = 0; diff --git a/qcsrc/common/mutators/mutator/instagib/items.qh b/qcsrc/common/mutators/mutator/instagib/items.qh index 42e3adbd73..abc57a4a03 100644 --- a/qcsrc/common/mutators/mutator/instagib/items.qh +++ b/qcsrc/common/mutators/mutator/instagib/items.qh @@ -18,8 +18,8 @@ SOUND(VaporizerCells, Item_Sound("itempickup")); int autocvar_g_instagib_ammo_drop; void ammo_vaporizercells_init(Pickup this, entity item) { - if(!GetResourceAmount(item, RESOURCE_CELLS)) - SetResourceAmountExplicit(item, RESOURCE_CELLS, autocvar_g_instagib_ammo_drop); + if(!GetResource(item, RES_CELLS)) + SetResourceExplicit(item, RES_CELLS, autocvar_g_instagib_ammo_drop); } #endif REGISTER_ITEM(VaporizerCells, Ammo) { diff --git a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc index 3cda4485f1..fc571678b2 100644 --- a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc +++ b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc @@ -82,7 +82,7 @@ void instagib_ammocheck(entity this) if(IS_DEAD(this) || game_stopped) instagib_stop_countdown(this); - else if (GetResourceAmount(this, RESOURCE_CELLS) > 0 || (this.items & IT_UNLIMITED_WEAPON_AMMO) || (this.flags & FL_GODMODE)) + else if (GetResource(this, RES_CELLS) > 0 || (this.items & IT_UNLIMITED_WEAPON_AMMO) || (this.flags & FL_GODMODE)) instagib_stop_countdown(this); else if(autocvar_g_rm && autocvar_g_rm_laser) { @@ -94,7 +94,7 @@ void instagib_ammocheck(entity this) } else { - float hp = GetResourceAmount(this, RESOURCE_HEALTH); + float hp = GetResource(this, RES_HEALTH); this.instagib_needammo = true; if (hp <= 5) { @@ -328,11 +328,11 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, Damage_Calculate) if(!autocvar_g_instagib_friendlypush && SAME_TEAM(frag_target, frag_attacker)) frag_force = '0 0 0'; - float armor = GetResourceAmount(frag_target, RESOURCE_ARMOR); + float armor = GetResource(frag_target, RES_ARMOR); if(armor) { armor -= 1; - SetResourceAmount(frag_target, RESOURCE_ARMOR, armor); + SetResource(frag_target, RES_ARMOR, armor); frag_damage = 0; frag_target.damage_dealt += 1; frag_attacker.damage_dealt += 1; @@ -353,7 +353,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, Damage_Calculate) if(frag_target != frag_attacker) { - if(frag_damage <= 0 && GetResourceAmount(frag_target, RESOURCE_HEALTH) > 0) { Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_SECONDARY_NODAMAGE); } + if(frag_damage <= 0 && GetResource(frag_target, RES_HEALTH) > 0) { Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_SECONDARY_NODAMAGE); } if(!autocvar_g_instagib_blaster_keepforce) frag_force = '0 0 0'; } @@ -366,11 +366,11 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, Damage_Calculate) if(frag_mirrordamage > 0) { // just lose extra LIVES, don't kill the player for mirror damage - float armor = GetResourceAmount(frag_attacker, RESOURCE_ARMOR); + float armor = GetResource(frag_attacker, RES_ARMOR); if(armor > 0) { armor -= 1; - SetResourceAmount(frag_attacker, RESOURCE_ARMOR, armor); + SetResource(frag_attacker, RES_ARMOR, armor); Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_INSTAGIB_LIVES_REMAINING, armor); frag_attacker.damage_dealt += frag_mirrordamage; } @@ -458,7 +458,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, FilterItem) if(item.weapon == WEP_VAPORIZER.m_id && Item_IsLoot(item)) { - SetResourceAmount(item, RESOURCE_CELLS, autocvar_g_instagib_ammo_drop); + SetResource(item, RES_CELLS, autocvar_g_instagib_ammo_drop); return false; } @@ -471,9 +471,9 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, FilterItem) if(item.flags & FL_POWERUP) return false; - float cells = GetResourceAmount(item, RESOURCE_CELLS); + float cells = GetResource(item, RES_CELLS); if(cells > autocvar_g_instagib_ammo_drop && item.classname != "item_vaporizer_cells") - SetResourceAmount(item, RESOURCE_CELLS, autocvar_g_instagib_ammo_drop); + SetResource(item, RES_CELLS, autocvar_g_instagib_ammo_drop); if(cells && !item.weapon) return false; @@ -508,10 +508,10 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, ItemTouch) entity item = M_ARGV(0, entity); entity toucher = M_ARGV(1, entity); - if(GetResourceAmount(item, RESOURCE_CELLS)) + if(GetResource(item, RES_CELLS)) { // play some cool sounds ;) - float hp = GetResourceAmount(toucher, RESOURCE_HEALTH); + float hp = GetResource(toucher, RES_HEALTH); if (IS_CLIENT(toucher)) { if(hp <= 5) @@ -521,14 +521,14 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, ItemTouch) } if(hp < 100) - SetResourceAmount(toucher, RESOURCE_HEALTH, 100); + SetResource(toucher, RES_HEALTH, 100); return MUT_ITEMTOUCH_CONTINUE; } if(item.itemdef == ITEM_ExtraLife) { - GiveResource(toucher, RESOURCE_ARMOR, autocvar_g_instagib_extralives); + GiveResource(toucher, RES_ARMOR, autocvar_g_instagib_extralives); Send_Notification(NOTIF_ONE, toucher, MSG_CENTER, CENTER_EXTRALIVES); return MUT_ITEMTOUCH_PICKUP; } diff --git a/qcsrc/common/mutators/mutator/invincibleproj/sv_invincibleproj.qc b/qcsrc/common/mutators/mutator/invincibleproj/sv_invincibleproj.qc index 443fe24781..de49df26b4 100644 --- a/qcsrc/common/mutators/mutator/invincibleproj/sv_invincibleproj.qc +++ b/qcsrc/common/mutators/mutator/invincibleproj/sv_invincibleproj.qc @@ -7,10 +7,10 @@ MUTATOR_HOOKFUNCTION(invincibleprojectiles, EditProjectile) { entity proj = M_ARGV(1, entity); - if(GetResourceAmount(proj, RESOURCE_HEALTH)) + if(GetResource(proj, RES_HEALTH)) { // disable health which in effect disables damage calculations - SetResourceAmountExplicit(proj, RESOURCE_HEALTH, 0); + SetResourceExplicit(proj, RES_HEALTH, 0); } } diff --git a/qcsrc/common/mutators/mutator/nades/nades.inc b/qcsrc/common/mutators/mutator/nades/nades.inc index 0245cee640..4591d25bff 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.inc +++ b/qcsrc/common/mutators/mutator/nades/nades.inc @@ -1,8 +1,8 @@ #ifdef GAMEQC -#define NADE_PROJECTILE(i, projectile, trail) MACRO_BEGIN { \ +#define NADE_PROJECTILE(i, projectile, trail) MACRO_BEGIN \ this.m_projectile[i] = projectile; \ this.m_trail[i] = trail; \ -} MACRO_END +MACRO_END #else #define NADE_PROJECTILE(i, projectile, trail) #endif diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index 43de3b8cdc..6924947f05 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -440,7 +440,7 @@ void nade_ice_think(entity this) float current_freeze_time = this.ltime - time - 0.1; - FOREACH_ENTITY_RADIUS(this.origin, autocvar_g_nades_nade_radius, it != this && it.takedamage && !IS_DEAD(it) && GetResourceAmount(it, RESOURCE_HEALTH) > 0 && current_freeze_time > 0, + FOREACH_ENTITY_RADIUS(this.origin, autocvar_g_nades_nade_radius, it != this && it.takedamage && !IS_DEAD(it) && GetResource(it, RES_HEALTH) > 0 && current_freeze_time > 0, { if(!autocvar_g_nades_ice_teamcheck || (DIFF_TEAM(it, this.realowner) || it == this.realowner)) if(!it.revival_time || ((time - it.revival_time) >= 1.5)) @@ -632,14 +632,14 @@ void nade_heal_touch(entity this, entity toucher) if ( health_factor > 0 ) { maxhealth = (IS_MONSTER(toucher)) ? toucher.max_health : g_pickup_healthmega_max; - float hp = GetResourceAmount(toucher, RESOURCE_HEALTH); + float hp = GetResource(toucher, RES_HEALTH); if (hp < maxhealth) { if (this.nade_show_particles) { Send_Effect(EFFECT_HEALING, toucher.origin, '0 0 0', 1); } - GiveResourceWithLimit(toucher, RESOURCE_HEALTH, health_factor, maxhealth); + GiveResourceWithLimit(toucher, RES_HEALTH, health_factor, maxhealth); } } else if ( health_factor < 0 ) @@ -814,7 +814,7 @@ void nade_touch(entity this, entity toucher) if(autocvar_g_nades_pickup) if(time >= this.spawnshieldtime) - if(!toucher.nade && GetResourceAmount(this, RESOURCE_HEALTH) == this.max_health) // no boosted shot pickups, thank you very much + if(!toucher.nade && GetResource(this, RES_HEALTH) == this.max_health) // no boosted shot pickups, thank you very much if(CanThrowNade(toucher)) // prevent some obvious things, like dead players if(IS_REAL_CLIENT(toucher)) // above checks for IS_PLAYER, don't need to do it here { @@ -842,7 +842,7 @@ void nade_touch(entity this, entity toucher) //setsize(this, '-2 -2 -2', '2 2 2'); //UpdateCSQCProjectile(this); - if(GetResourceAmount(this, RESOURCE_HEALTH) == this.max_health) + if(GetResource(this, RES_HEALTH) == this.max_health) { spamsound(this, CH_SHOTS, SND_GRENADE_BOUNCE_RANDOM(), VOL_BASE, ATTEN_NORM); return; @@ -906,7 +906,7 @@ void nade_damage(entity this, entity inflictor, entity attacker, float damage, i if(damage <= 0 || ((IS_ONGROUND(this)) && IS_PLAYER(attacker))) return; - float hp = GetResourceAmount(this, RESOURCE_HEALTH); + float hp = GetResource(this, RES_HEALTH); if(hp == this.max_health) { sound(this, CH_SHOTS_SINGLE, SND_Null, VOL_BASE, 0.5 *(ATTEN_LARGE + ATTEN_MAX)); @@ -915,7 +915,7 @@ void nade_damage(entity this, entity inflictor, entity attacker, float damage, i } hp -= damage; - SetResourceAmount(this, RESOURCE_HEALTH, hp); + SetResource(this, RES_HEALTH, hp); if ( STAT(NADE_BONUS_TYPE, this) != NADE_TYPE_HEAL.m_id || IS_PLAYER(attacker) ) @@ -977,8 +977,8 @@ void toss_nade(entity e, bool set_owner, vector _velocity, float _time) settouch(_nade, nade_touch); _nade.spawnshieldtime = time + 0.1; // prevent instantly picking up again - SetResourceAmount(_nade, RESOURCE_HEALTH, autocvar_g_nades_nade_health); - _nade.max_health = GetResourceAmount(_nade, RESOURCE_HEALTH); + SetResource(_nade, RES_HEALTH, autocvar_g_nades_nade_health); + _nade.max_health = GetResource(_nade, RES_HEALTH); _nade.takedamage = DAMAGE_AIM; _nade.event_damage = nade_damage; setcefc(_nade, func_null); @@ -1359,7 +1359,7 @@ MUTATOR_HOOKFUNCTION(nades, PlayerPreThink) if (n > 0 && STAT(FROZEN, player) == FROZEN_TEMP_DYING) // OK, there is at least one teammate reviving us { STAT(REVIVE_PROGRESS, player) = bound(0, STAT(REVIVE_PROGRESS, player) + frametime * max(1/60, autocvar_g_freezetag_revive_speed), 1); - SetResourceAmount(player, RESOURCE_HEALTH, max(1, STAT(REVIVE_PROGRESS, player) * start_health)); + SetResource(player, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, player) * start_health)); if(STAT(REVIVE_PROGRESS, player) >= 1) { @@ -1479,7 +1479,7 @@ MUTATOR_HOOKFUNCTION(nades, Damage_Calculate) if(time - frag_inflictor.toss_time <= 0.1) { Unfreeze(frag_target, false); - SetResourceAmount(frag_target, RESOURCE_HEALTH, autocvar_g_freezetag_revive_nade_health); + SetResource(frag_target, RES_HEALTH, autocvar_g_freezetag_revive_nade_health); Send_Effect(EFFECT_ICEORGLASS, frag_target.origin, '0 0 0', 3); M_ARGV(4, float) = 0; M_ARGV(6, vector) = '0 0 0'; diff --git a/qcsrc/common/mutators/mutator/nades/net.qc b/qcsrc/common/mutators/mutator/nades/net.qc index 1fdf5fd7aa..02c5df7a3f 100644 --- a/qcsrc/common/mutators/mutator/nades/net.qc +++ b/qcsrc/common/mutators/mutator/nades/net.qc @@ -32,7 +32,7 @@ void orb_setup(entity e) e.draw = orb_draw; IL_PUSH(g_drawables, e); - SetResourceAmountExplicit(e, RESOURCE_HEALTH, 255); + SetResourceExplicit(e, RES_HEALTH, 255); set_movetype(e, MOVETYPE_NONE); e.solid = SOLID_NOT; e.drawmask = MASK_NORMAL; diff --git a/qcsrc/common/mutators/mutator/nix/sv_nix.qc b/qcsrc/common/mutators/mutator/nix/sv_nix.qc index 586deda3ef..efe8ee3aed 100644 --- a/qcsrc/common/mutators/mutator/nix/sv_nix.qc +++ b/qcsrc/common/mutators/mutator/nix/sv_nix.qc @@ -57,12 +57,12 @@ REGISTER_MUTATOR(nix, expr_evaluate(cvar_string("g_nix")) && !MUTATOR_IS_ENABLED { // as the PlayerSpawn hook will no longer run, NIX is turned off by this! FOREACH_CLIENT(IS_PLAYER(it) && !IS_DEAD(it), { - SetResourceAmount(it, RESOURCE_SHELLS, start_ammo_shells); - SetResourceAmount(it, RESOURCE_BULLETS, start_ammo_nails); - SetResourceAmount(it, RESOURCE_ROCKETS, start_ammo_rockets); - SetResourceAmount(it, RESOURCE_CELLS, start_ammo_cells); - SetResourceAmount(it, RESOURCE_PLASMA, start_ammo_plasma); - SetResourceAmount(it, RESOURCE_FUEL, start_ammo_fuel); + SetResource(it, RES_SHELLS, start_ammo_shells); + SetResource(it, RES_BULLETS, start_ammo_nails); + SetResource(it, RES_ROCKETS, start_ammo_rockets); + SetResource(it, RES_CELLS, start_ammo_cells); + SetResource(it, RES_PLASMA, start_ammo_plasma); + SetResource(it, RES_FUEL, start_ammo_fuel); STAT(WEAPONS, it) = start_weapons; for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) { @@ -134,34 +134,34 @@ void NIX_GiveCurrentWeapon(entity this) if(nix_nextchange != this.nix_lastchange_id) // this shall only be called once per round! { - SetResourceAmount(this, RESOURCE_SHELLS, 0); - SetResourceAmount(this, RESOURCE_BULLETS, 0); - SetResourceAmount(this, RESOURCE_ROCKETS, 0); - SetResourceAmount(this, RESOURCE_CELLS, 0); - SetResourceAmount(this, RESOURCE_PLASMA, 0); - SetResourceAmount(this, RESOURCE_FUEL, 0); + SetResource(this, RES_SHELLS, 0); + SetResource(this, RES_BULLETS, 0); + SetResource(this, RES_ROCKETS, 0); + SetResource(this, RES_CELLS, 0); + SetResource(this, RES_PLASMA, 0); + SetResource(this, RES_FUEL, 0); if(this.items & IT_UNLIMITED_WEAPON_AMMO) { switch (wpn.ammo_type) { - case RESOURCE_SHELLS: SetResourceAmount(this, RESOURCE_SHELLS, autocvar_g_pickup_shells_max); break; - case RESOURCE_BULLETS: SetResourceAmount(this, RESOURCE_BULLETS, autocvar_g_pickup_nails_max); break; - case RESOURCE_ROCKETS: SetResourceAmount(this, RESOURCE_ROCKETS, autocvar_g_pickup_rockets_max); break; - case RESOURCE_CELLS: SetResourceAmount(this, RESOURCE_CELLS, autocvar_g_pickup_cells_max); break; - case RESOURCE_PLASMA: SetResourceAmount(this, RESOURCE_PLASMA, autocvar_g_pickup_plasma_max); break; - case RESOURCE_FUEL: SetResourceAmount(this, RESOURCE_FUEL, autocvar_g_pickup_fuel_max); break; + case RES_SHELLS: SetResource(this, RES_SHELLS, autocvar_g_pickup_shells_max); break; + case RES_BULLETS: SetResource(this, RES_BULLETS, autocvar_g_pickup_nails_max); break; + case RES_ROCKETS: SetResource(this, RES_ROCKETS, autocvar_g_pickup_rockets_max); break; + case RES_CELLS: SetResource(this, RES_CELLS, autocvar_g_pickup_cells_max); break; + case RES_PLASMA: SetResource(this, RES_PLASMA, autocvar_g_pickup_plasma_max); break; + case RES_FUEL: SetResource(this, RES_FUEL, autocvar_g_pickup_fuel_max); break; } } else { switch (wpn.ammo_type) { - case RESOURCE_SHELLS: SetResourceAmount(this, RESOURCE_SHELLS, autocvar_g_balance_nix_ammo_shells); break; - case RESOURCE_BULLETS: SetResourceAmount(this, RESOURCE_BULLETS, autocvar_g_balance_nix_ammo_nails); break; - case RESOURCE_ROCKETS: SetResourceAmount(this, RESOURCE_ROCKETS, autocvar_g_balance_nix_ammo_rockets); break; - case RESOURCE_CELLS: SetResourceAmount(this, RESOURCE_CELLS, autocvar_g_balance_nix_ammo_cells); break; - case RESOURCE_PLASMA: SetResourceAmount(this, RESOURCE_PLASMA, autocvar_g_balance_nix_ammo_plasma); break; - case RESOURCE_FUEL: SetResourceAmount(this, RESOURCE_FUEL, autocvar_g_balance_nix_ammo_fuel); break; + case RES_SHELLS: SetResource(this, RES_SHELLS, autocvar_g_balance_nix_ammo_shells); break; + case RES_BULLETS: SetResource(this, RES_BULLETS, autocvar_g_balance_nix_ammo_nails); break; + case RES_ROCKETS: SetResource(this, RES_ROCKETS, autocvar_g_balance_nix_ammo_rockets); break; + case RES_CELLS: SetResource(this, RES_CELLS, autocvar_g_balance_nix_ammo_cells); break; + case RES_PLASMA: SetResource(this, RES_PLASMA, autocvar_g_balance_nix_ammo_plasma); break; + case RES_FUEL: SetResource(this, RES_FUEL, autocvar_g_balance_nix_ammo_fuel); break; } } @@ -197,12 +197,12 @@ void NIX_GiveCurrentWeapon(entity this) { switch (wpn.ammo_type) { - case RESOURCE_SHELLS: GiveResource(this, RESOURCE_SHELLS, autocvar_g_balance_nix_ammoincr_shells); break; - case RESOURCE_BULLETS: GiveResource(this, RESOURCE_BULLETS, autocvar_g_balance_nix_ammoincr_nails); break; - case RESOURCE_ROCKETS: GiveResource(this, RESOURCE_ROCKETS, autocvar_g_balance_nix_ammoincr_rockets); break; - case RESOURCE_CELLS: GiveResource(this, RESOURCE_CELLS, autocvar_g_balance_nix_ammoincr_cells); break; - case RESOURCE_PLASMA: GiveResource(this, RESOURCE_PLASMA, autocvar_g_balance_nix_ammoincr_plasma); break; - case RESOURCE_FUEL: GiveResource(this, RESOURCE_FUEL, autocvar_g_balance_nix_ammoincr_fuel); break; + case RES_SHELLS: GiveResource(this, RES_SHELLS, autocvar_g_balance_nix_ammoincr_shells); break; + case RES_BULLETS: GiveResource(this, RES_BULLETS, autocvar_g_balance_nix_ammoincr_nails); break; + case RES_ROCKETS: GiveResource(this, RES_ROCKETS, autocvar_g_balance_nix_ammoincr_rockets); break; + case RES_CELLS: GiveResource(this, RES_CELLS, autocvar_g_balance_nix_ammoincr_cells); break; + case RES_PLASMA: GiveResource(this, RES_PLASMA, autocvar_g_balance_nix_ammoincr_plasma); break; + case RES_FUEL: GiveResource(this, RES_FUEL, autocvar_g_balance_nix_ammoincr_fuel); break; } this.nix_nextincr = time + autocvar_g_balance_nix_incrtime; diff --git a/qcsrc/common/mutators/mutator/overkill/okhmg.qc b/qcsrc/common/mutators/mutator/overkill/okhmg.qc index 688928ce14..bee61f2fea 100644 --- a/qcsrc/common/mutators/mutator/overkill/okhmg.qc +++ b/qcsrc/common/mutators/mutator/overkill/okhmg.qc @@ -116,7 +116,7 @@ METHOD(OverkillHeavyMachineGun, wr_think, void(entity thiswep, entity actor, .en METHOD(OverkillHeavyMachineGun, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(okhmg, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(okhmg, ammo); if (autocvar_g_balance_okhmg_reload_ammo) { ammo_amount += actor.(weaponentity).(weapon_load[WEP_OVERKILL_HMG.m_id]) >= WEP_CVAR_PRI(okhmg, ammo); @@ -126,7 +126,7 @@ METHOD(OverkillHeavyMachineGun, wr_checkammo1, bool(entity thiswep, entity actor METHOD(OverkillHeavyMachineGun, wr_checkammo2, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(okhmg, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(okhmg, ammo); if (autocvar_g_balance_okhmg_reload_ammo) { ammo_amount += actor.(weaponentity).(weapon_load[WEP_OVERKILL_HMG.m_id]) >= WEP_CVAR_SEC(okhmg, ammo); diff --git a/qcsrc/common/mutators/mutator/overkill/okhmg.qh b/qcsrc/common/mutators/mutator/overkill/okhmg.qh index b3c2664402..68ddc9d923 100644 --- a/qcsrc/common/mutators/mutator/overkill/okhmg.qh +++ b/qcsrc/common/mutators/mutator/overkill/okhmg.qh @@ -4,7 +4,7 @@ CLASS(OverkillHeavyMachineGun, Weapon) /* spawnfunc */ ATTRIB(OverkillHeavyMachineGun, m_canonical_spawnfunc, string, "weapon_okhmg"); -/* ammotype */ ATTRIB(OverkillHeavyMachineGun, ammo_type, int, RESOURCE_BULLETS); +/* ammotype */ ATTRIB(OverkillHeavyMachineGun, ammo_type, int, RES_BULLETS); /* impulse */ ATTRIB(OverkillHeavyMachineGun, impulse, int, 3); /* flags */ ATTRIB(OverkillHeavyMachineGun, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_SUPERWEAPON); /* rating */ ATTRIB(OverkillHeavyMachineGun, bot_pickupbasevalue, float, 10000); diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc index aa872f1541..f8dfa89fe5 100644 --- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc +++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc @@ -111,7 +111,7 @@ METHOD(OverkillMachineGun, wr_think, void(entity thiswep, entity actor, .entity METHOD(OverkillMachineGun, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { float ammo_amount; - ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(okmachinegun, ammo); + ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(okmachinegun, ammo); if (WEP_CVAR(okmachinegun, reload_ammo)) { ammo_amount += actor.(weaponentity).(weapon_load[WEP_OVERKILL_MACHINEGUN.m_id]) >= WEP_CVAR_PRI(okmachinegun, ammo); diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh index 32176da90a..321d92e226 100644 --- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh @@ -2,7 +2,7 @@ CLASS(OverkillMachineGun, Weapon) /* spawnfunc */ ATTRIB(OverkillMachineGun, m_canonical_spawnfunc, string, "weapon_okmachinegun"); -/* ammotype */ ATTRIB(OverkillMachineGun, ammo_type, int, RESOURCE_BULLETS); +/* ammotype */ ATTRIB(OverkillMachineGun, ammo_type, int, RES_BULLETS); /* impulse */ ATTRIB(OverkillMachineGun, impulse, int, 3); /* flags */ ATTRIB(OverkillMachineGun, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS | WEP_FLAG_MUTATORBLOCKED); /* rating */ ATTRIB(OverkillMachineGun, bot_pickupbasevalue, float, 7000); diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qc b/qcsrc/common/mutators/mutator/overkill/oknex.qc index 4fbd200b69..e1b26c36d1 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qc +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qc @@ -268,7 +268,7 @@ METHOD(OverkillNex, wr_setup, void(entity thiswep, entity actor, .entity weapone METHOD(OverkillNex, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(oknex, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(oknex, ammo); ammo_amount += (autocvar_g_balance_oknex_reload_ammo && actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_PRI(oknex, ammo)); return ammo_amount; } @@ -278,7 +278,7 @@ METHOD(OverkillNex, wr_checkammo2, bool(entity thiswep, entity actor, .entity we if (WEP_CVAR(oknex, secondary)) { // don't allow charging if we don't have enough ammo - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(oknex, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(oknex, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_SEC(oknex, ammo); return ammo_amount; } diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qh b/qcsrc/common/mutators/mutator/overkill/oknex.qh index ec8ceeb390..d03f40ff2e 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qh +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qh @@ -2,7 +2,7 @@ CLASS(OverkillNex, Weapon) /* spawnfunc */ ATTRIB(OverkillNex, m_canonical_spawnfunc, string, "weapon_oknex"); -/* ammotype */ ATTRIB(OverkillNex, ammo_type, int, RESOURCE_CELLS); +/* ammotype */ ATTRIB(OverkillNex, ammo_type, int, RES_CELLS); /* impulse */ ATTRIB(OverkillNex, impulse, int, 7); /* flags */ ATTRIB(OverkillNex, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED); /* rating */ ATTRIB(OverkillNex, bot_pickupbasevalue, float, 8000); diff --git a/qcsrc/common/mutators/mutator/overkill/okrpc.qc b/qcsrc/common/mutators/mutator/overkill/okrpc.qc index 50c842d984..fa4ffc4b5e 100644 --- a/qcsrc/common/mutators/mutator/overkill/okrpc.qc +++ b/qcsrc/common/mutators/mutator/overkill/okrpc.qc @@ -36,15 +36,15 @@ void W_OverkillRocketPropelledChainsaw_Touch (entity this, entity toucher) void W_OverkillRocketPropelledChainsaw_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - if (GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if (GetResource(this, RES_HEALTH) <= 0) return; if (!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, -1)) // no exceptions return; // g_projectiles_damage says to halt - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); - if (GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if (GetResource(this, RES_HEALTH) <= 0) W_PrepareExplosionByDamage(this, attacker, W_OverkillRocketPropelledChainsaw_Explode_think); } @@ -100,7 +100,7 @@ void W_OverkillRocketPropelledChainsaw_Attack(Weapon thiswep, entity actor, .ent missile.takedamage = DAMAGE_YES; missile.damageforcescale = WEP_CVAR_PRI(okrpc, damageforcescale); - SetResourceAmountExplicit(missile, RESOURCE_HEALTH, WEP_CVAR_PRI(okrpc, health)); + SetResourceExplicit(missile, RES_HEALTH, WEP_CVAR_PRI(okrpc, health)); missile.event_damage = W_OverkillRocketPropelledChainsaw_Damage; missile.damagedbycontents = true; IL_PUSH(g_damagedbycontents, missile); @@ -191,14 +191,14 @@ METHOD(OverkillRocketPropelledChainsaw, wr_think, void(entity thiswep, entity ac METHOD(OverkillRocketPropelledChainsaw, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(okrpc, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(okrpc, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_PRI(okrpc, ammo); return ammo_amount; } METHOD(OverkillRocketPropelledChainsaw, wr_checkammo2, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(okrpc, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(okrpc, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_SEC(okrpc, ammo); return ammo_amount; } diff --git a/qcsrc/common/mutators/mutator/overkill/okrpc.qh b/qcsrc/common/mutators/mutator/overkill/okrpc.qh index 4f9bfe7b99..7d95296f96 100644 --- a/qcsrc/common/mutators/mutator/overkill/okrpc.qh +++ b/qcsrc/common/mutators/mutator/overkill/okrpc.qh @@ -4,7 +4,7 @@ CLASS(OverkillRocketPropelledChainsaw, Weapon) /* spawnfunc */ ATTRIB(OverkillRocketPropelledChainsaw, m_canonical_spawnfunc, string, "weapon_okrpc"); -/* ammotype */ ATTRIB(OverkillRocketPropelledChainsaw, ammo_type, int, RESOURCE_ROCKETS); +/* ammotype */ ATTRIB(OverkillRocketPropelledChainsaw, ammo_type, int, RES_ROCKETS); /* impulse */ ATTRIB(OverkillRocketPropelledChainsaw, impulse, int, 9); /* flags */ ATTRIB(OverkillRocketPropelledChainsaw, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_SUPERWEAPON); /* rating */ ATTRIB(OverkillRocketPropelledChainsaw, bot_pickupbasevalue, float, 10000); diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qc b/qcsrc/common/mutators/mutator/overkill/okshotgun.qc index 2461ba0cb0..784d1c37b7 100644 --- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qc +++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qc @@ -73,7 +73,7 @@ METHOD(OverkillShotgun, wr_think, void(entity thiswep, entity actor, .entity wea METHOD(OverkillShotgun, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(okshotgun, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(okshotgun, ammo); ammo_amount += actor.(weaponentity).(weapon_load[WEP_OVERKILL_SHOTGUN.m_id]) >= WEP_CVAR_PRI(okshotgun, ammo); return ammo_amount; } diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh index 1124baa68b..a830e6ac46 100644 --- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh @@ -2,7 +2,7 @@ CLASS(OverkillShotgun, Weapon) /* spawnfunc */ ATTRIB(OverkillShotgun, m_canonical_spawnfunc, string, "weapon_okshotgun"); -/* ammotype */ ATTRIB(OverkillShotgun, ammo_type, int, RESOURCE_SHELLS); +/* ammotype */ ATTRIB(OverkillShotgun, ammo_type, int, RES_SHELLS); /* impulse */ ATTRIB(OverkillShotgun, impulse, int, 2); /* flags */ ATTRIB(OverkillShotgun, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED); /* rating */ ATTRIB(OverkillShotgun, bot_pickupbasevalue, float, 6000); diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc b/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc index fdcc4beee5..b747ce7492 100644 --- a/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc +++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc @@ -91,7 +91,7 @@ MUTATOR_HOOKFUNCTION(spawn_near_teammate, PlayerSpawn) if (PHYS_INPUT_BUTTON_CHAT(it)) continue; if (DIFF_TEAM(player, it)) continue; - if (autocvar_g_spawn_near_teammate_ignore_spawnpoint_check_health && GetResourceAmount(it, RESOURCE_HEALTH) < autocvar_g_balance_health_regenstable) continue; + if (autocvar_g_spawn_near_teammate_ignore_spawnpoint_check_health && GetResource(it, RES_HEALTH) < autocvar_g_balance_health_regenstable) continue; if (IS_DEAD(it)) continue; if (time < it.msnt_timer) continue; if (time < it.spawnshieldtime) continue; diff --git a/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc b/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc index 56198186f1..57df1b02bf 100644 --- a/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc +++ b/qcsrc/common/mutators/mutator/vampire/sv_vampire.qc @@ -13,8 +13,8 @@ MUTATOR_HOOKFUNCTION(vampire, PlayerDamage_SplitHealthArmor) if(frag_target != frag_attacker) if(!IS_DEAD(frag_target)) { - GiveResource(frag_attacker, RESOURCE_HEALTH, - bound(0, damage_take, GetResourceAmount(frag_target, RESOURCE_HEALTH))); + GiveResource(frag_attacker, RES_HEALTH, + bound(0, damage_take, GetResource(frag_target, RES_HEALTH))); } } diff --git a/qcsrc/common/mutators/mutator/vampirehook/sv_vampirehook.qc b/qcsrc/common/mutators/mutator/vampirehook/sv_vampirehook.qc index e74cfb1152..b30df3790a 100644 --- a/qcsrc/common/mutators/mutator/vampirehook/sv_vampirehook.qc +++ b/qcsrc/common/mutators/mutator/vampirehook/sv_vampirehook.qc @@ -21,7 +21,7 @@ MUTATOR_HOOKFUNCTION(vh, GrappleHookThink) if(!STAT(FROZEN, thehook.aiment)) if(time >= game_starttime) if(DIFF_TEAM(thehook.owner, thehook.aiment) || autocvar_g_vampirehook_teamheal) - if(GetResourceAmount(thehook.aiment, RESOURCE_HEALTH) > 0) + if(GetResource(thehook.aiment, RES_HEALTH) > 0) if(autocvar_g_vampirehook_damage) { thehook.last_dmg = time + autocvar_g_vampirehook_damagerate; @@ -30,9 +30,9 @@ MUTATOR_HOOKFUNCTION(vh, GrappleHookThink) entity targ = ((SAME_TEAM(thehook.owner, thehook.aiment)) ? thehook.aiment : thehook.owner); // TODO: we can't do this due to an issue with globals and the mutator arguments //Heal(targ, thehook.owner, autocvar_g_vampirehook_health_steal, g_pickup_healthsmall_max); - SetResourceAmountExplicit(targ, RESOURCE_HEALTH, min(GetResourceAmount(targ, RESOURCE_HEALTH) + autocvar_g_vampirehook_health_steal, g_pickup_healthsmall_max)); + SetResourceExplicit(targ, RES_HEALTH, min(GetResource(targ, RES_HEALTH) + autocvar_g_vampirehook_health_steal, g_pickup_healthsmall_max)); if(dmgent == thehook.owner) - TakeResource(dmgent, RESOURCE_HEALTH, autocvar_g_vampirehook_damage); // FIXME: friendly fire?! + TakeResource(dmgent, RES_HEALTH, autocvar_g_vampirehook_damage); // FIXME: friendly fire?! } } diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc index 66904d0070..4192185dce 100644 --- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc +++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc @@ -34,7 +34,7 @@ bool WaypointSprite_SendEntity(entity this, entity to, float sendflags) { if (this.max_health) { - WriteByte(MSG_ENTITY, (GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health) * 191.0); + WriteByte(MSG_ENTITY, (GetResource(this, RES_HEALTH) / this.max_health) * 191.0); } else { @@ -82,11 +82,7 @@ bool WaypointSprite_SendEntity(entity this, entity to, float sendflags) if (WaypointSprite_isteammate(this.owner, WaypointSprite_getviewentity(to))) { - float dt = (this.waypointsprite_helpmetime - time) / 0.1; - if (dt < 0) - dt = 0; - if (dt > 255) - dt = 255; + float dt = bound(0, (this.waypointsprite_helpmetime - time) / 0.1, 255); WriteByte(MSG_ENTITY, dt); } else @@ -134,7 +130,7 @@ void Ent_WaypointSprite(entity this, bool isnew) int t = ReadByte(); if (t < 192) { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, t / 191.0); + SetResourceExplicit(this, RES_HEALTH, t / 191.0); this.build_finished = 0; } else @@ -142,7 +138,7 @@ void Ent_WaypointSprite(entity this, bool isnew) t = (t - 192) * 256 + ReadByte(); this.build_started = servertime; if (this.build_finished) - this.build_starthealth = bound(0, GetResourceAmount(this, RESOURCE_HEALTH), 1); + this.build_starthealth = bound(0, GetResource(this, RES_HEALTH), 1); else this.build_starthealth = 0; this.build_finished = servertime + t / 32; @@ -150,7 +146,7 @@ void Ent_WaypointSprite(entity this, bool isnew) } else { - SetResourceAmountExplicit(this, RESOURCE_HEALTH, -1); + SetResourceExplicit(this, RES_HEALTH, -1); this.build_finished = 0; } @@ -352,7 +348,7 @@ vector drawspritearrow(vector o, float ang, vector rgb, float a, float t) float border = 1.5 * t; float margin = 4.0 * t; - float borderDiag = border * 1.414; + float borderDiag = border * M_SQRT2; vector arrowX = eX * size; vector arrowY = eY * (size+borderDiag); vector borderX = eX * (size+borderDiag); @@ -552,7 +548,7 @@ void Draw_WaypointSprite(entity this) LOG_INFOF("WARNING: sprite of name %s has no color, using pink so you notice it", spriteimage); } - float health_val = GetResourceAmount(this, RESOURCE_HEALTH); + float health_val = GetResource(this, RES_HEALTH); float blink_time = (health_val >= 0) ? (health_val * 10) : time; if (blink_time - floor(blink_time) > 0.5) { @@ -656,14 +652,14 @@ void Draw_WaypointSprite(entity this) if (time < this.build_finished + 0.25) { if (time < this.build_started) - SetResourceAmountExplicit(this, RESOURCE_HEALTH, this.build_starthealth); + SetResourceExplicit(this, RES_HEALTH, this.build_starthealth); else if (time < this.build_finished) - SetResourceAmountExplicit(this, RESOURCE_HEALTH, (time - this.build_started) / (this.build_finished - this.build_started) * (1 - this.build_starthealth) + this.build_starthealth); + SetResourceExplicit(this, RES_HEALTH, (time - this.build_started) / (this.build_finished - this.build_started) * (1 - this.build_starthealth) + this.build_starthealth); else - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 1); + SetResourceExplicit(this, RES_HEALTH, 1); } else - SetResourceAmountExplicit(this, RESOURCE_HEALTH, -1); + SetResourceExplicit(this, RES_HEALTH, -1); } o = drawspritearrow(o, ang, rgb, a, SPRITE_ARROW_SCALE * t); @@ -711,7 +707,7 @@ void Draw_WaypointSprite(entity this) } draw_beginBoldFont(); - if (GetResourceAmount(this, RESOURCE_HEALTH) >= 0) + if (GetResource(this, RES_HEALTH) >= 0) { float align = 0, marg; if (this.build_finished) @@ -728,7 +724,7 @@ void Draw_WaypointSprite(entity this) drawhealthbar( o, 0, - GetResourceAmount(this, RESOURCE_HEALTH), + GetResource(this, RES_HEALTH), '0 0 0', '0 0 0', SPRITE_HEALTHBAR_WIDTH * t, @@ -833,9 +829,10 @@ void WaypointSprite_UpdateSprites(entity e, entity _m1, entity _m2, entity _m3) void WaypointSprite_UpdateHealth(entity e, float f) { f = bound(0, f, e.max_health); - if (f != GetResourceAmount(e, RESOURCE_HEALTH) || e.pain_finished) + float step = e.max_health / 40; + if ((floor(f / step) != floor(GetResource(e, RES_HEALTH) / step)) || e.pain_finished) { - SetResourceAmountExplicit(e, RESOURCE_HEALTH, f); + SetResourceExplicit(e, RES_HEALTH, f); e.pain_finished = 0; e.SendFlags |= 0x80; } @@ -1162,10 +1159,10 @@ entity WaypointSprite_AttachCarrier( { WaypointSprite_Kill(carrier.waypointsprite_attached); // FC overrides attached entity e = WaypointSprite_Spawn(spr, 0, 0, carrier, '0 0 64', NULL, carrier.team, carrier, waypointsprite_attachedforcarrier, false, icon); - if (GetResourceAmount(carrier, RESOURCE_HEALTH)) + if (GetResource(carrier, RES_HEALTH)) { - WaypointSprite_UpdateMaxHealth(e, '1 0 0' * healtharmor_maxdamage(start_health, start_armorvalue, autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id) * 2); - WaypointSprite_UpdateHealth(e, '1 0 0' * healtharmor_maxdamage(GetResourceAmount(carrier, RESOURCE_HEALTH), GetResourceAmount(carrier, RESOURCE_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id)); + WaypointSprite_UpdateMaxHealth(e, 2 * healtharmor_maxdamage(start_health, start_armorvalue, autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id).x); + WaypointSprite_UpdateHealth(e, healtharmor_maxdamage(GetResource(carrier, RES_HEALTH), GetResource(carrier, RES_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id).x); } return e; } diff --git a/qcsrc/common/net_notice.qc b/qcsrc/common/net_notice.qc index 20d1351ebc..1d10cf94fb 100644 --- a/qcsrc/common/net_notice.qc +++ b/qcsrc/common/net_notice.qc @@ -80,7 +80,10 @@ void cl_notice_run() drawfill(v1, v2, '0.5 0.5 0.5', 0.5, DRAWFLAG_NORMAL); vector v3 = v1 + '10 10 0'; - #define OUT(s, z) MACRO_BEGIN { drawcolorcodedstring(v3, s, '1 1 0' * z, 1, DRAWFLAG_NORMAL); v3.y += z + 4; } MACRO_END + #define OUT(s, z) MACRO_BEGIN \ + drawcolorcodedstring(v3, s, '1 1 0' * z, 1, DRAWFLAG_NORMAL); \ + v3.y += z + 4; \ + MACRO_END float cur_time = 0; float time_width = 48; diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc index 183706e56c..4125212723 100644 --- a/qcsrc/common/notifications/all.inc +++ b/qcsrc/common/notifications/all.inc @@ -401,7 +401,7 @@ MULTITEAM_INFO(KEYHUNT_DESTROYED, 4, N_CONSOLE, 1, 0, "s1", "", "", _("^BG%s^BG destroyed the ^TC^TT Key"), "", KEY) MULTITEAM_INFO(KEYHUNT_PICKUP, 4, N_CONSOLE, 1, 0, "s1", "", "", _("^BG%s^BG picked up the ^TC^TT Key"), "", KEY) - MSG_INFO_NOTIF(LMS_FORFEIT, N_CONSOLE, 1, 0, "s1", "", "", _("^BG%s^F3 forfeited"), "") + MSG_INFO_NOTIF(LMS_FORFEIT, N_CHATCON, 1, 0, "s1", "", "", _("^BG%s^F3 forfeited"), "") MSG_INFO_NOTIF(LMS_NOLIVES, N_CONSOLE, 1, 0, "s1", "", "", _("^BG%s^F3 has no more lives left"), "") MSG_INFO_NOTIF(MONSTERS_DISABLED, N_CONSOLE, 0, 0, "", "", "", _("^BGMonsters are currently disabled"), "") diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc index 644d049d38..b8e0d5c699 100644 --- a/qcsrc/common/notifications/all.qc +++ b/qcsrc/common/notifications/all.qc @@ -247,11 +247,11 @@ string Process_Notif_Args( switch(strtolower(selected)) { - #define ARG_CASE_ARG_CS_SV_HA(selected,result) case selected: { ++sel_num; break; } - #define ARG_CASE_ARG_CS_SV_DC(selected,result) case selected: { ++sel_num; break; } - #define ARG_CASE_ARG_CS_SV(selected,result) case selected: { ++sel_num; break; } - #define ARG_CASE_ARG_CS(selected,result) case selected: { ++sel_num; break; } - #define ARG_CASE_ARG_SV(selected,result) case selected: { ++sel_num; break; } + #define ARG_CASE_ARG_CS_SV_HA(selected,result) case selected: ++sel_num; break; + #define ARG_CASE_ARG_CS_SV_DC(selected,result) case selected: ++sel_num; break; + #define ARG_CASE_ARG_CS_SV(selected,result) case selected: ++sel_num; break; + #define ARG_CASE_ARG_CS(selected,result) case selected: ++sel_num; break; + #define ARG_CASE_ARG_SV(selected,result) case selected: ++sel_num; break; #define ARG_CASE_ARG_DC(selected,result) #define ARG_CASE(prog,selected,result) ARG_CASE_##prog(selected,result) NOTIF_ARGUMENT_LIST @@ -298,7 +298,7 @@ string Process_Notif_Args( switch(strtolower(selected)) { - #define ARG_CASE_ARG_CS_SV_HA(selected,result) case selected: { ++sel_num; break; } + #define ARG_CASE_ARG_CS_SV_HA(selected,result) case selected: ++sel_num; break; #define ARG_CASE_ARG_CS_SV_DC(selected,result) #define ARG_CASE_ARG_CS_SV(selected,result) #define ARG_CASE_ARG_CS(selected,result) @@ -350,11 +350,11 @@ string Process_Notif_Args( switch(strtolower(selected)) { #define ARG_CASE_ARG_CS_SV_HA(selected,result) - #define ARG_CASE_ARG_CS_SV_DC(selected,result) case selected: { ++sel_num; break; } + #define ARG_CASE_ARG_CS_SV_DC(selected,result) case selected: ++sel_num; break; #define ARG_CASE_ARG_CS_SV(selected,result) #define ARG_CASE_ARG_CS(selected,result) #define ARG_CASE_ARG_SV(selected,result) - #define ARG_CASE_ARG_DC(selected,result) case selected: { ++sel_num; break; } + #define ARG_CASE_ARG_DC(selected,result) case selected: ++sel_num; break; #define ARG_CASE(prog,selected,result) ARG_CASE_##prog(selected,result) NOTIF_ARGUMENT_LIST #undef ARG_CASE @@ -608,7 +608,7 @@ void Create_Notification_Entity_InfoCenter(entity notif, // ====================== // Process Notif String // ====================== - #define SET_NOTIF_STRING(string,stringname) MACRO_BEGIN { \ + #define SET_NOTIF_STRING(string,stringname) MACRO_BEGIN \ notif.nent_string = strzone(CCR( \ Process_Notif_Line( \ typeId, \ @@ -619,7 +619,7 @@ void Create_Notification_Entity_InfoCenter(entity notif, stringname \ )) \ ); \ - } MACRO_END + MACRO_END if(GENTLE) { @@ -777,60 +777,64 @@ void Notification_GetCvars(entity this) /** used to output notifications.cfg file */ void Dump_Notifications(int fh, bool alsoprint) { - #define NOTIF_WRITE(a) MACRO_BEGIN { \ - fputs(fh, a); \ - if (alsoprint) LOG_INFO(a); \ - } MACRO_END + #define NOTIF_WRITE(str) write_String_To_File(fh, str, alsoprint) - #define NOTIF_WRITE_ENTITY(e, description) MACRO_BEGIN { \ - string notif_msg = sprintf( \ + #define NOTIF_WRITE_ENTITY(e, description) \ + NOTIF_WRITE(sprintf( \ "seta notification_%s \"%d\" \"%s\"\n", \ Get_Notif_CvarName(e), e.nent_default, description \ - ); \ - NOTIF_WRITE(notif_msg); \ - } MACRO_END + )) - #define NOTIF_WRITE_ENTITY_CHOICE(e, descriptiona, descriptionb) MACRO_BEGIN { \ - string notif_msg = sprintf( \ + #define NOTIF_WRITE_ENTITY_CHOICE(e, descriptiona, descriptionb) \ + NOTIF_WRITE(sprintf( \ "seta notification_%s \"%d\" \"%s\"\n" \ "seta notification_%s_ALLOWED \"%d\" \"%s\"\n", \ Get_Notif_CvarName(e), e.nent_default, descriptiona, \ Get_Notif_CvarName(e), e.nent_challow_def, descriptionb \ - ); \ - NOTIF_WRITE(notif_msg); \ - } MACRO_END - - #define NOTIF_WRITE_HARDCODED(cvar, default, description) MACRO_BEGIN { \ - string notif_msg = sprintf( \ - "seta notification_%s \"%s\" \"%s\"\n", \ - cvar, default, description \ - ); \ - NOTIF_WRITE(notif_msg); \ - } MACRO_END + )) + + #define NOTIF_WRITE_HARDCODED(cvar, default, description) \ + NOTIF_WRITE("seta notification_" cvar " \"" default "\" \"" description "\"\n") // Note: This warning only applies to the notifications.cfg file that is output... // You ARE supposed to manually edit this function to add i.e. hard coded // notification variables for mutators or game modes or such and then // regenerate the notifications.cfg file from the new code. - NOTIF_WRITE("// ********************************************** //\n"); - NOTIF_WRITE("// ** WARNING - DO NOT MANUALLY EDIT THIS FILE ** //\n"); - NOTIF_WRITE("// ** ** //\n"); - NOTIF_WRITE("// ** This file is automatically generated ** //\n"); - NOTIF_WRITE("// ** by code with the command 'dumpnotifs'. ** //\n"); - NOTIF_WRITE("// ** ** //\n"); - NOTIF_WRITE("// ** If you add a new notification, please ** //\n"); - NOTIF_WRITE("// ** regenerate this file with that command ** //\n"); - NOTIF_WRITE("// ** making sure that the output matches ** //\n"); - NOTIF_WRITE("// ** with the lists and defaults in code. ** //\n"); - NOTIF_WRITE("// ** ** //\n"); - NOTIF_WRITE("// ********************************************** //\n"); + NOTIF_WRITE( + "// ********************************************** //\n" + "// ** WARNING - DO NOT MANUALLY EDIT THIS FILE ** //\n" + "// ** ** //\n" + "// ** This file is automatically generated ** //\n" + "// ** by code with the command 'dumpnotifs'. ** //\n" + "// ** ** //\n" + "// ** If you add a new notification, please ** //\n" + "// ** regenerate this file with that command ** //\n" + "// ** making sure that the output matches ** //\n" + "// ** with the lists and defaults in code. ** //\n" + "// ** ** //\n" + "// ********************************************** //\n"); // These notifications will also append their string as a comment... // This is not necessary, and does not matter if they vary between config versions, // it is just a semi-helpful tool for those who want to manually change their user settings. - int NOTIF_ANNCE_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_ANNCE, { ++NOTIF_ANNCE_COUNT; }); + int NOTIF_ANNCE_COUNT = 0; + int NOTIF_INFO_COUNT = 0; + int NOTIF_CENTER_COUNT = 0; + int NOTIF_MULTI_COUNT = 0; + int NOTIF_CHOICE_COUNT = 0; + FOREACH(Notifications, true, { + switch (it.nent_type) + { + case MSG_ANNCE: ++NOTIF_ANNCE_COUNT; break; + case MSG_INFO: ++NOTIF_INFO_COUNT; break; + case MSG_CENTER: ++NOTIF_CENTER_COUNT; break; + case MSG_MULTI: ++NOTIF_MULTI_COUNT; break; + case MSG_CHOICE: ++NOTIF_CHOICE_COUNT; break; + } + }); + NOTIF_WRITE(sprintf("\n// MSG_ANNCE notifications (count = %d):\n", NOTIF_ANNCE_COUNT)); FOREACH(Notifications, it.nent_type == MSG_ANNCE && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), { NOTIF_WRITE_ENTITY(it, @@ -838,7 +842,6 @@ void Dump_Notifications(int fh, bool alsoprint) ); }); - int NOTIF_INFO_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_INFO, { ++NOTIF_INFO_COUNT; }); NOTIF_WRITE(sprintf("\n// MSG_INFO notifications (count = %d):\n", NOTIF_INFO_COUNT)); FOREACH(Notifications, it.nent_type == MSG_INFO && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), { NOTIF_WRITE_ENTITY(it, @@ -847,7 +850,6 @@ void Dump_Notifications(int fh, bool alsoprint) ); }); - int NOTIF_CENTER_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_CENTER, { ++NOTIF_CENTER_COUNT; }); NOTIF_WRITE(sprintf("\n// MSG_CENTER notifications (count = %d):\n", NOTIF_CENTER_COUNT)); FOREACH(Notifications, it.nent_type == MSG_CENTER && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), { NOTIF_WRITE_ENTITY(it, @@ -855,7 +857,6 @@ void Dump_Notifications(int fh, bool alsoprint) ); }); - int NOTIF_MULTI_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_MULTI, { ++NOTIF_MULTI_COUNT; }); NOTIF_WRITE(sprintf("\n// MSG_MULTI notifications (count = %d):\n", NOTIF_MULTI_COUNT)); FOREACH(Notifications, it.nent_type == MSG_MULTI && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), { NOTIF_WRITE_ENTITY(it, @@ -863,7 +864,6 @@ void Dump_Notifications(int fh, bool alsoprint) ); }); - int NOTIF_CHOICE_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_CHOICE, { ++NOTIF_CHOICE_COUNT; }); NOTIF_WRITE(sprintf("\n// MSG_CHOICE notifications (count = %d):\n", NOTIF_CHOICE_COUNT)); FOREACH(Notifications, it.nent_type == MSG_CHOICE && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), { NOTIF_WRITE_ENTITY_CHOICE(it, @@ -1011,15 +1011,15 @@ string Local_Notification_sprintf( string tmp_s; // used by NOTIF_ARGUMENT_LIST switch (strtolower(selected)) { - #define ARG_CASE_ARG_CS_SV_HA(selected, result) case selected: { arg_slot[sel_num++] = result; break; } - #define ARG_CASE_ARG_CS_SV_DC(selected, result) case selected: { arg_slot[sel_num++] = result; break; } - #define ARG_CASE_ARG_CS_SV(selected, result) case selected: { arg_slot[sel_num++] = result; break; } + #define ARG_CASE_ARG_CS_SV_HA(selected, result) case selected: arg_slot[sel_num++] = result; break; + #define ARG_CASE_ARG_CS_SV_DC(selected, result) case selected: arg_slot[sel_num++] = result; break; + #define ARG_CASE_ARG_CS_SV(selected, result) case selected: arg_slot[sel_num++] = result; break; #ifdef CSQC - #define ARG_CASE_ARG_CS(selected, result) case selected: { arg_slot[sel_num++] = result; break; } + #define ARG_CASE_ARG_CS(selected, result) case selected: arg_slot[sel_num++] = result; break; #define ARG_CASE_ARG_SV(selected, result) #else #define ARG_CASE_ARG_CS(selected, result) - #define ARG_CASE_ARG_SV(selected, result) case selected: { arg_slot[sel_num++] = result; break; } + #define ARG_CASE_ARG_SV(selected, result) case selected: arg_slot[sel_num++] = result; break; #endif #define ARG_CASE_ARG_DC(selected, result) #define ARG_CASE(prog, selected, result) ARG_CASE_##prog(selected, result) @@ -1099,7 +1099,7 @@ void Local_Notification_HUD_Notify_Push( NOTIF_HIT_MAX(NOTIF_MAX_HUDARGS, "Local_Notification_HUD_Notify_Push"); switch (strtolower(selected)) { - #define ARG_CASE_ARG_CS_SV_HA(selected, result) case selected: { arg_slot[sel_num++] = result; break; } + #define ARG_CASE_ARG_CS_SV_HA(selected, result) case selected: arg_slot[sel_num++] = result; break; #define ARG_CASE_ARG_CS_SV_DC(selected, result) #define ARG_CASE_ARG_CS_SV(selected, result) #define ARG_CASE_ARG_CS(selected, result) @@ -1143,11 +1143,11 @@ void Local_Notification_centerprint_generic( switch (strtolower(selected)) { #define ARG_CASE_ARG_CS_SV_HA(selected, result) - #define ARG_CASE_ARG_CS_SV_DC(selected, result) case selected: { arg_slot[sel_num++] = result; break; } + #define ARG_CASE_ARG_CS_SV_DC(selected, result) case selected: arg_slot[sel_num++] = result; break; #define ARG_CASE_ARG_CS_SV(selected, result) #define ARG_CASE_ARG_CS(selected, result) #define ARG_CASE_ARG_SV(selected, result) - #define ARG_CASE_ARG_DC(selected, result) case selected: { arg_slot[sel_num++] = result; break; } + #define ARG_CASE_ARG_DC(selected, result) case selected: arg_slot[sel_num++] = result; break; #define ARG_CASE(prog, selected, result) ARG_CASE_##prog(selected,result) NOTIF_ARGUMENT_LIST #undef ARG_CASE @@ -1603,7 +1603,7 @@ void Send_Notification( // 2. Manually handling each separate call on per-usage basis (See old CTF usage of verbose) entity found_choice; - #define RECURSE_FROM_CHOICE(ent,action) MACRO_BEGIN { \ + #define RECURSE_FROM_CHOICE(ent,action) MACRO_BEGIN \ if (notif.nent_challow_var && (warmup_stage || (notif.nent_challow_var == 2))) { \ switch (CS(ent).msg_choice_choices[net_name.nent_choice_idx]) \ { \ @@ -1623,7 +1623,7 @@ void Send_Notification( found_choice.nent_floatcount, \ s1, s2, s3, s4, \ f1, f2, f3, f4); \ - } MACRO_END + MACRO_END switch (broadcast) { diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh index 6cbf91cc9b..da8c5ba6e1 100644 --- a/qcsrc/common/notifications/all.qh +++ b/qcsrc/common/notifications/all.qh @@ -441,9 +441,10 @@ string BUFF_NAME(int i); ARG_CASE(ARG_CS_SV_HA, "minigame1_name",find(NULL,netname,s1).descriptor.message) \ ARG_CASE(ARG_CS_SV_HA, "minigame1_d", find(NULL,netname,s1).descriptor.netname) -#define NOTIF_HIT_MAX(count,funcname) MACRO_BEGIN { \ +#define NOTIF_HIT_MAX(count,funcname) MACRO_BEGIN \ if(sel_num == count) { backtrace(sprintf("%s: Hit maximum arguments!\n", funcname)); break; } \ -} MACRO_END +MACRO_END + #define NOTIF_HIT_UNKNOWN(token,funcname) { backtrace(sprintf("%s: Hit unknown token in selected string! '%s'\n", funcname, selected)); break; } #define KILL_SPREE_LIST \ @@ -631,12 +632,12 @@ string notif_arg_item_wepammo(float f1, float f2) Weapon wep = Weapons_from(f1); switch (wep.ammo_type) { - case RESOURCE_SHELLS: ammoitems = ITEM_Shells.m_name; break; - case RESOURCE_BULLETS: ammoitems = ITEM_Bullets.m_name; break; - case RESOURCE_ROCKETS: ammoitems = ITEM_Rockets.m_name; break; - case RESOURCE_CELLS: ammoitems = ITEM_Cells.m_name; break; - case RESOURCE_PLASMA: ammoitems = ITEM_Plasma.m_name; break; - case RESOURCE_FUEL: ammoitems = ITEM_JetpackFuel.m_name; break; + case RES_SHELLS: ammoitems = ITEM_Shells.m_name; break; + case RES_BULLETS: ammoitems = ITEM_Bullets.m_name; break; + case RES_ROCKETS: ammoitems = ITEM_Rockets.m_name; break; + case RES_CELLS: ammoitems = ITEM_Cells.m_name; break; + case RES_PLASMA: ammoitems = ITEM_Plasma.m_name; break; + case RES_FUEL: ammoitems = ITEM_JetpackFuel.m_name; break; default: return ""; // doesn't use ammo } return sprintf(_(" with %d %s"), f2, ammoitems); diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc index 6a53e57c26..cbb54cd26e 100644 --- a/qcsrc/common/physics/movetypes/movetypes.qc +++ b/qcsrc/common/physics/movetypes/movetypes.qc @@ -540,7 +540,7 @@ void _Movetype_Physics_Frame(entity this, float movedt) { case MOVETYPE_PUSH: case MOVETYPE_FAKEPUSH: - LOG_DEBUGF("Physics: Lacking QuakeC support for Push movetype, FIX ME by using engine physics!"); + LOG_DEBUG("Physics: Lacking QuakeC support for Push movetype, FIX ME by using engine physics!"); break; case MOVETYPE_NONE: break; @@ -582,7 +582,7 @@ void _Movetype_Physics_ClientFrame(entity this, float movedt) { case MOVETYPE_PUSH: case MOVETYPE_FAKEPUSH: - LOG_DEBUGF("Physics: Lacking QuakeC support for Push movetype, FIX ME by using engine physics!"); + LOG_DEBUG("Physics: Lacking QuakeC support for Push movetype, FIX ME by using engine physics!"); break; case MOVETYPE_NONE: break; diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc index 87d456c018..acef8c97ad 100644 --- a/qcsrc/common/physics/player.qc +++ b/qcsrc/common/physics/player.qc @@ -132,7 +132,7 @@ void PM_ClientMovement_UpdateStatus(entity this) //do_crouch = false; } else if (PHYS_INVEHICLE(this)) { do_crouch = false; - } else if (STAT(FROZEN, this)) { + } else if (STAT(FROZEN, this) || IS_DEAD(this)) { do_crouch = false; } @@ -799,7 +799,7 @@ void PM_jetpack(entity this, float maxspd_mod, float dt) #ifdef SVQC if (!(ITEMS_STAT(this) & IT_UNLIMITED_WEAPON_AMMO)) - TakeResource(this, RESOURCE_FUEL, PHYS_JETPACK_FUEL(this) * dt * fvel * f); + TakeResource(this, RES_FUEL, PHYS_JETPACK_FUEL(this) * dt * fvel * f); ITEMS_STAT(this) |= IT_USING_JETPACK; diff --git a/qcsrc/common/resources.qh b/qcsrc/common/resources.qh index 8e33c649b3..81f4eb54a4 100644 --- a/qcsrc/common/resources.qh +++ b/qcsrc/common/resources.qh @@ -6,19 +6,19 @@ /// \copyright GNU GPLv2 or any later version. /// \brief Unconditional maximum amount of resources the entity can have. -const int RESOURCE_AMOUNT_HARD_LIMIT = 999; -const int RESOURCE_LIMIT_NONE = -1; +const int RES_AMOUNT_HARD_LIMIT = 999; +const int RES_LIMIT_NONE = -1; /// \brief Describes the available resource types. enum { - RESOURCE_NONE, ///< Indicates the lack of resource. Use with caution. - RESOURCE_HEALTH, ///< Health. - RESOURCE_ARMOR, ///< Armor. - RESOURCE_SHELLS, ///< Shells (used by shotgun). - RESOURCE_BULLETS, ///< Bullets (used by machinegun, rifle, HMG) - RESOURCE_ROCKETS, ///< Rockets (used by mortar, hagar, devastator, etc). - RESOURCE_CELLS, ///< Cells (used by electro, crylink, vortex, etc) - RESOURCE_PLASMA, ///< Plasma (unused). - RESOURCE_FUEL ///< Fuel (used by jetpack). + RES_NONE, ///< Indicates the lack of resource. Use with caution. + RES_HEALTH, ///< Health. + RES_ARMOR, ///< Armor. + RES_SHELLS, ///< Shells (used by shotgun). + RES_BULLETS, ///< Bullets (used by machinegun, rifle, HMG) + RES_ROCKETS, ///< Rockets (used by mortar, hagar, devastator, etc). + RES_CELLS, ///< Cells (used by electro, crylink, vortex, etc) + RES_PLASMA, ///< Plasma (unused). + RES_FUEL ///< Fuel (used by jetpack). }; diff --git a/qcsrc/common/sounds/sound.qh b/qcsrc/common/sounds/sound.qh index 49cfb4488c..b3eb1ea861 100644 --- a/qcsrc/common/sounds/sound.qh +++ b/qcsrc/common/sounds/sound.qh @@ -41,11 +41,10 @@ const float VOL_MUFFLED = 0.35; #ifdef SVQC #define _sound(e, c, s, v, a) \ MACRO_BEGIN \ - { \ entity __e = e; \ if (sound_allowed(MSG_BROADCAST, __e)) \ sound7(__e, c, s, v, a, 0, 0); \ - } MACRO_END + MACRO_END #else #define _sound(e, c, s, v, a) sound7(e, c, s, v, a, 0, 0) #endif @@ -65,7 +64,6 @@ const float VOL_MUFFLED = 0.35; */ #define sound8(e, o, chan, samp, vol, atten, speed, sf) \ MACRO_BEGIN \ - { \ entity __e; \ int __chan = chan; \ string __samp = samp; \ @@ -90,7 +88,7 @@ const float VOL_MUFFLED = 0.35; setorigin(__e, old_origin); \ setsize(__e, old_mins, old_maxs); \ } \ - } MACRO_END + MACRO_END string _Sound_fixpath(string base) { diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index 9675816cc5..2bea084b20 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -717,43 +717,43 @@ void GiveRandomWeapons(entity receiver, int num_weapons, string weapon_names, return; } STAT(WEAPONS, receiver) |= RandomSelection_chosen_ent.m_wepset; - if (RandomSelection_chosen_ent.ammo_type == RESOURCE_NONE) + if (RandomSelection_chosen_ent.ammo_type == RES_NONE) { continue; } - if (GetResourceAmount(receiver, + if (GetResource(receiver, RandomSelection_chosen_ent.ammo_type) != 0) { continue; } GiveResource(receiver, RandomSelection_chosen_ent.ammo_type, - GetResourceAmount(ammo_entity, + GetResource(ammo_entity, RandomSelection_chosen_ent.ammo_type)); } } -float Item_GiveAmmoTo(entity item, entity player, int resource_type, float ammomax) +float Item_GiveAmmoTo(entity item, entity player, int res_type, float ammomax) { - float amount = GetResourceAmount(item, resource_type); + float amount = GetResource(item, res_type); if (amount == 0) { return false; } - float player_amount = GetResourceAmount(player, resource_type); + float player_amount = GetResource(player, res_type); if (item.spawnshieldtime) { if ((player_amount >= ammomax) && (item.pickup_anyway <= 0)) { return false; } - GiveOrTakeResourceWithLimit(player, resource_type, amount, ammomax); + GiveOrTakeResourceWithLimit(player, res_type, amount, ammomax); return true; } if (g_weapon_stay != 2) { return false; } - GiveOrTakeResourceWithLimit(player, resource_type, amount, min(amount, ammomax)); + GiveOrTakeResourceWithLimit(player, res_type, amount, min(amount, ammomax)); return true; } @@ -783,14 +783,14 @@ float Item_GiveTo(entity item, entity player) } } } - pickedup |= Item_GiveAmmoTo(item, player, RESOURCE_HEALTH, item.max_health); - pickedup |= Item_GiveAmmoTo(item, player, RESOURCE_ARMOR, item.max_armorvalue); - pickedup |= Item_GiveAmmoTo(item, player, RESOURCE_SHELLS, g_pickup_shells_max); - pickedup |= Item_GiveAmmoTo(item, player, RESOURCE_BULLETS, g_pickup_nails_max); - pickedup |= Item_GiveAmmoTo(item, player, RESOURCE_ROCKETS, g_pickup_rockets_max); - pickedup |= Item_GiveAmmoTo(item, player, RESOURCE_CELLS, g_pickup_cells_max); - pickedup |= Item_GiveAmmoTo(item, player, RESOURCE_PLASMA, g_pickup_plasma_max); - pickedup |= Item_GiveAmmoTo(item, player, RESOURCE_FUEL, g_pickup_fuel_max); + pickedup |= Item_GiveAmmoTo(item, player, RES_HEALTH, item.max_health); + pickedup |= Item_GiveAmmoTo(item, player, RES_ARMOR, item.max_armorvalue); + pickedup |= Item_GiveAmmoTo(item, player, RES_SHELLS, g_pickup_shells_max); + pickedup |= Item_GiveAmmoTo(item, player, RES_BULLETS, g_pickup_nails_max); + pickedup |= Item_GiveAmmoTo(item, player, RES_ROCKETS, g_pickup_rockets_max); + pickedup |= Item_GiveAmmoTo(item, player, RES_CELLS, g_pickup_cells_max); + pickedup |= Item_GiveAmmoTo(item, player, RES_PLASMA, g_pickup_plasma_max); + pickedup |= Item_GiveAmmoTo(item, player, RES_FUEL, g_pickup_fuel_max); if (item.itemdef.instanceOfWeaponPickup) { WepSet w; @@ -1075,12 +1075,12 @@ float ammo_pickupevalfunc(entity player, entity item) if(item.itemdef.instanceOfWeaponPickup) { entity ammo = NULL; - if(GetResourceAmount(item, RESOURCE_SHELLS)) { need_shells = true; ammo = ITEM_Shells; } - else if(GetResourceAmount(item, RESOURCE_BULLETS)) { need_nails = true; ammo = ITEM_Bullets; } - else if(GetResourceAmount(item, RESOURCE_ROCKETS)) { need_rockets = true; ammo = ITEM_Rockets; } - else if(GetResourceAmount(item, RESOURCE_CELLS)) { need_cells = true; ammo = ITEM_Cells; } - else if(GetResourceAmount(item, RESOURCE_PLASMA)) { need_plasma = true; ammo = ITEM_Plasma; } - else if(GetResourceAmount(item, RESOURCE_FUEL)) { need_fuel = true; ammo = ITEM_JetpackFuel; } + if(GetResource(item, RES_SHELLS)) { need_shells = true; ammo = ITEM_Shells; } + else if(GetResource(item, RES_BULLETS)) { need_nails = true; ammo = ITEM_Bullets; } + else if(GetResource(item, RES_ROCKETS)) { need_rockets = true; ammo = ITEM_Rockets; } + else if(GetResource(item, RES_CELLS)) { need_cells = true; ammo = ITEM_Cells; } + else if(GetResource(item, RES_PLASMA)) { need_plasma = true; ammo = ITEM_Plasma; } + else if(GetResource(item, RES_FUEL)) { need_fuel = true; ammo = ITEM_JetpackFuel; } if(!ammo) return 0; @@ -1095,12 +1095,12 @@ float ammo_pickupevalfunc(entity player, entity item) switch(it.ammo_type) { - case RESOURCE_SHELLS: need_shells = true; break; - case RESOURCE_BULLETS: need_nails = true; break; - case RESOURCE_ROCKETS: need_rockets = true; break; - case RESOURCE_CELLS: need_cells = true; break; - case RESOURCE_PLASMA: need_plasma = true; break; - case RESOURCE_FUEL: need_fuel = true; break; + case RES_SHELLS: need_shells = true; break; + case RES_BULLETS: need_nails = true; break; + case RES_ROCKETS: need_rockets = true; break; + case RES_CELLS: need_cells = true; break; + case RES_PLASMA: need_plasma = true; break; + case RES_FUEL: need_fuel = true; break; } }); rating = item.bot_pickupbasevalue; @@ -1108,23 +1108,23 @@ float ammo_pickupevalfunc(entity player, entity item) float noammorating = 0.5; - if ((need_shells) && GetResourceAmount(item, RESOURCE_SHELLS) && (GetResourceAmount(player, RESOURCE_SHELLS) < g_pickup_shells_max)) - c = GetResourceAmount(item, RESOURCE_SHELLS) / max(noammorating, GetResourceAmount(player, RESOURCE_SHELLS)); + if ((need_shells) && GetResource(item, RES_SHELLS) && (GetResource(player, RES_SHELLS) < g_pickup_shells_max)) + c = GetResource(item, RES_SHELLS) / max(noammorating, GetResource(player, RES_SHELLS)); - if ((need_nails) && GetResourceAmount(item, RESOURCE_BULLETS) && (GetResourceAmount(player, RESOURCE_BULLETS) < g_pickup_nails_max)) - c = GetResourceAmount(item, RESOURCE_BULLETS) / max(noammorating, GetResourceAmount(player, RESOURCE_BULLETS)); + if ((need_nails) && GetResource(item, RES_BULLETS) && (GetResource(player, RES_BULLETS) < g_pickup_nails_max)) + c = GetResource(item, RES_BULLETS) / max(noammorating, GetResource(player, RES_BULLETS)); - if ((need_rockets) && GetResourceAmount(item, RESOURCE_ROCKETS) && (GetResourceAmount(player, RESOURCE_ROCKETS) < g_pickup_rockets_max)) - c = GetResourceAmount(item, RESOURCE_ROCKETS) / max(noammorating, GetResourceAmount(player, RESOURCE_ROCKETS)); + if ((need_rockets) && GetResource(item, RES_ROCKETS) && (GetResource(player, RES_ROCKETS) < g_pickup_rockets_max)) + c = GetResource(item, RES_ROCKETS) / max(noammorating, GetResource(player, RES_ROCKETS)); - if ((need_cells) && GetResourceAmount(item, RESOURCE_CELLS) && (GetResourceAmount(player, RESOURCE_CELLS) < g_pickup_cells_max)) - c = GetResourceAmount(item, RESOURCE_CELLS) / max(noammorating, GetResourceAmount(player, RESOURCE_CELLS)); + if ((need_cells) && GetResource(item, RES_CELLS) && (GetResource(player, RES_CELLS) < g_pickup_cells_max)) + c = GetResource(item, RES_CELLS) / max(noammorating, GetResource(player, RES_CELLS)); - if ((need_plasma) && GetResourceAmount(item, RESOURCE_PLASMA) && (GetResourceAmount(player, RESOURCE_PLASMA) < g_pickup_plasma_max)) - c = GetResourceAmount(item, RESOURCE_PLASMA) / max(noammorating, GetResourceAmount(player, RESOURCE_PLASMA)); + if ((need_plasma) && GetResource(item, RES_PLASMA) && (GetResource(player, RES_PLASMA) < g_pickup_plasma_max)) + c = GetResource(item, RES_PLASMA) / max(noammorating, GetResource(player, RES_PLASMA)); - if ((need_fuel) && GetResourceAmount(item, RESOURCE_FUEL) && (GetResourceAmount(player, RESOURCE_FUEL) < g_pickup_fuel_max)) - c = GetResourceAmount(item, RESOURCE_FUEL) / max(noammorating, GetResourceAmount(player, RESOURCE_FUEL)); + if ((need_fuel) && GetResource(item, RES_FUEL) && (GetResource(player, RES_FUEL) < g_pickup_fuel_max)) + c = GetResource(item, RES_FUEL) / max(noammorating, GetResource(player, RES_FUEL)); rating *= min(c, 2); if(wpn) @@ -1137,8 +1137,8 @@ float healtharmor_pickupevalfunc(entity player, entity item) float c = 0; float rating = item.bot_pickupbasevalue; - float itemarmor = GetResourceAmount(item, RESOURCE_ARMOR); - float itemhealth = GetResourceAmount(item, RESOURCE_HEALTH); + float itemarmor = GetResource(item, RES_ARMOR); + float itemhealth = GetResource(item, RES_HEALTH); if(item.item_group) { @@ -1146,11 +1146,11 @@ float healtharmor_pickupevalfunc(entity player, entity item) itemhealth *= min(4, item.item_group_count); } - if (itemarmor && (GetResourceAmount(player, RESOURCE_ARMOR) < item.max_armorvalue)) - c = itemarmor / max(1, GetResourceAmount(player, RESOURCE_ARMOR) * 2/3 + GetResourceAmount(player, RESOURCE_HEALTH) * 1/3); + if (itemarmor && (GetResource(player, RES_ARMOR) < item.max_armorvalue)) + c = itemarmor / max(1, GetResource(player, RES_ARMOR) * 2/3 + GetResource(player, RES_HEALTH) * 1/3); - if (itemhealth && (GetResourceAmount(player, RESOURCE_HEALTH) < item.max_health)) - c = itemhealth / max(1, GetResourceAmount(player, RESOURCE_HEALTH)); + if (itemhealth && (GetResource(player, RES_HEALTH) < item.max_health)) + c = itemhealth / max(1, GetResource(player, RES_HEALTH)); rating *= min(2, c); return rating; @@ -1339,7 +1339,7 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default if(def.instanceOfPowerup) this.ItemStatus |= ITS_ANIMATE1; - if(GetResourceAmount(this, RESOURCE_ARMOR) || GetResourceAmount(this, RESOURCE_HEALTH)) + if(GetResource(this, RES_ARMOR) || GetResource(this, RES_HEALTH)) this.ItemStatus |= ITS_ANIMATE2; } @@ -1559,14 +1559,14 @@ spawnfunc(target_items) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, this.superweapons_finished * boolean(this.items & IT_SUPERWEAPON), "superweapons"); this.netname = sprintf("%s %s%d %s", this.netname, itemprefix, boolean(this.items & ITEM_Jetpack.m_itemid), "jetpack"); this.netname = sprintf("%s %s%d %s", this.netname, itemprefix, boolean(this.items & ITEM_JetpackRegen.m_itemid), "fuel_regen"); - if(GetResourceAmount(this, RESOURCE_SHELLS) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResourceAmount(this, RESOURCE_SHELLS)), "shells"); - if(GetResourceAmount(this, RESOURCE_BULLETS) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResourceAmount(this, RESOURCE_BULLETS)), "nails"); - if(GetResourceAmount(this, RESOURCE_ROCKETS) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResourceAmount(this, RESOURCE_ROCKETS)), "rockets"); - if(GetResourceAmount(this, RESOURCE_CELLS) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResourceAmount(this, RESOURCE_CELLS)), "cells"); - if(GetResourceAmount(this, RESOURCE_PLASMA) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResourceAmount(this, RESOURCE_PLASMA)), "plasma"); - if(GetResourceAmount(this, RESOURCE_FUEL) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResourceAmount(this, RESOURCE_FUEL)), "fuel"); - if(GetResourceAmount(this, RESOURCE_HEALTH) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResourceAmount(this, RESOURCE_HEALTH)), "health"); - if(GetResourceAmount(this, RESOURCE_ARMOR) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResourceAmount(this, RESOURCE_ARMOR)), "armor"); + if(GetResource(this, RES_SHELLS) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_SHELLS)), "shells"); + if(GetResource(this, RES_BULLETS) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_BULLETS)), "nails"); + if(GetResource(this, RES_ROCKETS) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_ROCKETS)), "rockets"); + if(GetResource(this, RES_CELLS) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_CELLS)), "cells"); + if(GetResource(this, RES_PLASMA) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_PLASMA)), "plasma"); + if(GetResource(this, RES_FUEL) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_FUEL)), "fuel"); + if(GetResource(this, RES_HEALTH) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_HEALTH)), "health"); + if(GetResource(this, RES_ARMOR) != 0) this.netname = sprintf("%s %s%d %s", this.netname, valueprefix, max(0, GetResource(this, RES_ARMOR)), "armor"); FOREACH(Buffs, it != BUFF_Null, this.netname = sprintf("%s %s%d %s", this.netname, itemprefix, !!(STAT(BUFFS, this) & (it.m_itemid)), it.m_name)); FOREACH(Weapons, it != WEP_Null, this.netname = sprintf("%s %s%d %s", this.netname, itemprefix, !!(STAT(WEAPONS, this) & (it.m_wepset)), it.netname)); } @@ -1666,28 +1666,19 @@ void GiveRot(entity e, float v0, float v1, .float rotfield, float rottime, .floa else if(v0 > v1) e.(regenfield) = max(e.(regenfield), time + regentime); } -bool GiveResourceValue(entity e, int resource_type, int op, int val) +bool GiveResourceValue(entity e, int res_type, int op, int val) { - int v0 = GetResourceAmount(e, resource_type); + int v0 = GetResource(e, res_type); switch (op) { - case OP_SET: - SetResourceAmount(e, resource_type, val); - break; - case OP_MIN: - SetResourceAmount(e, resource_type, max(v0, val)); // min 100 cells = at least 100 cells - break; - case OP_MAX: - SetResourceAmount(e, resource_type, min(v0, val)); - break; - case OP_PLUS: - SetResourceAmount(e, resource_type, v0 + val); - break; - case OP_MINUS: - SetResourceAmount(e, resource_type, v0 - val); - break; + // min 100 cells = at least 100 cells + case OP_SET: SetResource(e, res_type, val); break; + case OP_MIN: SetResource(e, res_type, max(v0, val)); break; + case OP_MAX: SetResource(e, res_type, min(v0, val)); break; + case OP_PLUS: SetResource(e, res_type, v0 + val); break; + case OP_MINUS: SetResource(e, res_type, v0 - val); break; } - int v1 = GetResourceAmount(e, resource_type); + int v1 = GetResource(e, res_type); return v0 != v1; } @@ -1723,14 +1714,14 @@ float GiveItems(entity e, float beginarg, float endarg) PREGIVE(e, strength_finished); PREGIVE(e, invincible_finished); PREGIVE(e, superweapons_finished); - PREGIVE_RESOURCE(e, RESOURCE_BULLETS); - PREGIVE_RESOURCE(e, RESOURCE_CELLS); - PREGIVE_RESOURCE(e, RESOURCE_PLASMA); - PREGIVE_RESOURCE(e, RESOURCE_SHELLS); - PREGIVE_RESOURCE(e, RESOURCE_ROCKETS); - PREGIVE_RESOURCE(e, RESOURCE_FUEL); - PREGIVE_RESOURCE(e, RESOURCE_ARMOR); - PREGIVE_RESOURCE(e, RESOURCE_HEALTH); + PREGIVE_RESOURCE(e, RES_BULLETS); + PREGIVE_RESOURCE(e, RES_CELLS); + PREGIVE_RESOURCE(e, RES_PLASMA); + PREGIVE_RESOURCE(e, RES_SHELLS); + PREGIVE_RESOURCE(e, RES_ROCKETS); + PREGIVE_RESOURCE(e, RES_FUEL); + PREGIVE_RESOURCE(e, RES_ARMOR); + PREGIVE_RESOURCE(e, RES_HEALTH); for(i = beginarg; i < endarg; ++i) { @@ -1767,19 +1758,19 @@ float GiveItems(entity e, float beginarg, float endarg) got += GiveBit(e, items, IT_UNLIMITED_AMMO, op, val); case "all": got += GiveBit(e, items, ITEM_Jetpack.m_itemid, op, val); - got += GiveResourceValue(e, RESOURCE_HEALTH, op, val); - got += GiveResourceValue(e, RESOURCE_ARMOR, op, val); + got += GiveResourceValue(e, RES_HEALTH, op, val); + got += GiveResourceValue(e, RES_ARMOR, op, val); case "allweapons": FOREACH(Weapons, it != WEP_Null && !(it.spawnflags & WEP_FLAG_MUTATORBLOCKED), got += GiveWeapon(e, it.m_id, op, val)); //case "allbuffs": // all buffs makes a player god, do not want! //FOREACH(Buffs, it != BUFF_Null, got += GiveBuff(e, it.m_itemid, op, val)); case "allammo": - got += GiveResourceValue(e, RESOURCE_CELLS, op, val); - got += GiveResourceValue(e, RESOURCE_PLASMA, op, val); - got += GiveResourceValue(e, RESOURCE_SHELLS, op, val); - got += GiveResourceValue(e, RESOURCE_BULLETS, op, val); - got += GiveResourceValue(e, RESOURCE_ROCKETS, op, val); - got += GiveResourceValue(e, RESOURCE_FUEL, op, val); + got += GiveResourceValue(e, RES_CELLS, op, val); + got += GiveResourceValue(e, RES_PLASMA, op, val); + got += GiveResourceValue(e, RES_SHELLS, op, val); + got += GiveResourceValue(e, RES_BULLETS, op, val); + got += GiveResourceValue(e, RES_ROCKETS, op, val); + got += GiveResourceValue(e, RES_FUEL, op, val); break; case "unlimited_ammo": got += GiveBit(e, items, IT_UNLIMITED_AMMO, op, val); @@ -1806,29 +1797,29 @@ float GiveItems(entity e, float beginarg, float endarg) got += GiveValue(e, superweapons_finished, op, val); break; case "cells": - got += GiveResourceValue(e, RESOURCE_CELLS, op, val); + got += GiveResourceValue(e, RES_CELLS, op, val); break; case "plasma": - got += GiveResourceValue(e, RESOURCE_PLASMA, op, val); + got += GiveResourceValue(e, RES_PLASMA, op, val); break; case "shells": - got += GiveResourceValue(e, RESOURCE_SHELLS, op, val); + got += GiveResourceValue(e, RES_SHELLS, op, val); break; case "nails": case "bullets": - got += GiveResourceValue(e, RESOURCE_BULLETS, op, val); + got += GiveResourceValue(e, RES_BULLETS, op, val); break; case "rockets": - got += GiveResourceValue(e, RESOURCE_ROCKETS, op, val); + got += GiveResourceValue(e, RES_ROCKETS, op, val); break; case "health": - got += GiveResourceValue(e, RESOURCE_HEALTH, op, val); + got += GiveResourceValue(e, RES_HEALTH, op, val); break; case "armor": - got += GiveResourceValue(e, RESOURCE_ARMOR, op, val); + got += GiveResourceValue(e, RES_ARMOR, op, val); break; case "fuel": - got += GiveResourceValue(e, RESOURCE_FUEL, op, val); + got += GiveResourceValue(e, RES_FUEL, op, val); break; default: FOREACH(Buffs, it != BUFF_Null && Buff_UndeprecateName(cmd) == it.m_name, @@ -1859,14 +1850,14 @@ float GiveItems(entity e, float beginarg, float endarg) POSTGIVE_VALUE(e, strength_finished, 1, SND_POWERUP, SND_POWEROFF); POSTGIVE_VALUE(e, invincible_finished, 1, SND_Shield, SND_POWEROFF); //POSTGIVE_VALUE(e, superweapons_finished, 1, SND_Null, SND_Null); - POSTGIVE_RESOURCE(e, RESOURCE_BULLETS, 0, SND_ITEMPICKUP, SND_Null); - POSTGIVE_RESOURCE(e, RESOURCE_CELLS, 0, SND_ITEMPICKUP, SND_Null); - POSTGIVE_RESOURCE(e, RESOURCE_PLASMA, 0, SND_ITEMPICKUP, SND_Null); - POSTGIVE_RESOURCE(e, RESOURCE_SHELLS, 0, SND_ITEMPICKUP, SND_Null); - POSTGIVE_RESOURCE(e, RESOURCE_ROCKETS, 0, SND_ITEMPICKUP, SND_Null); - POSTGIVE_RESOURCE_ROT(e, RESOURCE_FUEL, 1, pauserotfuel_finished, autocvar_g_balance_pause_fuel_rot, pauseregen_finished, autocvar_g_balance_pause_fuel_regen, SND_ITEMPICKUP, SND_Null); - POSTGIVE_RESOURCE_ROT(e, RESOURCE_ARMOR, 1, pauserotarmor_finished, autocvar_g_balance_pause_armor_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, SND_ARMOR25, SND_Null); - POSTGIVE_RESOURCE_ROT(e, RESOURCE_HEALTH, 1, pauserothealth_finished, autocvar_g_balance_pause_health_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, SND_MEGAHEALTH, SND_Null); + POSTGIVE_RESOURCE(e, RES_BULLETS, 0, SND_ITEMPICKUP, SND_Null); + POSTGIVE_RESOURCE(e, RES_CELLS, 0, SND_ITEMPICKUP, SND_Null); + POSTGIVE_RESOURCE(e, RES_PLASMA, 0, SND_ITEMPICKUP, SND_Null); + POSTGIVE_RESOURCE(e, RES_SHELLS, 0, SND_ITEMPICKUP, SND_Null); + POSTGIVE_RESOURCE(e, RES_ROCKETS, 0, SND_ITEMPICKUP, SND_Null); + POSTGIVE_RES_ROT(e, RES_FUEL, 1, pauserotfuel_finished, autocvar_g_balance_pause_fuel_rot, pauseregen_finished, autocvar_g_balance_pause_fuel_regen, SND_ITEMPICKUP, SND_Null); + POSTGIVE_RES_ROT(e, RES_ARMOR, 1, pauserotarmor_finished, autocvar_g_balance_pause_armor_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, SND_ARMOR25, SND_Null); + POSTGIVE_RES_ROT(e, RES_HEALTH, 1, pauserothealth_finished, autocvar_g_balance_pause_health_rot, pauseregen_finished, autocvar_g_balance_pause_health_regen, SND_MEGAHEALTH, SND_Null); if(e.superweapons_finished <= 0) if(STAT(WEAPONS, e) & WEPSET_SUPERWEAPONS) diff --git a/qcsrc/common/t_items.qh b/qcsrc/common/t_items.qh index 4d3f453800..f03d3d4870 100644 --- a/qcsrc/common/t_items.qh +++ b/qcsrc/common/t_items.qh @@ -82,7 +82,7 @@ void Item_ScheduleInitialRespawn(entity e); void GiveRandomWeapons(entity receiver, int num_weapons, string weapon_names, entity ammo_entity); -float Item_GiveAmmoTo(entity item, entity player, int resource_type, float ammomax); +float Item_GiveAmmoTo(entity item, entity player, int res_type, float ammomax); float Item_GiveTo(entity item, entity player); @@ -128,11 +128,11 @@ spawnfunc(target_items); #define PREGIVE_WEAPONS(e) WepSet save_weapons; save_weapons = STAT(WEAPONS, e) #define PREGIVE(e,f) float save_##f; save_##f = (e).f -#define PREGIVE_RESOURCE(e,f) float save_##f = GetResourceAmount((e), (f)) +#define PREGIVE_RESOURCE(e,f) float save_##f = GetResource((e), (f)) #define POSTGIVE_WEAPON(e,b,snd_incr,snd_decr) GiveSound((e), !!(save_weapons & WepSet_FromWeapon(b)), !!(STAT(WEAPONS, e) & WepSet_FromWeapon(b)), 0, snd_incr, snd_decr) #define POSTGIVE_BIT(e,f,b,snd_incr,snd_decr) GiveSound((e), save_##f & (b), (e).f & (b), 0, snd_incr, snd_decr) -#define POSTGIVE_RESOURCE(e,f,t,snd_incr,snd_decr) GiveSound((e), save_##f, GetResourceAmount((e), (f)), t, snd_incr, snd_decr) -#define POSTGIVE_RESOURCE_ROT(e,f,t,rotfield,rottime,regenfield,regentime,snd_incr,snd_decr) GiveRot((e),save_##f,GetResourceAmount((e),(f)),rotfield,rottime,regenfield,regentime);GiveSound((e),save_##f,GetResourceAmount((e),(f)),t,snd_incr,snd_decr) +#define POSTGIVE_RESOURCE(e,f,t,snd_incr,snd_decr) GiveSound((e), save_##f, GetResource((e), (f)), t, snd_incr, snd_decr) +#define POSTGIVE_RES_ROT(e,f,t,rotfield,rottime,regenfield,regentime,snd_incr,snd_decr) GiveRot((e),save_##f,GetResource((e),(f)),rotfield,rottime,regenfield,regentime);GiveSound((e),save_##f,GetResource((e),(f)),t,snd_incr,snd_decr) #define POSTGIVE_VALUE(e,f,t,snd_incr,snd_decr) GiveSound((e), save_##f, (e).f, t, snd_incr, snd_decr) #define POSTGIVE_VALUE_ROT(e,f,t,rotfield,rottime,regenfield,regentime,snd_incr,snd_decr) GiveRot((e), save_##f, (e).f, rotfield, rottime, regenfield, regentime); GiveSound((e), save_##f, (e).f, t, snd_incr, snd_decr) diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc index 6cdda51039..f9374497c8 100644 --- a/qcsrc/common/turrets/cl_turrets.qc +++ b/qcsrc/common/turrets/cl_turrets.qc @@ -37,7 +37,7 @@ void turret_draw(entity this) this.tur_head.angles += dt * this.tur_head.avelocity; - if (GetResourceAmount(this, RESOURCE_HEALTH) < 127) + if (GetResource(this, RES_HEALTH) < 127) { dt = random(); @@ -45,11 +45,11 @@ void turret_draw(entity this) te_spark(this.origin + '0 0 40', randomvec() * 256 + '0 0 256', 16); } - if(GetResourceAmount(this, RESOURCE_HEALTH) < 85) + if(GetResource(this, RES_HEALTH) < 85) if(dt < 0.01) pointparticles(EFFECT_SMOKE_LARGE, (this.origin + (randomvec() * 80)), '0 0 0', 1); - if(GetResourceAmount(this, RESOURCE_HEALTH) < 32) + if(GetResource(this, RES_HEALTH) < 32) if(dt < 0.015) pointparticles(EFFECT_SMOKE_SMALL, (this.origin + (randomvec() * 80)), '0 0 0', 1); @@ -183,7 +183,7 @@ void turret_draw2d(entity this) drawhealthbar( o, 0, - GetResourceAmount(this, RESOURCE_HEALTH) / 255, + GetResource(this, RES_HEALTH) / 255, '0 0 0', '0 0 0', 0.5 * SPRITE_HEALTHBAR_WIDTH * t, @@ -224,7 +224,7 @@ void turret_construct(entity this, bool isnew) set_movetype(this.tur_head, MOVETYPE_NOCLIP); set_movetype(this, MOVETYPE_NOCLIP); this.tur_head.angles = this.angles; - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 255); + SetResourceExplicit(this, RES_HEALTH, 255); this.solid = SOLID_BBOX; this.tur_head.solid = SOLID_NOT; set_movetype(this, MOVETYPE_NOCLIP); @@ -425,7 +425,7 @@ NET_HANDLE(ENT_CLIENT_TURRET, bool isnew) } _tmp = ReadByte(); - float myhp = GetResourceAmount(this, RESOURCE_HEALTH); + float myhp = GetResource(this, RES_HEALTH); if(_tmp == 0 && myhp != 0) turret_die(this); else if(myhp && myhp > _tmp) @@ -433,7 +433,7 @@ NET_HANDLE(ENT_CLIENT_TURRET, bool isnew) else if(myhp && myhp < _tmp) this.helpme = 0; // we're being healed, don't spam help me waypoints - SetResourceAmountExplicit(this, RESOURCE_HEALTH, _tmp); + SetResourceExplicit(this, RES_HEALTH, _tmp); } return true; } diff --git a/qcsrc/common/turrets/config.qc b/qcsrc/common/turrets/config.qc index effabeac27..d1a980d76e 100644 --- a/qcsrc/common/turrets/config.qc +++ b/qcsrc/common/turrets/config.qc @@ -30,6 +30,7 @@ float T_Config_Queue_Compare(float root, float child, entity pass) void Dump_Turret_Settings() { + #define TUR_CONFIG_WRITETOFILE(str) write_String_To_File(tur_config_file, str, tur_config_alsoprint) int totalsettings = 0; FOREACH(Turrets, it != TUR_Null, { // step 1: clear the queue @@ -44,15 +45,16 @@ void Dump_Turret_Settings() heapsort(TUR_CONFIG_COUNT, T_Config_Queue_Swap, T_Config_Queue_Compare, NULL); // step 4: write queue - TUR_CONFIG_WRITETOFILE(sprintf("// {{{ #%d: %s\n", i, it.turret_name)) + TUR_CONFIG_WRITETOFILE(sprintf("// {{{ #%d: %s\n", i, it.turret_name)); for(int j = 0; j <= TUR_CONFIG_COUNT; ++j) - TUR_CONFIG_WRITETOFILE(config_queue[j]) - TUR_CONFIG_WRITETOFILE("// }}}\n") + TUR_CONFIG_WRITETOFILE(config_queue[j]); + TUR_CONFIG_WRITETOFILE("// }}}\n"); // step 5: debug info LOG_INFOF("#%d: %s: %d settings...", i, it.turret_name, TUR_CONFIG_COUNT); totalsettings += TUR_CONFIG_COUNT; }); + #undef TUR_CONFIG_WRITETOFILE // clear queue now that we're finished TUR_CONFIG_COUNT = 0; diff --git a/qcsrc/common/turrets/config.qh b/qcsrc/common/turrets/config.qh index ac09e9e372..ad9c3846f9 100644 --- a/qcsrc/common/turrets/config.qh +++ b/qcsrc/common/turrets/config.qh @@ -7,9 +7,6 @@ float tur_config_file; float tur_config_alsoprint; float TUR_CONFIG_COUNT; -#define TUR_CONFIG_WRITETOFILE(a) { \ - fputs(tur_config_file, a); \ - if(tur_config_alsoprint) { LOG_INFO(a); } } #endif diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc index 37fb5f0d52..09eed0ea59 100644 --- a/qcsrc/common/turrets/sv_turrets.qc +++ b/qcsrc/common/turrets/sv_turrets.qc @@ -185,7 +185,7 @@ void turret_die(entity this) this.event_heal = func_null; this.takedamage = DAMAGE_NO; - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 0); + SetResourceExplicit(this, RES_HEALTH, 0); // Go boom //RadiusDamage (this,this, min(this.ammo,50),min(this.ammo,50) * 0.25,250,NULL,min(this.ammo,50)*5,DEATH_TURRET,NULL); @@ -231,7 +231,7 @@ void turret_damage(entity this, entity inflictor, entity attacker, float damage, return; } - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); // thorw head slightly off aim when hit? if (this.damage_flags & TFL_DMG_HEADSHAKE) @@ -245,7 +245,7 @@ void turret_damage(entity this, entity inflictor, entity attacker, float damage, if (this.turret_flags & TUR_FLAG_MOVE) this.velocity = this.velocity + vforce; - if (GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if (GetResource(this, RES_HEALTH) <= 0) { this.event_damage = func_null; this.tur_head.event_damage = func_null; @@ -261,11 +261,11 @@ void turret_damage(entity this, entity inflictor, entity attacker, float damage, bool turret_heal(entity targ, entity inflictor, float amount, float limit) { - float true_limit = ((limit != RESOURCE_LIMIT_NONE) ? limit : targ.max_health); - if(GetResourceAmount(targ, RESOURCE_HEALTH) <= 0 || GetResourceAmount(targ, RESOURCE_HEALTH) >= true_limit) + float true_limit = ((limit != RES_LIMIT_NONE) ? limit : targ.max_health); + if(GetResource(targ, RES_HEALTH) <= 0 || GetResource(targ, RES_HEALTH) >= true_limit) return false; - GiveResourceWithLimit(targ, RESOURCE_HEALTH, amount, true_limit); + GiveResourceWithLimit(targ, RES_HEALTH, amount, true_limit); targ.SendFlags |= TNSF_STATUS; return true; } @@ -286,7 +286,7 @@ void turret_respawn(entity this) this.avelocity = '0 0 0'; this.tur_head.avelocity = this.avelocity; this.tur_head.angles = this.idle_aim; - SetResourceAmountExplicit(this, RESOURCE_HEALTH, this.max_health); + SetResourceExplicit(this, RES_HEALTH, this.max_health); this.enemy = NULL; this.volly_counter = this.shot_volly; this.ammo = this.ammo_max; @@ -365,10 +365,10 @@ bool turret_send(entity this, entity to, float sf) { WriteByte(MSG_ENTITY, this.team); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) WriteByte(MSG_ENTITY, 0); else - WriteByte(MSG_ENTITY, ceil((GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health) * 255)); + WriteByte(MSG_ENTITY, ceil((GetResource(this, RES_HEALTH) / this.max_health) * 255)); } return true; @@ -399,7 +399,7 @@ void load_unit_settings(entity ent, bool is_reload) ent.tur_head.angles = '0 0 0'; } - SetResourceAmountExplicit(ent, RESOURCE_HEALTH, cvar(strcat(sbase,"_health")) * ent.turret_scale_health); + SetResourceExplicit(ent, RES_HEALTH, cvar(strcat(sbase,"_health")) * ent.turret_scale_health); ent.respawntime = cvar(strcat(sbase,"_respawntime")) * ent.turret_scale_respawn; ent.shot_dmg = cvar(strcat(sbase,"_shot_dmg")) * ent.turret_scale_damage; @@ -466,9 +466,9 @@ void turret_projectile_touch(entity this, entity toucher) void turret_projectile_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector vforce) { this.velocity += vforce; - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); //this.realowner = attacker; // Dont change realowner, it does not make much sense for turrets - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) W_PrepareExplosionByDamage(this, this.owner, turret_projectile_explode); } @@ -498,7 +498,7 @@ entity turret_projectile(entity actor, Sound _snd, float _size, float _health, f PROJECTILE_MAKETRIGGER(proj); if(_health) { - SetResourceAmountExplicit(proj, RESOURCE_HEALTH, _health); + SetResourceExplicit(proj, RES_HEALTH, _health); proj.takedamage = DAMAGE_YES; proj.event_damage = turret_projectile_damage; } @@ -731,7 +731,7 @@ float turret_validate_target(entity e_turret, entity e_target, float validate_fl return -5; // Cant touch this - if (GetResourceAmount(e_target, RESOURCE_HEALTH) <= 0) + if (GetResource(e_target, RES_HEALTH) <= 0) return -6; else if (STAT(FROZEN, e_target)) return -6; @@ -961,10 +961,11 @@ bool turret_firecheck(entity this) { // To close? if (this.tur_dist_aimpos < this.target_range_min) + { if(turret_validate_target(this, this.tur_impactent, this.target_validate_flags) > 0) return true; // Target of opertunity? - else - return false; + return false; + } } // Try to avoid FF? @@ -1310,7 +1311,7 @@ bool turret_initialize(entity this, Turret tur) if(!this.team || !teamplay) { this.team = FLOAT_MAX; } if(!this.ticrate) { this.ticrate = ((this.turret_flags & TUR_FLAG_SUPPORT) ? 0.2 : 0.1); } - if(!GetResourceAmount(this, RESOURCE_HEALTH)) { SetResourceAmountExplicit(this, RESOURCE_HEALTH, 1000); } + if(!GetResource(this, RES_HEALTH)) { SetResourceExplicit(this, RES_HEALTH, 1000); } if(!this.shot_refire) { this.shot_refire = 1; } if(!this.tur_shotorg) { this.tur_shotorg = '50 0 50'; } if(!this.turret_flags) { this.turret_flags = TUR_FLAG_SPLASH | TUR_FLAG_MEDPROJ | TUR_FLAG_PLAYER; } @@ -1367,7 +1368,7 @@ bool turret_initialize(entity this, Turret tur) this.effects = EF_NODRAW; this.netname = tur.turret_name; this.ticrate = bound(sys_frametime, this.ticrate, 60); - this.max_health = GetResourceAmount(this, RESOURCE_HEALTH); + this.max_health = GetResource(this, RES_HEALTH); this.target_validate_flags = this.target_select_flags; this.ammo = this.ammo_max; this.ammo_recharge *= this.ticrate; diff --git a/qcsrc/common/turrets/turret/ewheel.qc b/qcsrc/common/turrets/turret/ewheel.qc index c0a0b177ee..90463697db 100644 --- a/qcsrc/common/turrets/turret/ewheel.qc +++ b/qcsrc/common/turrets/turret/ewheel.qc @@ -228,7 +228,7 @@ void ewheel_draw(entity this) setorigin(this, this.origin + this.velocity * dt); this.tur_head.angles += dt * this.tur_head.avelocity; - if(GetResourceAmount(this, RESOURCE_HEALTH) < 127) + if(GetResource(this, RES_HEALTH) < 127) if(random() < 0.05) te_spark(this.origin + '0 0 40', randomvec() * 256 + '0 0 256', 16); } diff --git a/qcsrc/common/turrets/turret/hk_weapon.qc b/qcsrc/common/turrets/turret/hk_weapon.qc index b68bfb7730..deb508bca2 100644 --- a/qcsrc/common/turrets/turret/hk_weapon.qc +++ b/qcsrc/common/turrets/turret/hk_weapon.qc @@ -251,7 +251,7 @@ bool hk_is_valid_target(entity this, entity proj, entity targ) return false; // Cant touch this - if ((targ.takedamage == DAMAGE_NO) || (GetResourceAmount(targ, RESOURCE_HEALTH) < 0)) + if ((targ.takedamage == DAMAGE_NO) || (GetResource(targ, RES_HEALTH) < 0)) return false; // player diff --git a/qcsrc/common/turrets/turret/walker.qc b/qcsrc/common/turrets/turret/walker.qc index 6aa0865e69..2718b1dc48 100644 --- a/qcsrc/common/turrets/turret/walker.qc +++ b/qcsrc/common/turrets/turret/walker.qc @@ -86,10 +86,10 @@ void walker_rocket_touch(entity this, entity toucher) void walker_rocket_damage(entity this, entity inflictor, entity attacker, float damage, float deathtype, .entity weaponentity, vector hitloc, vector vforce) { - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); this.velocity = this.velocity + vforce; - if (GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if (GetResource(this, RES_HEALTH) <= 0) W_PrepareExplosionByDamage(this, this.owner, walker_rocket_explode); } @@ -218,7 +218,7 @@ void walker_fire_rocket(entity this, vector org) rocket.bot_dodgerating = 50; rocket.takedamage = DAMAGE_YES; rocket.damageforcescale = 2; - SetResourceAmountExplicit(rocket, RESOURCE_HEALTH, 25); + SetResourceExplicit(rocket, RES_HEALTH, 25); rocket.tur_shotorg = randomvec() * 512; rocket.cnt = time + 1; rocket.enemy = this.enemy; @@ -629,7 +629,7 @@ void walker_draw(entity this) setorigin(this, this.origin + this.velocity * dt); this.tur_head.angles += dt * this.tur_head.avelocity; - if(GetResourceAmount(this, RESOURCE_HEALTH) < 127) + if(GetResource(this, RES_HEALTH) < 127) if(random() < 0.15) te_spark(this.origin + '0 0 40', randomvec() * 256 + '0 0 256', 16); } diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index a7e9c42104..74e337f749 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -217,7 +217,8 @@ void wordwrap_cb(string s, float l, void(string) callback) s = strzone(s); lleft = l; - for (i = 0;i < strlen(s);++i) + int len = strlen(s); + for (i = 0; i < len; ++i) { if (substring(s, i, 2) == "\\n") { @@ -235,12 +236,12 @@ void wordwrap_cb(string s, float l, void(string) callback) if (lleft > 0) { callback(" "); - lleft = lleft - 1; + --lleft; } } else { - for (j = i+1;j < strlen(s);++j) + for (j = i+1; j < len; ++j) // ^^ this skips over the first character of a word, which // is ALWAYS part of the word // this is safe since if i+1 == strlen(s), i will become @@ -268,7 +269,7 @@ void wordwrap_cb(string s, float l, void(string) callback) lleft = l; } callback(substring(s, i, wlen)); - lleft = lleft - wlen; + lleft -= wlen; i = j - 1; } } @@ -1304,6 +1305,13 @@ float matchacl(string acl, string str) return r; } +ERASEABLE +void write_String_To_File(int fh, string str, bool alsoprint) +{ + fputs(fh, str); + if (alsoprint) LOG_INFO(str); +} + string get_model_datafilename(string m, float sk, string fil) { if(m) diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index a1c0d6785f..d0a8ab86a1 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -135,6 +135,8 @@ string getcurrentmod(); float matchacl(string acl, string str); // matches str against ACL acl (with entries +foo*, +foo, +*foo, +*foo*, and same with - for forbidding) +void write_String_To_File(int fh, string str, bool alsoprint); + string get_model_datafilename(string mod, float skn, string fil); // skin -1 will return wildcard, mod string_null will also put wildcard there string get_model_parameters_modelname; float get_model_parameters_modelskin; diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc index be8d468fa7..9a85e11455 100644 --- a/qcsrc/common/vehicles/sv_vehicles.qc +++ b/qcsrc/common/vehicles/sv_vehicles.qc @@ -205,9 +205,9 @@ void vehicles_projectile_damage(entity this, entity inflictor, entity attacker, if(inflictor.owner == this.owner) return; - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); this.velocity += force; - if(GetResourceAmount(this, RESOURCE_HEALTH) < 1) + if(GetResource(this, RES_HEALTH) < 1) { this.takedamage = DAMAGE_NO; this.event_damage = func_null; @@ -282,7 +282,7 @@ entity vehicles_projectile(entity this, string _mzlfx, Sound _mzlsound, { proj.takedamage = DAMAGE_AIM; proj.event_damage = vehicles_projectile_damage; - SetResourceAmountExplicit(proj, RESOURCE_HEALTH, _health); + SetResourceExplicit(proj, RES_HEALTH, _health); } else proj.flags |= FL_NOTARGET; @@ -587,7 +587,7 @@ void vehicles_regen(entity this, float timer, .float regen_field, float field_ma if(timer + rpause < time) { if(_healthscale) - regen = regen * (GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health); + regen = regen * (GetResource(this, RES_HEALTH) / this.max_health); this.(regen_field) = min(this.(regen_field) + regen * delta_time, field_max); @@ -598,7 +598,7 @@ void vehicles_regen(entity this, float timer, .float regen_field, float field_ma void vehicles_regen_resource(entity this, float timer, .float regen_field, float field_max, float rpause, float regen, float delta_time, float _healthscale, int resource) { - float resource_amount = GetResourceAmount(this, resource); + float resource_amount = GetResource(this, resource); if(resource_amount < field_max) if(timer + rpause < time) @@ -606,10 +606,10 @@ void vehicles_regen_resource(entity this, float timer, .float regen_field, float if(_healthscale) regen = regen * (resource_amount / this.max_health); - SetResourceAmount(this, resource, min(resource_amount + regen * delta_time, field_max)); + SetResource(this, resource, min(resource_amount + regen * delta_time, field_max)); if(this.owner) - this.owner.(regen_field) = (GetResourceAmount(this, resource) / field_max) * 100; + this.owner.(regen_field) = (GetResource(this, resource) / field_max) * 100; } } @@ -630,7 +630,7 @@ void shieldhit_think(entity this) void vehicles_painframe(entity this) { - int myhealth = ((this.owner) ? this.owner.vehicle_health : ((GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health) * 100)); + int myhealth = ((this.owner) ? this.owner.vehicle_health : ((GetResource(this, RES_HEALTH) / this.max_health) * 100)); if(myhealth <= 50) if(this.pain_frame < time) @@ -643,10 +643,12 @@ void vehicles_painframe(entity this) this.velocity += randomvec() * 30; if(this.vehicle_flags & VHF_DMGROLL) + { if(this.vehicle_flags & VHF_DMGHEADROLL) this.tur_head.angles += randomvec(); else this.angles += randomvec(); + } } } @@ -701,7 +703,7 @@ void vehicles_damage(entity this, entity inflictor, entity attacker, float damag if(this.vehicle_shield < 0) { - TakeResource(this, RESOURCE_HEALTH, fabs(this.vehicle_shield)); + TakeResource(this, RES_HEALTH, fabs(this.vehicle_shield)); this.vehicle_shieldent.colormod = '2 0 0'; this.vehicle_shield = 0; this.vehicle_shieldent.alpha = 0.75; @@ -716,7 +718,7 @@ void vehicles_damage(entity this, entity inflictor, entity attacker, float damag } else { - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); if(sound_allowed(MSG_BROADCAST, attacker)) spamsound (this, CH_PAIN, SND_ONS_HIT2, VOL_BASE, ATTEN_NORM); // FIXME: PLACEHOLDER @@ -727,14 +729,15 @@ void vehicles_damage(entity this, entity inflictor, entity attacker, float damag else this.velocity += force; - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) { if(this.owner) + { if(this.vehicle_flags & VHF_DEATHEJECT) vehicles_exit(this, VHEF_EJECT); else vehicles_exit(this, VHEF_RELEASE); - + } antilag_clear(this, this); @@ -746,13 +749,13 @@ void vehicles_damage(entity this, entity inflictor, entity attacker, float damag bool vehicles_heal(entity targ, entity inflictor, float amount, float limit) { - float true_limit = ((limit != RESOURCE_LIMIT_NONE) ? limit : targ.max_health); - if(GetResourceAmount(targ, RESOURCE_HEALTH) <= 0 || GetResourceAmount(targ, RESOURCE_HEALTH) >= true_limit) + float true_limit = ((limit != RES_LIMIT_NONE) ? limit : targ.max_health); + if(GetResource(targ, RES_HEALTH) <= 0 || GetResource(targ, RES_HEALTH) >= true_limit) return false; - GiveResourceWithLimit(targ, RESOURCE_HEALTH, amount, true_limit); + GiveResourceWithLimit(targ, RES_HEALTH, amount, true_limit); if(targ.owner) - targ.owner.vehicle_health = (GetResourceAmount(targ, RESOURCE_HEALTH) / targ.max_health) * 100; + targ.owner.vehicle_health = (GetResource(targ, RES_HEALTH) / targ.max_health) * 100; return true; } diff --git a/qcsrc/common/vehicles/sv_vehicles.qh b/qcsrc/common/vehicles/sv_vehicles.qh index a1f23c1dfc..9870814d30 100644 --- a/qcsrc/common/vehicles/sv_vehicles.qh +++ b/qcsrc/common/vehicles/sv_vehicles.qh @@ -45,14 +45,14 @@ float autocvar_g_vehicles_weapon_damagerate = 2; .entity gunner1; .entity gunner2; -.float vehicle_health = _STAT(VEHICLESTAT_HEALTH); /// If ent is player this is 0..100 indicating precentage of health left on vehicle. Vehicle's value is the health resource -.float vehicle_energy = _STAT(VEHICLESTAT_ENERGY); /// If ent is player this is 0..100 indicating precentage of energy left on vehicle. If ent is vehicle, this is the real energy value. -.float vehicle_shield = _STAT(VEHICLESTAT_SHIELD); /// If ent is player this is 0..100 indicating precentage of shield left on vehicle. If ent is vehicle, this is the real shield value. +const .float vehicle_health = _STAT(VEHICLESTAT_HEALTH); /// If ent is player this is 0..100 indicating precentage of health left on vehicle. Vehicle's value is the health resource +const .float vehicle_energy = _STAT(VEHICLESTAT_ENERGY); /// If ent is player this is 0..100 indicating precentage of energy left on vehicle. If ent is vehicle, this is the real energy value. +const .float vehicle_shield = _STAT(VEHICLESTAT_SHIELD); /// If ent is player this is 0..100 indicating precentage of shield left on vehicle. If ent is vehicle, this is the real shield value. -.float vehicle_ammo1 = _STAT(VEHICLESTAT_AMMO1); /// If ent is player this is 0..100 indicating percentage of primary ammo left UNLESS value is already stored in vehicle_energy. If ent is vehicle, this is the real ammo1 value. -.float vehicle_reload1 = _STAT(VEHICLESTAT_RELOAD1); /// If ent is player this is 0..100 indicating percentage of primary reload status. If ent is vehicle, this is the real reload1 value. -.float vehicle_ammo2 = _STAT(VEHICLESTAT_AMMO2); /// If ent is player this is 0..100 indicating percentage of secondary ammo left. If ent is vehicle, this is the real ammo2 value. -.float vehicle_reload2 = _STAT(VEHICLESTAT_RELOAD2); /// If ent is player this is 0..100 indicating percentage of secondary reload status. If ent is vehicle, this is the real reload2 value. +const .float vehicle_ammo1 = _STAT(VEHICLESTAT_AMMO1); /// If ent is player this is 0..100 indicating percentage of primary ammo left UNLESS value is already stored in vehicle_energy. If ent is vehicle, this is the real ammo1 value. +const .float vehicle_reload1 = _STAT(VEHICLESTAT_RELOAD1); /// If ent is player this is 0..100 indicating percentage of primary reload status. If ent is vehicle, this is the real reload1 value. +const .float vehicle_ammo2 = _STAT(VEHICLESTAT_AMMO2); /// If ent is player this is 0..100 indicating percentage of secondary ammo left. If ent is vehicle, this is the real ammo2 value. +const .float vehicle_reload2 = _STAT(VEHICLESTAT_RELOAD2); /// If ent is player this is 0..100 indicating percentage of secondary reload status. If ent is vehicle, this is the real reload2 value. .float sound_nexttime; const float VOL_VEHICLEENGINE = 1; @@ -100,7 +100,7 @@ float vehicles_exit_running; ply.vehicle_##fld = (vehi.vehicle_##fld / autocvar_g_vehicle_##vhname##_##fld) * 100 #define VEHICLE_UPDATE_PLAYER_RESOURCE(ply,vehi,fld,vhname,res) \ - ply.vehicle_##fld = (GetResourceAmount(vehi, res) / autocvar_g_vehicle_##vhname##_##fld) * 100 + ply.vehicle_##fld = (GetResource(vehi, res) / autocvar_g_vehicle_##vhname##_##fld) * 100 .float vehicle_enter_delay; // prevent players jumping to and from vehicles instantly diff --git a/qcsrc/common/vehicles/vehicle/bumblebee.qc b/qcsrc/common/vehicles/vehicle/bumblebee.qc index 377b193087..a83b0928f3 100644 --- a/qcsrc/common/vehicles/vehicle/bumblebee.qc +++ b/qcsrc/common/vehicles/vehicle/bumblebee.qc @@ -168,7 +168,7 @@ bool bumblebee_gunner_frame(entity this, float dt) gun.attack_finished_single[0] = time + autocvar_g_vehicle_bumblebee_cannon_refire; } - VEHICLE_UPDATE_PLAYER_RESOURCE(this, vehic, health, bumblebee, RESOURCE_HEALTH); + VEHICLE_UPDATE_PLAYER_RESOURCE(this, vehic, health, bumblebee, RES_HEALTH); if(vehic.vehicle_flags & VHF_HASSHIELD) VEHICLE_UPDATE_PLAYER(this, vehic, shield, bumblebee); @@ -397,7 +397,7 @@ void bumblebee_regen(entity this, float dt) vehicles_regen(this, this.dmg_time, vehicle_shield, autocvar_g_vehicle_bumblebee_shield, autocvar_g_vehicle_bumblebee_shield_regen_pause, autocvar_g_vehicle_bumblebee_shield_regen, dt, true); if(this.vehicle_flags & VHF_HEALTHREGEN) - vehicles_regen_resource(this, this.dmg_time, vehicle_health, autocvar_g_vehicle_bumblebee_health, autocvar_g_vehicle_bumblebee_health_regen_pause, autocvar_g_vehicle_bumblebee_health_regen, dt, false, RESOURCE_HEALTH); + vehicles_regen_resource(this, this.dmg_time, vehicle_health, autocvar_g_vehicle_bumblebee_health, autocvar_g_vehicle_bumblebee_health_regen_pause, autocvar_g_vehicle_bumblebee_health_regen, dt, false, RES_HEALTH); if(this.vehicle_flags & VHF_ENERGYREGEN) vehicles_regen(this, this.wait, vehicle_energy, autocvar_g_vehicle_bumblebee_energy, autocvar_g_vehicle_bumblebee_energy_regen_pause, autocvar_g_vehicle_bumblebee_energy_regen, dt, false); @@ -557,19 +557,19 @@ bool bumblebee_pilot_frame(entity this, float dt) { if(autocvar_g_vehicle_bumblebee_healgun_hps) { - float hplimit = ((IS_PLAYER(trace_ent)) ? autocvar_g_vehicle_bumblebee_healgun_hmax : RESOURCE_LIMIT_NONE); + float hplimit = ((IS_PLAYER(trace_ent)) ? autocvar_g_vehicle_bumblebee_healgun_hmax : RES_LIMIT_NONE); Heal(trace_ent, this, autocvar_g_vehicle_bumblebee_healgun_hps * dt, hplimit); } if(IS_VEHICLE(trace_ent)) { - if(autocvar_g_vehicle_bumblebee_healgun_sps && GetResourceAmount(trace_ent, RESOURCE_HEALTH) <= trace_ent.max_health) + if(autocvar_g_vehicle_bumblebee_healgun_sps && GetResource(trace_ent, RES_HEALTH) <= trace_ent.max_health) trace_ent.vehicle_shield = min(trace_ent.vehicle_shield + autocvar_g_vehicle_bumblebee_healgun_sps * dt, trace_ent.tur_head.max_health); } else if(IS_CLIENT(trace_ent)) { - if(GetResourceAmount(trace_ent, RESOURCE_ARMOR) <= autocvar_g_vehicle_bumblebee_healgun_amax && autocvar_g_vehicle_bumblebee_healgun_aps) - GiveResourceWithLimit(trace_ent, RESOURCE_ARMOR, autocvar_g_vehicle_bumblebee_healgun_aps * dt, autocvar_g_vehicle_bumblebee_healgun_amax); + if(GetResource(trace_ent, RES_ARMOR) <= autocvar_g_vehicle_bumblebee_healgun_amax && autocvar_g_vehicle_bumblebee_healgun_aps) + GiveResourceWithLimit(trace_ent, RES_ARMOR, autocvar_g_vehicle_bumblebee_healgun_aps * dt, autocvar_g_vehicle_bumblebee_healgun_amax); } } } @@ -592,7 +592,7 @@ bool bumblebee_pilot_frame(entity this, float dt) } */ - VEHICLE_UPDATE_PLAYER_RESOURCE(this, vehic, health, bumblebee, RESOURCE_HEALTH); + VEHICLE_UPDATE_PLAYER_RESOURCE(this, vehic, health, bumblebee, RES_HEALTH); VEHICLE_UPDATE_PLAYER(this, vehic, energy, bumblebee); this.vehicle_ammo1 = (vehic.gun1.vehicle_energy / autocvar_g_vehicle_bumblebee_cannon_ammo) * 100; @@ -802,7 +802,7 @@ METHOD(Bumblebee, vr_death, void(Bumblebee thisveh, entity instance)) Send_Effect(EFFECT_EXPLOSION_MEDIUM, findbetterlocation(instance.origin, 16), '0 0 0', 1); - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, 0); + SetResourceExplicit(instance, RES_HEALTH, 0); instance.event_damage = func_null; instance.solid = SOLID_NOT; instance.takedamage = DAMAGE_NO; @@ -887,7 +887,7 @@ METHOD(Bumblebee, vr_spawn, void(Bumblebee thisveh, entity instance)) if(!autocvar_g_vehicle_bumblebee_swim) instance.dphitcontentsmask |= DPCONTENTS_LIQUIDSMASK; - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, autocvar_g_vehicle_bumblebee_health); + SetResourceExplicit(instance, RES_HEALTH, autocvar_g_vehicle_bumblebee_health); instance.vehicle_shield = autocvar_g_vehicle_bumblebee_shield; instance.solid = SOLID_BBOX; set_movetype(instance, MOVETYPE_TOSS); @@ -914,8 +914,8 @@ METHOD(Bumblebee, vr_setup, void(Bumblebee thisveh, entity instance)) instance.vehicle_exit = bumblebee_exit; instance.respawntime = autocvar_g_vehicle_bumblebee_respawntime; - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, autocvar_g_vehicle_bumblebee_health); - instance.max_health = GetResourceAmount(instance, RESOURCE_HEALTH); + SetResourceExplicit(instance, RES_HEALTH, autocvar_g_vehicle_bumblebee_health); + instance.max_health = GetResource(instance, RES_HEALTH); instance.vehicle_shield = autocvar_g_vehicle_bumblebee_shield; } diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc index c7f7af8ac6..109eab0ca2 100644 --- a/qcsrc/common/vehicles/vehicle/racer.qc +++ b/qcsrc/common/vehicles/vehicle/racer.qc @@ -359,12 +359,12 @@ bool racer_frame(entity this, float dt) vehicles_regen(vehic, vehic.dmg_time, vehicle_shield, autocvar_g_vehicle_racer_shield, autocvar_g_vehicle_racer_shield_regen_pause, autocvar_g_vehicle_racer_shield_regen, dt, true); if(vehic.vehicle_flags & VHF_HEALTHREGEN) - vehicles_regen_resource(vehic, vehic.dmg_time, vehicle_health, autocvar_g_vehicle_racer_health, autocvar_g_vehicle_racer_health_regen_pause, autocvar_g_vehicle_racer_health_regen, dt, false, RESOURCE_HEALTH); + vehicles_regen_resource(vehic, vehic.dmg_time, vehicle_health, autocvar_g_vehicle_racer_health, autocvar_g_vehicle_racer_health_regen_pause, autocvar_g_vehicle_racer_health_regen, dt, false, RES_HEALTH); if(vehic.vehicle_flags & VHF_ENERGYREGEN) vehicles_regen(vehic, vehic.wait, vehicle_energy, autocvar_g_vehicle_racer_energy, autocvar_g_vehicle_racer_energy_regen_pause, autocvar_g_vehicle_racer_energy_regen, dt, false); - VEHICLE_UPDATE_PLAYER_RESOURCE(player, vehic, health, racer, RESOURCE_HEALTH); + VEHICLE_UPDATE_PLAYER_RESOURCE(player, vehic, health, racer, RES_HEALTH); VEHICLE_UPDATE_PLAYER(player, vehic, energy, racer); if(vehic.vehicle_flags & VHF_HASSHIELD) @@ -514,7 +514,7 @@ METHOD(Racer, vr_enter, void(Racer thisveh, entity instance)) { #ifdef SVQC set_movetype(instance, MOVETYPE_BOUNCE); - instance.owner.vehicle_health = (GetResourceAmount(instance, RESOURCE_HEALTH) / autocvar_g_vehicle_racer_health) * 100; + instance.owner.vehicle_health = (GetResource(instance, RES_HEALTH) / autocvar_g_vehicle_racer_health) * 100; instance.owner.vehicle_shield = (instance.vehicle_shield / autocvar_g_vehicle_racer_shield) * 100; if(instance.owner.flagcarried) @@ -544,7 +544,7 @@ METHOD(Racer, vr_spawn, void(Racer thisveh, entity instance)) setthink(instance, racer_think); instance.nextthink = time; - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, autocvar_g_vehicle_racer_health); + SetResourceExplicit(instance, RES_HEALTH, autocvar_g_vehicle_racer_health); instance.vehicle_shield = autocvar_g_vehicle_racer_shield; set_movetype(instance, MOVETYPE_TOSS); @@ -557,7 +557,7 @@ METHOD(Racer, vr_spawn, void(Racer thisveh, entity instance)) instance.bouncefactor = autocvar_g_vehicle_racer_bouncefactor; instance.bouncestop = autocvar_g_vehicle_racer_bouncestop; instance.damageforcescale = 0.5; - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, autocvar_g_vehicle_racer_health); + SetResourceExplicit(instance, RES_HEALTH, autocvar_g_vehicle_racer_health); instance.vehicle_shield = autocvar_g_vehicle_racer_shield; #endif } @@ -566,7 +566,7 @@ METHOD(Racer, vr_death, void(Racer thisveh, entity instance)) { #ifdef SVQC setSendEntity(instance, func_null); // stop networking this racer (for now) - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, 0); + SetResourceExplicit(instance, RES_HEALTH, 0); instance.event_damage = func_null; instance.solid = SOLID_CORPSE; instance.takedamage = DAMAGE_NO; @@ -625,9 +625,9 @@ METHOD(Racer, vr_setup, void(Racer thisveh, entity instance)) instance.vehicle_flags |= VHF_HEALTHREGEN; instance.respawntime = autocvar_g_vehicle_racer_respawntime; - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, autocvar_g_vehicle_racer_health); + SetResourceExplicit(instance, RES_HEALTH, autocvar_g_vehicle_racer_health); instance.vehicle_shield = autocvar_g_vehicle_racer_shield; - instance.max_health = GetResourceAmount(instance, RESOURCE_HEALTH); + instance.max_health = GetResource(instance, RES_HEALTH); #endif #ifdef CSQC diff --git a/qcsrc/common/vehicles/vehicle/raptor.qc b/qcsrc/common/vehicles/vehicle/raptor.qc index 0150ee98f9..b672d348b4 100644 --- a/qcsrc/common/vehicles/vehicle/raptor.qc +++ b/qcsrc/common/vehicles/vehicle/raptor.qc @@ -369,7 +369,7 @@ bool raptor_frame(entity this, float dt) vehicles_regen(vehic, vehic.dmg_time, vehicle_shield, autocvar_g_vehicle_raptor_shield, autocvar_g_vehicle_raptor_shield_regen_pause, autocvar_g_vehicle_raptor_shield_regen, dt, true); if(vehic.vehicle_flags & VHF_HEALTHREGEN) - vehicles_regen_resource(vehic, vehic.dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, dt, false, RESOURCE_HEALTH); + vehicles_regen_resource(vehic, vehic.dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, dt, false, RES_HEALTH); if(vehic.vehicle_flags & VHF_ENERGYREGEN) vehicles_regen(vehic, vehic.cnt, vehicle_energy, autocvar_g_vehicle_raptor_energy, autocvar_g_vehicle_raptor_energy_regen_pause, autocvar_g_vehicle_raptor_energy_regen, dt, false); @@ -427,7 +427,7 @@ bool raptor_frame(entity this, float dt) } - VEHICLE_UPDATE_PLAYER_RESOURCE(this, vehic, health, raptor, RESOURCE_HEALTH); + VEHICLE_UPDATE_PLAYER_RESOURCE(this, vehic, health, raptor, RES_HEALTH); VEHICLE_UPDATE_PLAYER(this, vehic, energy, raptor); if(vehic.vehicle_flags & VHF_HASSHIELD) VEHICLE_UPDATE_PLAYER(this, vehic, shield, raptor); @@ -471,7 +471,7 @@ bool raptor_takeoff(entity this, float dt) vehicles_regen(vehic, vehic.dmg_time, vehicle_shield, autocvar_g_vehicle_raptor_shield, autocvar_g_vehicle_raptor_shield_regen_pause, autocvar_g_vehicle_raptor_shield_regen, dt, true); if(vehic.vehicle_flags & VHF_HEALTHREGEN) - vehicles_regen_resource(vehic, vehic.dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, dt, false, RESOURCE_HEALTH); + vehicles_regen_resource(vehic, vehic.dmg_time, vehicle_health, autocvar_g_vehicle_raptor_health, autocvar_g_vehicle_raptor_health_regen_pause, autocvar_g_vehicle_raptor_health_regen, dt, false, RES_HEALTH); if(vehic.vehicle_flags & VHF_ENERGYREGEN) vehicles_regen(vehic, vehic.cnt, vehicle_energy, autocvar_g_vehicle_raptor_energy, autocvar_g_vehicle_raptor_energy_regen_pause, autocvar_g_vehicle_raptor_energy_regen, dt, false); @@ -481,7 +481,7 @@ bool raptor_takeoff(entity this, float dt) this.vehicle_reload2 = bound(0, vehic.bomb1.alpha * 100, 100); this.vehicle_ammo2 = (this.vehicle_reload2 == 100) ? 100 : 0; - VEHICLE_UPDATE_PLAYER_RESOURCE(this, vehic, health, raptor, RESOURCE_HEALTH); + VEHICLE_UPDATE_PLAYER_RESOURCE(this, vehic, health, raptor, RES_HEALTH); VEHICLE_UPDATE_PLAYER(this, vehic, energy, raptor); if(vehic.vehicle_flags & VHF_HASSHIELD) VEHICLE_UPDATE_PLAYER(this, vehic, shield, raptor); @@ -594,7 +594,7 @@ METHOD(Raptor, vr_enter, void(Raptor thisveh, entity instance)) instance.owner.PlayerPhysplug = raptor_takeoff; set_movetype(instance, MOVETYPE_BOUNCEMISSILE); instance.solid = SOLID_SLIDEBOX; - instance.owner.vehicle_health = (GetResourceAmount(instance, RESOURCE_HEALTH) / autocvar_g_vehicle_raptor_health) * 100; + instance.owner.vehicle_health = (GetResource(instance, RES_HEALTH) / autocvar_g_vehicle_raptor_health) * 100; instance.owner.vehicle_shield = (instance.vehicle_shield / autocvar_g_vehicle_raptor_shield) * 100; instance.velocity = '0 0 1'; // nudge upwards so takeoff sequence can work instance.tur_head.exteriormodeltoclient = instance.owner; @@ -609,7 +609,7 @@ METHOD(Raptor, vr_enter, void(Raptor thisveh, entity instance)) } METHOD(Raptor, vr_death, void(Raptor thisveh, entity instance)) { - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, 0); + SetResourceExplicit(instance, RES_HEALTH, 0); instance.event_damage = func_null; instance.solid = SOLID_CORPSE; instance.takedamage = DAMAGE_NO; @@ -701,7 +701,7 @@ METHOD(Raptor, vr_spawn, void(Raptor thisveh, entity instance)) } instance.frame = 0; - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, autocvar_g_vehicle_raptor_health); + SetResourceExplicit(instance, RES_HEALTH, autocvar_g_vehicle_raptor_health); instance.vehicle_shield = autocvar_g_vehicle_raptor_shield; set_movetype(instance, MOVETYPE_TOSS); instance.solid = SOLID_SLIDEBOX; @@ -720,7 +720,7 @@ METHOD(Raptor, vr_spawn, void(Raptor thisveh, entity instance)) instance.bouncefactor = autocvar_g_vehicle_raptor_bouncefactor; instance.bouncestop = autocvar_g_vehicle_raptor_bouncestop; instance.damageforcescale = 0.25; - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, autocvar_g_vehicle_raptor_health); + SetResourceExplicit(instance, RES_HEALTH, autocvar_g_vehicle_raptor_health); instance.vehicle_shield = autocvar_g_vehicle_raptor_shield; } METHOD(Raptor, vr_setup, void(Raptor thisveh, entity instance)) @@ -739,9 +739,9 @@ METHOD(Raptor, vr_setup, void(Raptor thisveh, entity instance)) instance.vehicle_exit = raptor_exit; instance.respawntime = autocvar_g_vehicle_raptor_respawntime; - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, autocvar_g_vehicle_raptor_health); + SetResourceExplicit(instance, RES_HEALTH, autocvar_g_vehicle_raptor_health); instance.vehicle_shield = autocvar_g_vehicle_raptor_shield; - instance.max_health = GetResourceAmount(instance, RESOURCE_HEALTH); + instance.max_health = GetResource(instance, RES_HEALTH); if(!autocvar_g_vehicle_raptor_swim) instance.dphitcontentsmask |= DPCONTENTS_LIQUIDSMASK; diff --git a/qcsrc/common/vehicles/vehicle/raptor_weapons.qc b/qcsrc/common/vehicles/vehicle/raptor_weapons.qc index 53475d6cfd..66b5bec883 100644 --- a/qcsrc/common/vehicles/vehicle/raptor_weapons.qc +++ b/qcsrc/common/vehicles/vehicle/raptor_weapons.qc @@ -74,7 +74,7 @@ METHOD(RaptorFlare, wr_think, void(entity thiswep, entity actor, .entity weapone _flare.solid = SOLID_CORPSE; _flare.takedamage = DAMAGE_YES; _flare.event_damage = raptor_flare_damage; - SetResourceAmountExplicit(_flare, RESOURCE_HEALTH, 20); + SetResourceExplicit(_flare, RES_HEALTH, 20); _flare.tur_impacttime = time + autocvar_g_vehicle_raptor_flare_lifetime; settouch(_flare, raptor_flare_touch); } @@ -191,8 +191,8 @@ void raptor_flare_touch(entity this, entity toucher) void raptor_flare_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - TakeResource(this, RESOURCE_HEALTH, damage); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + TakeResource(this, RES_HEALTH, damage); + if(GetResource(this, RES_HEALTH) <= 0) delete(this); } diff --git a/qcsrc/common/vehicles/vehicle/spiderbot.qc b/qcsrc/common/vehicles/vehicle/spiderbot.qc index 323b025e0e..3f023729f2 100644 --- a/qcsrc/common/vehicles/vehicle/spiderbot.qc +++ b/qcsrc/common/vehicles/vehicle/spiderbot.qc @@ -294,7 +294,7 @@ bool spiderbot_frame(entity this, float dt) vehicles_regen(vehic, vehic.dmg_time, vehicle_shield, autocvar_g_vehicle_spiderbot_shield, autocvar_g_vehicle_spiderbot_shield_regen_pause, autocvar_g_vehicle_spiderbot_shield_regen, dt, true); if(vehic.vehicle_flags & VHF_HEALTHREGEN) - vehicles_regen_resource(vehic, vehic.dmg_time, vehicle_health, autocvar_g_vehicle_spiderbot_health, autocvar_g_vehicle_spiderbot_health_regen_pause, autocvar_g_vehicle_spiderbot_health_regen, dt, false, RESOURCE_HEALTH); + vehicles_regen_resource(vehic, vehic.dmg_time, vehicle_health, autocvar_g_vehicle_spiderbot_health, autocvar_g_vehicle_spiderbot_health_regen_pause, autocvar_g_vehicle_spiderbot_health_regen, dt, false, RES_HEALTH); PHYS_INPUT_BUTTON_ATCK(this) = PHYS_INPUT_BUTTON_ATCK2(this) = false; //this.vehicle_ammo2 = vehic.tur_head.frame; @@ -309,7 +309,7 @@ bool spiderbot_frame(entity this, float dt) this.oldorigin = this.origin; // negate fall damage this.velocity = vehic.velocity; - VEHICLE_UPDATE_PLAYER_RESOURCE(this, vehic, health, spiderbot, RESOURCE_HEALTH); + VEHICLE_UPDATE_PLAYER_RESOURCE(this, vehic, health, spiderbot, RES_HEALTH); if(vehic.vehicle_flags & VHF_HASSHIELD) VEHICLE_UPDATE_PLAYER(this, vehic, shield, spiderbot); @@ -524,7 +524,7 @@ METHOD(Spiderbot, vr_enter, void(Spiderbot thisveh, entity instance)) STAT(VEHICLESTAT_W2MODE, instance) = SBRM_GUIDE; set_movetype(instance, MOVETYPE_WALK); CSQCVehicleSetup(instance.owner, 0); - instance.owner.vehicle_health = (GetResourceAmount(instance, RESOURCE_HEALTH) / autocvar_g_vehicle_spiderbot_health) * 100; + instance.owner.vehicle_health = (GetResource(instance, RES_HEALTH) / autocvar_g_vehicle_spiderbot_health) * 100; instance.owner.vehicle_shield = (instance.vehicle_shield / autocvar_g_vehicle_spiderbot_shield) * 100; if(instance.owner.flagcarried) @@ -540,7 +540,7 @@ METHOD(Spiderbot, vr_think, void(Spiderbot thisveh, entity instance)) } METHOD(Spiderbot, vr_death, void(Spiderbot thisveh, entity instance)) { - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, 0); + SetResourceExplicit(instance, RES_HEALTH, 0); instance.event_damage = func_null; instance.takedamage = DAMAGE_NO; settouch(instance, func_null); @@ -582,7 +582,7 @@ METHOD(Spiderbot, vr_spawn, void(Spiderbot thisveh, entity instance)) setorigin(instance, instance.pos1 + '0 0 128'); instance.angles = instance.pos2; instance.damageforcescale = 0.03; - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, autocvar_g_vehicle_spiderbot_health); + SetResourceExplicit(instance, RES_HEALTH, autocvar_g_vehicle_spiderbot_health); instance.vehicle_shield = autocvar_g_vehicle_spiderbot_shield; instance.PlayerPhysplug = spiderbot_frame; @@ -599,9 +599,9 @@ METHOD(Spiderbot, vr_setup, void(Spiderbot thisveh, entity instance)) instance.vehicle_flags |= VHF_HEALTHREGEN; instance.respawntime = autocvar_g_vehicle_spiderbot_respawntime; - SetResourceAmountExplicit(instance, RESOURCE_HEALTH, autocvar_g_vehicle_spiderbot_health); + SetResourceExplicit(instance, RES_HEALTH, autocvar_g_vehicle_spiderbot_health); instance.vehicle_shield = autocvar_g_vehicle_spiderbot_shield; - instance.max_health = GetResourceAmount(instance, RESOURCE_HEALTH); + instance.max_health = GetResource(instance, RES_HEALTH); instance.pushable = true; // spiderbot can use jumppads } diff --git a/qcsrc/common/viewloc.qc b/qcsrc/common/viewloc.qc index e1be43af0d..55e37c4d92 100644 --- a/qcsrc/common/viewloc.qc +++ b/qcsrc/common/viewloc.qc @@ -77,10 +77,12 @@ void viewloc_SetTags(entity this) this.viewloc = NULL; if(this.viewloc.entnum != this.tag_networkviewloc) - if(this.tag_networkviewloc == 0) - this.viewloc = NULL; - else - this.viewloc = findfloat(NULL, entnum, this.tag_networkviewloc); + { + if(this.tag_networkviewloc == 0) + this.viewloc = NULL; + else + this.viewloc = findfloat(NULL, entnum, this.tag_networkviewloc); + } } vector CursorToWorldCoord(vector mpos) diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index f118a04667..f2fdf4407f 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -215,12 +215,12 @@ string GetAmmoPicture(int ammotype) { switch (ammotype) { - case RESOURCE_SHELLS: return ITEM_Shells.m_icon; - case RESOURCE_BULLETS: return ITEM_Bullets.m_icon; - case RESOURCE_ROCKETS: return ITEM_Rockets.m_icon; - case RESOURCE_CELLS: return ITEM_Cells.m_icon; - case RESOURCE_PLASMA: return ITEM_Plasma.m_icon; - case RESOURCE_FUEL: return ITEM_JetpackFuel.m_icon; + case RES_SHELLS: return ITEM_Shells.m_icon; + case RES_BULLETS: return ITEM_Bullets.m_icon; + case RES_ROCKETS: return ITEM_Rockets.m_icon; + case RES_CELLS: return ITEM_Cells.m_icon; + case RES_PLASMA: return ITEM_Plasma.m_icon; + case RES_FUEL: return ITEM_JetpackFuel.m_icon; default: return ""; // wtf, no ammo type? } } @@ -230,13 +230,13 @@ int GetAmmoTypeFromNum(int i) { switch (i) { - case 0: return RESOURCE_SHELLS; - case 1: return RESOURCE_BULLETS; - case 2: return RESOURCE_ROCKETS; - case 3: return RESOURCE_CELLS; - case 4: return RESOURCE_PLASMA; - case 5: return RESOURCE_FUEL; - default: return RESOURCE_NONE; + case 0: return RES_SHELLS; + case 1: return RES_BULLETS; + case 2: return RES_ROCKETS; + case 3: return RES_CELLS; + case 4: return RES_PLASMA; + case 5: return RES_FUEL; + default: return RES_NONE; } } @@ -244,12 +244,12 @@ int GetAmmoStat(int ammotype) { switch (ammotype) { - case RESOURCE_SHELLS: return STAT_SHELLS; - case RESOURCE_BULLETS: return STAT_NAILS; - case RESOURCE_ROCKETS: return STAT_ROCKETS; - case RESOURCE_CELLS: return STAT_CELLS; - case RESOURCE_PLASMA: return STAT_PLASMA.m_id; - case RESOURCE_FUEL: return STAT_FUEL.m_id; + case RES_SHELLS: return STAT_SHELLS; + case RES_BULLETS: return STAT_NAILS; + case RES_ROCKETS: return STAT_ROCKETS; + case RES_CELLS: return STAT_CELLS; + case RES_PLASMA: return STAT_PLASMA.m_id; + case RES_FUEL: return STAT_FUEL.m_id; default: return -1; } } diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 9a32b42778..42805b3a08 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -144,9 +144,9 @@ X(weaponstart, float) X(weaponthrowable, float) #ifdef SVQC X(reload_ammo, float) -.float reloading_ammo = reload_ammo; +const .float reloading_ammo = reload_ammo; X(reload_time, float) -.float reloading_time = reload_time; +const .float reloading_time = reload_time; #endif #undef X diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc index b53e25fde9..bf34d53208 100644 --- a/qcsrc/common/weapons/config.qc +++ b/qcsrc/common/weapons/config.qc @@ -26,6 +26,7 @@ void Dump_Weapon_Settings() { int totalweapons = 0, totalsettings = 0; int wepcount = 1; + #define WEP_CONFIG_WRITETOFILE(str) write_String_To_File(wep_config_file, str, wep_config_alsoprint) FOREACH(Weapons, it != WEP_Null, { if((it.spawnflags & WEP_FLAG_HIDDEN) && (it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_FLAG_NORMAL)) continue; // never include the attacks @@ -56,6 +57,7 @@ void Dump_Weapon_Settings() totalsettings += WEP_CONFIG_COUNT; wepcount += 1; }); + #undef WEP_CONFIG_WRITETOFILE // clear queue now that we're finished WEP_CONFIG_COUNT = 0; diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh index 9489843654..b21bf01702 100644 --- a/qcsrc/common/weapons/config.qh +++ b/qcsrc/common/weapons/config.qh @@ -14,11 +14,6 @@ int WEP_CONFIG_COUNT; config_queue[WEP_CONFIG_COUNT] = a; \ ++WEP_CONFIG_COUNT; } -#define WEP_CONFIG_WRITETOFILE(a) MACRO_BEGIN { \ - fputs(wep_config_file, a); \ - if(wep_config_alsoprint) { LOG_INFO(a); } \ -} MACRO_END - #define WEP_CONFIG_WRITE_CVARS(wepname, name, T) WEP_CONFIG_WRITE_PROPS_##T(wepname, name) diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh index cdf5748e67..0d65bbef9d 100644 --- a/qcsrc/common/weapons/weapon.qh +++ b/qcsrc/common/weapons/weapon.qh @@ -45,7 +45,7 @@ CLASS(Weapon, Object) /** control what happens when this weapon is spawned */ METHOD(Weapon, m_spawnfunc_hookreplace, Weapon(Weapon this, entity e)) { return this; } /** M: ammotype : main ammo type */ - ATTRIB(Weapon, ammo_type, int, RESOURCE_NONE); + ATTRIB(Weapon, ammo_type, int, RES_NONE); /** M: impulse : weapon impulse */ ATTRIB(Weapon, impulse, int, -1); /** M: flags : WEPSPAWNFLAG_... combined */ diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc index ef4e3eb7d7..6efb21495b 100644 --- a/qcsrc/common/weapons/weapon/arc.qc +++ b/qcsrc/common/weapons/weapon/arc.qc @@ -104,16 +104,16 @@ void W_Arc_Bolt_Explode_use(entity this, entity actor, entity trigger) void W_Arc_Bolt_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) return; if(!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, -1)) return; // g_projectiles_damage says to halt - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); this.angles = vectoangles(this.velocity); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) W_PrepareExplosionByDamage(this, attacker, getthink(this)); } @@ -140,7 +140,7 @@ void W_Arc_Attack_Bolt(Weapon thiswep, entity actor, .entity weaponentity) missile.bot_dodgerating = WEP_CVAR(arc, bolt_damage); missile.takedamage = DAMAGE_YES; - SetResourceAmountExplicit(missile, RESOURCE_HEALTH, WEP_CVAR(arc, bolt_health)); + SetResourceExplicit(missile, RES_HEALTH, WEP_CVAR(arc, bolt_health)); missile.damageforcescale = WEP_CVAR(arc, bolt_damageforcescale); missile.event_damage = W_Arc_Bolt_Damage; missile.damagedbycontents = true; @@ -254,8 +254,8 @@ void W_Arc_Beam_Think(entity this) if(rootammo) { - coefficient = min(coefficient, GetResourceAmount(own, thiswep.ammo_type) / rootammo); - SetResourceAmount(own, thiswep.ammo_type, max(0, GetResourceAmount(own, thiswep.ammo_type) - (rootammo * frametime))); + coefficient = min(coefficient, GetResource(own, thiswep.ammo_type) / rootammo); + SetResource(own, thiswep.ammo_type, max(0, GetResource(own, thiswep.ammo_type) - (rootammo * frametime))); } } float heat_speed = burst ? WEP_CVAR(arc, burst_heat) : WEP_CVAR(arc, beam_heat); @@ -428,13 +428,13 @@ void W_Arc_Beam_Think(entity this) { float roothealth = ((burst) ? WEP_CVAR(arc, burst_healing_hps) : WEP_CVAR(arc, beam_healing_hps)); float rootarmor = ((burst) ? WEP_CVAR(arc, burst_healing_aps) : WEP_CVAR(arc, beam_healing_aps)); - float hplimit = ((IS_PLAYER(trace_ent)) ? WEP_CVAR(arc, beam_healing_hmax) : RESOURCE_LIMIT_NONE); + float hplimit = ((IS_PLAYER(trace_ent)) ? WEP_CVAR(arc, beam_healing_hmax) : RES_LIMIT_NONE); Heal(trace_ent, own, (roothealth * coefficient), hplimit); if(IS_PLAYER(trace_ent) && rootarmor) { - if(GetResourceAmount(trace_ent, RESOURCE_ARMOR) <= WEP_CVAR(arc, beam_healing_amax)) + if(GetResource(trace_ent, RES_ARMOR) <= WEP_CVAR(arc, beam_healing_amax)) { - GiveResourceWithLimit(trace_ent, RESOURCE_ARMOR, (rootarmor * coefficient), WEP_CVAR(arc, beam_healing_amax)); + GiveResourceWithLimit(trace_ent, RES_ARMOR, (rootarmor * coefficient), WEP_CVAR(arc, beam_healing_amax)); trace_ent.pauserotarmor_finished = max( trace_ent.pauserotarmor_finished, time + autocvar_g_balance_pause_armor_rot @@ -695,19 +695,19 @@ METHOD(Arc, wr_init, void(entity thiswep)) } METHOD(Arc, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { - return ((!WEP_CVAR(arc, beam_ammo)) || (GetResourceAmount(actor, thiswep.ammo_type) > 0)); + return ((!WEP_CVAR(arc, beam_ammo)) || (GetResource(actor, thiswep.ammo_type) > 0)); } METHOD(Arc, wr_checkammo2, bool(entity thiswep, entity actor, .entity weaponentity)) { if(WEP_CVAR(arc, bolt)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(arc, bolt_ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR(arc, bolt_ammo); ammo_amount += actor.(weaponentity).(weapon_load[WEP_ARC.m_id]) >= WEP_CVAR(arc, bolt_ammo); return ammo_amount; } else return WEP_CVAR(arc, overheat_max) > 0 && - ((!WEP_CVAR(arc, burst_ammo)) || (GetResourceAmount(actor, thiswep.ammo_type) > 0)); + ((!WEP_CVAR(arc, burst_ammo)) || (GetResource(actor, thiswep.ammo_type) > 0)); } METHOD(Arc, wr_killmessage, Notification(entity thiswep)) { diff --git a/qcsrc/common/weapons/weapon/arc.qh b/qcsrc/common/weapons/weapon/arc.qh index 187e584025..13321039c9 100644 --- a/qcsrc/common/weapons/weapon/arc.qh +++ b/qcsrc/common/weapons/weapon/arc.qh @@ -2,7 +2,7 @@ CLASS(Arc, Weapon) /* spawnfunc */ ATTRIB(Arc, m_canonical_spawnfunc, string, "weapon_arc"); -/* ammotype */ ATTRIB(Arc, ammo_type, int, RESOURCE_CELLS); +/* ammotype */ ATTRIB(Arc, ammo_type, int, RES_CELLS); /* impulse */ ATTRIB(Arc, impulse, int, 3); /* flags */ ATTRIB(Arc, spawnflags, int, WEP_TYPE_HITSCAN); /* rating */ ATTRIB(Arc, bot_pickupbasevalue, float, 8000); diff --git a/qcsrc/common/weapons/weapon/blaster.qh b/qcsrc/common/weapons/weapon/blaster.qh index 7efbdf7a52..c9825adf0b 100644 --- a/qcsrc/common/weapons/weapon/blaster.qh +++ b/qcsrc/common/weapons/weapon/blaster.qh @@ -2,7 +2,7 @@ CLASS(Blaster, Weapon) /* spawnfunc */ ATTRIB(Blaster, m_canonical_spawnfunc, string, "weapon_blaster"); -/* ammotype */ //ATTRIB(Blaster, ammo_type, int, RESOURCE_NONE); +/* ammotype */ //ATTRIB(Blaster, ammo_type, int, RES_NONE); /* impulse */ ATTRIB(Blaster, impulse, int, 1); /* flags */ ATTRIB(Blaster, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Blaster, bot_pickupbasevalue, float, 0); diff --git a/qcsrc/common/weapons/weapon/crylink.qc b/qcsrc/common/weapons/weapon/crylink.qc index 064668ca6c..3589146352 100644 --- a/qcsrc/common/weapons/weapon/crylink.qc +++ b/qcsrc/common/weapons/weapon/crylink.qc @@ -583,7 +583,7 @@ METHOD(Crylink, wr_checkammo1, bool(entity thiswep, entity actor, .entity weapon if(actor.(weaponentity).crylink_lastgroup && actor.(weaponentity).crylink_waitrelease) return true; - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(crylink, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(crylink, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_PRI(crylink, ammo); return ammo_amount; } @@ -593,7 +593,7 @@ METHOD(Crylink, wr_checkammo2, bool(entity thiswep, entity actor, .entity weapon if(actor.(weaponentity).crylink_lastgroup && actor.(weaponentity).crylink_waitrelease) return true; - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(crylink, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(crylink, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_SEC(crylink, ammo); return ammo_amount; } diff --git a/qcsrc/common/weapons/weapon/crylink.qh b/qcsrc/common/weapons/weapon/crylink.qh index 77e0b734e2..5843c94bbe 100644 --- a/qcsrc/common/weapons/weapon/crylink.qh +++ b/qcsrc/common/weapons/weapon/crylink.qh @@ -2,7 +2,7 @@ CLASS(Crylink, Weapon) /* spawnfunc */ ATTRIB(Crylink, m_canonical_spawnfunc, string, "weapon_crylink"); -/* ammotype */ ATTRIB(Crylink, ammo_type, int, RESOURCE_CELLS); +/* ammotype */ ATTRIB(Crylink, ammo_type, int, RES_CELLS); /* impulse */ ATTRIB(Crylink, impulse, int, 6); /* flags */ ATTRIB(Crylink, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_CANCLIMB); /* rating */ ATTRIB(Crylink, bot_pickupbasevalue, float, 6000); diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc index f8539b14c3..5654488ddb 100644 --- a/qcsrc/common/weapons/weapon/devastator.qc +++ b/qcsrc/common/weapons/weapon/devastator.qc @@ -46,7 +46,7 @@ void W_Devastator_Explode(entity this, entity directhitentity) .entity weaponentity = this.weaponentity_fld; if(this.realowner.(weaponentity).m_weapon == thiswep) { - if(GetResourceAmount(this.realowner, thiswep.ammo_type) < WEP_CVAR(devastator, ammo)) + if(GetResource(this.realowner, thiswep.ammo_type) < WEP_CVAR(devastator, ammo)) if(!(this.realowner.items & IT_UNLIMITED_WEAPON_AMMO)) { this.realowner.cnt = thiswep.m_id; @@ -139,7 +139,7 @@ void W_Devastator_DoRemoteExplode(entity this, .entity weaponentity) Weapon thiswep = WEP_DEVASTATOR; if(this.realowner.(weaponentity).m_weapon == thiswep) { - if(GetResourceAmount(this.realowner, thiswep.ammo_type) < WEP_CVAR(devastator, ammo)) + if(GetResource(this.realowner, thiswep.ammo_type) < WEP_CVAR(devastator, ammo)) if(!(this.realowner.items & IT_UNLIMITED_WEAPON_AMMO)) { this.realowner.cnt = thiswep.m_id; @@ -287,16 +287,16 @@ void W_Devastator_Touch(entity this, entity toucher) void W_Devastator_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) return; if(!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, -1)) // no exceptions return; // g_projectiles_damage says to halt - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); this.angles = vectoangles(this.velocity); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) W_PrepareExplosionByDamage(this, attacker, W_Devastator_Explode_think); } @@ -322,7 +322,7 @@ void W_Devastator_Attack(Weapon thiswep, entity actor, .entity weaponentity, int missile.takedamage = DAMAGE_YES; missile.damageforcescale = WEP_CVAR(devastator, damageforcescale); - SetResourceAmountExplicit(missile, RESOURCE_HEALTH, WEP_CVAR(devastator, health)); + SetResourceExplicit(missile, RES_HEALTH, WEP_CVAR(devastator, health)); missile.event_damage = W_Devastator_Damage; missile.damagedbycontents = true; IL_PUSH(g_damagedbycontents, missile); @@ -435,7 +435,7 @@ METHOD(Devastator, wr_aim, void(entity thiswep, entity actor, .entity weaponenti // but don't fire a new shot at the same time! if(desirabledamage >= 0.75 * coredamage) //this should do group damage in rare fortunate events PHYS_INPUT_BUTTON_ATCK2(actor) = true; - if((skill > 6.5) && (selfdamage > GetResourceAmount(actor, RESOURCE_HEALTH))) + if((skill > 6.5) && (selfdamage > GetResource(actor, RES_HEALTH))) PHYS_INPUT_BUTTON_ATCK2(actor) = false; //if(PHYS_INPUT_BUTTON_ATCK2(actor) == true) // dprint(ftos(desirabledamage),"\n"); @@ -491,10 +491,10 @@ METHOD(Devastator, wr_checkammo1, bool(entity thiswep, entity actor, .entity wea ammo_amount = false; if(WEP_CVAR(devastator, reload_ammo)) { - if(GetResourceAmount(actor, thiswep.ammo_type) < WEP_CVAR(devastator, ammo) && actor.(weaponentity).(weapon_load[WEP_DEVASTATOR.m_id]) < WEP_CVAR(devastator, ammo)) + if(GetResource(actor, thiswep.ammo_type) < WEP_CVAR(devastator, ammo) && actor.(weaponentity).(weapon_load[WEP_DEVASTATOR.m_id]) < WEP_CVAR(devastator, ammo)) ammo_amount = true; } - else if(GetResourceAmount(actor, thiswep.ammo_type) < WEP_CVAR(devastator, ammo)) + else if(GetResource(actor, thiswep.ammo_type) < WEP_CVAR(devastator, ammo)) ammo_amount = true; return !ammo_amount; } @@ -502,18 +502,18 @@ METHOD(Devastator, wr_checkammo1, bool(entity thiswep, entity actor, .entity wea #if 0 if(actor.rl_release == 0) { - LOG_INFOF("W_Devastator(WR_CHECKAMMO1): %d, %.2f, %d: TRUE", actor.rl_release, GetResourceAmount(actor, thiswep.ammo_type), WEP_CVAR(devastator, ammo)); + LOG_INFOF("W_Devastator(WR_CHECKAMMO1): %d, %.2f, %d: TRUE", actor.rl_release, GetResource(actor, thiswep.ammo_type), WEP_CVAR(devastator, ammo)); return true; } else { - ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(devastator, ammo); + ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR(devastator, ammo); ammo_amount += actor.(weaponentity).(weapon_load[WEP_DEVASTATOR.m_id]) >= WEP_CVAR(devastator, ammo); - LOG_INFOF("W_Devastator(WR_CHECKAMMO1): %d, %.2f, %d: %s", actor.rl_release, GetResourceAmount(actor, thiswep.ammo_type), WEP_CVAR(devastator, ammo), (ammo_amount ? "TRUE" : "FALSE")); + LOG_INFOF("W_Devastator(WR_CHECKAMMO1): %d, %.2f, %d: %s", actor.rl_release, GetResource(actor, thiswep.ammo_type), WEP_CVAR(devastator, ammo), (ammo_amount ? "TRUE" : "FALSE")); return ammo_amount; } #else - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(devastator, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR(devastator, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR(devastator, ammo); return ammo_amount; #endif diff --git a/qcsrc/common/weapons/weapon/devastator.qh b/qcsrc/common/weapons/weapon/devastator.qh index e858d54e42..33814a5e1e 100644 --- a/qcsrc/common/weapons/weapon/devastator.qh +++ b/qcsrc/common/weapons/weapon/devastator.qh @@ -2,7 +2,7 @@ CLASS(Devastator, Weapon) /* spawnfunc */ ATTRIB(Devastator, m_canonical_spawnfunc, string, "weapon_devastator"); -/* ammotype */ ATTRIB(Devastator, ammo_type, int, RESOURCE_ROCKETS); +/* ammotype */ ATTRIB(Devastator, ammo_type, int, RES_ROCKETS); /* impulse */ ATTRIB(Devastator, impulse, int, 9); /* flags */ ATTRIB(Devastator, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Devastator, bot_pickupbasevalue, float, 8000); diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc index e22b5e9412..2ba6b5da18 100644 --- a/qcsrc/common/weapons/weapon/electro.qc +++ b/qcsrc/common/weapons/weapon/electro.qc @@ -258,7 +258,7 @@ void W_Electro_Orb_Stick(entity this, entity to) newproj.takedamage = this.takedamage; newproj.damageforcescale = this.damageforcescale; - SetResourceAmountExplicit(newproj, RESOURCE_HEALTH, GetResourceAmount(this, RESOURCE_HEALTH)); + SetResourceExplicit(newproj, RES_HEALTH, GetResource(this, RES_HEALTH)); newproj.event_damage = this.event_damage; newproj.spawnshieldtime = this.spawnshieldtime; newproj.damagedbycontents = true; @@ -300,7 +300,7 @@ void W_Electro_Orb_Touch(entity this, entity toucher) void W_Electro_Orb_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) return; // note: combos are usually triggered by W_Electro_TriggerCombo, not damage @@ -309,8 +309,8 @@ void W_Electro_Orb_Damage(entity this, entity inflictor, entity attacker, float if(!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, (is_combo ? 1 : -1))) return; // g_projectiles_damage says to halt - TakeResource(this, RESOURCE_HEALTH, damage); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + TakeResource(this, RES_HEALTH, damage); + if(GetResource(this, RES_HEALTH) <= 0) { this.takedamage = DAMAGE_NO; this.nextthink = time; @@ -381,7 +381,7 @@ void W_Electro_Attack_Orb(Weapon thiswep, entity actor, .entity weaponentity) setsize(proj, '-4 -4 -4', '4 4 4'); proj.takedamage = DAMAGE_YES; proj.damageforcescale = WEP_CVAR_SEC(electro, damageforcescale); - SetResourceAmountExplicit(proj, RESOURCE_HEALTH, WEP_CVAR_SEC(electro, health)); + SetResourceExplicit(proj, RES_HEALTH, WEP_CVAR_SEC(electro, health)); proj.event_damage = W_Electro_Orb_Damage; proj.flags = FL_PROJECTILE; IL_PUSH(g_projectiles, proj); @@ -483,7 +483,7 @@ METHOD(Electro, wr_think, void(entity thiswep, entity actor, .entity weaponentit } METHOD(Electro, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(electro, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(electro, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_PRI(electro, ammo); return ammo_amount; } @@ -492,12 +492,12 @@ METHOD(Electro, wr_checkammo2, bool(entity thiswep, entity actor, .entity weapon float ammo_amount; if(WEP_CVAR(electro, combo_safeammocheck)) // true if you can fire at least one secondary blob AND one primary shot after it, otherwise false. { - ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(electro, ammo) + WEP_CVAR_PRI(electro, ammo); + ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(electro, ammo) + WEP_CVAR_PRI(electro, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_SEC(electro, ammo) + WEP_CVAR_PRI(electro, ammo); } else { - ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(electro, ammo); + ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(electro, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_SEC(electro, ammo); } return ammo_amount; diff --git a/qcsrc/common/weapons/weapon/electro.qh b/qcsrc/common/weapons/weapon/electro.qh index 4018e5926c..7dbed189b0 100644 --- a/qcsrc/common/weapons/weapon/electro.qh +++ b/qcsrc/common/weapons/weapon/electro.qh @@ -2,7 +2,7 @@ CLASS(Electro, Weapon) /* spawnfunc */ ATTRIB(Electro, m_canonical_spawnfunc, string, "weapon_electro"); -/* ammotype */ ATTRIB(Electro, ammo_type, int, RESOURCE_CELLS); +/* ammotype */ ATTRIB(Electro, ammo_type, int, RES_CELLS); /* impulse */ ATTRIB(Electro, impulse, int, 5); /* flags */ ATTRIB(Electro, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Electro, bot_pickupbasevalue, float, 5000); diff --git a/qcsrc/common/weapons/weapon/fireball.qc b/qcsrc/common/weapons/weapon/fireball.qc index ea7f5b8aea..6b52ba32ab 100644 --- a/qcsrc/common/weapons/weapon/fireball.qc +++ b/qcsrc/common/weapons/weapon/fireball.qc @@ -14,9 +14,9 @@ void W_Fireball_Explode(entity this, entity directhitentity) this.takedamage = DAMAGE_NO; // 1. dist damage - d = (GetResourceAmount(this.realowner, RESOURCE_HEALTH) + GetResourceAmount(this.realowner, RESOURCE_ARMOR)); + d = (GetResource(this.realowner, RES_HEALTH) + GetResource(this.realowner, RES_ARMOR)); RadiusDamage(this, this.realowner, WEP_CVAR_PRI(fireball, damage), WEP_CVAR_PRI(fireball, edgedamage), WEP_CVAR_PRI(fireball, radius), NULL, NULL, WEP_CVAR_PRI(fireball, force), this.projectiledeathtype, this.weaponentity_fld, directhitentity); - if(GetResourceAmount(this.realowner, RESOURCE_HEALTH) + GetResourceAmount(this.realowner, RESOURCE_ARMOR) >= d) + if(GetResource(this.realowner, RES_HEALTH) + GetResource(this.realowner, RES_ARMOR) >= d) if(!this.cnt) { modeleffect_spawn("models/sphere/sphere.md3", 0, 0, this.origin, '0 0 0', '0 0 0', '0 0 0', 0, WEP_CVAR_PRI(fireball, bfgradius), 0.2, 0.05, 0.25); @@ -119,14 +119,14 @@ void W_Fireball_Think(entity this) void W_Fireball_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) return; if(!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, -1)) // no exceptions return; // g_projectiles_damage says to halt - TakeResource(this, RESOURCE_HEALTH, damage); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + TakeResource(this, RES_HEALTH, damage); + if(GetResource(this, RES_HEALTH) <= 0) { this.cnt = 1; W_PrepareExplosionByDamage(this, attacker, W_Fireball_Explode_think); @@ -147,7 +147,7 @@ void W_Fireball_Attack1(entity actor, .entity weaponentity) proj.use = W_Fireball_Explode_use; setthink(proj, W_Fireball_Think); proj.nextthink = time; - SetResourceAmountExplicit(proj, RESOURCE_HEALTH, WEP_CVAR_PRI(fireball, health)); + SetResourceExplicit(proj, RES_HEALTH, WEP_CVAR_PRI(fireball, health)); proj.team = actor.team; proj.event_damage = W_Fireball_Damage; proj.takedamage = DAMAGE_YES; diff --git a/qcsrc/common/weapons/weapon/fireball.qh b/qcsrc/common/weapons/weapon/fireball.qh index 4302c9e797..ba391f6a2d 100644 --- a/qcsrc/common/weapons/weapon/fireball.qh +++ b/qcsrc/common/weapons/weapon/fireball.qh @@ -2,7 +2,7 @@ CLASS(Fireball, Weapon) /* spawnfunc */ ATTRIB(Fireball, m_canonical_spawnfunc, string, "weapon_fireball"); -/* ammotype */ //ATTRIB(Fireball, ammo_type, int, RESOURCE_NONE); +/* ammotype */ //ATTRIB(Fireball, ammo_type, int, RES_NONE); /* impulse */ ATTRIB(Fireball, impulse, int, 9); /* flags */ ATTRIB(Fireball, spawnflags, int, WEP_FLAG_SUPERWEAPON | WEP_TYPE_SPLASH | WEP_FLAG_NODUAL); /* rating */ ATTRIB(Fireball, bot_pickupbasevalue, float, 5000); diff --git a/qcsrc/common/weapons/weapon/hagar.qc b/qcsrc/common/weapons/weapon/hagar.qc index 58be8f835f..20c588715a 100644 --- a/qcsrc/common/weapons/weapon/hagar.qc +++ b/qcsrc/common/weapons/weapon/hagar.qc @@ -32,7 +32,7 @@ void W_Hagar_Explode2_use(entity this, entity actor, entity trigger) void W_Hagar_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) return; float is_linkexplode = ( ((inflictor.owner != NULL) ? (inflictor.owner == this.owner) : true) @@ -47,10 +47,10 @@ void W_Hagar_Damage(entity this, entity inflictor, entity attacker, float damage if(!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, is_linkexplode)) return; // g_projectiles_damage says to halt - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); this.angles = vectoangles(this.velocity); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) W_PrepareExplosionByDamage(this, attacker, getthink(this)); } @@ -91,7 +91,7 @@ void W_Hagar_Attack(Weapon thiswep, entity actor, .entity weaponentity) missile.bot_dodgerating = WEP_CVAR_PRI(hagar, damage); missile.takedamage = DAMAGE_YES; - SetResourceAmountExplicit(missile, RESOURCE_HEALTH, WEP_CVAR_PRI(hagar, health)); + SetResourceExplicit(missile, RES_HEALTH, WEP_CVAR_PRI(hagar, health)); missile.damageforcescale = WEP_CVAR_PRI(hagar, damageforcescale); missile.event_damage = W_Hagar_Damage; missile.damagedbycontents = true; @@ -137,7 +137,7 @@ void W_Hagar_Attack2(Weapon thiswep, entity actor, .entity weaponentity) missile.bot_dodgerating = WEP_CVAR_SEC(hagar, damage); missile.takedamage = DAMAGE_YES; - SetResourceAmountExplicit(missile, RESOURCE_HEALTH, WEP_CVAR_SEC(hagar, health)); + SetResourceExplicit(missile, RES_HEALTH, WEP_CVAR_SEC(hagar, health)); missile.damageforcescale = WEP_CVAR_SEC(hagar, damageforcescale); missile.event_damage = W_Hagar_Damage; missile.damagedbycontents = true; @@ -200,7 +200,7 @@ void W_Hagar_Attack2_Load_Release(Weapon thiswep, entity actor, .entity weaponen missile.bot_dodgerating = WEP_CVAR_SEC(hagar, damage); missile.takedamage = DAMAGE_YES; - SetResourceAmountExplicit(missile, RESOURCE_HEALTH, WEP_CVAR_SEC(hagar, health)); + SetResourceExplicit(missile, RES_HEALTH, WEP_CVAR_SEC(hagar, health)); missile.damageforcescale = WEP_CVAR_SEC(hagar, damageforcescale); missile.event_damage = W_Hagar_Damage; missile.damagedbycontents = true; @@ -269,7 +269,7 @@ void W_Hagar_Attack2_Load(Weapon thiswep, entity actor, .entity weaponentity) else if(autocvar_g_balance_hagar_reload_ammo) enough_ammo = actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_SEC(hagar, ammo); else - enough_ammo = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(hagar, ammo); + enough_ammo = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(hagar, ammo); bool stopped = loaded || !enough_ammo; @@ -435,13 +435,13 @@ METHOD(Hagar, wr_setup, void(entity thiswep, entity actor, .entity weaponentity) } METHOD(Hagar, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(hagar, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(hagar, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_PRI(hagar, ammo); return ammo_amount; } METHOD(Hagar, wr_checkammo2, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(hagar, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(hagar, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_SEC(hagar, ammo); return ammo_amount; } diff --git a/qcsrc/common/weapons/weapon/hagar.qh b/qcsrc/common/weapons/weapon/hagar.qh index 924326fb3a..0d0f11e857 100644 --- a/qcsrc/common/weapons/weapon/hagar.qh +++ b/qcsrc/common/weapons/weapon/hagar.qh @@ -2,7 +2,7 @@ CLASS(Hagar, Weapon) /* spawnfunc */ ATTRIB(Hagar, m_canonical_spawnfunc, string, "weapon_hagar"); -/* ammotype */ ATTRIB(Hagar, ammo_type, int, RESOURCE_ROCKETS); +/* ammotype */ ATTRIB(Hagar, ammo_type, int, RES_ROCKETS); /* impulse */ ATTRIB(Hagar, impulse, int, 8); /* flags */ ATTRIB(Hagar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Hagar, bot_pickupbasevalue, float, 6000); diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc index 816ddae365..8498597634 100644 --- a/qcsrc/common/weapons/weapon/hlac.qc +++ b/qcsrc/common/weapons/weapon/hlac.qc @@ -190,13 +190,13 @@ METHOD(HLAC, wr_think, void(entity thiswep, entity actor, .entity weaponentity, } METHOD(HLAC, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(hlac, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(hlac, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_PRI(hlac, ammo); return ammo_amount; } METHOD(HLAC, wr_checkammo2, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(hlac, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(hlac, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_SEC(hlac, ammo); return ammo_amount; } diff --git a/qcsrc/common/weapons/weapon/hlac.qh b/qcsrc/common/weapons/weapon/hlac.qh index d2bd427c23..769209259b 100644 --- a/qcsrc/common/weapons/weapon/hlac.qh +++ b/qcsrc/common/weapons/weapon/hlac.qh @@ -2,7 +2,7 @@ CLASS(HLAC, Weapon) /* spawnfunc */ ATTRIB(HLAC, m_canonical_spawnfunc, string, "weapon_hlac"); -/* ammotype */ ATTRIB(HLAC, ammo_type, int, RESOURCE_CELLS); +/* ammotype */ ATTRIB(HLAC, ammo_type, int, RES_CELLS); /* impulse */ ATTRIB(HLAC, impulse, int, 6); /* flags */ ATTRIB(HLAC, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(HLAC, bot_pickupbasevalue, float, 4000); diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc index e17e976208..d8cebd740a 100644 --- a/qcsrc/common/weapons/weapon/hook.qc +++ b/qcsrc/common/weapons/weapon/hook.qc @@ -48,15 +48,15 @@ void W_Hook_Explode2_use(entity this, entity actor, entity trigger) void W_Hook_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) return; if(!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, -1)) // no exceptions return; // g_projectiles_damage says to halt - SetResourceAmountExplicit(this, RESOURCE_HEALTH, GetResourceAmount(this, RESOURCE_HEALTH)); + SetResourceExplicit(this, RES_HEALTH, GetResource(this, RES_HEALTH)); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) W_PrepareExplosionByDamage(this, this.realowner, W_Hook_Explode2); } @@ -88,7 +88,7 @@ void W_Hook_Attack2(Weapon thiswep, entity actor, .entity weaponentity) settouch(gren, W_Hook_Touch2); gren.takedamage = DAMAGE_YES; - SetResourceAmountExplicit(gren, RESOURCE_HEALTH, WEP_CVAR_SEC(hook, health)); + SetResourceExplicit(gren, RES_HEALTH, WEP_CVAR_SEC(hook, health)); gren.damageforcescale = WEP_CVAR_SEC(hook, damageforcescale); gren.event_damage = W_Hook_Damage; gren.damagedbycontents = true; @@ -165,7 +165,7 @@ METHOD(Hook, wr_think, void(entity thiswep, entity actor, .entity weaponentity, { if(!(actor.items & IT_UNLIMITED_WEAPON_AMMO)) { - if( GetResourceAmount(actor, RESOURCE_FUEL) >= (time - actor.(weaponentity).hook_time_fueldecrease) * hooked_fuel ) + if( GetResource(actor, RES_FUEL) >= (time - actor.(weaponentity).hook_time_fueldecrease) * hooked_fuel ) { W_DecreaseAmmo(thiswep, actor, (time - actor.(weaponentity).hook_time_fueldecrease) * hooked_fuel, weaponentity); actor.(weaponentity).hook_time_fueldecrease = time; @@ -173,7 +173,7 @@ METHOD(Hook, wr_think, void(entity thiswep, entity actor, .entity weaponentity, } else { - SetResourceAmount(actor, RESOURCE_FUEL, 0); + SetResource(actor, RES_FUEL, 0); actor.(weaponentity).hook_state |= HOOK_REMOVING; if(actor.(weaponentity).m_weapon != WEP_Null) // offhand W_SwitchWeapon_Force(actor, w_getbestweapon(actor, weaponentity), weaponentity); @@ -214,9 +214,9 @@ METHOD(Hook, wr_checkammo1, bool(Hook thiswep, entity actor, .entity weaponentit if (!thiswep.ammo_factor) return true; if(actor.(weaponentity).hook) - return GetResourceAmount(actor, RESOURCE_FUEL) > 0; + return GetResource(actor, RES_FUEL) > 0; - return GetResourceAmount(actor, RESOURCE_FUEL) >= WEP_CVAR_PRI(hook, ammo); + return GetResource(actor, RES_FUEL) >= WEP_CVAR_PRI(hook, ammo); } METHOD(Hook, wr_checkammo2, bool(Hook thiswep, entity actor, .entity weaponentity)) { diff --git a/qcsrc/common/weapons/weapon/hook.qh b/qcsrc/common/weapons/weapon/hook.qh index 31424d421b..1d15d448ec 100644 --- a/qcsrc/common/weapons/weapon/hook.qh +++ b/qcsrc/common/weapons/weapon/hook.qh @@ -2,7 +2,7 @@ CLASS(Hook, Weapon) /* spawnfunc */ ATTRIB(Hook, m_canonical_spawnfunc, string, "weapon_hook"); -/* ammotype */ ATTRIB(Hook, ammo_type, int, RESOURCE_FUEL); +/* ammotype */ ATTRIB(Hook, ammo_type, int, RES_FUEL); /* impulse */ ATTRIB(Hook, impulse, int, 0); /* flags */ ATTRIB(Hook, spawnflags, int, WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Hook, bot_pickupbasevalue, float, 0); diff --git a/qcsrc/common/weapons/weapon/machinegun.qc b/qcsrc/common/weapons/weapon/machinegun.qc index 607f1fcddf..6679f2135f 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qc +++ b/qcsrc/common/weapons/weapon/machinegun.qc @@ -252,9 +252,9 @@ METHOD(MachineGun, wr_checkammo1, bool(entity thiswep, entity actor, .entity wea { float ammo_amount; if(WEP_CVAR(machinegun, mode) == 1) - ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(machinegun, sustained_ammo); + ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR(machinegun, sustained_ammo); else - ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(machinegun, first_ammo); + ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR(machinegun, first_ammo); if(WEP_CVAR(machinegun, reload_ammo)) { @@ -269,9 +269,9 @@ METHOD(MachineGun, wr_checkammo2, bool(entity thiswep, entity actor, .entity wea { float ammo_amount; if(WEP_CVAR(machinegun, mode) == 1) - ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(machinegun, burst_ammo); + ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR(machinegun, burst_ammo); else - ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(machinegun, first_ammo); + ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR(machinegun, first_ammo); if(WEP_CVAR(machinegun, reload_ammo)) { diff --git a/qcsrc/common/weapons/weapon/machinegun.qh b/qcsrc/common/weapons/weapon/machinegun.qh index a7ede47a21..2ecd8082fb 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qh +++ b/qcsrc/common/weapons/weapon/machinegun.qh @@ -2,7 +2,7 @@ CLASS(MachineGun, Weapon) /* spawnfunc */ ATTRIB(MachineGun, m_canonical_spawnfunc, string, "weapon_machinegun"); -/* ammotype */ ATTRIB(MachineGun, ammo_type, int, RESOURCE_BULLETS); +/* ammotype */ ATTRIB(MachineGun, ammo_type, int, RES_BULLETS); /* impulse */ ATTRIB(MachineGun, impulse, int, 3); /* flags */ ATTRIB(MachineGun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS); /* rating */ ATTRIB(MachineGun, bot_pickupbasevalue, float, 7000); diff --git a/qcsrc/common/weapons/weapon/minelayer.qc b/qcsrc/common/weapons/weapon/minelayer.qc index 6063c666eb..7f60c5b571 100644 --- a/qcsrc/common/weapons/weapon/minelayer.qc +++ b/qcsrc/common/weapons/weapon/minelayer.qc @@ -27,7 +27,7 @@ void W_MineLayer_Stick(entity this, entity to) newmine.takedamage = this.takedamage; newmine.damageforcescale = this.damageforcescale; - SetResourceAmountExplicit(newmine, RESOURCE_HEALTH, GetResourceAmount(this, RESOURCE_HEALTH)); + SetResourceExplicit(newmine, RES_HEALTH, GetResource(this, RES_HEALTH)); newmine.event_damage = this.event_damage; newmine.spawnshieldtime = this.spawnshieldtime; newmine.damagedbycontents = true; @@ -237,7 +237,7 @@ void W_MineLayer_Touch(entity this, entity toucher) void W_MineLayer_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) return; float is_from_enemy = (inflictor.realowner != this.realowner); @@ -245,10 +245,10 @@ void W_MineLayer_Damage(entity this, entity inflictor, entity attacker, float da if(!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, (is_from_enemy ? 1 : -1))) return; // g_projectiles_damage says to halt - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); this.angles = vectoangles(this.velocity); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) W_PrepareExplosionByDamage(this, attacker, W_MineLayer_Explode_think); } @@ -289,7 +289,7 @@ void W_MineLayer_Attack(Weapon thiswep, entity actor, .entity weaponentity) mine.takedamage = DAMAGE_YES; mine.damageforcescale = WEP_CVAR(minelayer, damageforcescale); - SetResourceAmountExplicit(mine, RESOURCE_HEALTH, WEP_CVAR(minelayer, health)); + SetResourceExplicit(mine, RES_HEALTH, WEP_CVAR(minelayer, health)); mine.event_damage = W_MineLayer_Damage; mine.damagedbycontents = true; IL_PUSH(g_damagedbycontents, mine); @@ -427,7 +427,7 @@ METHOD(MineLayer, wr_aim, void(entity thiswep, entity actor, .entity weaponentit // but don't fire a new shot at the same time! if(desirabledamage >= 0.75 * coredamage) //this should do group damage in rare fortunate events PHYS_INPUT_BUTTON_ATCK2(actor) = true; - if((skill > 6.5) && (selfdamage > GetResourceAmount(actor, RESOURCE_HEALTH))) + if((skill > 6.5) && (selfdamage > GetResource(actor, RES_HEALTH))) PHYS_INPUT_BUTTON_ATCK2(actor) = false; //if(PHYS_INPUT_BUTTON_ATCK2(actor) == true) // dprint(ftos(desirabledamage),"\n"); @@ -441,7 +441,7 @@ METHOD(MineLayer, wr_think, void(entity thiswep, entity actor, .entity weaponent if(autocvar_g_balance_minelayer_reload_ammo && actor.(weaponentity).clip_load < WEP_CVAR(minelayer, ammo)) // forced reload { // not if we're holding the minelayer without enough ammo, but can detonate existing mines - if(!(W_MineLayer_PlacedMines(actor, weaponentity, false) && GetResourceAmount(actor, thiswep.ammo_type) < WEP_CVAR(minelayer, ammo))) { + if(!(W_MineLayer_PlacedMines(actor, weaponentity, false) && GetResource(actor, thiswep.ammo_type) < WEP_CVAR(minelayer, ammo))) { thiswep.wr_reload(thiswep, actor, weaponentity); } } @@ -465,7 +465,7 @@ METHOD(MineLayer, wr_checkammo1, bool(entity thiswep, entity actor, .entity weap // actually do // don't switch while placing a mine //if(ATTACK_FINISHED(actor, weaponentity) <= time || PS(actor).m_weapon != WEP_MINE_LAYER) //{ - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(minelayer, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR(minelayer, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR(minelayer, ammo); return ammo_amount; //} diff --git a/qcsrc/common/weapons/weapon/minelayer.qh b/qcsrc/common/weapons/weapon/minelayer.qh index f804aaf44e..6d63e539b4 100644 --- a/qcsrc/common/weapons/weapon/minelayer.qh +++ b/qcsrc/common/weapons/weapon/minelayer.qh @@ -2,7 +2,7 @@ CLASS(MineLayer, Weapon) /* spawnfunc */ ATTRIB(MineLayer, m_canonical_spawnfunc, string, "weapon_minelayer"); -/* ammotype */ ATTRIB(MineLayer, ammo_type, int, RESOURCE_ROCKETS); +/* ammotype */ ATTRIB(MineLayer, ammo_type, int, RES_ROCKETS); /* impulse */ ATTRIB(MineLayer, impulse, int, 4); /* flags */ ATTRIB(MineLayer, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(MineLayer, bot_pickupbasevalue, float, 7000); diff --git a/qcsrc/common/weapons/weapon/mortar.qc b/qcsrc/common/weapons/weapon/mortar.qc index 6e2bc91cf9..904f0c1283 100644 --- a/qcsrc/common/weapons/weapon/mortar.qc +++ b/qcsrc/common/weapons/weapon/mortar.qc @@ -54,15 +54,15 @@ void W_Mortar_Grenade_Explode2_use(entity this, entity actor, entity trigger) void W_Mortar_Grenade_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) return; if(!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, -1)) // no exceptions return; // g_projectiles_damage says to halt - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) W_PrepareExplosionByDamage(this, attacker, adaptor_think2use); } @@ -176,7 +176,7 @@ void W_Mortar_Attack(Weapon thiswep, entity actor, .entity weaponentity) settouch(gren, W_Mortar_Grenade_Touch1); gren.takedamage = DAMAGE_YES; - SetResourceAmountExplicit(gren, RESOURCE_HEALTH, WEP_CVAR_PRI(mortar, health)); + SetResourceExplicit(gren, RES_HEALTH, WEP_CVAR_PRI(mortar, health)); gren.damageforcescale = WEP_CVAR_PRI(mortar, damageforcescale); gren.event_damage = W_Mortar_Grenade_Damage; gren.damagedbycontents = true; @@ -227,7 +227,7 @@ void W_Mortar_Attack2(Weapon thiswep, entity actor, .entity weaponentity) settouch(gren, W_Mortar_Grenade_Touch2); gren.takedamage = DAMAGE_YES; - SetResourceAmountExplicit(gren, RESOURCE_HEALTH, WEP_CVAR_SEC(mortar, health)); + SetResourceExplicit(gren, RES_HEALTH, WEP_CVAR_SEC(mortar, health)); gren.damageforcescale = WEP_CVAR_SEC(mortar, damageforcescale); gren.event_damage = W_Mortar_Grenade_Damage; gren.damagedbycontents = true; @@ -324,13 +324,13 @@ METHOD(Mortar, wr_think, void(entity thiswep, entity actor, .entity weaponentity } METHOD(Mortar, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(mortar, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(mortar, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_PRI(mortar, ammo); return ammo_amount; } METHOD(Mortar, wr_checkammo2, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(mortar, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(mortar, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_SEC(mortar, ammo); return ammo_amount; } diff --git a/qcsrc/common/weapons/weapon/mortar.qh b/qcsrc/common/weapons/weapon/mortar.qh index affec0dbca..d83fe59dc6 100644 --- a/qcsrc/common/weapons/weapon/mortar.qh +++ b/qcsrc/common/weapons/weapon/mortar.qh @@ -2,7 +2,7 @@ CLASS(Mortar, Weapon) /* spawnfunc */ ATTRIB(Mortar, m_canonical_spawnfunc, string, "weapon_mortar"); -/* ammotype */ ATTRIB(Mortar, ammo_type, int, RESOURCE_ROCKETS); +/* ammotype */ ATTRIB(Mortar, ammo_type, int, RES_ROCKETS); /* impulse */ ATTRIB(Mortar, impulse, int, 4); /* flags */ ATTRIB(Mortar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Mortar, bot_pickupbasevalue, float, 7000); diff --git a/qcsrc/common/weapons/weapon/porto.qh b/qcsrc/common/weapons/weapon/porto.qh index a77093944b..735426feb6 100644 --- a/qcsrc/common/weapons/weapon/porto.qh +++ b/qcsrc/common/weapons/weapon/porto.qh @@ -2,7 +2,7 @@ CLASS(PortoLaunch, Weapon) /* spawnfunc */ ATTRIB(PortoLaunch, m_canonical_spawnfunc, string, "weapon_porto"); -/* ammotype */ ATTRIB(PortoLaunch, ammo_type, int, RESOURCE_NONE); +/* ammotype */ ATTRIB(PortoLaunch, ammo_type, int, RES_NONE); /* impulse */ ATTRIB(PortoLaunch, impulse, int, 0); /* flags */ ATTRIB(PortoLaunch, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_SUPERWEAPON | WEP_FLAG_NODUAL); /* rating */ ATTRIB(PortoLaunch, bot_pickupbasevalue, float, 0); diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc index d4d692ec70..7daf4ec408 100644 --- a/qcsrc/common/weapons/weapon/rifle.qc +++ b/qcsrc/common/weapons/weapon/rifle.qc @@ -146,13 +146,13 @@ METHOD(Rifle, wr_think, void(entity thiswep, entity actor, .entity weaponentity, } METHOD(Rifle, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(rifle, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(rifle, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_PRI(rifle, ammo); return ammo_amount; } METHOD(Rifle, wr_checkammo2, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(rifle, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(rifle, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_SEC(rifle, ammo); return ammo_amount; } diff --git a/qcsrc/common/weapons/weapon/rifle.qh b/qcsrc/common/weapons/weapon/rifle.qh index 560354c052..ae9a3b9aa5 100644 --- a/qcsrc/common/weapons/weapon/rifle.qh +++ b/qcsrc/common/weapons/weapon/rifle.qh @@ -2,7 +2,7 @@ CLASS(Rifle, Weapon) /* spawnfunc */ ATTRIB(Rifle, m_canonical_spawnfunc, string, "weapon_rifle"); -/* ammotype */ ATTRIB(Rifle, ammo_type, int, RESOURCE_BULLETS); +/* ammotype */ ATTRIB(Rifle, ammo_type, int, RES_BULLETS); /* impulse */ ATTRIB(Rifle, impulse, int, 7); /* flags */ ATTRIB(Rifle, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS); /* rating */ ATTRIB(Rifle, bot_pickupbasevalue, float, 7000); diff --git a/qcsrc/common/weapons/weapon/seeker.qc b/qcsrc/common/weapons/weapon/seeker.qc index 784276ef46..f8c2be1d50 100644 --- a/qcsrc/common/weapons/weapon/seeker.qc +++ b/qcsrc/common/weapons/weapon/seeker.qc @@ -124,18 +124,18 @@ void W_Seeker_Missile_Think(entity this) void W_Seeker_Missile_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) return; if(!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, -1)) // no exceptions return; // g_projectiles_damage says to halt if(this.realowner == attacker) - TakeResource(this, RESOURCE_HEALTH, (damage * 0.25)); + TakeResource(this, RES_HEALTH, (damage * 0.25)); else - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) W_PrepareExplosionByDamage(this, attacker, W_Seeker_Missile_Explode_think); } @@ -190,7 +190,7 @@ void W_Seeker_Fire_Missile(Weapon thiswep, entity actor, .entity weaponentity, v missile.scale = 2; missile.takedamage = DAMAGE_YES; missile.weaponentity_fld = weaponentity; - SetResourceAmountExplicit(missile, RESOURCE_HEALTH, WEP_CVAR(seeker, missile_health)); + SetResourceExplicit(missile, RES_HEALTH, WEP_CVAR(seeker, missile_health)); missile.damageforcescale = WEP_CVAR(seeker, missile_damageforcescale); missile.damagedbycontents = true; IL_PUSH(g_damagedbycontents, missile); @@ -348,7 +348,7 @@ void W_Seeker_Vollycontroller_Think(entity this) // TODO: Merge this with W_Seek Weapon thiswep = WEP_SEEKER; .entity weaponentity = this.weaponentity_fld; - if((!(this.realowner.items & IT_UNLIMITED_AMMO) && GetResourceAmount(this.realowner, thiswep.ammo_type) < WEP_CVAR(seeker, missile_ammo)) || (this.cnt <= -1) || (IS_DEAD(this.realowner)) || (this.realowner.(weaponentity).m_switchweapon != thiswep)) + if((!(this.realowner.items & IT_UNLIMITED_AMMO) && GetResource(this.realowner, thiswep.ammo_type) < WEP_CVAR(seeker, missile_ammo)) || (this.cnt <= -1) || (IS_DEAD(this.realowner)) || (this.realowner.(weaponentity).m_switchweapon != thiswep)) { delete(this); return; @@ -415,10 +415,10 @@ void W_Seeker_Tag_Explode(entity this) void W_Seeker_Tag_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) return; - TakeResource(this, RESOURCE_HEALTH, damage); - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + TakeResource(this, RES_HEALTH, damage); + if(GetResource(this, RES_HEALTH) <= 0) W_Seeker_Tag_Explode(this); } @@ -506,7 +506,7 @@ void W_Seeker_Fire_Tag(Weapon thiswep, entity actor, .entity weaponentity) missile.takedamage = DAMAGE_YES; missile.event_damage = W_Seeker_Tag_Damage; - SetResourceAmountExplicit(missile, RESOURCE_HEALTH, WEP_CVAR(seeker, tag_health)); + SetResourceExplicit(missile, RES_HEALTH, WEP_CVAR(seeker, tag_health)); missile.damageforcescale = WEP_CVAR(seeker, tag_damageforcescale); setorigin(missile, w_shotorg); @@ -533,10 +533,12 @@ void W_Seeker_Fire_Tag(Weapon thiswep, entity actor, .entity weaponentity) METHOD(Seeker, wr_aim, void(entity thiswep, entity actor, .entity weaponentity)) { if(WEP_CVAR(seeker, type) == 1) + { if(W_Seeker_Tagged_Info(actor, weaponentity, actor.enemy) != NULL) PHYS_INPUT_BUTTON_ATCK(actor) = bot_aim(actor, weaponentity, WEP_CVAR(seeker, missile_speed_max), 0, WEP_CVAR(seeker, missile_lifetime), false); else PHYS_INPUT_BUTTON_ATCK2(actor) = bot_aim(actor, weaponentity, WEP_CVAR(seeker, tag_speed), 0, WEP_CVAR(seeker, tag_lifetime), false); + } else PHYS_INPUT_BUTTON_ATCK(actor) = bot_aim(actor, weaponentity, WEP_CVAR(seeker, tag_speed), 0, WEP_CVAR(seeker, tag_lifetime), false); } @@ -589,12 +591,12 @@ METHOD(Seeker, wr_checkammo1, bool(entity thiswep, entity actor, .entity weapone float ammo_amount; if(WEP_CVAR(seeker, type) == 1) { - ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(seeker, missile_ammo); + ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR(seeker, missile_ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR(seeker, missile_ammo); } else { - ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(seeker, tag_ammo); + ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR(seeker, tag_ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR(seeker, tag_ammo); } return ammo_amount; @@ -604,12 +606,12 @@ METHOD(Seeker, wr_checkammo2, bool(entity thiswep, entity actor, .entity weapone float ammo_amount; if(WEP_CVAR(seeker, type) == 1) { - ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(seeker, tag_ammo); + ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR(seeker, tag_ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR(seeker, tag_ammo); } else { - ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR(seeker, flac_ammo); + ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR(seeker, flac_ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR(seeker, flac_ammo); } return ammo_amount; diff --git a/qcsrc/common/weapons/weapon/seeker.qh b/qcsrc/common/weapons/weapon/seeker.qh index e4e9fd5352..5690938137 100644 --- a/qcsrc/common/weapons/weapon/seeker.qh +++ b/qcsrc/common/weapons/weapon/seeker.qh @@ -2,7 +2,7 @@ CLASS(Seeker, Weapon) /* spawnfunc */ ATTRIB(Seeker, m_canonical_spawnfunc, string, "weapon_seeker"); -/* ammotype */ ATTRIB(Seeker, ammo_type, int, RESOURCE_ROCKETS); +/* ammotype */ ATTRIB(Seeker, ammo_type, int, RES_ROCKETS); /* impulse */ ATTRIB(Seeker, impulse, int, 8); /* flags */ ATTRIB(Seeker, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Seeker, bot_pickupbasevalue, float, 5000); diff --git a/qcsrc/common/weapons/weapon/shockwave.qh b/qcsrc/common/weapons/weapon/shockwave.qh index ade2e9a85c..f42eea7d49 100644 --- a/qcsrc/common/weapons/weapon/shockwave.qh +++ b/qcsrc/common/weapons/weapon/shockwave.qh @@ -2,7 +2,7 @@ CLASS(Shockwave, Weapon) /* spawnfunc */ ATTRIB(Shockwave, m_canonical_spawnfunc, string, "weapon_shockwave"); -/* ammotype */ //ATTRIB(Shockwave, ammo_type, int, RESOURCE_NONE); +/* ammotype */ //ATTRIB(Shockwave, ammo_type, int, RES_NONE); /* impulse */ ATTRIB(Shockwave, impulse, int, 2); /* flags */ ATTRIB(Shockwave, spawnflags, int, WEP_TYPE_HITSCAN | WEP_FLAG_CANCLIMB | WEP_TYPE_MELEE_SEC); /* rating */ ATTRIB(Shockwave, bot_pickupbasevalue, float, 3000); diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc index 8faac3d5d0..a3bf16145a 100644 --- a/qcsrc/common/weapons/weapon/shotgun.qc +++ b/qcsrc/common/weapons/weapon/shotgun.qc @@ -245,7 +245,7 @@ METHOD(Shotgun, wr_think, void(entity thiswep, entity actor, .entity weaponentit } if(actor.(weaponentity).clip_load >= 0) // we are not currently reloading if(WEP_CVAR(shotgun, secondary) == 1) - if(((fire & 1) && GetResourceAmount(actor, thiswep.ammo_type) <= 0 && !(actor.items & IT_UNLIMITED_WEAPON_AMMO)) || (fire & 2)) + if(((fire & 1) && GetResource(actor, thiswep.ammo_type) <= 0 && !(actor.items & IT_UNLIMITED_WEAPON_AMMO)) || (fire & 2)) if(weapon_prepareattack(thiswep, actor, weaponentity, true, WEP_CVAR_SEC(shotgun, refire))) { // attempt forcing playback of the anim by switching to another anim (that we never play) here... @@ -254,7 +254,7 @@ METHOD(Shotgun, wr_think, void(entity thiswep, entity actor, .entity weaponentit } METHOD(Shotgun, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(shotgun, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(shotgun, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_PRI(shotgun, ammo); return ammo_amount; } @@ -268,7 +268,7 @@ METHOD(Shotgun, wr_checkammo2, bool(entity thiswep, entity actor, .entity weapon case 1: return true; // melee does not use ammo case 2: // secondary triple shot { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(shotgun, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(shotgun, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_PRI(shotgun, ammo); return ammo_amount; } diff --git a/qcsrc/common/weapons/weapon/shotgun.qh b/qcsrc/common/weapons/weapon/shotgun.qh index e40b1d8a1f..5a47a18890 100644 --- a/qcsrc/common/weapons/weapon/shotgun.qh +++ b/qcsrc/common/weapons/weapon/shotgun.qh @@ -2,7 +2,7 @@ CLASS(Shotgun, Weapon) /* spawnfunc */ ATTRIB(Shotgun, m_canonical_spawnfunc, string, "weapon_shotgun"); -/* ammotype */ ATTRIB(Shotgun, ammo_type, int, RESOURCE_SHELLS); +/* ammotype */ ATTRIB(Shotgun, ammo_type, int, RES_SHELLS); /* impulse */ ATTRIB(Shotgun, impulse, int, 2); /* flags */ ATTRIB(Shotgun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_TYPE_MELEE_SEC); /* rating */ ATTRIB(Shotgun, bot_pickupbasevalue, float, 6000); diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc index cefa4558f2..2e76827d79 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qc +++ b/qcsrc/common/weapons/weapon/vaporizer.qc @@ -281,7 +281,7 @@ void W_RocketMinsta_Attack3 (entity actor, .entity weaponentity) METHOD(Vaporizer, wr_aim, void(entity thiswep, entity actor, .entity weaponentity)) { - if(GetResourceAmount(actor, thiswep.ammo_type) > 0) + if(GetResource(actor, thiswep.ammo_type) > 0) PHYS_INPUT_BUTTON_ATCK(actor) = bot_aim(actor, weaponentity, 1000000, 0, 1, false); else PHYS_INPUT_BUTTON_ATCK2(actor) = bot_aim(actor, weaponentity, WEP_CVAR_SEC(vaporizer, speed), 0, WEP_CVAR_SEC(vaporizer, lifetime), false); // WEAPONTODO: replace with proper vaporizer cvars @@ -295,7 +295,7 @@ METHOD(Vaporizer, wr_think, void(entity thiswep, entity actor, .entity weaponent } else if(WEP_CVAR(vaporizer, reload_ammo) && actor.(weaponentity).clip_load < vaporizer_ammo) { // forced reload thiswep.wr_reload(thiswep, actor, weaponentity); } - if((fire & 1) && (GetResourceAmount(actor, RESOURCE_CELLS) || !autocvar_g_rm) && !forbidWeaponUse(actor)) + if((fire & 1) && (GetResource(actor, RES_CELLS) || !autocvar_g_rm) && !forbidWeaponUse(actor)) { if(weapon_prepareattack(thiswep, actor, weaponentity, false, WEP_CVAR_PRI(vaporizer, refire))) { @@ -303,7 +303,7 @@ METHOD(Vaporizer, wr_think, void(entity thiswep, entity actor, .entity weaponent weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_PRI(vaporizer, animtime), w_ready); } } - if((fire & 2) || ((fire & 1) && !GetResourceAmount(actor, RESOURCE_CELLS) && autocvar_g_rm)) + if((fire & 2) || ((fire & 1) && !GetResource(actor, RES_CELLS) && autocvar_g_rm)) { if((autocvar_g_rm && autocvar_g_rm_laser) || autocvar_g_rm_laser == 2) { @@ -350,7 +350,7 @@ METHOD(Vaporizer, wr_setup, void(entity thiswep, entity actor, .entity weaponent METHOD(Vaporizer, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { float vaporizer_ammo = ((autocvar_g_instagib) ? 1 : WEP_CVAR_PRI(vaporizer, ammo)); - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= vaporizer_ammo; + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= vaporizer_ammo; ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= vaporizer_ammo; return ammo_amount; } @@ -358,7 +358,7 @@ METHOD(Vaporizer, wr_checkammo2, bool(entity thiswep, entity actor, .entity weap { if(!WEP_CVAR_SEC(vaporizer, ammo)) return true; - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(vaporizer, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(vaporizer, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_SEC(vaporizer, ammo); return ammo_amount; } diff --git a/qcsrc/common/weapons/weapon/vaporizer.qh b/qcsrc/common/weapons/weapon/vaporizer.qh index 9bbc5e9bdd..207ae8e630 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qh +++ b/qcsrc/common/weapons/weapon/vaporizer.qh @@ -2,7 +2,7 @@ CLASS(Vaporizer, Weapon) /* spawnfunc */ ATTRIB(Vaporizer, m_canonical_spawnfunc, string, "weapon_vaporizer"); -/* ammotype */ ATTRIB(Vaporizer, ammo_type, int, RESOURCE_CELLS); +/* ammotype */ ATTRIB(Vaporizer, ammo_type, int, RES_CELLS); /* impulse */ ATTRIB(Vaporizer, impulse, int, 7); /* flags */ ATTRIB(Vaporizer, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN | WEP_FLAG_NODUAL); /* rating */ ATTRIB(Vaporizer, bot_pickupbasevalue, float, 10000); diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc index 2e9a60ab85..edd9d47613 100644 --- a/qcsrc/common/weapons/weapon/vortex.qc +++ b/qcsrc/common/weapons/weapon/vortex.qc @@ -57,10 +57,12 @@ NET_HANDLE(TE_CSQC_VORTEXBEAMPARTICLE, bool isNew) particles_alphamin = particles_alphamax = particles_fade = charge; if(!MUTATOR_CALLHOOK(Particles_VortexBeam, shotorg, endpos)) - if(autocvar_cl_particles_oldvortexbeam && (STAT(ALLOW_OLDVORTEXBEAM) || isdemo())) - WarpZone_TrailParticles_WithMultiplier(NULL, particleeffectnum(EFFECT_VORTEX_BEAM_OLD), shotorg, endpos, 1, PARTICLES_USEALPHA | PARTICLES_USEFADE); - else - WarpZone_TrailParticles_WithMultiplier(NULL, particleeffectnum(EFFECT_VORTEX_BEAM), shotorg, endpos, 1, PARTICLES_USEALPHA | PARTICLES_USEFADE); + { + if(autocvar_cl_particles_oldvortexbeam && (STAT(ALLOW_OLDVORTEXBEAM) || isdemo())) + WarpZone_TrailParticles_WithMultiplier(NULL, particleeffectnum(EFFECT_VORTEX_BEAM_OLD), shotorg, endpos, 1, PARTICLES_USEALPHA | PARTICLES_USEFADE); + else + WarpZone_TrailParticles_WithMultiplier(NULL, particleeffectnum(EFFECT_VORTEX_BEAM), shotorg, endpos, 1, PARTICLES_USEALPHA | PARTICLES_USEFADE); + } return true; } #endif @@ -232,11 +234,11 @@ METHOD(Vortex, wr_think, void(entity thiswep, entity actor, .entity weaponentity } else { - dt = min(dt, (GetResourceAmount(actor, thiswep.ammo_type) - WEP_CVAR_PRI(vortex, ammo)) / WEP_CVAR_SEC(vortex, ammo)); + dt = min(dt, (GetResource(actor, thiswep.ammo_type) - WEP_CVAR_PRI(vortex, ammo)) / WEP_CVAR_SEC(vortex, ammo)); dt = max(0, dt); if(dt > 0) { - SetResourceAmount(actor, thiswep.ammo_type, max(WEP_CVAR_SEC(vortex, ammo), GetResourceAmount(actor, thiswep.ammo_type) - WEP_CVAR_SEC(vortex, ammo) * dt)); + SetResource(actor, thiswep.ammo_type, max(WEP_CVAR_SEC(vortex, ammo), GetResource(actor, thiswep.ammo_type) - WEP_CVAR_SEC(vortex, ammo) * dt)); } } } @@ -268,7 +270,7 @@ METHOD(Vortex, wr_setup, void(entity thiswep, entity actor, .entity weaponentity } METHOD(Vortex, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(vortex, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_PRI(vortex, ammo); ammo_amount += (autocvar_g_balance_vortex_reload_ammo && actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_PRI(vortex, ammo)); return ammo_amount; } @@ -277,7 +279,7 @@ METHOD(Vortex, wr_checkammo2, bool(entity thiswep, entity actor, .entity weapone if(WEP_CVAR(vortex, secondary)) { // don't allow charging if we don't have enough ammo - float ammo_amount = GetResourceAmount(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(vortex, ammo); + float ammo_amount = GetResource(actor, thiswep.ammo_type) >= WEP_CVAR_SEC(vortex, ammo); ammo_amount += actor.(weaponentity).(weapon_load[thiswep.m_id]) >= WEP_CVAR_SEC(vortex, ammo); return ammo_amount; } diff --git a/qcsrc/common/weapons/weapon/vortex.qh b/qcsrc/common/weapons/weapon/vortex.qh index 8a11b2e13e..570464cb91 100644 --- a/qcsrc/common/weapons/weapon/vortex.qh +++ b/qcsrc/common/weapons/weapon/vortex.qh @@ -2,7 +2,7 @@ CLASS(Vortex, Weapon) /* spawnfunc */ ATTRIB(Vortex, m_canonical_spawnfunc, string, "weapon_vortex"); -/* ammotype */ ATTRIB(Vortex, ammo_type, int, RESOURCE_CELLS); +/* ammotype */ ATTRIB(Vortex, ammo_type, int, RES_CELLS); /* impulse */ ATTRIB(Vortex, impulse, int, 7); /* flags */ ATTRIB(Vortex, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN); /* rating */ ATTRIB(Vortex, bot_pickupbasevalue, float, 8000); diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc index 0bed40bbf0..ab74531605 100644 --- a/qcsrc/lib/_all.inc +++ b/qcsrc/lib/_all.inc @@ -162,14 +162,14 @@ void make_safe_for_remove(entity this); #define objerror_safe(e) make_safe_for_remove(e) #endif -#define objerror(this, msg) MACRO_BEGIN { \ +#define objerror(this, msg) MACRO_BEGIN \ LOG_WARN("======OBJECT ERROR======"); \ entity _e = (this); \ eprint(_e); \ objerror_safe(_e); \ delete(_e); \ LOG_WARNF("%s OBJECT ERROR in %s:\n%s\nTip: read above for entity information", PROGNAME, __FUNC__, msg); \ -} MACRO_END +MACRO_END #ifdef MENUQC void _m_init(); diff --git a/qcsrc/lib/arraylist.qh b/qcsrc/lib/arraylist.qh index 18305177bf..a10dcaa7b9 100644 --- a/qcsrc/lib/arraylist.qh +++ b/qcsrc/lib/arraylist.qh @@ -6,7 +6,6 @@ USING(ArrayList, entity); #define AL_NEW(this, n, default, T) \ MACRO_BEGIN \ - { \ ArrayList _al = this = new_pure(ArrayList); \ _al.al_buf = buf_create(); \ for (int i = 0, _n = _al.al_len = n; i < _n; ++i) \ @@ -14,15 +13,14 @@ USING(ArrayList, entity); const _AL_type__##T() it = default; \ AL_set##T(this, i, it); \ } \ - } MACRO_END + MACRO_END #define AL_DELETE(this) \ MACRO_BEGIN \ - { \ buf_del(this.al_buf); \ delete(this); \ this = NULL; \ - } MACRO_END + MACRO_END #define _AL_type__s() string #define AL_gets(this, idx) bufstr_get(this.al_buf, idx) @@ -60,11 +58,10 @@ entity al_ftoe(int i) = #80; #define AL_EACH(this, T, cond, body) \ MACRO_BEGIN \ - { \ const noref ArrayList _al = this; \ for (int i = 0, n = _al.al_len; i < n; ++i) \ { \ const noref _AL_type__##T() it = AL_get##T(_al, i); \ if (cond) { body } \ } \ - } MACRO_END + MACRO_END diff --git a/qcsrc/lib/bits.qh b/qcsrc/lib/bits.qh index c158ea032d..de11eef412 100644 --- a/qcsrc/lib/bits.qh +++ b/qcsrc/lib/bits.qh @@ -2,6 +2,9 @@ #include "log.qh" +/// Only ever assign into the first 24 bits in QC (so max is BIT(23)). +/// QC converts the float to int, performs the bit operation, then converts it back. +/// Assigning to the highest bits means some of the low ones might get lost due to float precision. #define BIT(n) (1 << (n)) #define BITS(n) (BIT(n) - 1) #ifndef BRANCHLESS_BITSET diff --git a/qcsrc/lib/csqcmodel/cl_player.qc b/qcsrc/lib/csqcmodel/cl_player.qc index 268b591264..04b96bc997 100644 --- a/qcsrc/lib/csqcmodel/cl_player.qc +++ b/qcsrc/lib/csqcmodel/cl_player.qc @@ -98,7 +98,7 @@ void CSQCPlayer_Unpredict(entity this) void CSQCPlayer_SetMinsMaxs(entity this) { - if (IS_DUCKED(this) || !this.isplayermodel) + if (IS_DUCKED(this) || !(this.isplayermodel & ISPLAYER_PLAYER)) { this.mins = PHYS_PL_CROUCH_MIN(this); this.maxs = PHYS_PL_CROUCH_MAX(this); diff --git a/qcsrc/lib/intrusivelist.qh b/qcsrc/lib/intrusivelist.qh index fc0e080eae..279210fb18 100644 --- a/qcsrc/lib/intrusivelist.qh +++ b/qcsrc/lib/intrusivelist.qh @@ -146,27 +146,24 @@ void IL_REMOVE(IntrusiveList this, entity it) */ #define IL_CLEAR(this) \ MACRO_BEGIN \ - { \ IntrusiveList __il = this; \ assert(__il); \ .entity il_prev = __il.il_prevfld; \ IL_EACH(__il, true, it.(il_next) = it.(il_prev) = NULL); \ __il.il_head = __il.il_tail = NULL; \ - } MACRO_END + MACRO_END /** * Delete the list */ #define IL_DELETE(this) \ MACRO_BEGIN \ - { \ delete(this); \ this = NULL; \ - } MACRO_END + MACRO_END #define IL_EACH(this, cond, body) \ MACRO_BEGIN \ - { \ IntrusiveList _il = this; \ assert(_il); \ .entity il_next = _il.il_nextfld; \ @@ -177,7 +174,7 @@ void IL_REMOVE(IntrusiveList this, entity it) _next = it.(il_next); \ if (cond) { LAMBDA(body) } \ } \ - } MACRO_END + MACRO_END .int il_id; IntrusiveList il_links[IL_MAX]; @@ -215,7 +212,7 @@ void IL_INIT(IntrusiveList this) return; } } - LOG_WARNF("IntrusiveList overflow"); + LOG_WARN("IntrusiveList overflow"); } ERASEABLE diff --git a/qcsrc/lib/iter.qh b/qcsrc/lib/iter.qh index e3cf7410fb..4eae6d5d39 100644 --- a/qcsrc/lib/iter.qh +++ b/qcsrc/lib/iter.qh @@ -8,20 +8,18 @@ #define FOREACH_ARRAY(arr, start, end, cond, body) \ MACRO_BEGIN \ - { \ for (int _i = start; _i < end; ++_i) \ { \ const noref int i = _i; \ ITER_CONST noref entity it = arr[i]; \ if (cond) { LAMBDA(body) } \ } \ - } MACRO_END + MACRO_END #define FOREACH(list, cond, body) FOREACH_LIST(list, enemy, cond, body) #define FOREACH_LIST(list, next, cond, body) \ MACRO_BEGIN \ - { \ int _i = 0; \ for (entity _it = list##_first, _next = NULL; _it; (_it = _next, ++_i)) \ { \ @@ -30,11 +28,10 @@ _next = _it.next; \ if (cond) { LAMBDA(body) } \ } \ - } MACRO_END + MACRO_END #define FOREACH_WORD(words, cond, body) \ MACRO_BEGIN \ - { \ string _words = words; \ int _i = 0; \ for (string _it; (_it = car(_words)); (_words = cdr(_words), ++_i)) \ @@ -43,17 +40,17 @@ const noref string it = _it; \ if (cond) { LAMBDA(body) } \ } \ - } MACRO_END + MACRO_END #define STRING_ITERATOR(this, s, i) \ string this##_s = s; \ int this##_i = i #define STRING_ITERATOR_SET(this, s, i) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ this##_s = s; \ this##_i = i; \ - } MACRO_END + MACRO_END #define STRING_ITERATOR_GET(this) str2chr(this##_s, this##_i++) #define STRING_ITERATOR_PEEK(this) str2chr(this##_s, this##_i) @@ -64,7 +61,6 @@ #define FOREACH_CHAR(s, cond, body) \ MACRO_BEGIN \ - { \ STRING_ITERATOR(iter, s, 0); \ int _it; \ while ((_it = STRING_ITERATOR_GET(iter)) > 0) \ @@ -72,7 +68,7 @@ const noref int it = _it; \ if (cond) { LAMBDA(body) } \ } \ - } MACRO_END + MACRO_END #if defined(CSQC) entity(entity start, .string fld, string match) _findstring = #18; @@ -114,7 +110,7 @@ #define ORDERED(F) F##_UNORDERED #define _FOREACH_ENTITY_FIND_ORDERED(T, fld, match, cond, body) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ int _i = 0; \ for (entity _it = NULL; (_it = _find##T(_it, fld, match)); ++_i) \ { \ @@ -122,7 +118,7 @@ ITER_CONST noref entity it = _it; \ if (cond) LAMBDA(body) \ } \ - } MACRO_END + MACRO_END #define MUTEX_LOCK(this) MACRO_BEGIN \ if (this) LOG_SEVEREF("Loop mutex held by %s", this); \ this = __FUNC__; \ @@ -131,16 +127,16 @@ MACRO_END this = string_null; \ MACRO_END #define _FOREACH_ENTITY_FIND_UNORDERED(id, T, fld, match, cond, body) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ MUTEX_LOCK(_FOREACH_ENTITY_FIND_##T##_##id##mutex); \ entity _foundchain_first = _findchain##T##_tofield(fld, match, _FOREACH_ENTITY_FIND_##T##_next##id); \ FOREACH_LIST(_foundchain, _FOREACH_ENTITY_FIND_##T##_next##id, cond, body); \ MUTEX_UNLOCK(_FOREACH_ENTITY_FIND_##T##_##id##mutex); \ - } MACRO_END + MACRO_END #define FOREACH_ENTITY(cond, body) ORDERED(FOREACH_ENTITY)(cond, body) #define FOREACH_ENTITY_ORDERED(cond, body) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ int _i = 0; \ for (entity _it = NULL; (_it = nextent(_it)); ++_i) \ { \ @@ -148,7 +144,7 @@ MACRO_END ITER_CONST noref entity it = _it; \ if (cond) LAMBDA(body) \ } \ - } MACRO_END + MACRO_END /** marker field, always NULL */ .entity _FOREACH_ENTITY_fld; .entity _FOREACH_ENTITY_FIND_entity_nextall; noref string _FOREACH_ENTITY_FIND_entity_allmutex; diff --git a/qcsrc/lib/linkedlist.qh b/qcsrc/lib/linkedlist.qh index 0dd430722f..aa7d7c9517 100644 --- a/qcsrc/lib/linkedlist.qh +++ b/qcsrc/lib/linkedlist.qh @@ -49,7 +49,6 @@ entity LL_POP(LinkedList this) #define LL_CLEAR_1(this) LL_CLEAR_2(this, LAMBDA()) #define LL_CLEAR_2(this, dtor) \ MACRO_BEGIN \ - { \ LinkedList _ll = this; \ assert(_ll); \ while (_ll.ll_tail) \ @@ -59,26 +58,24 @@ entity LL_POP(LinkedList this) dtor \ delete(it); \ } \ - } MACRO_END + MACRO_END #define LL_DELETE(...) EVAL_LL_DELETE(OVERLOAD(LL_DELETE, __VA_ARGS__)) #define EVAL_LL_DELETE(...) __VA_ARGS__ #define LL_DELETE_1(this) LL_DELETE_2(this, LAMBDA()) #define LL_DELETE_2(this, dtor) \ MACRO_BEGIN \ - { \ LL_CLEAR_2(this, dtor); \ delete(this); \ this = NULL; \ - } MACRO_END + MACRO_END #define LL_EACH(list, cond, body) \ MACRO_BEGIN \ - { \ noref int i = 0; \ for (entity _it = list.ll_head; _it; (_it = _it.ll_next, ++i)) \ { \ ITER_CONST noref entity it = _it.ll_data; \ if (cond) { body } \ } \ - } MACRO_END + MACRO_END diff --git a/qcsrc/lib/log.qh b/qcsrc/lib/log.qh index 7491818b24..94a58d0ca4 100644 --- a/qcsrc/lib/log.qh +++ b/qcsrc/lib/log.qh @@ -2,32 +2,34 @@ #include "progname.qh" -#define assert(expr, ...) _assert(LOG_SEVERE, expr, __VA_ARGS__) +void print_assertfailed_severe(string expr); +void print_assertfailed_fatal(string expr); + +#define assert(expr, ...) _assert(print_assertfailed_severe, expr, __VA_ARGS__) #define devassert(...) MACRO_BEGIN if (autocvar_developer) assert(__VA_ARGS__); MACRO_END #define assert_once(expr, ...) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ static bool __once; \ if (!__once) \ { \ assert(expr, __VA_ARGS__); \ __once = true; \ } \ - } MACRO_END + MACRO_END #define devassert_once(...) MACRO_BEGIN if (autocvar_developer) assert_once(__VA_ARGS__); MACRO_END -#define demand(expr, ...) _assert(LOG_FATAL, expr, __VA_ARGS__) +#define demand(expr, ...) _assert(print_assertfailed_fatal, expr, __VA_ARGS__) #define devdemand(...) MACRO_BEGIN if (autocvar_developer) demand(__VA_ARGS__); MACRO_END #define _assert(f, expr, then) \ MACRO_BEGIN \ - { \ if (!(expr)) \ { \ - f("assertion failed: `" #expr "`\n"); \ + f(#expr); \ then; \ } \ - } MACRO_END + MACRO_END #define ASSERT_LESS(name, var, const) noref int name[(const - var + 1)]; @@ -41,16 +43,16 @@ string(string, string...) strcat1n = #115; // would be nice if __FUNC__ could be concatenated at compile time #if 0 // less work, bigger binary - #define __SOURCELOC__ (sprintf("^7%s^9" "(" "^9"__FILE__"^7" ":" "^9"STR(__LINE__)"^7" ")", __FUNC__)) + #define __SOURCELOC__ (sprintf("^7%s^9(^9"__FILE__"^7:^9"STR(__LINE__)"^7)", __FUNC__)) #else - #define __SOURCELOC__ (sprintf("^7%s^9" "(" "^9%s^7" ":" "^9%s^7" ")", __FUNC__, __FILE__, STR(__LINE__))) + #define __SOURCELOC__ (sprintf("^7%s^9(^9%s^7:^9%s^7)", __FUNC__, __FILE__, STR(__LINE__))) #endif -#define _LOG_HEADER(level) "^9[::" "^7"PROGNAME"^9" "::" level"^9" "] ", __SOURCELOC__ +#define _LOG_HEADER(level) "^9[::^7"PROGNAME"^9::"level"^9] ", __SOURCELOC__ #define _LOG(f, level, s) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ f(strcat1n(_LOG_HEADER(level), "\n^7", s, "\n")); \ - } MACRO_END + MACRO_END #define LOG_FATAL(...) _LOG_FATAL(strcat1n(__VA_ARGS__)) #define LOG_FATALF(...) _LOG_FATAL(sprintf(__VA_ARGS__)) @@ -67,13 +69,13 @@ string(string, string...) strcat1n = #115; #define LOG_INFO(...) _LOG_INFO(strcat1n(__VA_ARGS__)) #define LOG_INFOF(...) _LOG_INFO(sprintf(__VA_ARGS__)) #define _LOG_INFO(s) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ dprint(_LOG_HEADER("^5INFO")); \ string __s = s; \ print("\n^7", __s); \ /* TODO: unconditionally add a newline when possible */ \ if (str2chr(__s, strlen(__s) - 1) != '\n') { print("\n"); } \ - } MACRO_END + MACRO_END #define LOG_TRACE(...) _LOG_TRACE(strcat1n(__VA_ARGS__)) #define LOG_TRACEF(...) _LOG_TRACE(sprintf(__VA_ARGS__)) @@ -84,9 +86,9 @@ string(string, string...) strcat1n = #115; #define _LOG_DEBUG(s) _LOG(dprint2, "^2DEBUG", s) #define dprint2(msg) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ if (autocvar_developer > 1) dprint(msg); \ - } MACRO_END + MACRO_END // TODO: this sucks, lets find a better way to do backtraces? #define _backtrace() builtin_remove(NULL) @@ -102,7 +104,6 @@ noref bool autocvar_prvm_backtraceforwarnings; #define backtrace(msg) \ MACRO_BEGIN \ - { \ int dev = autocvar_developer; \ bool war = autocvar_prvm_backtraceforwarnings; \ bt_cvar_set("developer", "1"); \ @@ -112,4 +113,16 @@ noref bool autocvar_prvm_backtraceforwarnings; print("\n--- CUT UNTIL HERE ---\n"); \ bt_cvar_set("developer", ftos(dev)); \ bt_cvar_set("prvm_backtraceforwarnings", ftos(war)); \ - } MACRO_END + MACRO_END + +void print_assertfailed_severe(string expr) +{ + // this is inside a function to avoid expanding it on compilation everytime + LOG_SEVERE("assertion failed: `", expr, "`\n"); +} + +void print_assertfailed_fatal(string expr) +{ + // this is inside a function to avoid expanding it on compilation everytime + LOG_FATAL("assertion failed: `", expr, "`\n"); +} diff --git a/qcsrc/lib/macro.qh b/qcsrc/lib/macro.qh index f2ec6df4a4..62c1e3133c 100644 --- a/qcsrc/lib/macro.qh +++ b/qcsrc/lib/macro.qh @@ -1,12 +1,13 @@ #pragma once +// NOTE: spaces removed from these often used macros to reduce size when expanded #if 1 void voidfunc() { } - #define MACRO_BEGIN if (1) { - #define MACRO_END } else voidfunc() + #define MACRO_BEGIN if(1){ + #define MACRO_END }else voidfunc() #else - #define MACRO_BEGIN do { - #define MACRO_END } while (0) + #define MACRO_BEGIN do{ + #define MACRO_END }while(0) #endif /** Marker for use in (RVALUE, (expr)) */ diff --git a/qcsrc/lib/misc.qh b/qcsrc/lib/misc.qh index cbb1079244..474484c64e 100644 --- a/qcsrc/lib/misc.qh +++ b/qcsrc/lib/misc.qh @@ -39,9 +39,8 @@ // With block may not contain continue or break #define WITH(type, name, value, block) \ MACRO_BEGIN \ - { \ type __with_save = (name); \ name = (value); \ LAMBDA(block) \ name = __with_save; \ - } MACRO_END + MACRO_END diff --git a/qcsrc/lib/net.qh b/qcsrc/lib/net.qh index 7b3f581b38..a6c363b8f7 100644 --- a/qcsrc/lib/net.qh +++ b/qcsrc/lib/net.qh @@ -44,7 +44,7 @@ REGISTRY(TempEntities, BITS(8) - 80) REGISTER_REGISTRY(TempEntities) REGISTRY_SORT(TempEntities) REGISTRY_CHECK(TempEntities) -STATIC_INIT(RegisterTempEntities_renumber) { FOREACH(TempEntities, true, it.m_id = 80 + i); } +STATIC_INIT(TempEntities_renumber) { FOREACH(TempEntities, true, it.m_id = 80 + i); } @@ -53,7 +53,7 @@ STATIC_INIT(RegisterTempEntities_renumber) { FOREACH(TempEntities, true, it.m_id ACCUMULATE NET_HANDLE(id, bool isnew) \ { \ this = __self; \ - this.sourceLoc = __FILE__ ":" STR(__LINE__); \ + this.sourceLoc = __FILE__":"STR(__LINE__); \ if (!this) isnew = true; \ } \ NET_GUARD(id); \ @@ -76,7 +76,7 @@ REGISTRY(LinkedEntities, BITS(8) - 1) REGISTER_REGISTRY(LinkedEntities) REGISTRY_SORT(LinkedEntities) REGISTRY_CHECK(LinkedEntities) -STATIC_INIT(RegisterLinkedEntities_renumber) { FOREACH(LinkedEntities, true, it.m_id = 1 + i); } +STATIC_INIT(LinkedEntities_renumber) { FOREACH(LinkedEntities, true, it.m_id = 1 + i); } @@ -187,13 +187,13 @@ STATIC_INIT(C2S_Protocol_renumber) { FOREACH(C2S_Protocol, true, it.m_id = i); } const int MSG_C2S = 0; #define Net_Accept(classname) \ - MACRO_BEGIN { \ - if (!this) this = new(classname); \ - } MACRO_END + MACRO_BEGIN \ + if (!this) this = new(classname); \ + MACRO_END #define Net_Reject() \ - MACRO_BEGIN { \ - if (this) delete(this); \ - } MACRO_END + MACRO_BEGIN \ + if (this) delete(this); \ + MACRO_END string g_buf; @@ -207,16 +207,14 @@ STATIC_INIT(C2S_Protocol_renumber) { FOREACH(C2S_Protocol, true, it.m_id = i); } #if defined(CSQC) #define WriteHeader(to, id) \ - MACRO_BEGIN { \ - WriteByte(to, NET_##id.m_id); \ - } MACRO_END + WriteByte(to, NET_##id.m_id) #elif defined(SVQC) #define WriteHeader(to, id) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ if (NET_##id##_istemp) WriteByte(to, SVC_TEMPENTITY); \ WriteByte(to, NET_##id.m_id); \ bool _net_valid = false; serialize_marker(to, _net_valid); \ - } MACRO_END + MACRO_END #endif // serialization: new style @@ -386,9 +384,9 @@ MACRO_END WriteInt24_t(dst, val.z); } - #define WriteFloat(to, f) WriteCoord(to, f) - #define WriteVector(to, v) MACRO_BEGIN { WriteFloat(to, v.x); WriteFloat(to, v.y); WriteFloat(to, v.z); } MACRO_END - #define WriteVector2D(to, v) MACRO_BEGIN { WriteFloat(to, v.x); WriteFloat(to, v.y); } MACRO_END + #define WriteFloat(to, f) WriteCoord(to, f) + #define WriteVector(to, v) MACRO_BEGIN WriteFloat(to, v.x); WriteFloat(to, v.y); WriteFloat(to, v.z); MACRO_END + #define WriteVector2D(to, v) MACRO_BEGIN WriteFloat(to, v.x); WriteFloat(to, v.y); MACRO_END // this will use the value: // 128 @@ -413,7 +411,7 @@ MACRO_END } // allow writing to also pass through to spectators (like so spectators see the same centerprints as players for example) - #define WRITESPECTATABLE_MSG_ONE(to, statement) MACRO_BEGIN { \ + #define WRITESPECTATABLE_MSG_ONE(to, statement) MACRO_BEGIN \ entity prev = msg_entity; \ entity dst = to; \ FOREACH_CLIENT(IS_REAL_CLIENT(it), { \ @@ -424,6 +422,6 @@ MACRO_END } \ }); \ msg_entity = prev; \ - } MACRO_END + MACRO_END #endif #endif diff --git a/qcsrc/lib/oo.qh b/qcsrc/lib/oo.qh index e482d7d9ac..b91a6d1898 100644 --- a/qcsrc/lib/oo.qh +++ b/qcsrc/lib/oo.qh @@ -75,13 +75,13 @@ ACCUMULATE void ONREMOVE(entity this) {} #endif .void(entity this) dtor; -#define delete(this) MACRO_BEGIN { \ +#define delete(this) MACRO_BEGIN \ entity _this = (this); \ void(entity) _dtor = _this.dtor; \ ONREMOVE(this); \ if (_dtor) _dtor(_this); else delete_fn(_this); \ /* this = NULL; */ \ -} MACRO_END +MACRO_END entity _clearentity_ent; STATIC_INIT(clearentity) diff --git a/qcsrc/lib/registry.qh b/qcsrc/lib/registry.qh index d8f18a02c9..4e8e09083f 100644 --- a/qcsrc/lib/registry.qh +++ b/qcsrc/lib/registry.qh @@ -52,6 +52,14 @@ REGISTRY(Registries, BITS(8)) /** registered item identifier */ .string registered_id; +void _regCheck(int i, int _max) +{ + // this is inside a function to avoid expanding it on compilation everytime + // (this very long line would be repeated literally thousands times!) + if (i >= _max) + LOG_FATALF("Registry capacity exceeded (%d)", _max); +} + /** * Register a new entity with a registry. * Must be followed by a semicolon or a function body with a `this` parameter. @@ -79,7 +87,7 @@ REGISTRY(Registries, BITS(8)) { \ entity this = id; \ if (this == NULL) { \ - if (registry##_COUNT >= registry##_MAX) LOG_FATALF("Registry capacity exceeded (%d)", registry##_MAX); \ + _regCheck(registry##_COUNT, registry##_MAX); \ this = id = inst; \ this.registered_id = #id; \ REGISTRY_PUSH(registry, fld, this); \ @@ -89,20 +97,20 @@ REGISTRY(Registries, BITS(8)) ACCUMULATE_FUNCTION(_Register##registry, Register_##id) \ REGISTER_INIT(id) -#define REGISTRY_PUSH(registry, fld, it) MACRO_BEGIN { \ +#define REGISTRY_PUSH(registry, fld, it) MACRO_BEGIN \ it.fld = registry##_COUNT; \ _R_SET(_##registry, registry##_COUNT, it); \ ++registry##_COUNT; \ if (!registry##_first) registry##_first = it; \ if (registry##_last) registry##_last.REGISTRY_NEXT = it; \ registry##_last = it; \ -} MACRO_END +MACRO_END -#define REGISTRY_RESERVE(registry, fld, id, suffix) MACRO_BEGIN { \ +#define REGISTRY_RESERVE(registry, fld, id, suffix) MACRO_BEGIN \ entity e = new_pure(registry_reserved); \ e.registered_id = #id "/" #suffix; \ REGISTRY_PUSH(registry, fld, e); \ -} MACRO_END +MACRO_END #define REGISTER_INIT(id) ACCUMULATE void Register_##id##_init(entity this) @@ -162,12 +170,10 @@ void Registry_send(string id, string hash); STATIC_INIT(Registry_check_##id) \ { \ /* Note: SHA256 isn't always available, use MD4 instead */ \ - string algo = "MD4"; \ - string join = ":"; \ - string s = ""; \ + string s = "", join = ":"; \ FOREACH(id, true, s = strcat(s, join, it.registered_id)); \ s = substring(s, strlen(join), -1); \ - string h = REGISTRY_HASH(id) = strzone(digest_hex(algo, s)); \ + string h = REGISTRY_HASH(id) = strzone(digest_hex("MD4", s)); \ LOG_DEBUGF(#id ": %s\n[%s]", h, s); \ } \ void Registry_check(string r, string sv) \ diff --git a/qcsrc/lib/sort.qh b/qcsrc/lib/sort.qh index 565ebb29c8..cd0000912d 100644 --- a/qcsrc/lib/sort.qh +++ b/qcsrc/lib/sort.qh @@ -10,16 +10,14 @@ void heapsort(int n, swapfunc_t swap, comparefunc_t cmp, entity pass) { #define heapify(_count) \ MACRO_BEGIN \ - { \ for (int start = floor(((_count) - 2) / 2); start >= 0; --start) \ { \ siftdown(start, (_count) - 1); \ } \ - } MACRO_END + MACRO_END #define siftdown(_start, _end) \ MACRO_BEGIN \ - { \ for (int root = (_start); root * 2 + 1 <= (_end); ) \ { \ int child = root * 2 + 1; \ @@ -28,7 +26,7 @@ void heapsort(int n, swapfunc_t swap, comparefunc_t cmp, entity pass) swap(root, child, pass); \ root = child; \ } \ - } MACRO_END + MACRO_END heapify(n); int end = n - 1; diff --git a/qcsrc/lib/spawnfunc.qh b/qcsrc/lib/spawnfunc.qh index d3198b3ce4..bf8eeb34b0 100644 --- a/qcsrc/lib/spawnfunc.qh +++ b/qcsrc/lib/spawnfunc.qh @@ -1,5 +1,8 @@ #pragma once +// remove this ifdef when client or menu will actually make use of this stuff +#ifdef SVQC + /** If this global exists, only functions with spawnfunc_ name prefix qualify as spawn functions */ noref bool require_spawnfunc_prefix; .bool spawnfunc_checked; @@ -81,58 +84,6 @@ noref bool require_spawnfunc_prefix; e.__spawnfunc_constructor(e); } - noref bool __spawnfunc_first; - - #define spawnfunc_1(id) spawnfunc_2(id, FIELDS_UNION) - #define spawnfunc_2(id, whitelist) \ - void __spawnfunc_##id(entity this); \ - ACCUMULATE void spawnfunc_##id(entity this) \ - { \ - if (!__spawnfunc_first) { \ - __spawnfunc_first = true; \ - static_init_early(); \ - } \ - bool dospawn = true; \ - if (__spawnfunc_expecting > 1) { __spawnfunc_expecting = false; } \ - else if (__spawnfunc_expecting) { \ - /* engine call */ \ - if (!g_spawn_queue) { g_spawn_queue = IL_NEW(); } \ - __spawnfunc_expecting = false; \ - this = __spawnfunc_expect; \ - __spawnfunc_expect = NULL; \ - dospawn = false; \ - } else { \ - /* userland call */ \ - assert(this); \ - } \ - if (!this.sourceLoc) { \ - this.sourceLoc = __FILE__ ":" STR(__LINE__); \ - } \ - if (!this.spawnfunc_checked) { \ - for (int i = 0, n = numentityfields(); i < n; ++i) { \ - string value = getentityfieldstring(i, this); \ - string s = entityfieldname(i); \ - whitelist(_spawnfunc_checktypes) \ - if (value == "") continue; \ - if (s == "") continue; \ - FIELDS_COMMON(_spawnfunc_check) \ - whitelist(_spawnfunc_check) \ - LOG_WARNF(_("Entity field %s.%s (%s) is not whitelisted. If you believe this is an error, please file an issue."), #id, s, value); \ - } \ - this.spawnfunc_checked = true; \ - if (this) { \ - /* not worldspawn, delay spawn */ \ - __spawnfunc_defer(this, __spawnfunc_##id); \ - } else { \ - /* world might not be "worldspawn" */ \ - this.__spawnfunc_constructor = __spawnfunc_##id; \ - } \ - } \ - if (dospawn) { __spawnfunc_##id(this); } \ - if (__spawnfunc_unreachable_workaround) return; \ - } \ - void __spawnfunc_##id(entity this) - #define FIELD_SCALAR(fld, n) \ fld(n) #define FIELD_VEC(fld, n) \ @@ -273,5 +224,62 @@ noref bool require_spawnfunc_prefix; FIELD_VEC(fld, velocity) \ /**/ - #define spawnfunc(...) EVAL_spawnfunc(OVERLOAD(spawnfunc, __VA_ARGS__)) - #define EVAL_spawnfunc(...) __VA_ARGS__ +ERASEABLE +void _checkWhitelisted(entity this, string id) +{ + for (int i = 0, n = numentityfields(); i < n; ++i) + { + string value = getentityfieldstring(i, this); + string s = entityfieldname(i); + FIELDS_UNION(_spawnfunc_checktypes) + if (value == "") continue; + if (s == "") continue; + FIELDS_COMMON(_spawnfunc_check) + FIELDS_UNION(_spawnfunc_check) + LOG_WARNF(_("Entity field %s.%s (%s) is not whitelisted. If you believe this is an error, please file an issue."), id, s, value); + } +} + +noref bool __spawnfunc_first; + +#define spawnfunc(id) \ + void __spawnfunc_##id(entity this); \ + ACCUMULATE void spawnfunc_##id(entity this) \ + { \ + if (!__spawnfunc_first) { \ + __spawnfunc_first = true; \ + static_init_early(); \ + } \ + bool dospawn = true; \ + if (__spawnfunc_expecting > 1) { __spawnfunc_expecting = 0; } \ + else if (__spawnfunc_expecting) { \ + /* engine call */ \ + if (!g_spawn_queue) { g_spawn_queue = IL_NEW(); } \ + __spawnfunc_expecting = 0; \ + this = __spawnfunc_expect; \ + __spawnfunc_expect = NULL; \ + dospawn = false; \ + } else { \ + /* userland call */ \ + assert(this); \ + } \ + if (!this.sourceLoc) { \ + this.sourceLoc = __FILE__":"STR(__LINE__); \ + } \ + if (!this.spawnfunc_checked) { \ + _checkWhitelisted(this, #id); \ + this.spawnfunc_checked = true; \ + if (this) { \ + /* not worldspawn, delay spawn */ \ + __spawnfunc_defer(this, __spawnfunc_##id); \ + } else { \ + /* world might not be "worldspawn" */ \ + this.__spawnfunc_constructor = __spawnfunc_##id; \ + } \ + } \ + if (dospawn) { __spawnfunc_##id(this); } \ + if (__spawnfunc_unreachable_workaround) return; \ + } \ + void __spawnfunc_##id(entity this) + +#endif diff --git a/qcsrc/lib/stats.qh b/qcsrc/lib/stats.qh index 03bd34b813..b57f41af2b 100644 --- a/qcsrc/lib/stats.qh +++ b/qcsrc/lib/stats.qh @@ -73,16 +73,16 @@ int g_magic_stats_hole = 0; #define addstat_int(id, fld) addstat(id, AS_INT, fld) #define addstat_bool(id, fld) addstat(id, AS_INT, fld) #define addstat_float(id, fld) addstat(id, AS_FLOAT, fld) - #define addstat_vector(id, fld) MACRO_BEGIN { \ + #define addstat_vector(id, fld) MACRO_BEGIN \ addstat_float(id + 0, fld##_x); \ addstat_float(id + 1, fld##_y); \ addstat_float(id + 2, fld##_z); \ - } MACRO_END - #define addstat_vectori(id, fld) MACRO_BEGIN { \ + MACRO_END + #define addstat_vectori(id, fld) MACRO_BEGIN \ addstat_int(id + 0, fld##_x); \ addstat_int(id + 1, fld##_y); \ addstat_int(id + 2, fld##_z); \ - } MACRO_END + MACRO_END const int AS_STRING = 1; const int AS_INT = 2; const int AS_FLOAT = 8; @@ -131,7 +131,7 @@ REGISTRY(Stats, 256 - STATS_ENGINE_RESERVE) REGISTER_REGISTRY(Stats) REGISTRY_SORT(Stats) REGISTRY_CHECK(Stats) -STATIC_INIT(RegisterStats_renumber) +STATIC_INIT(Stats_renumber) { FOREACH(Stats, true, { it.m_id = STATS_ENGINE_RESERVE + i; diff --git a/qcsrc/lib/test.qh b/qcsrc/lib/test.qh index 8d8de76ec6..e806db7547 100644 --- a/qcsrc/lib/test.qh +++ b/qcsrc/lib/test.qh @@ -15,7 +15,10 @@ #define SUCCEED() (TEST_ok = true) /** Add a failure, but continue */ -#define ADD_FAILURE(msg) MACRO_BEGIN { ++TEST_failed; LOG_WARN(msg); } MACRO_END +#define ADD_FAILURE(msg) MACRO_BEGIN \ + ++TEST_failed; \ + LOG_WARN(msg); \ +MACRO_END /** Add a failure and return */ #define FAIL(msg) _TEST_ASSERT(ADD_FAILURE(msg)) @@ -26,7 +29,7 @@ bool RUN_ALL_TESTS(); // difference between expect/assert: assert returns early -#define EXPECT_EQ(expected_, actual_) MACRO_BEGIN { \ +#define EXPECT_EQ(expected_, actual_) MACRO_BEGIN \ int expected = expected_; \ int actual = actual_; \ if ((expected) != (actual)) { \ @@ -37,7 +40,7 @@ bool RUN_ALL_TESTS(); actual, expected \ )); \ } \ -} MACRO_END +MACRO_END #define ASSERT_EQ(expected, actual) _TEST_ASSERT(EXPECT_EQ(expected, actual)) #define EXPECT_TRUE(condition) EXPECT_EQ(true, condition) @@ -72,18 +75,18 @@ bool TEST_ok; int TEST_failed; #define _TEST_ASSERT(statement) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ LAMBDA(statement); \ ++TEST_fatal; return; \ - } MACRO_END + MACRO_END #define EXPECT_NO_FATAL_FAILURE__(statement, then) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ int TEST_prevfatal = TEST_fatal; \ LAMBDA(statement); \ if (TEST_fatal != TEST_prevfatal) \ LAMBDA(then); \ - } MACRO_END + MACRO_END #define EXPECT_NO_FATAL_FAILURE_(statement, then) \ EXPECT_NO_FATAL_FAILURE__(statement, { \ diff --git a/qcsrc/lib/vector.qh b/qcsrc/lib/vector.qh index 8340381bab..0d09ea8e6a 100644 --- a/qcsrc/lib/vector.qh +++ b/qcsrc/lib/vector.qh @@ -93,12 +93,12 @@ float boxinsidebox(vector smins, vector smaxs, vector bmins, vector bmaxs) { ret #define YAW(v) ((v).y) #define ROLL(v) ((v).z) -#define MAKEVECTORS(f, angles, forward, right, up) MACRO_BEGIN { \ +#define MAKEVECTORS(f, angles, forward, right, up) MACRO_BEGIN \ f(angles); \ forward = v_forward; \ right = v_right; \ up = v_up; \ -} MACRO_END +MACRO_END //pseudo prototypes: // vector vec2(vector v); // returns a vector with just the x and y components of the given vector diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc index a81d0c4fb7..9958a5df4a 100644 --- a/qcsrc/lib/warpzone/server.qc +++ b/qcsrc/lib/warpzone/server.qc @@ -29,12 +29,12 @@ .float warpzone_teleport_finishtime; .entity warpzone_teleport_zone; -#define WarpZone_StoreProjectileData(e_) MACRO_BEGIN { \ +#define WarpZone_StoreProjectileData(e_) MACRO_BEGIN \ entity e = e_; \ e.warpzone_oldorigin = e.origin; \ e.warpzone_oldvelocity = e.velocity; \ e.warpzone_oldangles = e.angles; \ - } MACRO_END + MACRO_END void WarpZone_TeleportPlayer(entity teleporter, entity player, vector to, vector to_angles, vector to_velocity) { diff --git a/qcsrc/lib/yenc.qh b/qcsrc/lib/yenc.qh index dce6e9c9d8..e71c68ef63 100644 --- a/qcsrc/lib/yenc.qh +++ b/qcsrc/lib/yenc.qh @@ -3,7 +3,7 @@ #include "test.qh" #define yenc_single(c, ret) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ int conv = c; \ conv += 42; \ if (conv >= 256) conv -= 256; \ @@ -26,10 +26,10 @@ break; \ } \ } \ - } MACRO_END + MACRO_END #define ydec_single(stringiter, ret) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ int conv = STRING_ITERATOR_GET(stringiter); \ if (conv <= 0) { \ ret = -1; \ @@ -42,7 +42,7 @@ conv -= 42; \ ret = conv; \ } \ - } MACRO_END + MACRO_END TEST(yEnc, EncodeDecode) { diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc index a06ac8e231..93deaff332 100644 --- a/qcsrc/menu/command/menu_cmd.qc +++ b/qcsrc/menu/command/menu_cmd.qc @@ -88,7 +88,7 @@ void GameCommand(string theCommand) if (!startsWith(s, filter)) continue; s = substring(s, strlen(filter), strlen(s) - strlen(filter)); } - LOG_INFOF(" %s", s); + LOG_INFO(" ", s); }); } else if (argc == 2 && !isdemo()) // don't allow this command in demos diff --git a/qcsrc/menu/item/inputbox.qc b/qcsrc/menu/item/inputbox.qc index 3272ed54f3..d19125a218 100644 --- a/qcsrc/menu/item/inputbox.qc +++ b/qcsrc/menu/item/inputbox.qc @@ -106,19 +106,19 @@ void InputBox_enterText(entity me, string ch) { - float i; - for (i = 0; i < strlen(ch); ++i) + int len = strlen(ch); + for (int i = 0; i < len; ++i) if (strstrofs(me.forbiddenCharacters, substring(ch, i, 1), 0) > -1) return; if (me.maxLength > 0) { - if (strlen(ch) + strlen(me.text) > me.maxLength) return; + if (len + strlen(me.text) > me.maxLength) return; } else if (me.maxLength < 0) { if (u8_strsize(ch) + u8_strsize(me.text) > -me.maxLength) return; } me.setText(me, strcat(substring(me.text, 0, me.cursorPos), ch, substring(me.text, me.cursorPos, strlen(me.text) - me.cursorPos))); - me.cursorPos += strlen(ch); + me.cursorPos += len; } float InputBox_keyDown(entity me, float key, float ascii, float shift) diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index fb6c4aeeda..f195574449 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -335,7 +335,8 @@ void drawBackground(string img, float a, string algn, float force1) if (main.mainNexposee.ModalController_state == 0) return; vector v = '0 0 0'; int scalemode = SCALEMODE_CROP; - for (int i = 0, l = 0; i < strlen(algn); ++i) + int len = strlen(algn); + for (int i = 0, l = 0; i < len; ++i) { string c = substring(algn, i, 1); switch (c) diff --git a/qcsrc/menu/xonotic/gametypelist.qc b/qcsrc/menu/xonotic/gametypelist.qc index 3703393789..2de655940f 100644 --- a/qcsrc/menu/xonotic/gametypelist.qc +++ b/qcsrc/menu/xonotic/gametypelist.qc @@ -31,16 +31,17 @@ void XonoticGametypeList_setSelected(entity me, float i) void XonoticGametypeList_loadCvars(entity me) { Gametype t = MapInfo_CurrentGametype(); + int cnt = GameType_GetCount(); float i; - for(i = 0; i < GameType_GetCount(); ++i) + for(i = 0; i < cnt; ++i) if(t == GameType_GetID(i)) break; - if(i >= GameType_GetCount()) + if(i >= cnt) { - for(i = 0; i < GameType_GetCount(); ++i) + for(i = 0; i < cnt; ++i) if(t == MAPINFO_TYPE_DEATHMATCH) break; - if(i >= GameType_GetCount()) + if(i >= cnt) i = 0; } me.setSelected(me, i); diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc index f4417171ff..69734ef18e 100644 --- a/qcsrc/menu/xonotic/keybinder.qc +++ b/qcsrc/menu/xonotic/keybinder.qc @@ -10,21 +10,21 @@ const string KEY_NOT_BOUND_CMD = "// not bound"; const int MAX_KEYS_PER_FUNCTION = 2; const int MAX_KEYBINDS = 256; -string Xonotic_KeyBinds_Functions[MAX_KEYBINDS]; -string Xonotic_KeyBinds_Descriptions[MAX_KEYBINDS]; -int Xonotic_KeyBinds_Count = -1; +string KeyBinds_Functions[MAX_KEYBINDS]; +string KeyBinds_Descriptions[MAX_KEYBINDS]; +int KeyBinds_Count = -1; -void Xonotic_KeyBinds_Read() +void KeyBinds_Read() { - Xonotic_KeyBinds_Count = 0; + KeyBinds_Count = 0; - #define KEYBIND_DEF(func, desc) MACRO_BEGIN { \ - if((Xonotic_KeyBinds_Count < MAX_KEYBINDS)) { \ - Xonotic_KeyBinds_Functions[Xonotic_KeyBinds_Count] = strzone(func); \ - Xonotic_KeyBinds_Descriptions[Xonotic_KeyBinds_Count] = strzone(desc); \ - ++Xonotic_KeyBinds_Count; \ + #define KEYBIND_DEF(func, desc) MACRO_BEGIN \ + if((KeyBinds_Count < MAX_KEYBINDS)) { \ + KeyBinds_Functions[KeyBinds_Count] = strzone(func); \ + KeyBinds_Descriptions[KeyBinds_Count] = strzone(desc); \ + ++KeyBinds_Count; \ } \ - } MACRO_END + MACRO_END KEYBIND_DEF("" , _("Moving")); KEYBIND_DEF("+forward" , _("forward")); @@ -59,7 +59,7 @@ void Xonotic_KeyBinds_Read() for(int imp = 1; imp <= 9; ++imp) { - string w_list = ""; + string w_list = ""; ADD_TO_W_LIST(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_FLAG_HIDDEN) && !(it.spawnflags & WEP_FLAG_SUPERWEAPON)); ADD_TO_W_LIST((it.spawnflags & WEP_FLAG_SUPERWEAPON) && !(it.spawnflags & WEP_FLAG_HIDDEN)); ADD_TO_W_LIST((it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_FLAG_HIDDEN)); @@ -157,10 +157,10 @@ void XonoticKeyBinder_configureXonoticKeyBinder(entity me) void XonoticKeyBinder_loadKeyBinds(entity me) { bool force_initial_selection = false; - if(Xonotic_KeyBinds_Count < 0) // me.handle not loaded yet? + if(KeyBinds_Count < 0) // me.handle not loaded yet? force_initial_selection = true; - Xonotic_KeyBinds_Read(); - me.nItems = Xonotic_KeyBinds_Count; + KeyBinds_Read(); + me.nItems = KeyBinds_Count; if(force_initial_selection) me.setSelected(me, 0); } @@ -184,9 +184,7 @@ void XonoticKeyBinder_resizeNotify(entity me, vector relOrigin, vector relSize, } void KeyBinder_Bind_Change(entity btn, entity me) { - string func; - - func = Xonotic_KeyBinds_Functions[me.selectedItem]; + string func = KeyBinds_Functions[me.selectedItem]; if(func == "") return; @@ -198,7 +196,6 @@ void XonoticKeyBinder_keyGrabbed(entity me, int key, bool ascii) { int n, j, nvalid; float k; - string func; me.keyGrabButton.forcePressed = 0; me.clearButton.disabled = 0; @@ -213,7 +210,7 @@ void XonoticKeyBinder_keyGrabbed(entity me, int key, bool ascii) return; } - func = Xonotic_KeyBinds_Functions[me.selectedItem]; + string func = KeyBinds_Functions[me.selectedItem]; if(func == "") return; @@ -242,28 +239,26 @@ void XonoticKeyBinder_keyGrabbed(entity me, int key, bool ascii) } void XonoticKeyBinder_destroy(entity me) { - if(Xonotic_KeyBinds_Count < 0) + if(KeyBinds_Count < 0) return; for(int i = 0; i < MAX_KEYBINDS; ++i) { - strfree(Xonotic_KeyBinds_Functions[i]); - strfree(Xonotic_KeyBinds_Descriptions[i]); + strfree(KeyBinds_Functions[i]); + strfree(KeyBinds_Descriptions[i]); } - Xonotic_KeyBinds_Count = 0; + KeyBinds_Count = 0; } void XonoticKeyBinder_editUserbind(entity me, string theName, string theCommandPress, string theCommandRelease) { - string func, descr; - if(!me.userbindEditDialog) return; - func = Xonotic_KeyBinds_Functions[me.selectedItem]; + string func = KeyBinds_Functions[me.selectedItem]; if(func == "") return; - descr = Xonotic_KeyBinds_Descriptions[me.selectedItem]; + string descr = KeyBinds_Descriptions[me.selectedItem]; if(substring(descr, 0, 1) != "$") return; descr = substring(descr, 1, strlen(descr) - 1); @@ -275,16 +270,14 @@ void XonoticKeyBinder_editUserbind(entity me, string theName, string theCommandP } void KeyBinder_Bind_Edit(entity btn, entity me) { - string func, descr; - if(!me.userbindEditDialog) return; - func = Xonotic_KeyBinds_Functions[me.selectedItem]; + string func = KeyBinds_Functions[me.selectedItem]; if(func == "") return; - descr = Xonotic_KeyBinds_Descriptions[me.selectedItem]; + string descr = KeyBinds_Descriptions[me.selectedItem]; if(substring(descr, 0, 1) != "$") return; descr = substring(descr, 1, strlen(descr) - 1); @@ -297,9 +290,8 @@ void KeyBinder_Bind_Edit(entity btn, entity me) void KeyBinder_Bind_Clear(entity btn, entity me) { float n, j, k; - string func; - func = Xonotic_KeyBinds_Functions[me.selectedItem]; + string func = KeyBinds_Functions[me.selectedItem]; if(func == "") return; @@ -334,23 +326,23 @@ void XonoticKeyBinder_setSelected(entity me, int i) { if(i > me.previouslySelected) { - while((i < me.nItems - 1) && (Xonotic_KeyBinds_Functions[i] == "")) + while((i < me.nItems - 1) && (KeyBinds_Functions[i] == "")) ++i; } - while((i > 0) && (Xonotic_KeyBinds_Functions[i] == "")) + while((i > 0) && (KeyBinds_Functions[i] == "")) --i; - while((i < me.nItems - 1) && (Xonotic_KeyBinds_Functions[i] == "")) + while((i < me.nItems - 1) && (KeyBinds_Functions[i] == "")) ++i; } if(me.pressed == 3) // released the mouse - fall back to last valid item { - if(Xonotic_KeyBinds_Functions[i] == "") + if(KeyBinds_Functions[i] == "") i = me.previouslySelected; } - if(Xonotic_KeyBinds_Functions[i] != "") + if(KeyBinds_Functions[i] != "") me.previouslySelected = i; if(me.userbindEditButton) - me.userbindEditButton.disabled = (substring(Xonotic_KeyBinds_Descriptions[i], 0, 1) != "$"); + me.userbindEditButton.disabled = (substring(KeyBinds_Descriptions[i], 0, 1) != "$"); SUPER(XonoticKeyBinder).setSelected(me, i); } float XonoticKeyBinder_keyDown(entity me, int key, bool ascii, float shift) @@ -381,11 +373,10 @@ void XonoticKeyBinder_drawListBoxItem(entity me, int i, vector absSize, bool isS float k; vector theColor; float theAlpha; - string func, descr; float extraMargin; - descr = Xonotic_KeyBinds_Descriptions[i]; - func = Xonotic_KeyBinds_Functions[i]; + string descr = KeyBinds_Descriptions[i]; + string func = KeyBinds_Functions[i]; if(func == "") { diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc index b781ff6819..4421fce9b9 100644 --- a/qcsrc/menu/xonotic/serverlist.qc +++ b/qcsrc/menu/xonotic/serverlist.qc @@ -6,6 +6,36 @@ #include "dialog_multiplayer_join_serverinfo.qh" #include +void SL_ProcessCategoryOverrides(.string override_field_string, .float override_field) +{ + string s; + for (int i = 0; i < category_ent_count; ++i) + { + s = categories[i].override_field_string; + if (s != "" && s != categories[i].cat_name) + { + int catnum = 0; + for (int x = 0; x < category_ent_count; ++x) + { + if(categories[x].cat_name == s) + { + catnum = x + 1; + break; + } + } + if (catnum) + { + strfree(categories[i].override_field_string); + categories[i].override_field = catnum; + continue; + } + LOG_INFOF("RegisterSLCategories(): Improper override '%s' for category '%s'!", s, categories[i].cat_name); + } + strfree(categories[i].override_field_string); + categories[i].override_field = 0; + } +} + void RegisterSLCategories() { entity cat; @@ -20,45 +50,8 @@ void RegisterSLCategories() SLIST_CATEGORIES #undef SLIST_CATEGORY - int i, x, catnum; - string s; - - #define PROCESS_OVERRIDE(override_string,override_field) \ - for(i = 0; i < category_ent_count; ++i) \ - { \ - s = categories[i].override_string; \ - if(s != "" && s != categories[i].cat_name) \ - { \ - catnum = 0; \ - for(x = 0; x < category_ent_count; ++x) \ - { \ - if(categories[x].cat_name == s) \ - { \ - catnum = x + 1; \ - break; \ - } \ - } \ - if(catnum) \ - { \ - strfree(categories[i].override_string); \ - categories[i].override_field = catnum; \ - continue; \ - } \ - else \ - { \ - LOG_INFOF( \ - "RegisterSLCategories(): Improper override '%s' for category '%s'!", \ - s, \ - categories[i].cat_name \ - ); \ - } \ - } \ - strfree(categories[i].override_string); \ - categories[i].override_field = 0; \ - } - PROCESS_OVERRIDE(cat_enoverride_string, cat_enoverride) - PROCESS_OVERRIDE(cat_dioverride_string, cat_dioverride) - #undef PROCESS_OVERRIDE + SL_ProcessCategoryOverrides(cat_enoverride_string, cat_enoverride); + SL_ProcessCategoryOverrides(cat_dioverride_string, cat_dioverride); } // Supporting Functions @@ -810,7 +803,7 @@ void XonoticServerList_drawListBoxItem(entity me, int i, vector absSize, bool is vector oldscale = draw_scale; vector oldshift = draw_shift; #define SET_YRANGE(start,end) \ - draw_scale = boxToGlobalSize(eX * 1 + eY * (end - start), oldscale); \ + draw_scale = boxToGlobalSize(eX + eY * (end - start), oldscale); \ draw_shift = boxToGlobal(eY * start, oldshift, oldscale); for (j = 0; j < category_draw_count; ++j) { diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc index e994491121..7340564126 100644 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@ -702,7 +702,7 @@ float updateCompression() Gametype GameType_GetID(int cnt) { int i = 0; - #define GAMETYPE(it) { if (i++ == cnt) return it; } + #define GAMETYPE(it) if (i++ == cnt) return it; GAMETYPES HIDDEN_GAMETYPES #undef GAMETYPE @@ -712,10 +712,11 @@ Gametype GameType_GetID(int cnt) int GameType_GetCount() { int i = 0; + int dev = cvar("developer"); #define GAMETYPE(id) ++i; GAMETYPES #undef GAMETYPE - #define GAMETYPE(it) if (cvar("developer")) ++i; + #define GAMETYPE(it) if (dev) ++i; HIDDEN_GAMETYPES #undef GAMETYPE return i; diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index b23f6f1481..a501917759 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -251,6 +251,7 @@ bool autocvar_lastlevel; int autocvar_leadlimit_and_fraglimit; int autocvar_leadlimit_override; int autocvar_minplayers; +int autocvar_minplayers_per_team; string autocvar_nextmap; string autocvar_quit_and_redirect; float autocvar_quit_and_redirect_timer; diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc index 2552cc4bab..3911d596dc 100644 --- a/qcsrc/server/bot/default/bot.qc +++ b/qcsrc/server/bot/default/bot.qc @@ -215,13 +215,13 @@ void bot_setnameandstuff(entity this) prio = 6; - #define READSKILL(f, w, r) MACRO_BEGIN { \ + #define READSKILL(f, w, r) MACRO_BEGIN \ if(argv(prio) != "") \ this.f = stof(argv(prio)) * w; \ else \ this.f = (!autocvar_g_campaign) * (2 * random() - 1) * r * w; \ prio++; \ - } MACRO_END + MACRO_END //print(bot_name, ": ping=", argv(9), "\n"); READSKILL(havocbot_keyboardskill, 0.5, 0.5); // keyboard skill @@ -604,6 +604,8 @@ bool bot_fixcount() else if ((realplayers || autocvar_bot_join_empty || (currentbots > 0 && time < 5))) { int minplayers = max(0, floor(autocvar_minplayers)); + if (teamplay) + minplayers = max(0, floor(autocvar_minplayers_per_team) * AvailableTeams()); int minbots = max(0, floor(autocvar_bot_number)); // add bots to reach minplayers if needed diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc index b82398675c..502d3bcfc5 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -477,7 +477,7 @@ void havocbot_movetogoal(entity this) // Jetpack navigation if(this.navigation_jetpack_goal) if(this.goalcurrent==this.navigation_jetpack_goal) - if(GetResourceAmount(this, RESOURCE_FUEL)) + if(GetResource(this, RES_FUEL)) { if(autocvar_bot_debug_goalstack) { @@ -673,7 +673,7 @@ void havocbot_movetogoal(entity this) return; } else if(!this.jumppadcount && !this.goalcurrent.wphardwired - && GetResourceAmount(this, RESOURCE_HEALTH) + GetResourceAmount(this, RESOURCE_ARMOR) > ROCKETJUMP_DAMAGE()) + && GetResource(this, RES_HEALTH) + GetResource(this, RES_ARMOR) > ROCKETJUMP_DAMAGE()) { if(this.velocity.z < 0) { @@ -1303,7 +1303,7 @@ void havocbot_chooseenemy(entity this) traceline(this.origin+this.view_ofs, ( this.enemy.absmin + this.enemy.absmax ) * 0.5,false,NULL); if (trace_ent == this.enemy || trace_fraction == 1) if (vdist(((this.enemy.absmin + this.enemy.absmax) * 0.5) - this.origin, <, 1000)) - if (GetResourceAmount(this, RESOURCE_HEALTH) > 30) + if (GetResource(this, RES_HEALTH) > 30) { // remain tracking him for a shot while (case he went after a small corner or pilar this.havocbot_chooseenemy_finished = time + 0.5; diff --git a/qcsrc/server/bot/default/havocbot/roles.qc b/qcsrc/server/bot/default/havocbot/roles.qc index 1d66df0966..b72153c95c 100644 --- a/qcsrc/server/bot/default/havocbot/roles.qc +++ b/qcsrc/server/bot/default/havocbot/roles.qc @@ -50,14 +50,14 @@ void havocbot_goalrating_waypoints(entity this, float ratingscale, vector org, f bool havocbot_goalrating_item_can_be_left_to_teammate(entity this, entity player, entity item) { - if (GetResourceAmount(item, RESOURCE_HEALTH) && GetResourceAmount(player, RESOURCE_HEALTH) <= GetResourceAmount(this, RESOURCE_HEALTH)) {return true;} - if (GetResourceAmount(item, RESOURCE_ARMOR) && GetResourceAmount(player, RESOURCE_ARMOR) <= GetResourceAmount(this, RESOURCE_ARMOR)) {return true;} + if (GetResource(item, RES_HEALTH) && GetResource(player, RES_HEALTH) <= GetResource(this, RES_HEALTH)) {return true;} + if (GetResource(item, RES_ARMOR) && GetResource(player, RES_ARMOR) <= GetResource(this, RES_ARMOR)) {return true;} if (STAT(WEAPONS, item) && !(STAT(WEAPONS, player) & STAT(WEAPONS, item))) {return true;} - if (GetResourceAmount(item, RESOURCE_SHELLS) && GetResourceAmount(player, RESOURCE_SHELLS) <= GetResourceAmount(this, RESOURCE_SHELLS)) {return true;} - if (GetResourceAmount(item, RESOURCE_BULLETS) && GetResourceAmount(player, RESOURCE_BULLETS) <= GetResourceAmount(this, RESOURCE_BULLETS)) {return true;} - if (GetResourceAmount(item, RESOURCE_ROCKETS) && GetResourceAmount(player, RESOURCE_ROCKETS) <= GetResourceAmount(this, RESOURCE_ROCKETS)) {return true;} - if (GetResourceAmount(item, RESOURCE_CELLS) && GetResourceAmount(player, RESOURCE_CELLS) <= GetResourceAmount(this, RESOURCE_CELLS)) {return true;} - if (GetResourceAmount(item, RESOURCE_PLASMA) && GetResourceAmount(player, RESOURCE_PLASMA) <= GetResourceAmount(this, RESOURCE_PLASMA)) {return true;} + if (GetResource(item, RES_SHELLS) && GetResource(player, RES_SHELLS) <= GetResource(this, RES_SHELLS)) {return true;} + if (GetResource(item, RES_BULLETS) && GetResource(player, RES_BULLETS) <= GetResource(this, RES_BULLETS)) {return true;} + if (GetResource(item, RES_ROCKETS) && GetResource(player, RES_ROCKETS) <= GetResource(this, RES_ROCKETS)) {return true;} + if (GetResource(item, RES_CELLS) && GetResource(player, RES_CELLS) <= GetResource(this, RES_CELLS)) {return true;} + if (GetResource(item, RES_PLASMA) && GetResource(player, RES_PLASMA) <= GetResource(this, RES_PLASMA)) {return true;} if (item.itemdef.instanceOfPowerup) {return true;} return false; @@ -208,7 +208,7 @@ void havocbot_goalrating_enemyplayers(entity this, float ratingscale, vector org continue; */ - t = ((GetResourceAmount(this, RESOURCE_HEALTH) + GetResourceAmount(this, RESOURCE_ARMOR)) - (GetResourceAmount(it, RESOURCE_HEALTH) + GetResourceAmount(it, RESOURCE_ARMOR))) / 150; + t = ((GetResource(this, RES_HEALTH) + GetResource(this, RES_ARMOR)) - (GetResource(it, RES_HEALTH) + GetResource(it, RES_ARMOR))) / 150; t = bound(0, 1 + t, 3); if (skill > 3) { diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc index 7c7f7e1e12..9dc1e47aa3 100644 --- a/qcsrc/server/bot/default/navigation.qc +++ b/qcsrc/server/bot/default/navigation.qc @@ -1332,10 +1332,10 @@ void navigation_routerating(entity this, entity e, float f, float rangebias) t += xydistance / autocvar_g_jetpack_maxspeed_side; fuel = t * autocvar_g_jetpack_fuel * 0.8; - LOG_DEBUG("jetpack ai: required fuel ", ftos(fuel), ", have ", ftos(GetResourceAmount(this, RESOURCE_FUEL))); + LOG_DEBUG("jetpack ai: required fuel ", ftos(fuel), ", have ", ftos(GetResource(this, RES_FUEL))); // enough fuel ? - if(GetResourceAmount(this, RESOURCE_FUEL) > fuel || (this.items & IT_UNLIMITED_WEAPON_AMMO)) + if(GetResource(this, RES_FUEL) > fuel || (this.items & IT_UNLIMITED_WEAPON_AMMO)) { // Estimate cost // (as onground costs calculation is mostly based on distances, here we do the same establishing some relationship diff --git a/qcsrc/server/bot/default/scripting.qc b/qcsrc/server/bot/default/scripting.qc index 555f6fc58a..176b6361de 100644 --- a/qcsrc/server/bot/default/scripting.qc +++ b/qcsrc/server/bot/default/scripting.qc @@ -624,7 +624,7 @@ float bot_cmd_eval(entity this, string expr) switch(expr) { case "health": - return GetResourceAmount(this, RESOURCE_HEALTH); + return GetResource(this, RES_HEALTH); case "speed": return vlen(this.velocity); case "flagcarrier": diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc index 1ef4c8c52f..9de3779870 100644 --- a/qcsrc/server/bot/default/waypoints.qc +++ b/qcsrc/server/bot/default/waypoints.qc @@ -31,7 +31,7 @@ void waypoint_unreachable(entity pl) entity e2 = navigation_findnearestwaypoint(pl, false); if(!e2) { - LOG_INFOF("Can't find any waypoint nearby\n"); + LOG_INFO("Can't find any waypoint nearby\n"); return; } diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index c22737ed0d..c2dbb74113 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -152,14 +152,14 @@ float CheatImpulse(entity this, int imp) this.personal.origin = this.origin; this.personal.v_angle = this.v_angle; this.personal.velocity = this.velocity; - SetResourceAmount(this.personal, RESOURCE_ROCKETS, GetResourceAmount(this, RESOURCE_ROCKETS)); - SetResourceAmount(this.personal, RESOURCE_BULLETS, GetResourceAmount(this, RESOURCE_BULLETS)); - SetResourceAmount(this.personal, RESOURCE_CELLS, GetResourceAmount(this, RESOURCE_CELLS)); - SetResourceAmount(this.personal, RESOURCE_PLASMA, GetResourceAmount(this, RESOURCE_PLASMA)); - SetResourceAmount(this.personal, RESOURCE_SHELLS, GetResourceAmount(this, RESOURCE_SHELLS)); - SetResourceAmount(this.personal, RESOURCE_FUEL, GetResourceAmount(this, RESOURCE_FUEL)); - SetResourceAmount(this.personal, RESOURCE_HEALTH, max(1, GetResourceAmount(this, RESOURCE_HEALTH))); - SetResourceAmount(this.personal, RESOURCE_ARMOR, GetResourceAmount(this, RESOURCE_ARMOR)); + SetResource(this.personal, RES_ROCKETS, GetResource(this, RES_ROCKETS)); + SetResource(this.personal, RES_BULLETS, GetResource(this, RES_BULLETS)); + SetResource(this.personal, RES_CELLS, GetResource(this, RES_CELLS)); + SetResource(this.personal, RES_PLASMA, GetResource(this, RES_PLASMA)); + SetResource(this.personal, RES_SHELLS, GetResource(this, RES_SHELLS)); + SetResource(this.personal, RES_FUEL, GetResource(this, RES_FUEL)); + SetResource(this.personal, RES_HEALTH, max(1, GetResource(this, RES_HEALTH))); + SetResource(this.personal, RES_ARMOR, GetResource(this, RES_ARMOR)); STAT(WEAPONS, this.personal) = STAT(WEAPONS, this); this.personal.items = this.items; this.personal.pauserotarmor_finished = this.pauserotarmor_finished; @@ -211,14 +211,14 @@ float CheatImpulse(entity this, int imp) MUTATOR_CALLHOOK(AbortSpeedrun, this); } - SetResourceAmount(this, RESOURCE_ROCKETS, GetResourceAmount(this.personal, RESOURCE_ROCKETS)); - SetResourceAmount(this, RESOURCE_BULLETS, GetResourceAmount(this.personal, RESOURCE_BULLETS)); - SetResourceAmount(this, RESOURCE_CELLS, GetResourceAmount(this.personal, RESOURCE_CELLS)); - SetResourceAmount(this, RESOURCE_PLASMA, GetResourceAmount(this.personal, RESOURCE_PLASMA)); - SetResourceAmount(this, RESOURCE_SHELLS, GetResourceAmount(this.personal, RESOURCE_SHELLS)); - SetResourceAmount(this, RESOURCE_FUEL, GetResourceAmount(this.personal, RESOURCE_FUEL)); - SetResourceAmount(this, RESOURCE_HEALTH, GetResourceAmount(this.personal, RESOURCE_HEALTH)); - SetResourceAmount(this, RESOURCE_ARMOR, GetResourceAmount(this.personal, RESOURCE_ARMOR)); + SetResource(this, RES_ROCKETS, GetResource(this.personal, RES_ROCKETS)); + SetResource(this, RES_BULLETS, GetResource(this.personal, RES_BULLETS)); + SetResource(this, RES_CELLS, GetResource(this.personal, RES_CELLS)); + SetResource(this, RES_PLASMA, GetResource(this.personal, RES_PLASMA)); + SetResource(this, RES_SHELLS, GetResource(this.personal, RES_SHELLS)); + SetResource(this, RES_FUEL, GetResource(this.personal, RES_FUEL)); + SetResource(this, RES_HEALTH, GetResource(this.personal, RES_HEALTH)); + SetResource(this, RES_ARMOR, GetResource(this.personal, RES_ARMOR)); STAT(WEAPONS, this) = STAT(WEAPONS, this.personal); this.items = this.personal.items; this.pauserotarmor_finished = time + this.personal.pauserotarmor_finished - this.personal.teleport_time; @@ -355,7 +355,7 @@ float CheatCommand(entity this, int argc) entity e = spawn(); e.model = strzone(argv(1)); e.mdl = "rocket_explode"; - SetResourceAmountExplicit(e, RESOURCE_HEALTH, 1000); + SetResourceExplicit(e, RES_HEALTH, 1000); setorigin(e, trace_endpos); e.effects = EF_NOMODELFLAGS; if(f == 1) diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index c5d9854019..f8d1056459 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -232,7 +232,7 @@ void PutObserverInServer(entity this) if (IS_PLAYER(this)) { - if(GetResourceAmount(this, RESOURCE_HEALTH) >= 1) + if(GetResource(this, RES_HEALTH) >= 1) { // despawn effect Send_Effect(EFFECT_SPAWN_NEUTRAL, this.origin, '0 0 0', 1); @@ -311,14 +311,14 @@ void PutObserverInServer(entity this) if(this.damagedbycontents) IL_REMOVE(g_damagedbycontents, this); this.damagedbycontents = false; - SetResourceAmountExplicit(this, RESOURCE_HEALTH, FRAGS_SPECTATOR); + SetResourceExplicit(this, RES_HEALTH, FRAGS_SPECTATOR); SetSpectatee_status(this, etof(this)); this.takedamage = DAMAGE_NO; this.solid = SOLID_NOT; set_movetype(this, MOVETYPE_FLY_WORLDONLY); // user preference is controlled by playerprethink this.flags = FL_CLIENT | FL_NOTARGET; this.effects = 0; - SetResourceAmountExplicit(this, RESOURCE_ARMOR, autocvar_g_balance_armor_start); // was 666?! + SetResourceExplicit(this, RES_ARMOR, autocvar_g_balance_armor_start); // was 666?! this.pauserotarmor_finished = 0; this.pauserothealth_finished = 0; this.pauseregen_finished = 0; @@ -557,24 +557,24 @@ void PutPlayerInServer(entity this) this.effects = EF_TELEPORT_BIT | EF_RESTARTANIM_BIT; if (warmup_stage) { - SetResourceAmount(this, RESOURCE_SHELLS, warmup_start_ammo_shells); - SetResourceAmount(this, RESOURCE_BULLETS, warmup_start_ammo_nails); - SetResourceAmount(this, RESOURCE_ROCKETS, warmup_start_ammo_rockets); - SetResourceAmount(this, RESOURCE_CELLS, warmup_start_ammo_cells); - SetResourceAmount(this, RESOURCE_PLASMA, warmup_start_ammo_plasma); - SetResourceAmount(this, RESOURCE_FUEL, warmup_start_ammo_fuel); - SetResourceAmount(this, RESOURCE_HEALTH, warmup_start_health); - SetResourceAmount(this, RESOURCE_ARMOR, warmup_start_armorvalue); + SetResource(this, RES_SHELLS, warmup_start_ammo_shells); + SetResource(this, RES_BULLETS, warmup_start_ammo_nails); + SetResource(this, RES_ROCKETS, warmup_start_ammo_rockets); + SetResource(this, RES_CELLS, warmup_start_ammo_cells); + SetResource(this, RES_PLASMA, warmup_start_ammo_plasma); + SetResource(this, RES_FUEL, warmup_start_ammo_fuel); + SetResource(this, RES_HEALTH, warmup_start_health); + SetResource(this, RES_ARMOR, warmup_start_armorvalue); STAT(WEAPONS, this) = WARMUP_START_WEAPONS; } else { - SetResourceAmount(this, RESOURCE_SHELLS, start_ammo_shells); - SetResourceAmount(this, RESOURCE_BULLETS, start_ammo_nails); - SetResourceAmount(this, RESOURCE_ROCKETS, start_ammo_rockets); - SetResourceAmount(this, RESOURCE_CELLS, start_ammo_cells); - SetResourceAmount(this, RESOURCE_PLASMA, start_ammo_plasma); - SetResourceAmount(this, RESOURCE_FUEL, start_ammo_fuel); - SetResourceAmount(this, RESOURCE_HEALTH, start_health); - SetResourceAmount(this, RESOURCE_ARMOR, start_armorvalue); + SetResource(this, RES_SHELLS, start_ammo_shells); + SetResource(this, RES_BULLETS, start_ammo_nails); + SetResource(this, RES_ROCKETS, start_ammo_rockets); + SetResource(this, RES_CELLS, start_ammo_cells); + SetResource(this, RES_PLASMA, start_ammo_plasma); + SetResource(this, RES_FUEL, start_ammo_fuel); + SetResource(this, RES_HEALTH, start_health); + SetResource(this, RES_ARMOR, start_armorvalue); STAT(WEAPONS, this) = start_weapons; if (MUTATOR_CALLHOOK(ForbidRandomStartWeapons, this) == false) { @@ -1575,25 +1575,25 @@ void player_regen(entity this) float mina, maxa, limith, limita; maxa = autocvar_g_balance_armor_rotstable; mina = autocvar_g_balance_armor_regenstable; - limith = GetResourceLimit(this, RESOURCE_HEALTH); - limita = GetResourceLimit(this, RESOURCE_ARMOR); + limith = GetResourceLimit(this, RES_HEALTH); + limita = GetResourceLimit(this, RES_ARMOR); regen_health_rotstable = regen_health_rotstable * max_mod; regen_health_stable = regen_health_stable * max_mod; limith = limith * limit_mod; limita = limita * limit_mod; - SetResourceAmount(this, RESOURCE_ARMOR, CalcRotRegen(GetResourceAmount(this, RESOURCE_ARMOR), mina, autocvar_g_balance_armor_regen, autocvar_g_balance_armor_regenlinear, + SetResource(this, RES_ARMOR, CalcRotRegen(GetResource(this, RES_ARMOR), mina, autocvar_g_balance_armor_regen, autocvar_g_balance_armor_regenlinear, regen_mod * frametime * (time > this.pauseregen_finished), maxa, autocvar_g_balance_armor_rot, autocvar_g_balance_armor_rotlinear, rot_mod * frametime * (time > this.pauserotarmor_finished), limita)); - SetResourceAmount(this, RESOURCE_HEALTH, CalcRotRegen(GetResourceAmount(this, RESOURCE_HEALTH), regen_health_stable, regen_health, regen_health_linear, + SetResource(this, RES_HEALTH, CalcRotRegen(GetResource(this, RES_HEALTH), regen_health_stable, regen_health, regen_health_linear, regen_mod * frametime * (time > this.pauseregen_finished), regen_health_rotstable, regen_health_rot, regen_health_rotlinear, rot_mod * frametime * (time > this.pauserothealth_finished), limith)); } // if player rotted to death... die! // check this outside above checks, as player may still be able to rot to death - if(GetResourceAmount(this, RESOURCE_HEALTH) < 1) + if(GetResource(this, RES_HEALTH) < 1) { if(this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE); @@ -1607,9 +1607,9 @@ void player_regen(entity this) maxf = autocvar_g_balance_fuel_rotstable; minf = autocvar_g_balance_fuel_regenstable; - limitf = GetResourceLimit(this, RESOURCE_FUEL); + limitf = GetResourceLimit(this, RES_FUEL); - SetResourceAmount(this, RESOURCE_FUEL, CalcRotRegen(GetResourceAmount(this, RESOURCE_FUEL), minf, autocvar_g_balance_fuel_regen, autocvar_g_balance_fuel_regenlinear, + SetResource(this, RES_FUEL, CalcRotRegen(GetResource(this, RES_FUEL), minf, autocvar_g_balance_fuel_regen, autocvar_g_balance_fuel_regenlinear, frametime * (time > this.pauseregen_finished) * ((this.items & ITEM_JetpackRegen.m_itemid) != 0), maxf, autocvar_g_balance_fuel_rot, autocvar_g_balance_fuel_rotlinear, frametime * (time > this.pauserotfuel_finished), limitf)); } @@ -1657,15 +1657,15 @@ void SpectateCopy(entity this, entity spectatee) MUTATOR_CALLHOOK(SpectateCopy, spectatee, this); PS(this) = PS(spectatee); this.armortype = spectatee.armortype; - SetResourceAmountExplicit(this, RESOURCE_ARMOR, GetResourceAmount(spectatee, RESOURCE_ARMOR)); - SetResourceAmountExplicit(this, RESOURCE_CELLS, GetResourceAmount(spectatee, RESOURCE_CELLS)); - SetResourceAmountExplicit(this, RESOURCE_PLASMA, GetResourceAmount(spectatee, RESOURCE_PLASMA)); - SetResourceAmountExplicit(this, RESOURCE_SHELLS, GetResourceAmount(spectatee, RESOURCE_SHELLS)); - SetResourceAmountExplicit(this, RESOURCE_BULLETS, GetResourceAmount(spectatee, RESOURCE_BULLETS)); - SetResourceAmountExplicit(this, RESOURCE_ROCKETS, GetResourceAmount(spectatee, RESOURCE_ROCKETS)); - SetResourceAmountExplicit(this, RESOURCE_FUEL, GetResourceAmount(spectatee, RESOURCE_FUEL)); + SetResourceExplicit(this, RES_ARMOR, GetResource(spectatee, RES_ARMOR)); + SetResourceExplicit(this, RES_CELLS, GetResource(spectatee, RES_CELLS)); + SetResourceExplicit(this, RES_PLASMA, GetResource(spectatee, RES_PLASMA)); + SetResourceExplicit(this, RES_SHELLS, GetResource(spectatee, RES_SHELLS)); + SetResourceExplicit(this, RES_BULLETS, GetResource(spectatee, RES_BULLETS)); + SetResourceExplicit(this, RES_ROCKETS, GetResource(spectatee, RES_ROCKETS)); + SetResourceExplicit(this, RES_FUEL, GetResource(spectatee, RES_FUEL)); this.effects = spectatee.effects & EFMASK_CHEAP; // eat performance - SetResourceAmountExplicit(this, RESOURCE_HEALTH, GetResourceAmount(spectatee, RESOURCE_HEALTH)); + SetResourceExplicit(this, RES_HEALTH, GetResource(spectatee, RES_HEALTH)); CS(this).impulse = 0; this.items = spectatee.items; STAT(LAST_PICKUP, this) = STAT(LAST_PICKUP, spectatee); @@ -2173,7 +2173,7 @@ bool PlayerThink(entity this) } this.items_added = 0; - if ((this.items & ITEM_Jetpack.m_itemid) && ((this.items & ITEM_JetpackRegen.m_itemid) || GetResourceAmount(this, RESOURCE_FUEL) >= 0.01)) + if ((this.items & ITEM_Jetpack.m_itemid) && ((this.items & ITEM_JetpackRegen.m_itemid) || GetResource(this, RES_FUEL) >= 0.01)) this.items_added |= IT_FUEL; this.items |= this.items_added; @@ -2429,7 +2429,7 @@ void PlayerPreThink (entity this) if (STAT(FROZEN, this) == FROZEN_TEMP_REVIVING) { STAT(REVIVE_PROGRESS, this) = bound(0, STAT(REVIVE_PROGRESS, this) + frametime * this.revive_speed, 1); - SetResourceAmountExplicit(this, RESOURCE_HEALTH, max(1, STAT(REVIVE_PROGRESS, this) * start_health)); + SetResourceExplicit(this, RES_HEALTH, max(1, STAT(REVIVE_PROGRESS, this) * start_health)); this.iceblock.alpha = bound(0.2, 1 - STAT(REVIVE_PROGRESS, this), 1); if (STAT(REVIVE_PROGRESS, this) >= 1) @@ -2438,9 +2438,9 @@ void PlayerPreThink (entity this) else if (STAT(FROZEN, this) == FROZEN_TEMP_DYING) { STAT(REVIVE_PROGRESS, this) = bound(0, STAT(REVIVE_PROGRESS, this) - frametime * this.revive_speed, 1); - SetResourceAmountExplicit(this, RESOURCE_HEALTH, max(0, autocvar_g_nades_ice_health + (start_health-autocvar_g_nades_ice_health) * STAT(REVIVE_PROGRESS, this))); + SetResourceExplicit(this, RES_HEALTH, max(0, autocvar_g_nades_ice_health + (start_health-autocvar_g_nades_ice_health) * STAT(REVIVE_PROGRESS, this))); - if (GetResourceAmount(this, RESOURCE_HEALTH) < 1) + if (GetResource(this, RES_HEALTH) < 1) { if (this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE); @@ -2682,9 +2682,9 @@ void PlayerPostThink (entity this) } if (this.waypointsprite_attachedforcarrier) { - vector v = healtharmor_maxdamage(GetResourceAmount(this, RESOURCE_HEALTH), GetResourceAmount(this, RESOURCE_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id); - WaypointSprite_UpdateHealth(this.waypointsprite_attachedforcarrier, '1 0 0' * v); - } + float hp = healtharmor_maxdamage(GetResource(this, RES_HEALTH), GetResource(this, RES_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id).x; + WaypointSprite_UpdateHealth(this.waypointsprite_attachedforcarrier, hp); + } CSQCMODEL_AUTOUPDATE(this); } @@ -2715,9 +2715,6 @@ int Say(entity source, int teamsay, entity privatesay, string msgin, bool floodc teamsay = false; } - if (intermission_running) - teamsay = false; - if (!source) { colorstr = ""; teamsay = false; diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index e39d5039dd..1395986b97 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -285,7 +285,7 @@ void ClientCommand_kill(entity caller, int request) if(IS_SPEC(caller) || IS_OBSERVER(caller)) return; // no point warning about this, command does nothing - if(GetResourceAmount(caller, RESOURCE_HEALTH) <= 0) + if(GetResource(caller, RES_HEALTH) <= 0) { sprint(caller, "Can't die - you are already dead!\n"); return; diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc index 643afa3f17..6121867e20 100644 --- a/qcsrc/server/command/common.qc +++ b/qcsrc/server/command/common.qc @@ -405,7 +405,7 @@ void CommonCommand_editmob(int request, entity caller, int argc) if (mon.realowner != caller && autocvar_g_monsters_edit < 2) { print_to(caller, "This monster does not belong to you"); return; } if (!is_visible) { print_to(caller, "You must look at your monster to edit it"); return; } - Damage(mon, NULL, NULL, GetResourceAmount(mon, RESOURCE_HEALTH) + mon.max_health + 200, DEATH_KILL.m_id, DMG_NOWEP, mon.origin, '0 0 0'); + Damage(mon, NULL, NULL, GetResource(mon, RES_HEALTH) + mon.max_health + 200, DEATH_KILL.m_id, DMG_NOWEP, mon.origin, '0 0 0'); print_to(caller, strcat("Your pet '", mon.monster_name, "' has been brutally mutilated")); return; } @@ -437,7 +437,7 @@ void CommonCommand_editmob(int request, entity caller, int argc) case "butcher": { if (caller) { print_to(caller, "This command is not available to players"); return; } - if (MUTATOR_CALLHOOK(AllowMobButcher)) { LOG_INFOF("%s", M_ARGV(0, string)); return; } + if (MUTATOR_CALLHOOK(AllowMobButcher)) { LOG_INFO(M_ARGV(0, string)); return; } int tmp_remcount = 0; diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index c3e5bf9015..e8fc1b13f1 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -330,6 +330,7 @@ void GameCommand_bot_cmd(int request, int argc, string command) { cvar_settemp("bot_vs_human", "0"); cvar_settemp("minplayers", "0"); + cvar_settemp("minplayers_per_team", "0"); cvar_settemp("bot_number", "0"); bot_fixcount(); cvar_settemp("bot_number", argv(2)); @@ -362,6 +363,7 @@ void GameCommand_bot_cmd(int request, int argc, string command) { cvar_settemp("bot_vs_human", "0"); cvar_settemp("minplayers", "0"); + cvar_settemp("minplayers_per_team", "0"); cvar_settemp("bot_number", "0"); bot_fixcount(); cvar_settemp("bot_number", argv(3)); @@ -605,6 +607,13 @@ void GameCommand_delrec(int request, int argc) // perhaps merge later with reco } } +void print_Effect_Index(int d, string effect_name) +{ + // this is inside a function to avoid expanding it on compilation everytime + LOG_INFO("effect ", effect_name, " is ", ftos(_particleeffectnum(effect_name)), "\n"); + db_put(d, effect_name, "1"); +} + void GameCommand_effectindexdump(int request) { switch (request) @@ -616,78 +625,43 @@ void GameCommand_effectindexdump(int request) d = db_create(); LOG_INFO("begin of effects list"); - db_put(d, "TE_GUNSHOT", "1"); - LOG_INFO("effect TE_GUNSHOT is ", ftos(_particleeffectnum("TE_GUNSHOT"))); - db_put(d, "TE_GUNSHOTQUAD", "1"); - LOG_INFO("effect TE_GUNSHOTQUAD is ", ftos(_particleeffectnum("TE_GUNSHOTQUAD"))); - db_put(d, "TE_SPIKE", "1"); - LOG_INFO("effect TE_SPIKE is ", ftos(_particleeffectnum("TE_SPIKE"))); - db_put(d, "TE_SPIKEQUAD", "1"); - LOG_INFO("effect TE_SPIKEQUAD is ", ftos(_particleeffectnum("TE_SPIKEQUAD"))); - db_put(d, "TE_SUPERSPIKE", "1"); - LOG_INFO("effect TE_SUPERSPIKE is ", ftos(_particleeffectnum("TE_SUPERSPIKE"))); - db_put(d, "TE_SUPERSPIKEQUAD", "1"); - LOG_INFO("effect TE_SUPERSPIKEQUAD is ", ftos(_particleeffectnum("TE_SUPERSPIKEQUAD"))); - db_put(d, "TE_WIZSPIKE", "1"); - LOG_INFO("effect TE_WIZSPIKE is ", ftos(_particleeffectnum("TE_WIZSPIKE"))); - db_put(d, "TE_KNIGHTSPIKE", "1"); - LOG_INFO("effect TE_KNIGHTSPIKE is ", ftos(_particleeffectnum("TE_KNIGHTSPIKE"))); - db_put(d, "TE_EXPLOSION", "1"); - LOG_INFO("effect TE_EXPLOSION is ", ftos(_particleeffectnum("TE_EXPLOSION"))); - db_put(d, "TE_EXPLOSIONQUAD", "1"); - LOG_INFO("effect TE_EXPLOSIONQUAD is ", ftos(_particleeffectnum("TE_EXPLOSIONQUAD"))); - db_put(d, "TE_TAREXPLOSION", "1"); - LOG_INFO("effect TE_TAREXPLOSION is ", ftos(_particleeffectnum("TE_TAREXPLOSION"))); - db_put(d, "TE_TELEPORT", "1"); - LOG_INFO("effect TE_TELEPORT is ", ftos(_particleeffectnum("TE_TELEPORT"))); - db_put(d, "TE_LAVASPLASH", "1"); - LOG_INFO("effect TE_LAVASPLASH is ", ftos(_particleeffectnum("TE_LAVASPLASH"))); - db_put(d, "TE_SMALLFLASH", "1"); - LOG_INFO("effect TE_SMALLFLASH is ", ftos(_particleeffectnum("TE_SMALLFLASH"))); - db_put(d, "TE_FLAMEJET", "1"); - LOG_INFO("effect TE_FLAMEJET is ", ftos(_particleeffectnum("TE_FLAMEJET"))); - db_put(d, "EF_FLAME", "1"); - LOG_INFO("effect EF_FLAME is ", ftos(_particleeffectnum("EF_FLAME"))); - db_put(d, "TE_BLOOD", "1"); - LOG_INFO("effect TE_BLOOD is ", ftos(_particleeffectnum("TE_BLOOD"))); - db_put(d, "TE_SPARK", "1"); - LOG_INFO("effect TE_SPARK is ", ftos(_particleeffectnum("TE_SPARK"))); - db_put(d, "TE_PLASMABURN", "1"); - LOG_INFO("effect TE_PLASMABURN is ", ftos(_particleeffectnum("TE_PLASMABURN"))); - db_put(d, "TE_TEI_G3", "1"); - LOG_INFO("effect TE_TEI_G3 is ", ftos(_particleeffectnum("TE_TEI_G3"))); - db_put(d, "TE_TEI_SMOKE", "1"); - LOG_INFO("effect TE_TEI_SMOKE is ", ftos(_particleeffectnum("TE_TEI_SMOKE"))); - db_put(d, "TE_TEI_BIGEXPLOSION", "1"); - LOG_INFO("effect TE_TEI_BIGEXPLOSION is ", ftos(_particleeffectnum("TE_TEI_BIGEXPLOSION"))); - db_put(d, "TE_TEI_PLASMAHIT", "1"); - LOG_INFO("effect TE_TEI_PLASMAHIT is ", ftos(_particleeffectnum("TE_TEI_PLASMAHIT"))); - db_put(d, "EF_STARDUST", "1"); - LOG_INFO("effect EF_STARDUST is ", ftos(_particleeffectnum("EF_STARDUST"))); - db_put(d, "TR_ROCKET", "1"); - LOG_INFO("effect TR_ROCKET is ", ftos(_particleeffectnum("TR_ROCKET"))); - db_put(d, "TR_GRENADE", "1"); - LOG_INFO("effect TR_GRENADE is ", ftos(_particleeffectnum("TR_GRENADE"))); - db_put(d, "TR_BLOOD", "1"); - LOG_INFO("effect TR_BLOOD is ", ftos(_particleeffectnum("TR_BLOOD"))); - db_put(d, "TR_WIZSPIKE", "1"); - LOG_INFO("effect TR_WIZSPIKE is ", ftos(_particleeffectnum("TR_WIZSPIKE"))); - db_put(d, "TR_SLIGHTBLOOD", "1"); - LOG_INFO("effect TR_SLIGHTBLOOD is ", ftos(_particleeffectnum("TR_SLIGHTBLOOD"))); - db_put(d, "TR_KNIGHTSPIKE", "1"); - LOG_INFO("effect TR_KNIGHTSPIKE is ", ftos(_particleeffectnum("TR_KNIGHTSPIKE"))); - db_put(d, "TR_VORESPIKE", "1"); - LOG_INFO("effect TR_VORESPIKE is ", ftos(_particleeffectnum("TR_VORESPIKE"))); - db_put(d, "TR_NEHAHRASMOKE", "1"); - LOG_INFO("effect TR_NEHAHRASMOKE is ", ftos(_particleeffectnum("TR_NEHAHRASMOKE"))); - db_put(d, "TR_NEXUIZPLASMA", "1"); - LOG_INFO("effect TR_NEXUIZPLASMA is ", ftos(_particleeffectnum("TR_NEXUIZPLASMA"))); - db_put(d, "TR_GLOWTRAIL", "1"); - LOG_INFO("effect TR_GLOWTRAIL is ", ftos(_particleeffectnum("TR_GLOWTRAIL"))); - db_put(d, "TR_SEEKER", "1"); - LOG_INFO("effect TR_SEEKER is ", ftos(_particleeffectnum("TR_SEEKER"))); - db_put(d, "SVC_PARTICLE", "1"); - LOG_INFO("effect SVC_PARTICLE is ", ftos(_particleeffectnum("SVC_PARTICLE"))); + + print_Effect_Index(d, "TE_GUNSHOT"); + print_Effect_Index(d, "TE_GUNSHOTQUAD"); + print_Effect_Index(d, "TE_SPIKE"); + print_Effect_Index(d, "TE_SPIKEQUAD"); + print_Effect_Index(d, "TE_SUPERSPIKE"); + print_Effect_Index(d, "TE_SUPERSPIKEQUAD"); + print_Effect_Index(d, "TE_WIZSPIKE"); + print_Effect_Index(d, "TE_KNIGHTSPIKE"); + print_Effect_Index(d, "TE_EXPLOSION"); + print_Effect_Index(d, "TE_EXPLOSIONQUAD"); + print_Effect_Index(d, "TE_TAREXPLOSION"); + print_Effect_Index(d, "TE_TELEPORT"); + print_Effect_Index(d, "TE_LAVASPLASH"); + print_Effect_Index(d, "TE_SMALLFLASH"); + print_Effect_Index(d, "TE_FLAMEJET"); + print_Effect_Index(d, "EF_FLAME"); + print_Effect_Index(d, "TE_BLOOD"); + print_Effect_Index(d, "TE_SPARK"); + print_Effect_Index(d, "TE_PLASMABURN"); + print_Effect_Index(d, "TE_TEI_G3"); + print_Effect_Index(d, "TE_TEI_SMOKE"); + print_Effect_Index(d, "TE_TEI_BIGEXPLOSION"); + print_Effect_Index(d, "TE_TEI_PLASMAHIT"); + print_Effect_Index(d, "EF_STARDUST"); + print_Effect_Index(d, "TR_ROCKET"); + print_Effect_Index(d, "TR_GRENADE"); + print_Effect_Index(d, "TR_BLOOD"); + print_Effect_Index(d, "TR_WIZSPIKE"); + print_Effect_Index(d, "TR_SLIGHTBLOOD"); + print_Effect_Index(d, "TR_KNIGHTSPIKE"); + print_Effect_Index(d, "TR_VORESPIKE"); + print_Effect_Index(d, "TR_NEHAHRASMOKE"); + print_Effect_Index(d, "TR_NEXUIZPLASMA"); + print_Effect_Index(d, "TR_GLOWTRAIL"); + print_Effect_Index(d, "TR_SEEKER"); + print_Effect_Index(d, "SVC_PARTICLE"); fh = fopen("effectinfo.txt", FILE_READ); while ((s = fgets(fh))) @@ -820,8 +794,8 @@ void GameCommand_gettaginfo(int request, int argc) { v = gettaginfo(tmp_entity, i); LOG_INFOF( - "model %s frame %s tag %s index %s parent %s", - tmp_entity.model, ftos(tmp_entity.frame), gettaginfo_name, ftos(i), ftos(gettaginfo_parent) + "model %s frame %s tag %s index %s parent %s", + tmp_entity.model, ftos(tmp_entity.frame), gettaginfo_name, ftos(i), ftos(gettaginfo_parent) ); LOG_INFOF(" vector = %s %s %s", ftos(v.x), ftos(v.y), ftos(v.z)); LOG_INFOF(" offset = %s %s %s", ftos(gettaginfo_offset.x), ftos(gettaginfo_offset.y), ftos(gettaginfo_offset.z)); @@ -1281,6 +1255,7 @@ void GameCommand_setbots(int request, int argc) if (argc >= 2) { cvar_settemp("minplayers", "0"); + cvar_settemp("minplayers_per_team", "0"); cvar_settemp("bot_number", argv(1)); bot_fixcount(); return; diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc index 65f231374f..112a7f039d 100644 --- a/qcsrc/server/compat/quake3.qc +++ b/qcsrc/server/compat/quake3.qc @@ -88,25 +88,25 @@ void target_init_use(entity this, entity actor, entity trigger) { if (!(this.spawnflags & 1)) { - SetResourceAmount(actor, RESOURCE_ARMOR, start_armorvalue); + SetResource(actor, RES_ARMOR, start_armorvalue); actor.pauserotarmor_finished = time + autocvar_g_balance_pause_armor_rot; } if (!(this.spawnflags & 2)) { - SetResourceAmount(actor, RESOURCE_HEALTH, start_health); + SetResource(actor, RES_HEALTH, start_health); actor.pauserothealth_finished = time + autocvar_g_balance_pause_health_rot; actor.pauseregen_finished = time + autocvar_g_balance_pause_health_regen; } if (!(this.spawnflags & 4)) { - SetResourceAmount(actor, RESOURCE_SHELLS, start_ammo_shells); - SetResourceAmount(actor, RESOURCE_BULLETS, start_ammo_nails); - SetResourceAmount(actor, RESOURCE_ROCKETS, start_ammo_rockets); - SetResourceAmount(actor, RESOURCE_CELLS, start_ammo_cells); - SetResourceAmount(actor, RESOURCE_PLASMA, start_ammo_plasma); - SetResourceAmount(actor, RESOURCE_FUEL, start_ammo_fuel); + SetResource(actor, RES_SHELLS, start_ammo_shells); + SetResource(actor, RES_BULLETS, start_ammo_nails); + SetResource(actor, RES_ROCKETS, start_ammo_rockets); + SetResource(actor, RES_CELLS, start_ammo_cells); + SetResource(actor, RES_PLASMA, start_ammo_plasma); + SetResource(actor, RES_FUEL, start_ammo_fuel); STAT(WEAPONS, actor) = start_weapons; if (this.spawnflags & 32) @@ -142,33 +142,33 @@ void target_give_init(entity this) IL_EACH(g_items, it.targetname == this.target, { if (it.classname == "weapon_devastator") { - SetResourceAmountExplicit(this, RESOURCE_ROCKETS, GetResourceAmount(this, RESOURCE_ROCKETS) + it.count * WEP_CVAR_PRI(devastator, ammo)); // WEAPONTODO + SetResourceExplicit(this, RES_ROCKETS, GetResource(this, RES_ROCKETS) + it.count * WEP_CVAR_PRI(devastator, ammo)); // WEAPONTODO this.netname = cons(this.netname, "devastator"); } else if (it.classname == "weapon_vortex") { - SetResourceAmountExplicit(this, RESOURCE_CELLS, GetResourceAmount(this, RESOURCE_CELLS) + it.count * WEP_CVAR_PRI(vortex, ammo)); // WEAPONTODO + SetResourceExplicit(this, RES_CELLS, GetResource(this, RES_CELLS) + it.count * WEP_CVAR_PRI(vortex, ammo)); // WEAPONTODO this.netname = cons(this.netname, "vortex"); } else if (it.classname == "weapon_electro") { - SetResourceAmountExplicit(this, RESOURCE_CELLS, GetResourceAmount(this, RESOURCE_CELLS) + it.count * WEP_CVAR_PRI(electro, ammo)); // WEAPONTODO + SetResourceExplicit(this, RES_CELLS, GetResource(this, RES_CELLS) + it.count * WEP_CVAR_PRI(electro, ammo)); // WEAPONTODO this.netname = cons(this.netname, "electro"); } else if (it.classname == "weapon_hagar") { - SetResourceAmountExplicit(this, RESOURCE_ROCKETS, GetResourceAmount(this, RESOURCE_ROCKETS) + it.count * WEP_CVAR_PRI(hagar, ammo)); // WEAPONTODO + SetResourceExplicit(this, RES_ROCKETS, GetResource(this, RES_ROCKETS) + it.count * WEP_CVAR_PRI(hagar, ammo)); // WEAPONTODO this.netname = cons(this.netname, "hagar"); } else if (it.classname == "weapon_crylink") { - SetResourceAmountExplicit(this, RESOURCE_CELLS, GetResourceAmount(this, RESOURCE_CELLS) + it.count * WEP_CVAR_PRI(crylink, ammo)); // WEAPONTODO + SetResourceExplicit(this, RES_CELLS, GetResource(this, RES_CELLS) + it.count * WEP_CVAR_PRI(crylink, ammo)); // WEAPONTODO this.netname = cons(this.netname, "crylink"); } else if (it.classname == "weapon_mortar") { - SetResourceAmountExplicit(this, RESOURCE_ROCKETS, GetResourceAmount(this, RESOURCE_ROCKETS) + it.count * WEP_CVAR_PRI(mortar, ammo)); // WEAPONTODO + SetResourceExplicit(this, RES_ROCKETS, GetResource(this, RES_ROCKETS) + it.count * WEP_CVAR_PRI(mortar, ammo)); // WEAPONTODO this.netname = cons(this.netname, "mortar"); } else if (it.classname == "item_armor_mega") - SetResourceAmountExplicit(this, RESOURCE_ARMOR, 100); + SetResourceExplicit(this, RES_ARMOR, 100); else if (it.classname == "item_health_mega") - SetResourceAmountExplicit(this, RESOURCE_HEALTH, 200); + SetResourceExplicit(this, RES_HEALTH, 200); //remove(it); // removing ents in init functions causes havoc, workaround: setthink(it, SUB_Remove); it.nextthink = time; diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 5b5d8a66b7..c66ad28fe3 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -50,7 +50,7 @@ float server_is_dedicated; .float pain_frame; //" .float crouch; // Crouching or not? -.float superweapons_finished = _STAT(SUPERWEAPONS_FINISHED); +const .float superweapons_finished = _STAT(SUPERWEAPONS_FINISHED); .float cnt; // used in too many places .float count; diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 49be7c4c3d..0901ab4478 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -216,7 +216,7 @@ bool frag_centermessage_override(entity attacker, entity targ, int deathtype, in if(deathtype == DEATH_FIRE.m_id) { Send_Notification(NOTIF_ONE, attacker, MSG_CHOICE, CHOICE_FRAG_FIRE, targ.netname, kill_count_to_attacker, (IS_BOT_CLIENT(targ) ? -1 : CS(targ).ping)); - Send_Notification(NOTIF_ONE, targ, MSG_CHOICE, CHOICE_FRAGGED_FIRE, attacker.netname, kill_count_to_target, GetResourceAmount(attacker, RESOURCE_HEALTH), GetResourceAmount(attacker, RESOURCE_ARMOR), (IS_BOT_CLIENT(attacker) ? -1 : CS(attacker).ping)); + Send_Notification(NOTIF_ONE, targ, MSG_CHOICE, CHOICE_FRAGGED_FIRE, attacker.netname, kill_count_to_target, GetResource(attacker, RES_HEALTH), GetResource(attacker, RES_ARMOR), (IS_BOT_CLIENT(attacker) ? -1 : CS(attacker).ping)); return true; } @@ -321,14 +321,11 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype, .en // these 2 macros are spread over multiple files #define SPREE_ITEM(counta,countb,center,normal,gentle) \ case counta: \ - { \ Send_Notification(NOTIF_ONE, attacker, MSG_ANNCE, ANNCE_KILLSTREAK_##countb); \ - if (!warmup_stage)\ - {\ + if (!warmup_stage) \ PlayerStats_GameReport_Event_Player(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_##counta, 1); \ - }\ - break; \ - } + break; + switch(CS(attacker).killcount) { KILL_SPREE_LIST @@ -371,8 +368,8 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype, .en CHOICE_TYPEFRAGGED, attacker.netname, kill_count_to_target, - GetResourceAmount(attacker, RESOURCE_HEALTH), - GetResourceAmount(attacker, RESOURCE_ARMOR), + GetResource(attacker, RES_HEALTH), + GetResource(attacker, RES_ARMOR), (IS_BOT_CLIENT(attacker) ? -1 : CS(attacker).ping) ); } @@ -394,8 +391,8 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype, .en CHOICE_FRAGGED, attacker.netname, kill_count_to_target, - GetResourceAmount(attacker, RESOURCE_HEALTH), - GetResourceAmount(attacker, RESOURCE_ARMOR), + GetResource(attacker, RES_HEALTH), + GetResource(attacker, RES_ARMOR), (IS_BOT_CLIENT(attacker) ? -1 : CS(attacker).ping) ); } @@ -490,7 +487,7 @@ void Freeze(entity targ, float revivespeed, int frozen_type, bool show_waypoint) STAT(FROZEN, targ) = frozen_type; STAT(REVIVE_PROGRESS, targ) = ((frozen_type == FROZEN_TEMP_DYING) ? 1 : 0); - SetResourceAmount(targ, RESOURCE_HEALTH, ((frozen_type == FROZEN_TEMP_DYING) ? targ_maxhealth : 1)); + SetResource(targ, RES_HEALTH, ((frozen_type == FROZEN_TEMP_DYING) ? targ_maxhealth : 1)); targ.revive_speed = revivespeed; if(targ.bot_attack) IL_REMOVE(g_bot_targets, targ); @@ -535,7 +532,7 @@ void Unfreeze(entity targ, bool reset_health) return; if (reset_health && STAT(FROZEN, targ) != FROZEN_TEMP_DYING) - SetResourceAmount(targ, RESOURCE_HEALTH, ((IS_PLAYER(targ)) ? start_health : targ.max_health)); + SetResource(targ, RES_HEALTH, ((IS_PLAYER(targ)) ? start_health : targ.max_health)); targ.pauseregen_finished = time + autocvar_g_balance_pause_health_regen; @@ -595,9 +592,9 @@ void Damage(entity targ, entity inflictor, entity attacker, float damage, int de // These are ALWAYS lethal // No damage modification here // Instead, prepare the victim for his death... - SetResourceAmountExplicit(targ, RESOURCE_ARMOR, 0); + SetResourceExplicit(targ, RES_ARMOR, 0); targ.spawnshieldtime = 0; - SetResourceAmountExplicit(targ, RESOURCE_HEALTH, 0.9); // this is < 1 + SetResourceExplicit(targ, RES_HEALTH, 0.9); // this is < 1 targ.flags -= targ.flags & FL_GODMODE; damage = 100000; } @@ -638,7 +635,7 @@ void Damage(entity targ, entity inflictor, entity attacker, float damage, int de if(autocvar_g_mirrordamage_virtual) { - vector v = healtharmor_applydamage(GetResourceAmount(attacker, RESOURCE_ARMOR), autocvar_g_balance_armor_blockpercent, deathtype, mirrordamage); + vector v = healtharmor_applydamage(GetResource(attacker, RES_ARMOR), autocvar_g_balance_armor_blockpercent, deathtype, mirrordamage); attacker.dmg_take += v.x; attacker.dmg_save += v.y; attacker.dmg_inflictor = inflictor; @@ -648,7 +645,7 @@ void Damage(entity targ, entity inflictor, entity attacker, float damage, int de if(autocvar_g_friendlyfire_virtual) { - vector v = healtharmor_applydamage(GetResourceAmount(targ, RESOURCE_ARMOR), autocvar_g_balance_armor_blockpercent, deathtype, damage); + vector v = healtharmor_applydamage(GetResource(targ, RES_ARMOR), autocvar_g_balance_armor_blockpercent, deathtype, damage); targ.dmg_take += v.x; targ.dmg_save += v.y; targ.dmg_inflictor = inflictor; @@ -694,7 +691,7 @@ void Damage(entity targ, entity inflictor, entity attacker, float damage, int de if(autocvar_g_frozen_revive_falldamage > 0 && deathtype == DEATH_FALL.m_id && damage >= autocvar_g_frozen_revive_falldamage) { Unfreeze(targ, false); - SetResourceAmount(targ, RESOURCE_HEALTH, autocvar_g_frozen_revive_falldamage_health); + SetResource(targ, RES_HEALTH, autocvar_g_frozen_revive_falldamage_health); Send_Effect(EFFECT_ICEORGLASS, targ.origin, '0 0 0', 3); Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_FREEZETAG_REVIVED_FALL, targ.netname); Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_FREEZETAG_REVIVE_SELF); diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh index 1d100e7a5a..efe6b2e1b3 100644 --- a/qcsrc/server/g_damage.qh +++ b/qcsrc/server/g_damage.qh @@ -97,7 +97,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in float RadiusDamage (entity inflictor, entity attacker, float coredamage, float edgedamage, float rad, entity cantbe, entity mustbe, float forceintensity, int deathtype, .entity weaponentity, entity directhitentity); // Calls .event_heal on the target so that they can handle healing themselves -// a limit of RESOURCE_LIMIT_NONE should be handled by the entity as its max health (if applicable) +// a limit of RES_LIMIT_NONE should be handled by the entity as its max health (if applicable) bool Heal(entity targ, entity inflictor, float amount, float limit); .float fire_damagepersec; diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index 68aa7154ec..ffb19f17a1 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -338,15 +338,15 @@ void GrapplingHookTouch(entity this, entity toucher) void GrapplingHook_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force) { - if(GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if(GetResource(this, RES_HEALTH) <= 0) return; if (!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, -1)) // no exceptions return; // g_balance_projectiledamage says to halt - TakeResource(this, RESOURCE_HEALTH, damage); + TakeResource(this, RES_HEALTH, damage); - if (GetResourceAmount(this, RESOURCE_HEALTH) <= 0) + if (GetResource(this, RES_HEALTH) <= 0) { if(attacker != this.realowner) { @@ -397,7 +397,7 @@ void FireGrapplingHook(entity actor, .entity weaponentity) missile.effects = /*EF_FULLBRIGHT | EF_ADDITIVE |*/ EF_LOWPRECISION; - SetResourceAmountExplicit(missile, RESOURCE_HEALTH, autocvar_g_balance_grapplehook_health); + SetResourceExplicit(missile, RES_HEALTH, autocvar_g_balance_grapplehook_health); missile.event_damage = GrapplingHook_Damage; missile.takedamage = DAMAGE_AIM; missile.damageforcescale = 0; diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 522f4f041c..9ef72ae832 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -431,6 +431,7 @@ void cvar_changes_init() BADCVAR("log_file"); BADCVAR("maxplayers"); BADCVAR("minplayers"); + BADCVAR("minplayers_per_team"); BADCVAR("net_address"); BADCVAR("port"); BADCVAR("rcon_password"); @@ -615,10 +616,12 @@ void InitGameplayMode() world.fog = string_null; } if(MapInfo_Map_fog != "") + { if(MapInfo_Map_fog == "none") world.fog = string_null; else world.fog = strzone(MapInfo_Map_fog); + } clientstuff = strzone(MapInfo_Map_clientstuff); MapInfo_ClearTemps(); @@ -637,7 +640,7 @@ spawnfunc(worldspawn) { server_is_dedicated = boolean(stof(cvar_defstring("is_dedicated"))); - bool wantrestart = false; + bool wantrestart = false; { if (!server_is_dedicated) { @@ -692,7 +695,7 @@ spawnfunc(worldspawn) } if (wantrestart) { - LOG_INFOF("Restart requested"); + LOG_INFO("Restart requested"); changelevel(mapname); // let initialization continue, shutdown depends on it } @@ -771,7 +774,7 @@ spawnfunc(worldspawn) readlevelcvars(); GrappleHookInit(); - GameRules_limit_fallbacks(); + GameRules_limit_fallbacks(); if(warmup_limit == 0) warmup_limit = (autocvar_timelimit > 0) ? autocvar_timelimit * 60 : autocvar_timelimit; @@ -922,7 +925,7 @@ spawnfunc(worldspawn) s = cons(s, pkg); } // add automatically managed files to the list - #define X(match) MACRO_BEGIN { \ + #define X(match) MACRO_BEGIN \ int fd = search_begin(match, true, false); \ if (fd >= 0) \ { \ @@ -932,7 +935,7 @@ spawnfunc(worldspawn) } \ search_end(fd); \ } \ - } MACRO_END + MACRO_END X("*-serverpackage.txt"); X("*.serverpackage"); #undef X @@ -1004,8 +1007,11 @@ float GetMaplistPosition() bool MapHasRightSize(string map) { - if(currentbots || autocvar_bot_number || player_count < autocvar_minplayers) - if(autocvar_g_maplist_check_waypoints) + int minplayers = max(0, floor(autocvar_minplayers)); + if (teamplay) + minplayers = max(0, floor(autocvar_minplayers_per_team) * AvailableTeams()); + if (autocvar_g_maplist_check_waypoints + && (currentbots || autocvar_bot_number || player_count < minplayers)) { string checkwp_msg = strcat("checkwp ", map); if(!fexists(strcat("maps/", map, ".waypoints"))) @@ -1521,7 +1527,7 @@ void FixIntermissionClient(entity e) if(!e.autoscreenshot) // initial call { e.autoscreenshot = time + 0.8; // used for autoscreenshot - SetResourceAmountExplicit(e, RESOURCE_HEALTH, -2342); + SetResourceExplicit(e, RES_HEALTH, -2342); // first intermission phase; voting phase has positive health (used to decide whether to send SVC_FINALE or not) for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) { @@ -1644,22 +1650,29 @@ void InitiateOvertime() // ONLY call this if InitiateSuddenDeath returned true float GetWinningCode(float fraglimitreached, float equality) { if(autocvar_g_campaign == 1) + { if(fraglimitreached) return WINNING_YES; else return WINNING_NO; - + } else + { if(equality) + { if(fraglimitreached) return WINNING_STARTSUDDENDEATHOVERTIME; else return WINNING_NEVER; + } else + { if(fraglimitreached) return WINNING_YES; else return WINNING_NO; + } + } } // set the .winning flag for exactly those players with a given field value @@ -1729,19 +1742,20 @@ float WinningCondition_Scores(float limit, float leadlimit) leaderfrags = WinningConditionHelper_topscore; if (limit) - if (leaderfrags == limit - 1) - Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_1); - else if (leaderfrags == limit - 2) - Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_2); - else if (leaderfrags == limit - 3) - Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_3); + { + if (leaderfrags == limit - 1) + Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_1); + else if (leaderfrags == limit - 2) + Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_2); + else if (leaderfrags == limit - 3) + Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_3); + } } } limitreached = false; - if(limit) - if(WinningConditionHelper_topscore >= limit) - limitreached = true; + if (limit && WinningConditionHelper_topscore >= limit) + limitreached = true; if(leadlimit) { float leadlimitreached; diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc index 8a17ef6a1d..9b1e38e8e3 100644 --- a/qcsrc/server/impulse.qc +++ b/qcsrc/server/impulse.qc @@ -51,19 +51,19 @@ // weapon switching impulses -#define X(slot) \ - IMPULSE(weapon_group_##slot) \ +#define X(i) \ + IMPULSE(weapon_group_##i) \ { \ if (IS_DEAD(this)) \ { \ - this.impulse = IMP_weapon_group_##slot.impulse; \ + this.impulse = IMP_weapon_group_##i.impulse; \ return; \ } \ - for(int wepslot = 0; wepslot < MAX_WEAPONSLOTS; ++wepslot) \ + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) \ { \ - .entity weaponentity = weaponentities[wepslot]; \ - W_NextWeaponOnImpulse(this, slot, weaponentity); \ - if(wepslot == 0 && autocvar_g_weaponswitch_debug != 1) \ + .entity weaponentity = weaponentities[slot]; \ + W_NextWeaponOnImpulse(this, i, weaponentity); \ + if(autocvar_g_weaponswitch_debug != 1) \ break; \ } \ } @@ -81,23 +81,23 @@ X(0) // custom order weapon cycling -#define X(slot, dir) \ - IMPULSE(weapon_priority_##slot##_##dir) \ +#define X(i, dir) \ + IMPULSE(weapon_priority_##i##_##dir) \ { \ if (this.vehicle) return; \ if (IS_DEAD(this)) \ { \ - this.impulse = IMP_weapon_priority_##slot##_##dir.impulse; \ + this.impulse = IMP_weapon_priority_##i##_##dir.impulse; \ return; \ } \ noref int prev = -1; \ noref int best = 0; \ noref int next = +1; \ - for(int wepslot = 0; wepslot < MAX_WEAPONSLOTS; ++wepslot) \ + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) \ { \ - .entity weaponentity = weaponentities[wepslot]; \ - W_CycleWeapon(this, CS(this).cvar_cl_weaponpriorities[slot], dir, weaponentity); \ - if(wepslot == 0 && autocvar_g_weaponswitch_debug != 1) \ + .entity weaponentity = weaponentities[slot]; \ + W_CycleWeapon(this, CS(this).cvar_cl_weaponpriorities[i], dir, weaponentity); \ + if(autocvar_g_weaponswitch_debug != 1) \ break; \ } \ } @@ -150,7 +150,7 @@ X(9, next) { \ .entity weaponentity = weaponentities[slot]; \ W_SwitchWeapon_TryOthers(this, Weapons_from(WEP_FIRST + i), weaponentity); \ - if(slot == 0 && autocvar_g_weaponswitch_debug != 1) \ + if(autocvar_g_weaponswitch_debug != 1) \ break; \ } \ } @@ -193,7 +193,7 @@ IMPULSE(weapon_next_byid) .entity weaponentity = weaponentities[slot]; W_NextWeapon(this, 0, weaponentity); - if(slot == 0 && autocvar_g_weaponswitch_debug != 1) + if(autocvar_g_weaponswitch_debug != 1) break; } } @@ -211,7 +211,7 @@ IMPULSE(weapon_prev_byid) .entity weaponentity = weaponentities[slot]; W_PreviousWeapon(this, 0, weaponentity); - if(slot == 0 && autocvar_g_weaponswitch_debug != 1) + if(autocvar_g_weaponswitch_debug != 1) break; } } @@ -229,7 +229,7 @@ IMPULSE(weapon_next_bygroup) .entity weaponentity = weaponentities[slot]; W_NextWeapon(this, 1, weaponentity); - if(slot == 0 && autocvar_g_weaponswitch_debug != 1) + if(autocvar_g_weaponswitch_debug != 1) break; } } @@ -247,7 +247,7 @@ IMPULSE(weapon_prev_bygroup) .entity weaponentity = weaponentities[slot]; W_PreviousWeapon(this, 1, weaponentity); - if(slot == 0 && autocvar_g_weaponswitch_debug != 1) + if(autocvar_g_weaponswitch_debug != 1) break; } } @@ -265,7 +265,7 @@ IMPULSE(weapon_next_bypriority) .entity weaponentity = weaponentities[slot]; W_NextWeapon(this, 2, weaponentity); - if(slot == 0 && autocvar_g_weaponswitch_debug != 1) + if(autocvar_g_weaponswitch_debug != 1) break; } } @@ -283,7 +283,7 @@ IMPULSE(weapon_prev_bypriority) .entity weaponentity = weaponentities[slot]; W_PreviousWeapon(this, 2, weaponentity); - if(slot == 0 && autocvar_g_weaponswitch_debug != 1) + if(autocvar_g_weaponswitch_debug != 1) break; } } @@ -297,7 +297,7 @@ IMPULSE(weapon_last) .entity weaponentity = weaponentities[slot]; W_LastWeapon(this, weaponentity); - if(slot == 0 && autocvar_g_weaponswitch_debug != 1) + if(autocvar_g_weaponswitch_debug != 1) break; } } @@ -311,7 +311,7 @@ IMPULSE(weapon_best) .entity weaponentity = weaponentities[slot]; W_SwitchWeapon(this, w_getbestweapon(this, weaponentity), weaponentity); - if(slot == 0 && autocvar_g_weaponswitch_debug != 1) + if(autocvar_g_weaponswitch_debug != 1) break; } } @@ -325,7 +325,7 @@ IMPULSE(weapon_drop) .entity weaponentity = weaponentities[slot]; W_ThrowWeapon(this, weaponentity, W_CalculateProjectileVelocity(this, this.velocity, v_forward * 750, false), '0 0 0', true); - if(slot == 0 && autocvar_g_weaponswitch_debug != 1) + if(autocvar_g_weaponswitch_debug != 1) break; } } @@ -343,7 +343,7 @@ IMPULSE(weapon_reload) w.wr_reload(w, actor, weaponentity); // allow reloading all active slots? - //if(slot == 0 && autocvar_g_weaponswitch_debug != 1) + //if(autocvar_g_weaponswitch_debug != 1) //break; } } diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc index 5c564d56db..ceb2cdd078 100644 --- a/qcsrc/server/mapvoting.qc +++ b/qcsrc/server/mapvoting.qc @@ -591,9 +591,9 @@ void MapVote_Tick() int totalvotes = 0; FOREACH_CLIENT(IS_REAL_CLIENT(it), { // hide scoreboard again - if(GetResourceAmount(it, RESOURCE_HEALTH) != 2342) + if(GetResource(it, RES_HEALTH) != 2342) { - SetResourceAmountExplicit(it, RESOURCE_HEALTH, 2342); + SetResourceExplicit(it, RES_HEALTH, 2342); CS(it).impulse = 0; msg_entity = it; diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 035891e5b1..9c1596f5d0 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -218,12 +218,12 @@ string AmmoNameFromWeaponentity(Weapon wep) string ammoitems = "batteries"; switch (wep.ammo_type) { - case RESOURCE_SHELLS: ammoitems = ITEM_Shells.m_name; break; - case RESOURCE_BULLETS: ammoitems = ITEM_Bullets.m_name; break; - case RESOURCE_ROCKETS: ammoitems = ITEM_Rockets.m_name; break; - case RESOURCE_CELLS: ammoitems = ITEM_Cells.m_name; break; - case RESOURCE_PLASMA: ammoitems = ITEM_Plasma.m_name; break; - case RESOURCE_FUEL: ammoitems = ITEM_JetpackFuel.m_name; break; + case RES_SHELLS: ammoitems = ITEM_Shells.m_name; break; + case RES_BULLETS: ammoitems = ITEM_Bullets.m_name; break; + case RES_ROCKETS: ammoitems = ITEM_Rockets.m_name; break; + case RES_CELLS: ammoitems = ITEM_Cells.m_name; break; + case RES_PLASMA: ammoitems = ITEM_Plasma.m_name; break; + case RES_FUEL: ammoitems = ITEM_JetpackFuel.m_name; break; } return ammoitems; } @@ -280,8 +280,8 @@ string formatmessage(entity this, string msg) case "%": replacement = "%"; break; case "\\":replacement = "\\"; break; case "n": replacement = "\n"; break; - case "a": replacement = ftos(floor(GetResourceAmount(this, RESOURCE_ARMOR))); break; - case "h": replacement = ftos(floor(GetResourceAmount(this, RESOURCE_HEALTH))); break; + case "a": replacement = ftos(floor(GetResource(this, RES_ARMOR))); break; + case "h": replacement = ftos(floor(GetResource(this, RES_HEALTH))); break; case "l": replacement = NearestLocation(this.origin); break; case "y": replacement = NearestLocation(cursor); break; case "d": replacement = NearestLocation(this.death_origin); break; @@ -499,12 +499,7 @@ float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still ne allow_mutatorblocked = M_ARGV(3, bool); if(allguns) - { - if(weaponinfo.spawnflags & WEP_FLAG_NORMAL) - d = true; - else - d = false; - } + d = boolean(weaponinfo.spawnflags & WEP_FLAG_NORMAL); else if(!mutator_returnvalue) d = !(!weaponinfo.weaponstart); @@ -660,15 +655,15 @@ void readplayerstartcvars() start_ammo_plasma = cvar("g_start_ammo_plasma"); start_ammo_fuel = cvar("g_start_ammo_fuel"); random_start_weapons_count = cvar("g_random_start_weapons_count"); - SetResourceAmount(random_start_ammo, RESOURCE_SHELLS, cvar( + SetResource(random_start_ammo, RES_SHELLS, cvar( "g_random_start_shells")); - SetResourceAmount(random_start_ammo, RESOURCE_BULLETS, cvar( + SetResource(random_start_ammo, RES_BULLETS, cvar( "g_random_start_bullets")); - SetResourceAmount(random_start_ammo, RESOURCE_ROCKETS, + SetResource(random_start_ammo, RES_ROCKETS, cvar("g_random_start_rockets")); - SetResourceAmount(random_start_ammo, RESOURCE_CELLS, cvar( + SetResource(random_start_ammo, RES_CELLS, cvar( "g_random_start_cells")); - SetResourceAmount(random_start_ammo, RESOURCE_PLASMA, cvar( + SetResource(random_start_ammo, RES_PLASMA, cvar( "g_random_start_plasma")); } @@ -738,16 +733,16 @@ void readplayerstartcvars() start_ammo_cells = max(0, start_ammo_cells); start_ammo_plasma = max(0, start_ammo_plasma); start_ammo_fuel = max(0, start_ammo_fuel); - SetResourceAmount(random_start_ammo, RESOURCE_SHELLS, max(0, - GetResourceAmount(random_start_ammo, RESOURCE_SHELLS))); - SetResourceAmount(random_start_ammo, RESOURCE_BULLETS, max(0, - GetResourceAmount(random_start_ammo, RESOURCE_BULLETS))); - SetResourceAmount(random_start_ammo, RESOURCE_ROCKETS, max(0, - GetResourceAmount(random_start_ammo, RESOURCE_ROCKETS))); - SetResourceAmount(random_start_ammo, RESOURCE_CELLS, max(0, - GetResourceAmount(random_start_ammo, RESOURCE_CELLS))); - SetResourceAmount(random_start_ammo, RESOURCE_PLASMA, max(0, - GetResourceAmount(random_start_ammo, RESOURCE_PLASMA))); + SetResource(random_start_ammo, RES_SHELLS, max(0, + GetResource(random_start_ammo, RES_SHELLS))); + SetResource(random_start_ammo, RES_BULLETS, max(0, + GetResource(random_start_ammo, RES_BULLETS))); + SetResource(random_start_ammo, RES_ROCKETS, max(0, + GetResource(random_start_ammo, RES_ROCKETS))); + SetResource(random_start_ammo, RES_CELLS, max(0, + GetResource(random_start_ammo, RES_CELLS))); + SetResource(random_start_ammo, RES_PLASMA, max(0, + GetResource(random_start_ammo, RES_PLASMA))); warmup_start_ammo_shells = max(0, warmup_start_ammo_shells); warmup_start_ammo_nails = max(0, warmup_start_ammo_nails); diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh index 864623bbae..ff8928c98e 100644 --- a/qcsrc/server/mutators/events.qh +++ b/qcsrc/server/mutators/events.qh @@ -701,18 +701,18 @@ resource limit. */ /**/ MUTATOR_HOOKABLE(GetResourceLimit, EV_GetResourceLimit); -/** Called when the amount of resource of an entity changes. See RESOURCE_* +/** Called when the amount of resource of an entity changes. See RES_* constants for resource types. Return true to forbid the change. */ -#define EV_SetResourceAmount(i, o) \ +#define EV_SetResource(i, o) \ /** checked entity */ i(entity, MUTATOR_ARGV_0_entity) \ /** resource type */ i(int, MUTATOR_ARGV_1_int) \ /**/ o(int, MUTATOR_ARGV_1_int) \ /** amount */ i(float, MUTATOR_ARGV_2_float) \ /**/ o(float, MUTATOR_ARGV_2_float) \ /**/ -MUTATOR_HOOKABLE(SetResourceAmount, EV_SetResourceAmount); +MUTATOR_HOOKABLE(SetResource, EV_SetResource); -/** Called after the amount of resource of an entity has changed. See RESOURCE_* +/** Called after the amount of resource of an entity has changed. See RES_* constants for resource types. Amount wasted is the amount of resource that is above resource limit so it was not given. */ #define EV_ResourceAmountChanged(i, o) \ @@ -723,7 +723,7 @@ above resource limit so it was not given. */ MUTATOR_HOOKABLE(ResourceAmountChanged, EV_ResourceAmountChanged); /** Called when there was an attempt to set entity resources higher than their -limit. See RESOURCE_* constants for resource types. Amount wasted is the amount +limit. See RES_* constants for resource types. Amount wasted is the amount of resource that is above resource limit so it was not given. */ #define EV_ResourceWasted(i, o) \ /** checked entity */ i(entity, MUTATOR_ARGV_0_entity) \ @@ -732,8 +732,9 @@ of resource that is above resource limit so it was not given. */ /**/ MUTATOR_HOOKABLE(ResourceWasted, EV_ResourceWasted); -/** Called when entity is being given some resource. See RESOURCE_* constants -for resource types. Return true to forbid giving. */ +/** Called when entity is being given some resource. See RES_* constants +for resource types. Return true to forbid giving. +NOTE: This hook is also called by GiveResourceWithLimit */ #define EV_GiveResource(i, o) \ /** receiver */ i(entity, MUTATOR_ARGV_0_entity) \ /** resource type */ i(int, MUTATOR_ARGV_1_int) \ @@ -744,7 +745,7 @@ for resource types. Return true to forbid giving. */ MUTATOR_HOOKABLE(GiveResource, EV_GiveResource); /** Called when entity is being given some resource with specified limit. See -RESOURCE_* constants for resource types. Return true to forbid giving. */ +RES_* constants for resource types. Return true to forbid giving. */ #define EV_GiveResourceWithLimit(i, o) \ /** receiver */ i(entity, MUTATOR_ARGV_0_entity) \ /** resource type */ i(int, MUTATOR_ARGV_1_int) \ @@ -756,8 +757,9 @@ RESOURCE_* constants for resource types. Return true to forbid giving. */ /**/ MUTATOR_HOOKABLE(GiveResourceWithLimit, EV_GiveResourceWithLimit); -/** Called when some resource is being taken from an entity. See RESOURCE_* constants -for resource types. Return true to forbid giving. */ +/** Called when some resource is being taken from an entity. See RES_* constants +for resource types. Return true to forbid giving. +NOTE: This hook is also called by TakeResourceWithLimit */ #define EV_TakeResource(i, o) \ /** receiver */ i(entity, MUTATOR_ARGV_0_entity) \ /** resource type */ i(int, MUTATOR_ARGV_1_int) \ @@ -768,7 +770,7 @@ for resource types. Return true to forbid giving. */ MUTATOR_HOOKABLE(TakeResource, EV_TakeResource); /** Called when some resource is being taken from an entity, with a limit. See -RESOURCE_* constants for resource types. Return true to forbid giving. */ +RES_* constants for resource types. Return true to forbid giving. */ #define EV_TakeResourceWithLimit(i, o) \ /** receiver */ i(entity, MUTATOR_ARGV_0_entity) \ /** resource type */ i(int, MUTATOR_ARGV_1_int) \ diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc index 3805df3f26..ed1d938a29 100644 --- a/qcsrc/server/player.qc +++ b/qcsrc/server/player.qc @@ -93,8 +93,8 @@ void CopyBody(entity this, float keepvelocity) clone.dphitcontentsmask = this.dphitcontentsmask; clone.death_time = this.death_time; clone.pain_finished = this.pain_finished; - SetResourceAmountExplicit(clone, RESOURCE_HEALTH, GetResourceAmount(this, RESOURCE_HEALTH)); - SetResourceAmountExplicit(clone, RESOURCE_ARMOR, GetResourceAmount(this, RESOURCE_ARMOR)); + SetResourceExplicit(clone, RES_HEALTH, GetResource(this, RES_HEALTH)); + SetResourceExplicit(clone, RES_ARMOR, GetResource(this, RES_ARMOR)); clone.armortype = this.armortype; clone.model = this.model; clone.modelindex = this.modelindex; @@ -177,7 +177,7 @@ void PlayerCorpseDamage(entity this, entity inflictor, entity attacker, float da vector v; Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, this, attacker); - v = healtharmor_applydamage(GetResourceAmount(this, RESOURCE_ARMOR), autocvar_g_balance_armor_blockpercent, deathtype, damage); + v = healtharmor_applydamage(GetResource(this, RES_ARMOR), autocvar_g_balance_armor_blockpercent, deathtype, damage); take = v.x; save = v.y; @@ -196,8 +196,8 @@ void PlayerCorpseDamage(entity this, entity inflictor, entity attacker, float da if (take > 100) Violence_GibSplash_At(hitloc, force * -0.2, 3, 1, this, attacker); - TakeResource(this, RESOURCE_ARMOR, save); - TakeResource(this, RESOURCE_HEALTH, take); + TakeResource(this, RES_ARMOR, save); + TakeResource(this, RES_HEALTH, take); // pause regeneration for 5 seconds this.pauseregen_finished = max(this.pauseregen_finished, time + autocvar_g_balance_pause_health_regen); @@ -205,7 +205,7 @@ void PlayerCorpseDamage(entity this, entity inflictor, entity attacker, float da this.dmg_take = this.dmg_take + take;//max(take - 10, 0); this.dmg_inflictor = inflictor; - if (GetResourceAmount(this, RESOURCE_HEALTH) <= -autocvar_sv_gibhealth && this.alpha >= 0) + if (GetResource(this, RES_HEALTH) <= -autocvar_sv_gibhealth && this.alpha >= 0) { // don't use any animations as a gib this.frame = 0; @@ -314,8 +314,8 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, vector v; float excess; - dh = max(GetResourceAmount(this, RESOURCE_HEALTH), 0); - da = max(GetResourceAmount(this, RESOURCE_ARMOR), 0); + dh = max(GetResource(this, RES_HEALTH), 0); + da = max(GetResource(this, RES_ARMOR), 0); if(!DEATH_ISSPECIAL(deathtype)) { @@ -363,7 +363,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, else Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, this, attacker); - v = healtharmor_applydamage(GetResourceAmount(this, RESOURCE_ARMOR), autocvar_g_balance_armor_blockpercent, deathtype, damage); + v = healtharmor_applydamage(GetResource(this, RES_ARMOR), autocvar_g_balance_armor_blockpercent, deathtype, damage); take = v.x; save = v.y; @@ -392,8 +392,8 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, } MUTATOR_CALLHOOK(PlayerDamage_SplitHealthArmor, inflictor, attacker, this, force, take, save, deathtype, damage); - take = bound(0, M_ARGV(4, float), GetResourceAmount(this, RESOURCE_HEALTH)); - save = bound(0, M_ARGV(5, float), GetResourceAmount(this, RESOURCE_ARMOR)); + take = bound(0, M_ARGV(4, float), GetResource(this, RES_HEALTH)); + save = bound(0, M_ARGV(5, float), GetResource(this, RES_ARMOR)); excess = max(0, damage - take - save); if(sound_allowed(MSG_BROADCAST, attacker)) @@ -415,8 +415,8 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, { if (!(this.flags & FL_GODMODE)) { - TakeResource(this, RESOURCE_ARMOR, save); - TakeResource(this, RESOURCE_HEALTH, take); + TakeResource(this, RES_ARMOR, save); + TakeResource(this, RES_HEALTH, take); // pause regeneration for 5 seconds if(take) this.pauseregen_finished = max(this.pauseregen_finished, time + autocvar_g_balance_pause_health_regen); @@ -436,7 +436,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, animdecide_setaction(this, ANIMACTION_PAIN2, true); } } - float myhp = GetResourceAmount(this, RESOURCE_HEALTH); + float myhp = GetResource(this, RES_HEALTH); if(myhp > 1) if(myhp < 25 || !(DEATH_WEAPONOF(deathtype).spawnflags & WEP_FLAG_CANCLIMB) || take > 20 || attacker != this) if(sound_allowed(MSG_BROADCAST, attacker)) @@ -458,7 +458,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, // throw off bot aim temporarily float shake; - if(IS_BOT_CLIENT(this) && GetResourceAmount(this, RESOURCE_HEALTH) >= 1) + if(IS_BOT_CLIENT(this) && GetResource(this, RES_HEALTH) >= 1) { shake = damage * 5 / (bound(0,skill,100) + 1); this.v_angle_x = this.v_angle.x + (random() * 2 - 1) * shake; @@ -501,8 +501,8 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, valid_damage_for_weaponstats = true; } - dh = dh - max(GetResourceAmount(this, RESOURCE_HEALTH), 0); - da = da - max(GetResourceAmount(this, RESOURCE_ARMOR), 0); + dh = dh - max(GetResource(this, RES_HEALTH), 0); + da = da - max(GetResource(this, RES_ARMOR), 0); if(valid_damage_for_weaponstats) { WeaponStats_LogDamage(awep.m_id, abot, this.(weaponentity).m_weapon.m_id, vbot, dh + da); @@ -510,7 +510,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, MUTATOR_CALLHOOK(PlayerDamaged, attacker, this, dh, da, hitloc, deathtype, damage); - if (GetResourceAmount(this, RESOURCE_HEALTH) < 1) + if (GetResource(this, RES_HEALTH) < 1) { float defer_ClientKill_Now_TeamChange; defer_ClientKill_Now_TeamChange = false; @@ -584,7 +584,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, // player could have been miraculously resuscitated ;) // e.g. players in freezetag get frozen, they don't really die - if(GetResourceAmount(this, RESOURCE_HEALTH) >= 1 || !(IS_PLAYER(this) || this.classname == "body")) + if(GetResource(this, RES_HEALTH) >= 1 || !(IS_PLAYER(this) || this.classname == "body")) return; if (!this.respawn_time) // can be set in the mutator hook PlayerDies @@ -670,9 +670,9 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, bool PlayerHeal(entity targ, entity inflictor, float amount, float limit) { - if(GetResourceAmount(targ, RESOURCE_HEALTH) <= 0 || GetResourceAmount(targ, RESOURCE_HEALTH) >= limit) + if(GetResource(targ, RES_HEALTH) <= 0 || GetResource(targ, RES_HEALTH) >= limit) return false; - GiveResourceWithLimit(targ, RESOURCE_HEALTH, amount, limit); + GiveResourceWithLimit(targ, RES_HEALTH, amount, limit); return true; } diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc index 99f0c0d82e..6f12871636 100644 --- a/qcsrc/server/portals.qc +++ b/qcsrc/server/portals.qc @@ -199,8 +199,8 @@ float Portal_TeleportPlayer(entity teleporter, entity player) // reset fade counter teleporter.portal_wants_to_vanish = 0; teleporter.fade_time = ((autocvar_g_balance_portal_lifetime >= 0) ? time + autocvar_g_balance_portal_lifetime : 0); - SetResourceAmountExplicit(teleporter, RESOURCE_HEALTH, autocvar_g_balance_portal_health); - SetResourceAmountExplicit(teleporter.enemy, RESOURCE_HEALTH, autocvar_g_balance_portal_health); + SetResourceExplicit(teleporter, RES_HEALTH, autocvar_g_balance_portal_health); + SetResourceExplicit(teleporter.enemy, RES_HEALTH, autocvar_g_balance_portal_health); return 1; } @@ -435,8 +435,8 @@ void Portal_Damage(entity this, entity inflictor, entity attacker, float damage, if(attacker != this.aiment) if(IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(this.aiment)) return; - TakeResource(this, RESOURCE_HEALTH, damage); - if(GetResourceAmount(this, RESOURCE_HEALTH) < 0) + TakeResource(this, RES_HEALTH, damage); + if(GetResource(this, RES_HEALTH) < 0) Portal_Remove(this, 1); } @@ -639,7 +639,7 @@ entity Portal_Spawn(entity own, vector org, vector ang) portal.takedamage = DAMAGE_AIM; portal.event_damage = Portal_Damage; portal.fade_time = ((autocvar_g_balance_portal_lifetime >= 0) ? time + autocvar_g_balance_portal_lifetime : 0); - SetResourceAmountExplicit(portal, RESOURCE_HEALTH, autocvar_g_balance_portal_health); + SetResourceExplicit(portal, RES_HEALTH, autocvar_g_balance_portal_health); setmodel(portal, MDL_PORTAL); portal.savemodelindex = portal.modelindex; setcefc(portal, Portal_Customize); diff --git a/qcsrc/server/resources.qc b/qcsrc/server/resources.qc index 74a0c55788..6e63b2e3ee 100644 --- a/qcsrc/server/resources.qc +++ b/qcsrc/server/resources.qc @@ -8,50 +8,50 @@ #include "autocvars.qh" #include "miscfunctions.qh" -float GetResourceLimit(entity e, int resource_type) +float GetResourceLimit(entity e, int res_type) { if(!IS_PLAYER(e)) - return RESOURCE_LIMIT_NONE; // no limits on non-players + return RES_LIMIT_NONE; // no limits on non-players float limit; - switch (resource_type) + switch (res_type) { - case RESOURCE_HEALTH: + case RES_HEALTH: { limit = autocvar_g_balance_health_limit; break; } - case RESOURCE_ARMOR: + case RES_ARMOR: { limit = autocvar_g_balance_armor_limit; break; } - case RESOURCE_SHELLS: + case RES_SHELLS: { limit = g_pickup_shells_max; break; } - case RESOURCE_BULLETS: + case RES_BULLETS: { limit = g_pickup_nails_max; break; } - case RESOURCE_ROCKETS: + case RES_ROCKETS: { limit = g_pickup_rockets_max; break; } - case RESOURCE_CELLS: + case RES_CELLS: { limit = g_pickup_cells_max; break; } - case RESOURCE_PLASMA: + case RES_PLASMA: { limit = g_pickup_plasma_max; break; } - case RESOURCE_FUEL: + case RES_FUEL: { limit = autocvar_g_balance_fuel_limit; break; @@ -62,97 +62,94 @@ float GetResourceLimit(entity e, int resource_type) return 0; } } - MUTATOR_CALLHOOK(GetResourceLimit, e, resource_type, limit); + MUTATOR_CALLHOOK(GetResourceLimit, e, res_type, limit); limit = M_ARGV(2, float); - if (limit > RESOURCE_AMOUNT_HARD_LIMIT) + if (limit > RES_AMOUNT_HARD_LIMIT) { - limit = RESOURCE_AMOUNT_HARD_LIMIT; + limit = RES_AMOUNT_HARD_LIMIT; } return limit; } -float GetResourceAmount(entity e, int resource_type) +float GetResource(entity e, int res_type) { - .float resource_field = GetResourceField(resource_type); - return e.(resource_field); + return e.(GetResourceField(res_type)); } -bool SetResourceAmountExplicit(entity e, int resource_type, float amount) +bool SetResourceExplicit(entity e, int res_type, float amount) { - .float resource_field = GetResourceField(resource_type); - if (e.(resource_field) != amount) + .float res_field = GetResourceField(res_type); + if (e.(res_field) != amount) { - e.(resource_field) = amount; + e.(res_field) = amount; return true; } return false; } -void SetResourceAmount(entity e, int resource_type, float amount) +void SetResource(entity e, int res_type, float amount) { - bool forbid = MUTATOR_CALLHOOK(SetResourceAmount, e, resource_type, amount); + bool forbid = MUTATOR_CALLHOOK(SetResource, e, res_type, amount); if (forbid) { return; } - resource_type = M_ARGV(1, int); + res_type = M_ARGV(1, int); amount = M_ARGV(2, float); - float max_amount = GetResourceLimit(e, resource_type); // TODO: should allow overriding these limits if cheats are enabled! + float max_amount = GetResourceLimit(e, res_type); // TODO: should allow overriding these limits if cheats are enabled! float amount_wasted = 0; - if (amount > max_amount && max_amount != RESOURCE_LIMIT_NONE) + if (amount > max_amount && max_amount != RES_LIMIT_NONE) { amount_wasted = amount - max_amount; amount = max_amount; } - bool changed = SetResourceAmountExplicit(e, resource_type, amount); + bool changed = SetResourceExplicit(e, res_type, amount); if (changed) { - MUTATOR_CALLHOOK(ResourceAmountChanged, e, resource_type, amount); + MUTATOR_CALLHOOK(ResourceAmountChanged, e, res_type, amount); } if (amount_wasted == 0) { return; } - MUTATOR_CALLHOOK(ResourceWasted, e, resource_type, amount_wasted); + MUTATOR_CALLHOOK(ResourceWasted, e, res_type, amount_wasted); } -void GiveResource(entity receiver, int resource_type, float amount) +void GiveResource(entity receiver, int res_type, float amount) { if (amount <= 0) { return; } - bool forbid = MUTATOR_CALLHOOK(GiveResource, receiver, resource_type, - amount); + bool forbid = MUTATOR_CALLHOOK(GiveResource, receiver, res_type, amount); if (forbid) { return; } - resource_type = M_ARGV(1, int); + res_type = M_ARGV(1, int); amount = M_ARGV(2, float); if (amount <= 0) { return; } - SetResourceAmount(receiver, resource_type, - GetResourceAmount(receiver, resource_type) + amount); - switch (resource_type) + SetResource(receiver, res_type, GetResource(receiver, res_type) + amount); + switch (res_type) { - case RESOURCE_HEALTH: + case RES_HEALTH: { receiver.pauserothealth_finished = max(receiver.pauserothealth_finished, time + autocvar_g_balance_pause_health_rot); return; } - case RESOURCE_ARMOR: + case RES_ARMOR: { receiver.pauserotarmor_finished = max(receiver.pauserotarmor_finished, time + autocvar_g_balance_pause_armor_rot); return; } - case RESOURCE_FUEL: + case RES_FUEL: { receiver.pauserotfuel_finished = max(receiver.pauserotfuel_finished, time + autocvar_g_balance_pause_fuel_rot); @@ -161,138 +158,131 @@ void GiveResource(entity receiver, int resource_type, float amount) } } -void GiveResourceWithLimit(entity receiver, int resource_type, float amount, - float limit) +void GiveResourceWithLimit(entity receiver, int res_type, float amount, float limit) { if (amount <= 0) { return; } - bool forbid = MUTATOR_CALLHOOK(GiveResourceWithLimit, receiver, - resource_type, amount, limit); + bool forbid = MUTATOR_CALLHOOK(GiveResourceWithLimit, receiver, res_type, amount, limit); if (forbid) { return; } - resource_type = M_ARGV(1, int); + res_type = M_ARGV(1, int); amount = M_ARGV(2, float); limit = M_ARGV(3, float); if (amount <= 0) { return; } - float current_amount = GetResourceAmount(receiver, resource_type); - if (current_amount + amount > limit && limit != RESOURCE_LIMIT_NONE) + float current_amount = GetResource(receiver, res_type); + if (current_amount + amount > limit && limit != RES_LIMIT_NONE) { amount = limit - current_amount; } - GiveResource(receiver, resource_type, amount); + GiveResource(receiver, res_type, amount); } -void TakeResource(entity receiver, int resource_type, float amount) +void TakeResource(entity receiver, int res_type, float amount) { if (amount <= 0) { return; } - bool forbid = MUTATOR_CALLHOOK(TakeResource, receiver, resource_type, - amount); + bool forbid = MUTATOR_CALLHOOK(TakeResource, receiver, res_type, amount); if (forbid) { return; } - resource_type = M_ARGV(1, int); + res_type = M_ARGV(1, int); amount = M_ARGV(2, float); if (amount <= 0) { return; } - SetResourceAmount(receiver, resource_type, - GetResourceAmount(receiver, resource_type) - amount); + SetResource(receiver, res_type, GetResource(receiver, res_type) - amount); } -void TakeResourceWithLimit(entity receiver, int resource_type, float amount, - float limit) +void TakeResourceWithLimit(entity receiver, int res_type, float amount, float limit) { if (amount <= 0) { return; } - bool forbid = MUTATOR_CALLHOOK(TakeResourceWithLimit, receiver, - resource_type, amount, limit); + bool forbid = MUTATOR_CALLHOOK(TakeResourceWithLimit, receiver, res_type, amount, limit); if (forbid) { return; } - resource_type = M_ARGV(1, int); + res_type = M_ARGV(1, int); amount = M_ARGV(2, float); limit = M_ARGV(3, float); if (amount <= 0) { return; } - float current_amount = GetResourceAmount(receiver, resource_type); + float current_amount = GetResource(receiver, res_type); if (current_amount - amount < -limit) { amount = -limit + current_amount; } - TakeResource(receiver, resource_type, amount); + TakeResource(receiver, res_type, amount); } -void GiveOrTakeResource(entity receiver, int resource_type, float amount) +void GiveOrTakeResource(entity receiver, int res_type, float amount) { if(amount < 0) { - TakeResource(receiver, resource_type, amount * -1); + TakeResource(receiver, res_type, amount * -1); } else { - GiveResource(receiver, resource_type, amount); + GiveResource(receiver, res_type, amount); } } -void GiveOrTakeResourceWithLimit(entity receiver, int resource_type, float amount, - float limit) +void GiveOrTakeResourceWithLimit(entity receiver, int res_type, float amount, float limit) { if(amount < 0) { - TakeResourceWithLimit(receiver, resource_type, amount * -1, limit); + TakeResourceWithLimit(receiver, res_type, amount * -1, limit); } else { - GiveResourceWithLimit(receiver, resource_type, amount, limit); + GiveResourceWithLimit(receiver, res_type, amount, limit); } } -int GetResourceType(.float resource_field) +int GetResourceType(.float res_field) { - switch (resource_field) + switch (res_field) { - case health: { return RESOURCE_HEALTH; } - case armorvalue: { return RESOURCE_ARMOR; } - case ammo_shells: { return RESOURCE_SHELLS; } - case ammo_nails: { return RESOURCE_BULLETS; } - case ammo_rockets: { return RESOURCE_ROCKETS; } - case ammo_cells: { return RESOURCE_CELLS; } - case ammo_plasma: { return RESOURCE_PLASMA; } - case ammo_fuel: { return RESOURCE_FUEL; } + case health: { return RES_HEALTH; } + case armorvalue: { return RES_ARMOR; } + case ammo_shells: { return RES_SHELLS; } + case ammo_nails: { return RES_BULLETS; } + case ammo_rockets: { return RES_ROCKETS; } + case ammo_cells: { return RES_CELLS; } + case ammo_plasma: { return RES_PLASMA; } + case ammo_fuel: { return RES_FUEL; } } error("GetResourceType: Invalid field."); return 0; } -.float GetResourceField(int resource_type) +.float GetResourceField(int res_type) { - switch (resource_type) + switch (res_type) { - case RESOURCE_HEALTH: { return health; } - case RESOURCE_ARMOR: { return armorvalue; } - case RESOURCE_SHELLS: { return ammo_shells; } - case RESOURCE_BULLETS: { return ammo_nails; } - case RESOURCE_ROCKETS: { return ammo_rockets; } - case RESOURCE_CELLS: { return ammo_cells; } - case RESOURCE_PLASMA: { return ammo_plasma; } - case RESOURCE_FUEL: { return ammo_fuel; } + case RES_HEALTH: { return health; } + case RES_ARMOR: { return armorvalue; } + case RES_SHELLS: { return ammo_shells; } + case RES_BULLETS: { return ammo_nails; } + case RES_ROCKETS: { return ammo_rockets; } + case RES_CELLS: { return ammo_cells; } + case RES_PLASMA: { return ammo_plasma; } + case RES_FUEL: { return ammo_fuel; } } error("GetResourceField: Invalid resource type."); return health; diff --git a/qcsrc/server/resources.qh b/qcsrc/server/resources.qh index 15433b264f..f93db58fc3 100644 --- a/qcsrc/server/resources.qh +++ b/qcsrc/server/resources.qh @@ -11,86 +11,83 @@ /// \brief Returns the maximum amount of the given resource. /// \param[in] e Entity to check. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \return Maximum amount of the given resource. -float GetResourceLimit(entity e, int resource_type); +float GetResourceLimit(entity e, int res_type); /// \brief Returns the current amount of resource the given entity has. /// \param[in] e Entity to check. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \return Current amount of resource the given entity has. -float GetResourceAmount(entity e, int resource_type); +float GetResource(entity e, int res_type); /// \brief Sets the resource amount of an entity without calling any hooks. /// \param[in,out] e Entity to adjust. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to set. /// \return Boolean for whether the ammo amount was changed -bool SetResourceAmountExplicit(entity e, int resource_type, float amount); +bool SetResourceExplicit(entity e, int res_type, float amount); /// \brief Sets the current amount of resource the given entity will have. /// \param[in,out] e Entity to adjust. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to set. /// \return No return. -void SetResourceAmount(entity e, int resource_type, float amount); +void SetResource(entity e, int res_type, float amount); /// \brief Gives an entity some resource. /// \param[in,out] receiver Entity to give resource to. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to give. /// \return No return. -void GiveResource(entity receiver, int resource_type, float amount); +void GiveResource(entity receiver, int res_type, float amount); /// \brief Gives an entity some resource but not more than a limit. /// \param[in,out] receiver Entity to give resource to. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to give. /// \param[in] limit Limit of resources to give. /// \return No return. -void GiveResourceWithLimit(entity receiver, int resource_type, float amount, - float limit); +void GiveResourceWithLimit(entity receiver, int res_type, float amount, float limit); /// \brief Takes an entity some resource. /// \param[in,out] receiver Entity to take resource from. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to take. /// \return No return. -void TakeResource(entity receiver, int resource_type, float amount); +void TakeResource(entity receiver, int res_type, float amount); /// \brief Takes an entity some resource but not less than a limit. /// \param[in,out] receiver Entity to take resource from. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to take. /// \param[in] limit Limit of resources to take. /// \return No return. -void TakeResourceWithLimit(entity receiver, int resource_type, float amount, - float limit); +void TakeResourceWithLimit(entity receiver, int res_type, float amount, float limit); /// \brief Gives to or takes from an entity resource. /// \param[in,out] receiver Entity to give or take resource. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to give or take. /// \return No return. -void GiveOrTakeResource(entity receiver, int resource_type, float amount); +void GiveOrTakeResource(entity receiver, int res_type, float amount); /// \brief Gives to or takes from an entity resource but not more/less than a limit. /// \param[in,out] receiver Entity to give or take resource. -/// \param[in] resource_type Type of the resource (a RESOURCE_* constant). +/// \param[in] res_type Type of the resource (a RES_* constant). /// \param[in] amount Amount of resource to give or take. /// \param[in] limit Limit of resources to give or take. /// \return No return. -void GiveOrTakeResourceWithLimit(entity receiver, int resource_type, float amount, - float limit); +void GiveOrTakeResourceWithLimit(entity receiver, int res_type, float amount, float limit); // ===================== Legacy and/or internal API =========================== /// \brief Converts an entity field to resource type. -/// \param[in] resource_field Entity field to convert. -/// \return Resource type (a RESOURCE_* constant). -int GetResourceType(.float resource_field); +/// \param[in] res_field Entity field to convert. +/// \return Resource type (a RES_* constant). +int GetResourceType(.float res_field); -/// \brief Converts resource type (a RESOURCE_* constant) to entity field. -/// \param[in] resource_type Type of the resource. +/// \brief Converts resource type (a RES_* constant) to entity field. +/// \param[in] res_type Type of the resource. /// \return Entity field for that resource. -.float GetResourceField(int resource_type); +.float GetResourceField(int res_type); diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index a92a4ea12f..9be3c18f60 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -278,12 +278,11 @@ bool expr_evaluate(string s) string k, v; s = argv(i); #define X(expr) \ - if (expr) { \ + if (expr) \ continue; \ - } else { \ - expr_fail = true; \ - break; \ - } + expr_fail = true; \ + break; + #define BINOP(op, len, expr) \ if ((o = strstrofs(s, op, 0)) >= 0) { \ k = substring(s, 0, o); \ diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index d9682ed6ac..c19b85fe21 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -181,7 +181,7 @@ bool Player_SetTeamIndex(entity player, int index) { // This is important when players join the game and one of their // color matches the team color while other doesn't. For example - // [BOT]Lion. + // [BOT]Lion: color 0 4. SetPlayerColors(player, new_team - 1); } return true; @@ -236,7 +236,7 @@ bool SetPlayerTeam(entity player, int team_index, int type) } else if (team_index == -1) { - if (!CS(player).just_joined) + if (!CS(player).just_joined && player.frags != FRAGS_SPECTATOR) Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_QUIT_SPECTATE, player.netname); } return true; diff --git a/qcsrc/server/tests.qc b/qcsrc/server/tests.qc index e52d4fcf11..2f7dc88ba1 100644 --- a/qcsrc/server/tests.qc +++ b/qcsrc/server/tests.qc @@ -2,7 +2,7 @@ void test_weapons_hurt(entity this) { - EXPECT_NE(100, GetResourceAmount(this, RESOURCE_HEALTH)); + EXPECT_NE(100, GetResource(this, RES_HEALTH)); delete(this.enemy); delete(this); } diff --git a/qcsrc/server/utils.qh b/qcsrc/server/utils.qh index 097685abf1..a37029590a 100644 --- a/qcsrc/server/utils.qh +++ b/qcsrc/server/utils.qh @@ -34,14 +34,14 @@ const string STR_OBSERVER = "observer"; // NOTE: FOR_EACH_REALPLAYER deprecated! Use the following instead: FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it), { code; }); #define FOREACH_CLIENTSLOT(cond, body) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ for(int _i = 1; _i <= maxclients; ++_i) \ { \ const noref int i = _i; \ ITER_CONST noref entity it = ftoe(i); \ if(cond) { LAMBDA(body) } \ } \ - } MACRO_END + MACRO_END #define FOREACH_CLIENT(cond, body) FOREACH_CLIENTSLOT(IS_CLIENT(it) && (cond), LAMBDA(body)) @@ -50,23 +50,17 @@ const string STR_OBSERVER = "observer"; entity _FCR_clients[255]; bool _FCR_entered = false; #define FOREACH_CLIENT_RANDOM(cond, body) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ if (_FCR_entered) LOG_FATAL("FOREACH_CLIENT_RANDOM must not be nested"); \ _FCR_entered = true; \ int _cnt = 0; \ FOREACH_CLIENT(cond, { \ - int _j = floor(random() * (_cnt + 1)); \ - if (_j == _cnt) \ - { \ - _FCR_clients[_cnt] = it; \ - } \ - else \ - { \ - _FCR_clients[_cnt] = _FCR_clients[_j]; \ - _FCR_clients[_j] = it; \ - } \ - _cnt++; \ - }); \ + int _j = floor(random() * (_cnt + 1)); \ + if (_j != _cnt) \ + _FCR_clients[_cnt] = _FCR_clients[_j]; \ + _FCR_clients[_j] = it; \ + ++_cnt; \ + }); \ for (int _i = 0; _i < _cnt; ++_i) \ { \ const noref int i = _i; \ @@ -74,6 +68,6 @@ bool _FCR_entered = false; if (cond) { LAMBDA(body) } \ } \ _FCR_entered = false; \ - } MACRO_END + MACRO_END // NOTE: FOR_EACH_MONSTER deprecated! Use the following instead: IL_EACH(g_monsters, true, { code; }); diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc index 4ab5a43717..ba17d3f1f8 100644 --- a/qcsrc/server/weapons/spawning.qc +++ b/qcsrc/server/weapons/spawning.qc @@ -105,16 +105,16 @@ void weapon_defaultspawnfunc(entity this, Weapon e) this.superweapons_finished = autocvar_g_balance_superweapons_time; // if we don't already have ammo, give us some ammo - if ((wpn.ammo_type != RESOURCE_NONE) && !GetResourceAmount(this, wpn.ammo_type)) + if ((wpn.ammo_type != RES_NONE) && !GetResource(this, wpn.ammo_type)) { switch (wpn.ammo_type) { - case RESOURCE_SHELLS: SetResourceAmount(this, wpn.ammo_type, cvar("g_pickup_shells_weapon")); break; - case RESOURCE_BULLETS: SetResourceAmount(this, wpn.ammo_type, cvar("g_pickup_nails_weapon")); break; - case RESOURCE_ROCKETS: SetResourceAmount(this, wpn.ammo_type, cvar("g_pickup_rockets_weapon")); break; - case RESOURCE_CELLS: SetResourceAmount(this, wpn.ammo_type, cvar("g_pickup_cells_weapon")); break; - case RESOURCE_PLASMA: SetResourceAmount(this, wpn.ammo_type, cvar("g_pickup_plasma_weapon")); break; - case RESOURCE_FUEL: SetResourceAmount(this, wpn.ammo_type, cvar("g_pickup_fuel_weapon")); break; + case RES_SHELLS: SetResource(this, wpn.ammo_type, cvar("g_pickup_shells_weapon")); break; + case RES_BULLETS: SetResource(this, wpn.ammo_type, cvar("g_pickup_nails_weapon")); break; + case RES_ROCKETS: SetResource(this, wpn.ammo_type, cvar("g_pickup_rockets_weapon")); break; + case RES_CELLS: SetResource(this, wpn.ammo_type, cvar("g_pickup_cells_weapon")); break; + case RES_PLASMA: SetResource(this, wpn.ammo_type, cvar("g_pickup_plasma_weapon")); break; + case RES_FUEL: SetResource(this, wpn.ammo_type, cvar("g_pickup_fuel_weapon")); break; } } diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index 9aaabb05bf..af14839325 100644 --- a/qcsrc/server/weapons/throwing.qc +++ b/qcsrc/server/weapons/throwing.qc @@ -89,7 +89,7 @@ float W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector wep.pickup_anyway = true; // these are ALWAYS pickable //wa = W_AmmoItemCode(wpn); - if(ammotype == RESOURCE_NONE) + if(ammotype == RES_NONE) { return 0; } @@ -104,7 +104,7 @@ float W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector GiveResource(own, ammotype, own.(weaponentity).(weapon_load[i])); own.(weaponentity).(weapon_load[i]) = -1; // schedule the weapon for reloading } - SetResourceAmount(wep, ammotype, 0); + SetResource(wep, ammotype, 0); } else if(doreduce) { @@ -116,10 +116,10 @@ float W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector own.(weaponentity).(weapon_load[i]) = -1; // schedule the weapon for reloading } - float ownderammo = GetResourceAmount(own, ammotype); - float thisammo = min(ownderammo, GetResourceAmount(wep, ammotype)); - SetResourceAmount(wep, ammotype, thisammo); - SetResourceAmount(own, ammotype, ownderammo - thisammo); + float ownderammo = GetResource(own, ammotype); + float thisammo = min(ownderammo, GetResource(wep, ammotype)); + SetResource(wep, ammotype, thisammo); + SetResource(own, ammotype, ownderammo - thisammo); return thisammo; } diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index d791fc798e..e7ab90c39e 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -454,7 +454,7 @@ void W_WeaponFrame(Player actor, .entity weaponentity) entity this = actor.(weaponentity); if (frametime) this.weapon_frametime = frametime; - if (!this || GetResourceAmount(actor, RESOURCE_HEALTH) < 1) return; // Dead player can't use weapons and injure impulse commands + if (!this || GetResource(actor, RES_HEALTH) < 1) return; // Dead player can't use weapons and injure impulse commands int button_atck = PHYS_INPUT_BUTTON_ATCK(actor); int button_atck2 = PHYS_INPUT_BUTTON_ATCK2(actor); @@ -692,9 +692,9 @@ void W_DecreaseAmmo(Weapon wep, entity actor, float ammo_use, .entity weaponenti w_ent.clip_load -= ammo_use; w_ent.(weapon_load[w_ent.m_weapon.m_id]) = w_ent.clip_load; } - else if (wep.ammo_type != RESOURCE_NONE) + else if (wep.ammo_type != RES_NONE) { - float ammo = GetResourceAmount(actor, wep.ammo_type); + float ammo = GetResource(actor, wep.ammo_type); if (ammo < ammo_use) { backtrace(sprintf( @@ -707,7 +707,7 @@ void W_DecreaseAmmo(Weapon wep, entity actor, float ammo_use, .entity weaponenti ammo )); } - SetResourceAmount(actor, wep.ammo_type, ammo - ammo_use); + SetResource(actor, wep.ammo_type, ammo - ammo_use); } } @@ -727,17 +727,17 @@ void W_ReloadedAndReady(Weapon thiswep, entity actor, .entity weaponentity, int w_ent.clip_load = w_ent.old_clip_load; // restore the ammo counter, in case we still had ammo in the weapon before reloading // if the gun uses no ammo, max out weapon load, else decrease ammo as we increase weapon load - if (!w_ent.reload_ammo_min || (actor.items & IT_UNLIMITED_WEAPON_AMMO) || wpn.ammo_type == RESOURCE_NONE) + if (!w_ent.reload_ammo_min || (actor.items & IT_UNLIMITED_WEAPON_AMMO) || wpn.ammo_type == RES_NONE) { w_ent.clip_load = w_ent.reload_ammo_amount; } else { // make sure we don't add more ammo than we have - float ammo = GetResourceAmount(actor, wpn.ammo_type); + float ammo = GetResource(actor, wpn.ammo_type); float load = min(w_ent.reload_ammo_amount - w_ent.clip_load, ammo); w_ent.clip_load += load; - SetResourceAmount(actor, wpn.ammo_type, ammo - load); + SetResource(actor, wpn.ammo_type, ammo - load); } w_ent.(weapon_load[w_ent.m_weapon.m_id]) = w_ent.clip_load; @@ -779,9 +779,9 @@ void W_Reload(entity actor, .entity weaponentity, float sent_ammo_min, Sound sen if (this.clip_load >= this.reload_ammo_amount) return; // no ammo, so nothing to load - if (e.ammo_type != RESOURCE_NONE) + if (e.ammo_type != RES_NONE) { - if (!GetResourceAmount(actor, e.ammo_type) && this.reload_ammo_min) + if (!GetResource(actor, e.ammo_type) && this.reload_ammo_min) { if (!(actor.items & IT_UNLIMITED_WEAPON_AMMO)) { diff --git a/xonotic-server.cfg b/xonotic-server.cfg index e25ae7faca..bb0d59371d 100644 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@ -10,7 +10,8 @@ set sv_autotaunt 1 "allow autotaunts on the server" // server settings hostname "Xonotic $g_xonoticversion Server" set sv_mapchange_delay 5 -set minplayers 0 "fill server with bots to reach this number of players (if bot_number is not enough)" +set minplayers 0 "fill server with bots to reach this number of players in teamless games (if bot_number is not enough)" +set minplayers_per_team 0 "fill server with bots to reach this number of players per team (if bot_number is not enough)" // restart server if all players hit "ready"-button set sv_ready_restart 0 "allow a map to be restarted once all players pressed the \"ready\" button"