From c7d34f2a9946ce10f7e7051537f4e8f94823ac31 Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 3 Apr 2024 20:20:14 +0200 Subject: [PATCH 1/1] Use correct titles for a few scoreboard fields (now scoreboard can better handle longer titles); use proper field and score names for destroyed generators (Onslaught) --- qcsrc/client/hud/panel/scoreboard.qc | 7 ++++--- qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc | 4 ++-- qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc | 4 ++-- qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh | 2 +- qcsrc/common/scores.qh | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index aff309430..ad86b270c 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -140,9 +140,9 @@ string Label_getInfo(string label, int mode) SCO_LABEL(_("SCO^caps"), "caps", " ", _("How often a flag (CTF) or a key (KeyHunt) was captured")); SCO_LABEL(_("SCO^captime"), "captime", " ", _("Time of fastest capture (CTF)")); SCO_LABEL(_("SCO^deaths"), "deaths", " ", _("Number of deaths")); - SCO_LABEL(_("SCO^destroyed"), "destroyed", " ", _("Number of keys destroyed by pushing them into void")); - SCO_LABEL(_("SCO^damage"), "dmg", " ", _("The total damage done")); - SCO_LABEL(_("SCO^dmgtaken"), "dmgtaken", " ", _("The total damage taken")); + SCO_LABEL(_("SCO^destructions"), "destructions", " ", _("Number of keys destroyed by pushing them into void")); + SCO_LABEL(_("SCO^damage dealt"), "dmg", " ", _("The total damage dealt")); + SCO_LABEL(_("SCO^damage taken"), "dmgtaken", " ", _("The total damage taken")); SCO_LABEL(_("SCO^drops"), "drops", " ", _("Number of flag drops")); SCO_LABEL(_("SCO^elo"), "elo", " ", _("Player ELO")); SCO_LABEL(_("SCO^fastest"), "fastest", " ", _("Time of fastest lap (Race/CTS)")); @@ -150,6 +150,7 @@ string Label_getInfo(string label, int mode) SCO_LABEL(_("SCO^fckills"), "fckills", " ", _("Number of flag carrier kills")); SCO_LABEL(_("SCO^fps"), "fps", " ", _("FPS")); SCO_LABEL(_("SCO^frags"), "frags", " ", _("Number of kills minus suicides")); + SCO_LABEL(_("SCO^generators"), "generators", " ", _("Number of generators destroyed")); SCO_LABEL(_("SCO^goals"), "goals", " ", _("Number of goals scored")); SCO_LABEL(_("SCO^hunts"), "hunts", " ", _("Number of hunts (Survival)")); SCO_LABEL(_("SCO^kckills"), "kckills", " ", _("Number of keys carrier kills")); diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc b/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc index 0e79b58eb..beb5cd7f4 100644 --- a/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc +++ b/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc @@ -90,7 +90,7 @@ void kh_ScoreRules(int teams) field_team(ST_KH_CAPS, "caps", SFL_SORT_PRIO_SECONDARY); field(SP_KH_CAPS, "caps", SFL_SORT_PRIO_SECONDARY); field(SP_KH_PUSHES, "pushes", 0); - field(SP_KH_DESTROYS, "destroyed", SFL_LOWER_IS_BETTER); + field(SP_KH_DESTRUCTIONS, "destructions", SFL_LOWER_IS_BETTER); field(SP_KH_PICKUPS, "pickups", 0); field(SP_KH_KCKILLS, "kckills", 0); field(SP_KH_LOSSES, "losses", SFL_LOWER_IS_BETTER); @@ -607,7 +607,7 @@ void kh_LoserTeam(int loser_team, entity lostkey) // runs when a player pushes // don't actually GIVE them the -nn points, just log if(lostkey.kh_previous_owner.playerid == lostkey.kh_previous_owner_playerid) - GameRules_scoring_add(lostkey.kh_previous_owner, KH_DESTROYS, 1); + GameRules_scoring_add(lostkey.kh_previous_owner, KH_DESTRUCTIONS, 1); DistributeEvenly_Init(autocvar_g_balance_keyhunt_score_destroyed, keys * of + players); diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc index ea07659e3..370fda29d 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc @@ -1197,7 +1197,7 @@ bool Onslaught_CheckWinner() { Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, APP_TEAM_NUM(winner_team, CENTER_ROUND_TEAM_WIN)); Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(winner_team, INFO_ROUND_TEAM_WIN)); - TeamScore_AddToTeam(winner_team, ST_ONS_CAPS, +1); + TeamScore_AddToTeam(winner_team, ST_ONS_GENS, +1); } else if(winner_team == -1) { @@ -2135,7 +2135,7 @@ void ons_ScoreRules() int teams = TeamBalance_GetAllowedTeams(balance); TeamBalance_Destroy(balance); GameRules_scoring(teams, SFL_SORT_PRIO_PRIMARY, 0, { - field_team(ST_ONS_CAPS, "destroyed", SFL_SORT_PRIO_PRIMARY); + field_team(ST_ONS_GENS, "generators", SFL_SORT_PRIO_PRIMARY); field(SP_ONS_CAPS, "caps", SFL_SORT_PRIO_SECONDARY); field(SP_ONS_TAKES, "takes", 0); }); diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh index 1f98522ba..e2d5044a2 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh +++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh @@ -94,4 +94,4 @@ void havocbot_goalrating_items(entity this, float ratingscale, vector org, float void havocbot_goalrating_enemyplayers(entity this, float ratingscale, vector org, float sradius); // score rule declarations -const int ST_ONS_CAPS = 1; +const int ST_ONS_GENS = 1; diff --git a/qcsrc/common/scores.qh b/qcsrc/common/scores.qh index 8f22b5c75..f6df5d28c 100644 --- a/qcsrc/common/scores.qh +++ b/qcsrc/common/scores.qh @@ -47,7 +47,7 @@ REGISTER_SP(KEEPAWAY_PICKUPS); REGISTER_SP(KH_CAPS); REGISTER_SP(KH_KCKILLS); REGISTER_SP(KH_LOSSES); -REGISTER_SP(KH_DESTROYS); +REGISTER_SP(KH_DESTRUCTIONS); REGISTER_SP(KH_PUSHES); REGISTER_SP(KH_PICKUPS); -- 2.39.2