From: z411 <z411@omaera.org>
Date: Sat, 8 Aug 2020 12:25:10 +0000 (-0400)
Subject: Added new CA announcers
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=afa3e4cde6ea27537ed6e3bc31ddc9afdf39b2de;p=xonotic%2Fxonotic-data.pk3dir.git

Added new CA announcers
---

diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
index e525a980e..0ecb13c45 100644
--- a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
+++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc
@@ -68,6 +68,7 @@ float CA_CheckWinner()
 	{
 		Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_ROUND_OVER);
 		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_OVER);
+		Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_ROUND_OVER);
 		FOREACH_CLIENT(IS_PLAYER(it), { nades_Clear(it); });
 
 		allowed_to_spawn = false;
@@ -87,13 +88,14 @@ float CA_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));
-		Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, APP_TEAM_NUM(winner_team, ANNCE_SCORES));
+		Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, APP_TEAM_NUM(winner_team, ANNCE_ROUND_TEAM_WIN));
 		TeamScore_AddToTeam(winner_team, ST_CA_ROUNDS, +1);
 	}
 	else if(winner_team == -1)
 	{
 		Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_ROUND_TIED);
 		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_TIED);
+		Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_ROUND_TIED);
 	}
 
 	allowed_to_spawn = false;
@@ -269,8 +271,10 @@ void ca_LastPlayerForTeam_Notify(entity this)
 	if (!warmup_stage && round_handler_IsActive() && round_handler_IsRoundStarted())
 	{
 		entity pl = ca_LastPlayerForTeam(this);
-		if (pl)
+		if (pl) {
 			Send_Notification(NOTIF_ONE, pl, MSG_CENTER, CENTER_ALONE);
+			Send_Notification(NOTIF_ONE, pl, MSG_ANNCE, ANNCE_ALONE);
+		}
 	}
 }
 
diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc
index 1665ae515..b7f46eddb 100644
--- a/qcsrc/common/notifications/all.inc
+++ b/qcsrc/common/notifications/all.inc
@@ -213,10 +213,13 @@
 	MSG_ANNCE_NOTIF(LEAD_LOST,                  N__ALWAYS, "leadlost",          CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
 	MSG_ANNCE_NOTIF(LEAD_TIED,                  N__ALWAYS, "leadtied",          CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
 	
-	MSG_ANNCE_NOTIF(SCORES_RED,                 N__ALWAYS, "scoresred",         CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
-	MSG_ANNCE_NOTIF(SCORES_BLUE,                N__ALWAYS, "scoresblue",        CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
-	MSG_ANNCE_NOTIF(SCORES_YELLOW,              N__ALWAYS, "scoresyellow",      CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
-	MSG_ANNCE_NOTIF(SCORES_PINK,                N__ALWAYS, "scorespink",        CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
+	MSG_ANNCE_NOTIF(ANNCE_ROUND_TEAM_WIN_RED,   N__ALWAYS, "round_win_red",     CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
+	MSG_ANNCE_NOTIF(ANNCE_ROUND_TEAM_WIN_BLUE,  N__ALWAYS, "round_win_blue",    CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
+	MSG_ANNCE_NOTIF(ANNCE_ROUND_TEAM_WIN_YELLOW,N__ALWAYS, "round_win_yellow",  CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
+	MSG_ANNCE_NOTIF(ANNCE_ROUND_TEAM_WIN_PINK,  N__ALWAYS, "round_win_pink",    CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
+	MSG_ANNCE_NOTIF(ANNCE_ROUND_OVER,           N__ALWAYS, "round_over",        CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
+	MSG_ANNCE_NOTIF(ANNCE_ROUND_TIED,           N__ALWAYS, "round_tied",        CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
+	MSG_ANNCE_NOTIF(ANNCE_ALONE,                N__ALWAYS, "alone",             CH_INFO, VOL_BASEVOICE, ATTEN_NONE)
 
 #undef N___NEVER
 #undef N_GNTLOFF