]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/common/notifications.qc
Support up to 4 team definitions
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / notifications.qc
index 318432a479ac2a30a9e55142342226e64cf5ad49..8a4d97d9f9b1b6a832b860cd635526f95ffa832d 100644 (file)
@@ -4,66 +4,42 @@
 // ================================================
 
 // main types/groups of notifications
-#define MSG_INFO 1 // "Global" information messages (sent to console)
-#define MSG_NOTIFY 2 // "Global" events to be sent to the notification panel
-#define MSG_CENTER 3 // "Personal" centerprint messages
-#define MSG_WEAPON 4 // "Personal" weapon messages (like "You got the Nex", sent to weapon notify panel)
+#define MSG_INFO 1 // "Global" information messages (sent to console, and notify panel if it has an icon)
+#define MSG_CENTER 2 // "Personal" centerprint messages
+#define MSG_WEAPON 3 // "Personal" weapon messages (like "You got the Nex", sent to weapon notify panel)
 
-// expand multiple arguments into one argument
-#define XPND4(a,b,c,d) a, b, c, d
-#define XPND3(a,b,c) a, b, c
-#define XPND2(a,b) a, b
+#define NO_STR_ARG ""
+#define NO_FL_ARG -12345
 
-// accumulate functions for declarations
-#define NOTIF_FIRST 1
-#define NOTIF_MAX 1024 // limit of recursive functions with ACCUMULATE_FUNCTION
-float NOTIF_INFO_COUNT;
-float NOTIF_NOTIFY_COUNT;
-float NOTIF_CENTER_COUNT;
-float NOTIF_WEAPON_COUNT;
-float NOTIF_CPID_COUNT;
+#define F_NAME 1
+#define F_STRNUM 2
+#define F_FLNUM 3
 
-#define CHECK_MAX_NOTIFICATIONS(count) if(count == NOTIF_MAX) { error("Maximum notifications hit!\n"); }
+// allow sending of notifications to also pass through to spectators (specifically for centerprints)
+#ifdef SVQC
+#define WRITESPECTATABLE_MSG_ONE_VARNAME(varname,statement) entity varname; varname = msg_entity; FOR_EACH_REALCLIENT(msg_entity) if(msg_entity == varname || (msg_entity.classname == STR_SPECTATOR && msg_entity.enemy == varname)) statement msg_entity = varname
+#define WRITESPECTATABLE_MSG_ONE(statement) WRITESPECTATABLE_MSG_ONE_VARNAME(oldmsg_entity, statement)
+#define WRITESPECTATABLE(msg,statement) if(msg == MSG_ONE) { WRITESPECTATABLE_MSG_ONE(statement); } else statement float WRITESPECTATABLE_workaround = 0
+#endif
 
-#define MSG_INFO_NOTIF(name,args,normal,gentle) \
-       float name; \
-       void DecNotif_##name() { \
-               if(!name) { \
-                       name = (NOTIF_FIRST + NOTIF_INFO_COUNT); \
-                       ++NOTIF_INFO_COUNT; } \
-               CHECK_MAX_NOTIFICATIONS(NOTIF_INFO_COUNT) } \
-       ACCUMULATE_FUNCTION(DecNotifs, DecNotif_##name)
-
-#define MSG_NOTIFY_NOTIF(name,args,icon,normal,gentle) \
-       float name; \
-       void DecNotif_##name() { \
-               if(!name) { \
-                       name = (NOTIF_FIRST + NOTIF_NOTIFY_COUNT); \
-                       ++NOTIF_NOTIFY_COUNT; } \
-               CHECK_MAX_NOTIFICATIONS(NOTIF_NOTIFY_COUNT) } \
-       ACCUMULATE_FUNCTION(DecNotifs, DecNotif_##name)
-
-#define MSG_CENTER_NOTIF(name,args,cpid,durcnt,normal,gentle) \
-       float name; \
-       float cpid; \
-       void DecNotif_##name() { \
-               if(!name) { \
-                       name = (NOTIF_FIRST + NOTIF_CENTER_COUNT); \
-                       ++NOTIF_CENTER_COUNT; } \
-               if(!cpid) { \
-                       cpid = (NOTIF_FIRST + NOTIF_CPID_COUNT); \
-                       ++NOTIF_CPID_COUNT; } \
-               CHECK_MAX_NOTIFICATIONS(NOTIF_CENTER_COUNT) } \
-       ACCUMULATE_FUNCTION(DecNotifs, DecNotif_##name)
-
-#define MSG_WEAPON_NOTIF(name,args,normal,gentle) \
-       float name; \
-       void DecNotif_##name() { \
-               if(!name) { \
-                       name = (NOTIF_FIRST + NOTIF_WEAPON_COUNT); \
-                       ++NOTIF_WEAPON_COUNT; } \
-               CHECK_MAX_NOTIFICATIONS(NOTIF_WEAPON_COUNT) } \
-       ACCUMULATE_FUNCTION(DecNotifs, DecNotif_##name)
+#define NOTIF_MATCH(a,b) if(min(NOTIF_MAX, a) == b)
+#ifdef CSQC
+string got_commandkey;
+#define ADD_CSQC_AUTOCVAR(name) var float autocvar_notification_##name = TRUE;
+var float autocvar_notification_ctf_capture_verbose = TRUE;
+var float autocvar_notification_ctf_pickup_team_verbose = TRUE;
+var float autocvar_notification_ctf_pickup_enemy_verbose = TRUE;
+#define CHECK_AUTOCVAR(name) if(autocvar_notification_##name)
+#define HANDLE_CPID(cpid) ((min(NOTIF_MAX, cpid) == NO_CPID) ? FALSE : cpid)
+#define PASS_KEY ((((got_commandkey = getcommandkey("pass", "+use")) != "pass") && !(strstrofs(got_commandkey, "not bound", 0) >= 0)) ? sprintf(CCR(_(" ^F1(Press %s)")), got_commandkey) : "")
+#else
+#define ADD_CSQC_AUTOCVAR(name)
+#endif
+
+string team_name_red = _("RED");
+string team_name_blue = _("BLUE");
+string team_color_red = _("^1");
+string team_color_blue = _("^4");
 
 
 // ====================================
@@ -71,14 +47,18 @@ float NOTIF_CPID_COUNT;
 // ====================================
 /*
  List of all notifications (including identifiers and display information)
- Format: name, number, args, icon/CPID, normal, gentle
+ Format: name, strnum, flnum, args, *icon/CPID, *durcnt, normal, gentle
+ Asterisked fields are not present in all notification types.
  Specifications:
     Name of notification
-    ID number of notification
+    Number of STRING arguments (so that networking knows how many to send/receive)
+    Number of FLOAT arguments (so that networking knows how many to send/receive)
     Arguments for sprintf(string, args), if no args needed then use ""
-    Icon/CPID:
-      MSG_NOTIFY: STRING: icon string name for the hud notify panel, "" if no icon is used
+    *Icon/CPID:
+      MSG_INFO: STRING: icon string name for the hud notify panel, "" if no icon is used
       MSG_CENTER: FLOAT: centerprint ID number (CPID_*), NO_CPID if no CPID is needed
+    *Duration/Countdown:
+      MSG_CENTER: XPND2(FLOAT, FLOAT): extra arguments for centerprint messages
     Normal message (string for sprintf when gentle messages are NOT enabled)
     Gentle message (string for sprintf when gentle messages ARE enabled)
 
@@ -88,37 +68,132 @@ float NOTIF_CPID_COUNT;
     ^F2 = next highest priority, "secondary"
     ^BG = normal/less important priority, "tertiary"
 
- Guidlines:
-    ALWAYS start the string with a color, preferably background
-    ALWAYS end messages with a new line
-    NEVER re-declare an event twice
-    ARIRE unir frk jvgu lbhe bja zbgure (gvc sbe zvxrrhfn)
+ Guidlines (please try and follow these):
+    -ALWAYS start the string with a color, preferably background.
+    -ALWAYS reset a color after a name (this way they don't set it for the whole string).
+    -NEVER re-declare an event twice.
+    -NEVER add or remove fields from the format, it SHOULD already work.
+    -MSG_INFO messages must ALWAYS end with a new line: \n
+    -Be clean and simple with your notification naming,
+     nothing too long for the name field... Abbreviations are your friend. :D
+    -Keep the spacing as clean as possible... if the arguments are abnormally long,
+      it's okay to go out of line a bit... but try and keep it clean still.
+    -Keep the notifications in alphabetical order.
+    ARIRE unir frk jvgu lbhe bja zbgure. (gvc sbe zvxrrhfn) -- Don't pay attention to this ^_^
 */
+
+// flag.netname = ((teamnumber) ? "^1RED^7 flag" : "^4BLUE^7 flag");
+// weaponorder[f1].netname
+
+
+#define MULTITEAM_INFO(prefix,teams,strnum,flnum,args,icon,normal,gentle) \
+       MSG_INFO_NOTIF(prefix##RED, strnum, flnum, args, sprintf(icon, strtolower(team_name_red)), TEAM_CCR(normal, team_color_red, team_name_red), TEAM_CCR(gentle, team_color_red, team_name_red)) \
+       MSG_INFO_NOTIF(prefix##BLUE, strnum, flnum, args, sprintf(icon, strtolower(team_name_blue)), TEAM_CCR(normal, team_color_blue, team_name_blue), TEAM_CCR(gentle, team_color_blue, team_name_blue)) \
+       #if teams >= 3 \
+               MSG_INFO_NOTIF(prefix##YELLOW, strnum, flnum, args, sprintf(icon, strtolower(team_name_yellow)), TEAM_CCR(normal, team_color_yellow, team_name_yellow), TEAM_CCR(gentle, team_color_yellow, team_name_yellow)) \
+       #endif \
+       #if teams >= 4 \
+               MSG_INFO_NOTIF(prefix##PINK, strnum, flnum, args, sprintf(icon, strtolower(team_name_pink)), TEAM_CCR(normal, team_color_pink, team_name_pink), TEAM_CCR(gentle, team_color_pink, team_name_pink)) \
+       #endif
 #define MSG_INFO_NOTIFICATIONS \
-       MSG_INFO_NOTIF(DEATH_MARBLES_LOST, XPND3(s1, s2, s3), _("^F1%s^BG lost their marbles against ^F1%s^BG using the ^F2%s^BG\n"), "") \
+       MSG_INFO_NOTIF(INFO_EMPTY,                                                      0, 0, NO_STR_ARG,                                               "", "", "") \
+       MULTITEAM_INFO(INFO_SCORES_, 2,                                         0, 0, NO_STR_ARG,                                               "", _("^TC^TT ^BGteam scores!\n"), "") \
+       MULTITEAM_INFO(INFO_CTF_FLAGRETURN_DROPPED_, 2,         0, 0, NO_STR_ARG,                                               "", _("^BGThe ^TC^TT^BG flag was dropped in the base and returned itself\n"), "") \
+       MULTITEAM_INFO(INFO_CTF_FLAGRETURN_DAMAGED_, 2,         0, 0, NO_STR_ARG,                                               "", _("^BGThe ^TC^TT^BG flag was destroyed and returned to base\n"), "") \
+       MULTITEAM_INFO(INFO_CTF_FLAGRETURN_SPEEDRUN_, 2,        0, 1, f1/100,                                                   "", _("^BGThe ^TC^TT^BG flag became impatient after ^F1%.2f^BG seconds and returned itself\n"), "") \
+       MULTITEAM_INFO(INFO_CTF_FLAGRETURN_NEEDKILL_, 2,        0, 0, NO_STR_ARG,                                               "", _("^BGThe ^TC^TT^BG flag fell somewhere it couldn't be reached and returned to base\n"), "") \
+       MULTITEAM_INFO(INFO_CTF_FLAGRETURN_ABORTRUN_, 2,        0, 0, NO_STR_ARG,                                               "", _("^BGThe ^TC^TT^BG flag was returned to base by its owner\n"), "") \
+       MULTITEAM_INFO(INFO_CTF_FLAGRETURN_TIMEOUT_, 2,         0, 0, NO_STR_ARG,                                               "", _("^BGThe ^TC^TT^BG flag has returned to the base\n"), "") \
+       MULTITEAM_INFO(INFO_CTF_PICKUP_, 2,                                     1, 0, s1,                                                               "notify_%s_taken", _("^BG%s^BG got the ^TC^TT^BG flag\n"), "") \
+       MULTITEAM_INFO(INFO_CTF_RETURN_, 2,                                     1, 0, s1,                                                               "notify_%s_returned", _("^BG%s^BG returned the ^TC^TT^BG flag\n"), "") \
+       MULTITEAM_INFO(INFO_CTF_LOST_, 2,                                       1, 0, s1,                                                               "notify_%s_lost", _("^BG%s^BG lost the ^TC^TT^BG flag\n"), "") \
+       MULTITEAM_INFO(INFO_CTF_CAPTURE_, 2,                            1, 0, s1,                                                               "notify_%s_capture", _("^BG%s^BG captured the ^TC^TT^BG flag\n"), "") \
+       MULTITEAM_INFO(INFO_CTF_CAPTURE_TIME_, 2,                       1, 1, XPND2(s1, f1/100),                                "notify_%s_capture", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F1%.2f^BG seconds\n"), "") \
+       MULTITEAM_INFO(INFO_CTF_CAPTURE_BROKEN_, 2,                     2, 2, XPND4(s1, f1/100, s2, f2/100),    "notify_%s_capture", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F1%.2f^BG seconds, breaking ^BG%s^BG's previous record of ^F2%.2f^BG seconds\n"), "") \
+       MULTITEAM_INFO(INFO_CTF_CAPTURE_UNBROKEN_, 2,           2, 2, XPND4(s1, f1/100, s2, f2/100),    "notify_%s_capture", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F2%.2f^BG seconds, failing to break ^BG%s^BG's previous record of ^F1%.2f^BG seconds\n"), "") \
        #undef MSG_INFO_NOTIF
 
-#define MSG_NOTIFY_NOTIFICATIONS \
-       MSG_NOTIFY_NOTIF(DEATH_MARBLES_LOST2, XPND3(s1, s2, s3), "notify_death", _("^F1%s^BG lost their marbles against ^F1%s^BG using the ^F2%s^BG\n"), "") \
-       #undef MSG_NOTIFY_NOTIF
 
+#define MULTITEAM_CENTER(prefix,teams,strnum,flnum,args,cpid,durcnt,normal,gentle) \
+       MSG_CENTER_NOTIF(prefix##RED, strnum, flnum, args, cpid, durcnt, TEAM_CCR(normal, team_color_red, team_name_red), TEAM_CCR(gentle, team_color_red, team_name_red)) \
+       MSG_CENTER_NOTIF(prefix##BLUE, strnum, flnum, args, cpid, durcnt, TEAM_CCR(normal, team_color_blue, team_name_blue), TEAM_CCR(gentle, team_color_blue, team_name_blue)) \
+       #if teams >= 3 \
+               MSG_CENTER_NOTIF(prefix##YELLOW, strnum, flnum, args, cpid, durcnt, TEAM_CCR(normal, team_color_yellow, team_name_yellow), TEAM_CCR(gentle, team_color_yellow, team_name_yellow)) \
+       #endif \
+       #if teams >= 4 \
+               MSG_CENTER_NOTIF(prefix##PINK, strnum, flnum, args, cpid, durcnt, TEAM_CCR(normal, team_color_pink, team_name_pink), TEAM_CCR(gentle, team_color_pink, team_name_pink)) \
+       #endif
 #define MSG_CENTER_NOTIFICATIONS \
-       MSG_CENTER_NOTIF(CENTER_CTF_CAPTURESHIELD_SHIELDED, "", CPID_CTF_CAPTURESHIELD, XPND2(0, 0), _("^BGYou are now ^F1shielded^BG from the flag\n^BGfor ^F2too many unsuccessful attempts^BG to capture.\n^BGMake some defensive scores before trying again."), "") \
-       MSG_CENTER_NOTIF(CENTER_CTF_CAPTURESHIELD_FREE, "", CPID_CTF_CAPTURESHIELD, XPND2(0, 0), _("^BGYou are now free.\n^BGFeel free to ^F2try to capture^BG the flag again\n^BGif you think you will succeed."), "") \
-       MSG_CENTER_NOTIF(CENTER_CTF_EVENT_PASS, XPND2(s1, s2, s3), CPID_CTF_PASS, XPND2(0, 0), _("^BG%s passed the ^F1%s^BG to %s"), "") \
-       MSG_CENTER_NOTIF(CENTER_CTF_EVENT_PASS_SENT, XPND2(s1, s2), CPID_CTF_PASS, XPND2(0, 0), _("^BGYou passed the ^F1%s^BG to %s"), "") \
-       MSG_CENTER_NOTIF(CENTER_CTF_EVENT_PASS_RECEIVED, XPND2(s1, s2), CPID_CTF_PASS, XPND2(0, 0), _("^BGYou received the ^F1%s^BG from %s"), "") \
-       MSG_CENTER_NOTIF(CENTER_CTF_EVENT_RETURN, s1, CPID_CTF_LOWPRIO, XPND2(0, 0), _("^BGYou returned the ^F1%s"), "") \
-       MSG_CENTER_NOTIF(CENTER_CTF_EVENT_CAPTURE, s1, NO_CPID, XPND2(0, 0), _("^BGYou captured the ^F1%s"), "") \
+       MSG_CENTER_NOTIF(CENTER_EMPTY,                                                  0, 0, NO_STR_ARG,                               NO_CPID,                                XPND2(0, 0), "", "") \
+       MSG_CENTER_NOTIF(CENTER_CTF_CAPTURESHIELD_SHIELDED,             0, 0, NO_STR_ARG,                               CPID_CTF_CAPSHIELD,             XPND2(0, 0), _("^BGYou are now ^F1shielded^BG from the flag\n^BGfor ^F2too many unsuccessful attempts^BG to capture.\n^BGMake some defensive scores before trying again."), "") \
+       MSG_CENTER_NOTIF(CENTER_CTF_CAPTURESHIELD_FREE,                 0, 0, NO_STR_ARG,                               CPID_CTF_CAPSHIELD,             XPND2(0, 0), _("^BGYou are now free.\n^BGFeel free to ^F2try to capture^BG the flag again\n^BGif you think you will succeed."), "") \
+       MULTITEAM_CENTER(CENTER_CTF_PASS_OTHER_, 2,                             2, 0, XPND2(s1, s2),                    CPID_CTF_PASS,                  XPND2(0, 0), _("^BG%s^BG passed the ^TC^TT^BG flag to %s"), "") \
+       MULTITEAM_CENTER(CENTER_CTF_PASS_SENT_, 2,                              1, 0, s1,                                               CPID_CTF_PASS,                  XPND2(0, 0), _("^BGYou passed the ^TC^TT^BG flag to %s"), "") \
+       MULTITEAM_CENTER(CENTER_CTF_PASS_RECEIVED_, 2,                  1, 0, s1,                                               CPID_CTF_PASS,                  XPND2(0, 0), _("^BGYou received the ^TC^TT^BG flag from %s"), "") \
+       MSG_CENTER_NOTIF(CENTER_CTF_PASS_REQUESTING,                    1, 0, s1,                                               CPID_CTF_PASS,                  XPND2(0, 0), _("^BGRequesting %s^BG to pass you the flag"), "") \
+       MSG_CENTER_NOTIF(CENTER_CTF_PASS_REQUESTED,                     1, 0, XPND2(s1, PASS_KEY),              CPID_CTF_PASS,                  XPND2(0, 0), _("^BG%s^BG requests you to pass the flag%s"), "") \
+       MULTITEAM_CENTER(CENTER_CTF_RETURN_, 2,                                 0, 0, NO_STR_ARG,                               CPID_CTF_LOWPRIO,               XPND2(0, 0), _("^BGYou returned the ^TC^TT^BG flag!"), "") \
+       MULTITEAM_CENTER(CENTER_CTF_CAPTURE_, 2,                                0, 0, NO_STR_ARG,                               CPID_CTF_LOWPRIO,               XPND2(0, 0), _("^BGYou captured the ^TC^TT^BG flag!"), "") \
+       MULTITEAM_CENTER(CENTER_CTF_PICKUP_, 2,                                 0, 0, NO_STR_ARG,                               CPID_CTF_LOWPRIO,               XPND2(0, 0), _("^BGYou got the ^TC^TT^BG flag!"), "") \
+       MSG_CENTER_NOTIF(CENTER_CTF_PICKUP_TEAM,                                1, 0, s1,                                               CPID_CTF_LOWPRIO,               XPND2(0, 0), _("^BGYour %steam mate^BG got the flag! Protect them!"), "") \
+       MSG_CENTER_NOTIF(CENTER_CTF_PICKUP_TEAM_VERBOSE,                2, 0, XPND3(s1, s2, s1),                CPID_CTF_LOWPRIO,               XPND2(0, 0), _("^BGYour %steam mate (^BG%s%s)^BG got the flag! Protect them!"), "") \
+       MSG_CENTER_NOTIF(CENTER_CTF_PICKUP_ENEMY,                               1, 0, s1,                                               CPID_CTF_LOWPRIO,               XPND2(0, 0), _("^BGThe %senemy^BG got your flag! Retrieve it!"), "") \
+       MSG_CENTER_NOTIF(CENTER_CTF_PICKUP_ENEMY_VERBOSE,               2, 0, XPND3(s1, s2, s1),                CPID_CTF_LOWPRIO,               XPND2(0, 0), _("^BGThe %senemy (^BG%s%s)^BG got your flag! Retrieve it!"), "") \
+       MSG_CENTER_NOTIF(CENTER_CTF_STALEMATE_CARRIER,                  0, 0, NO_STR_ARG,                               CPID_STALEMATE,                 XPND2(0, 0), _("^BGStalemate! Enemies can now see you on radar!"), "") \
+       MSG_CENTER_NOTIF(CENTER_CTF_STALEMATE_OTHER,                    0, 0, NO_STR_ARG,                               CPID_STALEMATE,                 XPND2(0, 0), _("^BGStalemate! Flag carriers can now be seen by enemies on radar!"), "") \
+       MSG_CENTER_NOTIF(CENTER_CTF_FLAG_THROW_PUNISH,                  0, 1, f1,                                               CPID_CTF_LOWPRIO,               XPND2(0, 0), _("^BGToo many flag throws! Throwing disabled for %d seconds."), "") \
        #undef MSG_CENTER_NOTIF
 
 #define MSG_WEAPON_NOTIFICATIONS \
-       MSG_WEAPON_NOTIF(DEATH_MARBLES_LOST3, XPND3(s1, s2, s3), _("^F1%s^BG lost their marbles against ^F1%s^BG using the ^F2%s^BG\n"), "") \
+       MSG_WEAPON_NOTIF(DEATH_MARBLES_LOST3, 2, 1, XPND3(s1, s2, f1), _("^F1%s^BG lost their marbles against ^F1%s^BG using the ^F2%s^BG\n"), "") \
        #undef MSG_WEAPON_NOTIF
 
+
+// ====================================
+//  Initialization/Create Declarations
+// ====================================
+
+#define NOTIF_FIRST 1
+#define NOTIF_MAX 1024 // limit of recursive functions with ACCUMULATE_FUNCTION
+float NOTIF_INFO_COUNT;
+float NOTIF_CENTER_COUNT;
+float NOTIF_WEAPON_COUNT;
+float NOTIF_CPID_COUNT;
+
+#define MSG_INFO_NOTIF(name,strnum,flnum,args,icon,normal,gentle) \
+       ADD_CSQC_AUTOCVAR(name) \
+       float name; \
+       void RegisterNotification_##name() \
+       { \
+               SET_FIELD_COUNT(name, NOTIF_FIRST, NOTIF_INFO_COUNT) \
+               CHECK_MAX_COUNT(name, NOTIF_MAX, NOTIF_INFO_COUNT, "notifications") \
+       } \
+       ACCUMULATE_FUNCTION(RegisterNotifications, RegisterNotification_##name)
+
+#define MSG_CENTER_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) \
+       ADD_CSQC_AUTOCVAR(name) \
+       float name; \
+       float cpid; \
+       void RegisterNotification_##name() \
+       { \
+               SET_FIELD_COUNT(name, NOTIF_FIRST, NOTIF_CENTER_COUNT) \
+               SET_FIELD_COUNT(cpid, NOTIF_FIRST, NOTIF_CPID_COUNT) \
+               CHECK_MAX_COUNT(name, NOTIF_MAX, NOTIF_CENTER_COUNT, "notifications") \
+       } \
+       ACCUMULATE_FUNCTION(RegisterNotifications, RegisterNotification_##name)
+
+#define MSG_WEAPON_NOTIF(name,strnum,flnum,args,normal,gentle) \
+       ADD_CSQC_AUTOCVAR(name) \
+       float name; \
+       void RegisterNotification_##name() \
+       { \
+               SET_FIELD_COUNT(name, NOTIF_FIRST, NOTIF_WEAPON_COUNT) \
+               CHECK_MAX_COUNT(name, NOTIF_MAX, NOTIF_WEAPON_COUNT, "notifications") \
+       } \
+       ACCUMULATE_FUNCTION(RegisterNotifications, RegisterNotification_##name)
+
 // NOW we actually activate the declarations
 MSG_INFO_NOTIFICATIONS
-MSG_NOTIFY_NOTIFICATIONS
 MSG_CENTER_NOTIFICATIONS
 MSG_WEAPON_NOTIFICATIONS
 
@@ -127,14 +202,7 @@ MSG_WEAPON_NOTIFICATIONS
 //  Supporting Functions
 // ======================
 
-#ifdef SVQC
-#define WRITESPECTATABLE_MSG_ONE_VARNAME(varname,statement) entity varname; varname = msg_entity; FOR_EACH_REALCLIENT(msg_entity) if(msg_entity == varname || (msg_entity.classname == STR_SPECTATOR && msg_entity.enemy == varname)) statement msg_entity = varname
-#define WRITESPECTATABLE_MSG_ONE(statement) WRITESPECTATABLE_MSG_ONE_VARNAME(oldmsg_entity, statement)
-#define WRITESPECTATABLE(msg,statement) if(msg == MSG_ONE) { WRITESPECTATABLE_MSG_ONE(statement); } else statement float WRITESPECTATABLE_workaround = 0
-#endif
-
-#define HANDLE_CPID(cpid) ((min(NOTIF_MAX, cpid) == NO_CPID) ? FALSE : cpid)
-
+// select between the normal or the gentle message string based on client (or server) settings
 string normal_or_gentle(string normal, string gentle)
 {
        #ifdef CSQC
@@ -147,11 +215,78 @@ string normal_or_gentle(string normal, string gentle)
                return normal;
 }
 
-string CCR(string input) // color code replace, place inside of sprintf and parse the string
+float notif_stringcount(string s1, string s2)
+{
+       float stringcount;
+       if(s1 != NO_STR_ARG) ++stringcount;
+       if(s2 != NO_STR_ARG) ++stringcount;
+       return stringcount;
+}
+
+float notif_floatcount(float f1, float f2, float f3)
 {
-       input = strreplace("^F1", "^3", input);
-       input = strreplace("^F2", "^2", input);
-       input = strreplace("^BG", "^7", input);
+       float floatcount;
+       if(f1 != NO_FL_ARG) ++floatcount;
+       if(f2 != NO_FL_ARG) ++floatcount;
+       if(f3 != NO_FL_ARG) ++floatcount;
+       return floatcount;
+}
+
+// get the actual name of a notification and return it as a string
+string Get_Field_Value(float field, float net_type, float net_name)
+{
+       string output;
+       
+       #define GET_FIELD_VALUE_OUTPUT(field,name,strnum,flnum) \
+               if(field == F_NAME) { output = VAR_TO_TEXT(name); } \
+               else if(field == F_STRNUM) { output = ftos(strnum); } \
+               else if(field == F_FLNUM) { output = ftos(flnum); }
+       
+       switch(net_type)
+       {
+               case MSG_INFO:
+               {
+                       #define MSG_INFO_NOTIF(name,strnum,flnum,args,icon,normal,gentle) \
+                               { NOTIF_MATCH(name, net_name) { GET_FIELD_VALUE_OUTPUT(field,name,strnum,flnum) } }
+                       MSG_INFO_NOTIFICATIONS
+                       break;
+               }
+               case MSG_CENTER:
+               {
+                       #define MSG_CENTER_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) \
+                               { NOTIF_MATCH(name, net_name) { GET_FIELD_VALUE_OUTPUT(field,name,strnum,flnum) } }
+                       MSG_CENTER_NOTIFICATIONS
+                       break;
+               }
+               case MSG_WEAPON:
+               {
+                       #define MSG_WEAPON_NOTIF(name,strnum,flnum,args,normal,gentle) \
+                               { NOTIF_MATCH(name, net_name) { GET_FIELD_VALUE_OUTPUT(field,name,strnum,flnum) } }
+                       MSG_WEAPON_NOTIFICATIONS
+                       break;
+               }
+       }
+
+       #undef GET_FIELD_VALUE_OUTPUT
+       return output;
+}
+
+string TEAM_CCR(string input, string teamcolor, string teamtext)
+{
+       input = strreplace("^TC", teamcolor, input);
+       input = strreplace("^TT", teamtext, input);
+
+       return input;
+}
+
+// color code replace, place inside of sprintf and parse the string
+string CCR(string input)
+{
+       input = strreplace("^F1", "^2", input); // autocvar_notification_colors_F1 
+       input = strreplace("^F2", "^3", input); // autocvar_notification_colors_F2
+       input = strreplace("^K1", "^1", input); // autocvar_notification_colors_K1
+       input = strreplace("^K2", "^3", input); // autocvar_notification_colors_K2
+       input = strreplace("^BG", "^7", input); // autocvar_notification_colors_BG
 
        input = strreplace("^N", "^7", input); // "none"-- reset to white
 
@@ -163,95 +298,113 @@ string CCR(string input) // color code replace, place inside of sprintf and pars
 //  Frontend Notification Pushing
 // ===============================
 
-
-// =========================
-//  Notification Networking
-// =========================
-
 #ifdef CSQC
-void Read_Notification()
+void Local_Notification(float net_type, float net_name, string s1, string s2, float f1, float f2, float f3)
 {
-       float net_type = ReadByte();
-       float net_name = ReadCoord(); // byte only has 256 selections, we need more than that
-       string s1 = ReadString();
-       string s2 = ReadString();
-       string s3 = ReadString();
-
        switch(net_type)
        {
                case MSG_INFO:
                {
-                       #define MSG_INFO_NOTIF(name,args,normal,gentle) \
-                               { if(min(NOTIF_MAX, name) == net_name) { print(sprintf(CCR(normal_or_gentle(normal, gentle)), args)); } }
-
+                       #define MSG_INFO_NOTIF(name,strnum,flnum,args,icon,normal,gentle) \
+                               { NOTIF_MATCH(name, net_name) CHECK_AUTOCVAR(name) { print(sprintf(CCR(normal_or_gentle(normal, gentle)), args)); } }
                        MSG_INFO_NOTIFICATIONS
                        break;
                }
-
-               case MSG_NOTIFY:
-               {
-                       break;
-               }
-
                case MSG_CENTER:
                {
-                       #define MSG_CENTER_NOTIF(name,args,cpid,durcnt,normal,gentle) \
-                               { if(min(NOTIF_MAX, name) == net_name) { centerprint_generic(HANDLE_CPID(cpid), sprintf(CCR(normal_or_gentle(normal, gentle)), args), durcnt); } }
-
+                       #define MSG_CENTER_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) \
+                               { NOTIF_MATCH(name, net_name) CHECK_AUTOCVAR(name) { centerprint_generic(HANDLE_CPID(cpid), sprintf(CCR(normal_or_gentle(normal, gentle)), args), durcnt); } }
                        MSG_CENTER_NOTIFICATIONS
                        break;
                }
-
                case MSG_WEAPON:
                {
+                       #define MSG_WEAPON_NOTIF(name,strnum,flnum,args,normal,gentle) \
+                               { NOTIF_MATCH(name, net_name) CHECK_AUTOCVAR(name) { print("unhandled\n"); } }
+                       MSG_WEAPON_NOTIFICATIONS
                        break;
                }
        }
 }
 #endif
+
+
+// =========================
+//  Notification Networking
+// =========================
+
+#ifdef CSQC
+void Read_Notification(void)
+{
+       float net_type = ReadByte();
+       float net_name = ReadShort();
+
+       float stringcount = stof(Get_Field_Value(F_STRNUM, net_type, net_name));
+       float floatcount = stof(Get_Field_Value(F_FLNUM, net_type, net_name));
+       
+       Local_Notification(net_type, net_name,
+               ((stringcount >= 1) ? ReadString() : ""),
+               ((stringcount == 2) ? ReadString() : ""),
+               ((floatcount >= 1) ? ReadLong() : 0),
+               ((floatcount >= 2) ? ReadLong() : 0),
+               ((floatcount == 3) ? ReadLong() : 0));
+}
+#endif
+
 #ifdef SVQC
-void Send_Notification(float net_type, entity client, float net_name, string s1, string s2, string s3)
+void Send_Notification(entity client, float net_type, float net_name, string s1, string s2, float f1, float f2, float f3)
 {
        if(net_type && net_name)
        {
+               print("notification: ", Get_Field_Value(F_NAME, net_type, net_name), ": ", ftos(net_name), ".\n");
+
+               float stringcount = stof(Get_Field_Value(F_STRNUM, net_type, net_name));
+               float floatcount = stof(Get_Field_Value(F_FLNUM, net_type, net_name));
+               
+               if(notif_stringcount(s1, s2) > stringcount) { backtrace("Too many string arguments for notification!\n"); return; }
+               if(notif_floatcount(f1, f2, f3) > floatcount) { backtrace("Too many float arguments for notification!\n"); return; }
+               
                if(client && (clienttype(client) == CLIENTTYPE_REAL) && (client.flags & FL_CLIENT))
                {
+                       // personal/direct notification sent to ONE person and their spectators
                        msg_entity = client;
                        WRITESPECTATABLE_MSG_ONE({
                                WriteByte(MSG_ONE, SVC_TEMPENTITY);
                                WriteByte(MSG_ONE, TE_CSQC_NOTIFICATION);
                                WriteByte(MSG_ONE, net_type);
-                               WriteCoord(MSG_ONE, net_name);
-                               WriteString(MSG_ONE, s1);
-                               WriteString(MSG_ONE, s2);
-                               WriteString(MSG_ONE, s3);
+                               WriteShort(MSG_ONE, net_name);
+                               if(stringcount >= 1) { WriteString(MSG_ONE, s1); }
+                               if(stringcount == 2) { WriteString(MSG_ONE, s2); }
+                               if(floatcount >= 1) { WriteLong(MSG_ONE, f1); }
+                               if(floatcount >= 2) { WriteLong(MSG_ONE, f2); }
+                               if(floatcount == 3) { WriteLong(MSG_ONE, f3); }
                        });
                }
+               else
+               {
+                       // global notification sent to EVERYONE
+                       WriteByte(MSG_ALL, SVC_TEMPENTITY);
+                       WriteByte(MSG_ALL, TE_CSQC_NOTIFICATION);
+                       WriteByte(MSG_ALL, net_type);
+                       WriteShort(MSG_ALL, net_name);
+                       if(stringcount >= 1) { WriteString(MSG_ALL, s1); }
+                       if(stringcount == 2) { WriteString(MSG_ALL, s2); }
+                       if(floatcount >= 1) { WriteLong(MSG_ALL, f1); }
+                       if(floatcount >= 2) { WriteLong(MSG_ALL, f2); }
+                       if(floatcount == 3) { WriteLong(MSG_ALL, f3); }
+               }
 
-               if(!server_is_local && ((net_type == MSG_INFO || net_type == MSG_NOTIFY) || client == world))
+               if(!server_is_local && (net_type == MSG_INFO))
                {
-                       switch(net_type)
-                       {
-                               case MSG_INFO:
-                               {
-                                       #define MSG_INFO_NOTIF(name,args,normal,gentle) \
-                                               { if(min(NOTIF_MAX, name) == net_name) { print(sprintf(CCR(normal_or_gentle(normal, gentle)), args)); } }
-
-                                       MSG_INFO_NOTIFICATIONS
-                                       break;
-                               }
-
-                               case MSG_NOTIFY:
-                               {
-                                       break;
-                               }
-                       }
+                       #define MSG_INFO_NOTIF(name,strnum,flnum,args,icon,normal,gentle) \
+                               { NOTIF_MATCH(name, net_name) { print(sprintf(CCR(normal_or_gentle(normal, gentle)), args)); } }
+                       MSG_INFO_NOTIFICATIONS
                }
        }
        else { backtrace("Incorrect usage of Send_Notification!\n"); }
 }
 
-void Send_Notification_ToTeam(float targetteam, entity except, float net_type, float net_name, string s1, string s2, string s3)
+void Send_Notification_ToTeam(float targetteam, entity except, float net_type, float net_name, string s1, string s2, float f1, float f2, float f3)
 {
        entity tmp_entity;
        FOR_EACH_REALCLIENT(tmp_entity)
@@ -260,12 +413,13 @@ void Send_Notification_ToTeam(float targetteam, entity except, float net_type, f
                if(tmp_entity.team == targetteam)
                if(tmp_entity != except)
                {
-                       Send_Notification(net_type, tmp_entity, net_name, s1, s2, s3);
+                       Send_Notification(tmp_entity, net_type, net_name, s1, s2, f1, f2, f3);
                }
        }
 }
 
-void Send_Notification_ToAll(entity except, float spectators, float net_type, float net_name, string s1, string s2, string s3)
+// WARNING: use this ONLY if you need exceptions or want to exclude spectators, otherwise use Send_Notification(..., world, ...)
+void Send_Notification_ToAll(entity except, float spectators, float net_type, float net_name, string s1, string s2, float f1, float f2, float f3)
 {
        entity tmp_entity;
        FOR_EACH_REALCLIENT(tmp_entity)
@@ -273,12 +427,44 @@ void Send_Notification_ToAll(entity except, float spectators, float net_type, fl
                if((tmp_entity.classname == STR_PLAYER) || spectators)
                if(tmp_entity != except)
                {
-                       Send_Notification(net_type, tmp_entity, net_name, s1, s2, s3);
+                       Send_Notification(tmp_entity, net_type, net_name, s1, s2, f1, f2, f3);
                }
        }
 }
 
-// LEGACY NOTIFICATION SYSTEMS
+
+// =============================
+//  LEGACY NOTIFICATION SYSTEMS
+// =============================
+
+void Send_KillNotification(string s1, string s2, string s3, float msg, float type)
+{
+       WriteByte(MSG_ALL, SVC_TEMPENTITY);
+       WriteByte(MSG_ALL, TE_CSQC_KILLNOTIFY);
+       WriteString(MSG_ALL, s1);
+       WriteString(MSG_ALL, s2);
+       WriteString(MSG_ALL, s3);
+       WriteShort(MSG_ALL, msg);
+       WriteByte(MSG_ALL, type);
+}
+
+// Function is used to send a generic centerprint whose content CSQC gets to decide (gentle version or not in the below cases)
+void Send_CSQC_KillCenterprint(entity e, string s1, string s2, float msg, float type)
+{
+       if (clienttype(e) == CLIENTTYPE_REAL)
+       {
+               msg_entity = e;
+               WRITESPECTATABLE_MSG_ONE({
+                       WriteByte(MSG_ONE, SVC_TEMPENTITY);
+                       WriteByte(MSG_ONE, TE_CSQC_KILLCENTERPRINT);
+                       WriteString(MSG_ONE, s1);
+                       WriteString(MSG_ONE, s2);
+                       WriteShort(MSG_ONE, msg);
+                       WriteByte(MSG_ONE, type);
+               });
+       }
+}
+
 void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, float countdown_num)
 {
        if ((clienttype(e) == CLIENTTYPE_REAL) && (e.flags & FL_CLIENT))