From 996bed1f385d4263543c3bbc05f363e402e0c021 Mon Sep 17 00:00:00 2001 From: drjaska Date: Tue, 1 Feb 2022 09:11:01 +0200 Subject: [PATCH] disable X frags left announcements they do poorly with upscaled score counters --- qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc | 8 ++++++-- qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc b/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc index 8a3ba5349..ac5b4b6cd 100644 --- a/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc +++ b/qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc @@ -45,8 +45,12 @@ void mayhem_Initialize() MUTATOR_HOOKFUNCTION(mayhem, Scores_CountFragsRemaining) { - // announce remaining frags - return true; + // do not announce remaining frags, upscaled score count doesn't match well with this + // when scorelimit is set to 1000 it would announce 997, 998 and 999 score counts + // usually a single shot which deals ~40-80 dmg gives 2 or 3 score + // this usually would cause a "2 fra..." announcement to be played as the match ends + // without leaving anyone time to even process the announcement + return false; } MUTATOR_HOOKFUNCTION(mayhem, SetStartItems) diff --git a/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc b/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc index 397c76c55..3ac2950d9 100644 --- a/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc +++ b/qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc @@ -88,8 +88,12 @@ MUTATOR_HOOKFUNCTION(tmayhem, TeamBalance_CheckAllowedTeams, CBC_ORDER_EXCLUSIVE MUTATOR_HOOKFUNCTION(tmayhem, Scores_CountFragsRemaining) { - // announce remaining frags - return true; + // do not announce remaining frags, upscaled score count doesn't match well with this + // when scorelimit is set to 1000 it would announce 997, 998 and 999 score counts + // usually a single shot which deals ~40-80 dmg gives 2 or 3 score + // this usually would cause a "2 fra..." announcement to be played as the match ends + // without leaving anyone time to even process the announcement + return false; } MUTATOR_HOOKFUNCTION(tmayhem, SetStartItems) -- 2.39.2