Adding more announcements

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index dd80726c0798b5c94a9faa02b66496e3278ca811..2716998ae929f062bc9de8964271f35e0f17ef2a 100644 (file)
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -174,11 +174,34 @@ void Send_Notification_WOVA(
 */
 
        // default, name, channel, sound, volume, position
+       // default 0 = off, 1 = only if gentle is DISABLED, 2 = always enabled
 #define MSG_ANNCE_NOTIFICATIONS \
-       MSG_ANNCE_NOTIF(2, ANNCE_REMAINING_ONEMIN,  CH_INFO, "1minutesremain", VOL_BASEVOICE, ANNCE_GLOBAL) \
-       MSG_ANNCE_NOTIF(2, ANNCE_REMAINING_FIVEMIN, CH_INFO, "5minutesremain", VOL_BASEVOICE, ANNCE_GLOBAL) \
-       MSG_ANNCE_NOTIF(2, ANNCE_
-       MSG_ANNCE_NOTIF(2, ANNCE_NUMBER
+       MSG_ANNCE_NOTIF(2, ANNCE_REMAINING_ONEMIN,          CH_INFO, "1minutesremain",  VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(2, ANNCE_REMAINING_FIVEMIN,         CH_INFO, "5minutesremain",  VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(2, ANNCE_ACHIEVEMENT_ELECTROBITCH,  CH_INFO, "electrobitch",    VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(1, ANNCE_ACHIEVEMENT_AIRSHOT,       CH_INFO, "airshot",         VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(1, ANNCE_ACHIEVEMENT_BOTLIKE,       CH_INFO, "botlike",         VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(1, ANNCE_ACHIEVEMENT_YODA,          CH_INFO, "yoda",            VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(1, ANNCE_ACHIEVEMENT_AMAZING,       CH_INFO, "amazing",         VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(1, ANNCE_ACHIEVEMENT_AWESOME,       CH_INFO, "awesome",         VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(1, ANNCE_ACHIEVEMENT_IMPRESSIVE,    CH_INFO, "impressive",      VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(1, ANNCE_KILLSTREAK_3,              CH_INFO, "03kills",         VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(1, ANNCE_KILLSTREAK_5,              CH_INFO, "05kills",         VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(1, ANNCE_KILLSTREAK_10,             CH_INFO, "10kills",         VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(1, ANNCE_KILLSTREAK_15,             CH_INFO, "15kills",         VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(1, ANNCE_KILLSTREAK_20,             CH_INFO, "20kills",         VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(1, ANNCE_KILLSTREAK_25,             CH_INFO, "25kills",         VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(1, ANNCE_KILLSTREAK_30,             CH_INFO, "30kills",         VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(2, ANNCE_NUM_1,                     CH_INFO, "1",               VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(2, ANNCE_NUM_2,                     CH_INFO, "2",               VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(2, ANNCE_NUM_3,                     CH_INFO, "3",               VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(2, ANNCE_NUM_4,                     CH_INFO, "4",               VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(2, ANNCE_NUM_5,                     CH_INFO, "5",               VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(2, ANNCE_NUM_6,                     CH_INFO, "6",               VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(2, ANNCE_NUM_7,                     CH_INFO, "7",               VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(2, ANNCE_NUM_8,                     CH_INFO, "8",               VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(2, ANNCE_NUM_9,                     CH_INFO, "9",               VOL_BASEVOICE, ANNCE_GLOBAL) \
+       MSG_ANNCE_NOTIF(2, ANNCE_NUM_10,                    CH_INFO, "10",              VOL_BASEVOICE, ANNCE_GLOBAL) \
        MSG_ANNCE_NOTIF(2, ANNCE_
        MSG_ANNCE_NOTIF(2, ANNCE_