From: Samual Lenks Date: Fri, 22 Feb 2013 05:14:52 +0000 (-0500) Subject: Work on sprees a bit X-Git-Tag: xonotic-v0.7.0~62^2~23^2~171 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0cd4a8abdaa27ffe1b9faea3bbcd8c31a421585d;p=xonotic%2Fxonotic-data.pk3dir.git Work on sprees a bit --- diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc index 750f3bb59..2e78ce4ab 100644 --- a/qcsrc/common/notifications.qc +++ b/qcsrc/common/notifications.qc @@ -95,6 +95,7 @@ void Dump_Notifications(float fh, float alsoprint) // edit these to match whichever cvars are used for specific notification options NOTIF_WRITE("\n// HARD CODED notification variables:\n"); + NOTIF_WRITE("seta notification_show_sprees 1 \"Print information about sprees in death/kill messages\"\n"); NOTIF_WRITE("seta notification_version_mismatch_client_error 0 \"Cause a notif error on client if the version in notifications.cfg mismatches the code\"\n"); NOTIF_WRITE("seta notification_version_mismatch_server_error 1 \"Cause a notif error on server if the version in notifications.cfg mismatches the code\"\n"); NOTIF_WRITE("seta notification_errors_are_fatal 1 \"If a notification fails upon initialization, cause a Host_Error to stop the program\"\n"); diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index 6a0f7f82c..d8f53aa9c 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -9,14 +9,14 @@ #define MSG_WEAPON 3 // "Personal" weapon messages (like "You got the Nex", sent to weapon notify panel) #define MSG_DEATH 4 // "Personal" AND "Global" death messages +#define NO_MSG -12345 + // Current version number of the configuration file for notifications... // This is used to check matches between the config file and the code, // and should be incremented any time you add a new/remove or edit an notification // or any time you change default values or add/edit/remove a special cvar. #define NOTIF_VERSION 2 -#define NO_MSG -12345 - #define EIGHT_VARS_TO_VARARGS_VARLIST \ VARITEM(1, 0, s1) \ VARITEM(2, 0, XPD(s1, s2)) \ @@ -44,7 +44,6 @@ VARITEM(4, 4, XPD(s1, s2, s3, s4, f1, f2, f3, f4)) void Dump_Notifications(float fh, float alsoprint); - void Local_Notification(float net_type, float net_name, ...count); void Local_Notification_WOVA(float net_type, float net_name, float stringcount, float floatcount, string s1, string s2, string s3, string s4, float f1, float f2, float f3, float f4); @@ -65,7 +64,6 @@ void Read_Notification(float is_new); void Send_Notification(float broadcast, entity client, float net_type, float net_name, ...count); void Send_Notification_WOVA(float broadcast, entity client, float net_type, float net_name, string s1, string s2, string s3, string s4, float f1, float f2, float f3, float f4); - void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, float countdown_num); #define Send_CSQC_Centerprint_Generic_Expire(e,id) Send_CSQC_Centerprint_Generic(e, id, "", 1, 0) #endif @@ -167,16 +165,16 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, MSG_INFO_NOTIF(1, INFO_DEATH_SELF_GENERIC, 1, 1, "s1 spree_end", "s1", "notify_selfkill", _("^BG%s^K1 died%s\n"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_VOID, 1, 1, "s1 spree_end", "s1", "notify_void", _("^BG%s^K1 was in the wrong place%s\n"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_SUICIDE, 1, 1, "s1 spree_end", "s1", "notify_selfkill", _("^BG%s^K1 couldn't take it anymore%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_SELF_NOAMMO, 1, 1, "s1 spree_end", "s1", "notify_outofammo", _("^BG%s^K1 died%s. What's the point of living without ammo?\n"), _("^F1%s^K1 ran out of ammo%s\n")) \ + MSG_INFO_NOTIF(1, INFO_DEATH_SELF_NOAMMO, 1, 1, "s1 spree_end", "s1", "notify_outofammo", _("^BG%s^K1 died%s. What's the point of living without ammo?\n"), _("^BG%s^K1 ran out of ammo%s\n")) \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_ROT, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 rotted away%s\n"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_CAMP, 1, 1, "s1 spree_end", "s1", "notify_camping", _("^BG%s^K1 thought they found a nice camping ground%s\n"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_BETRAYAL, 1, 1, "s1 spree_end", "s1", "notify_teamkill_red", _("^BG%s^K1 became enemies with the Lord of Teamplay%s\n"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TEAMCHANGE, 1, 1, "s1 death_team", "", "", _("^BG%s^K1 switched to the %s\n"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_AUTOTEAMCHANGE, 1, 1, "s1 death_team", "", "", _("^BG%s^K1 was moved into the %s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_SELF_FALL, 1, 1, "s1 spree_end", "s1", "notify_fall", _("^BG%s^K1 hit the ground with a crunch%s\n"), _("^F1%s^K1 hit the ground with a bit too much force%s\n")) \ - MSG_INFO_NOTIF(1, INFO_DEATH_SELF_DROWN, 1, 1, "s1 spree_end", "s1", "notify_water", _("^BG%s^K1 couldn't catch their breath%s\n"), _("^F1%s^K1 was in the water for too long%s\n")) \ - MSG_INFO_NOTIF(1, INFO_DEATH_SELF_FIRE, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 became a bit too crispy%s\n"), _("^F1%s^K1 felt a little hot%s\n")) \ - MSG_INFO_NOTIF(1, INFO_DEATH_SELF_LAVA, 1, 1, "s1 spree_end", "s1", "notify_lava", _("^BG%s^K1 turned into hot slag%s\n"), _("^F1%s^K1 found a hot place%s\n")) \ + MSG_INFO_NOTIF(1, INFO_DEATH_SELF_FALL, 1, 1, "s1 spree_end", "s1", "notify_fall", _("^BG%s^K1 hit the ground with a crunch%s\n"), _("^BG%s^K1 hit the ground with a bit too much force%s\n")) \ + MSG_INFO_NOTIF(1, INFO_DEATH_SELF_DROWN, 1, 1, "s1 spree_end", "s1", "notify_water", _("^BG%s^K1 couldn't catch their breath%s\n"), _("^BG%s^K1 was in the water for too long%s\n")) \ + MSG_INFO_NOTIF(1, INFO_DEATH_SELF_FIRE, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 became a bit too crispy%s\n"), _("^BG%s^K1 felt a little hot%s\n")) \ + MSG_INFO_NOTIF(1, INFO_DEATH_SELF_LAVA, 1, 1, "s1 spree_end", "s1", "notify_lava", _("^BG%s^K1 turned into hot slag%s\n"), _("^BG%s^K1 found a hot place%s\n")) \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_SLIME, 1, 1, "s1 spree_end", "s1", "notify_slime", _("^BG%s^K1 was slimed%s\n"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_SHOOTING_STAR, 1, 1, "s1 spree_end", "s1", "notify_shootingstar", _("^BG%s^K1 became a shooting star%s\n"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_SWAMP, 1, 1, "s1 spree_end", "s1", "notify_slime", _("^BG%s^K1 is now preserved for centuries to come%s\n"), "") \ @@ -194,33 +192,33 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_MLRS, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 got turned into smoldering gibs by an MLRS turret%s\n"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_PLASMA, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 got served some superheated plasma from a turret%s\n"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_PHASER, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was phased out by a turret%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_TESLA, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was electrocuted by a Tesla turret%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_TELEFRAG, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_telefrag", _("^BG%s^K1 was telefragged by ^BG%s^K1%s\n"), _("^F1%s^K1 tried to occupy ^BG%s^K1's teleport destination space\n")) \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_FALL, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_fall", _("^BG%s^K1 was grounded by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_DROWN, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_water", _("^BG%s^K1 was drowned by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_LAVA, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_lava", _("^BG%s^K1 was cooked by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_SLIME, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_slime", _("^BG%s^K1 was slimed by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_SHOOTING_STAR, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_shootingstar", _("^BG%s^K1 was shot into space by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_SWAMP, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_slime", _("^BG%s^K1 was preserved by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VOID, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_void", _("^BG%s^K1 was thrown into a world of hurt by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_TOUCHEXPLODE, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 died in an accident with ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_CHEAT, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was unfairly eliminated by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_FIRE, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was burnt up into a crisp by ^BG%s^K1%s\n"), _("^F1%s^K1 felt a little hot from ^BG%s^K1's fire^K1%s\n")) \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_CRUSH, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was crushed by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_SPID_MINIGUN, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 got shredded by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_SPID_ROCKET, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was blasted to bits by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_SPID_DEATH, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_WAKI_GUN, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was bolted down by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_WAKI_ROCKET, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 couldn't find shelter from ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_WAKI_DEATH, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_RAPT_CANNON, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 couldn't resist ^BG%s^K1 purple blobs%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_RAPT_BOMB, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was cluster bombed by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_RAPT_FRAGMENT, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 was cluster bombed by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_RAPT_DEATH, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_BUMB_GUN, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_BUMB_RAY, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_BUMB_RAY_HEAL, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_BUMB_DEATH, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_TESLA, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was electrocuted by a Tesla turret%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_TELEFRAG, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_telefrag", _("^BG%s%s^K1 was telefragged by ^BG%s^K1%s\n"), _("^BG%s^K1 tried to occupy ^BG%s^K1's teleport destination space\n")) \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_FALL, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_fall", _("^BG%s%s^K1 was grounded by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_DROWN, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_water", _("^BG%s%s^K1 was drowned by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_LAVA, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_lava", _("^BG%s%s^K1 was cooked by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_SLIME, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_slime", _("^BG%s%s^K1 was slimed by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_SHOOTING_STAR, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_shootingstar", _("^BG%s%s^K1 was shot into space by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_SWAMP, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_slime", _("^BG%s%s^K1 was preserved by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VOID, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_void", _("^BG%s%s^K1 was thrown into a world of hurt by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_TOUCHEXPLODE, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 died in an accident with ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_CHEAT, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 was unfairly eliminated by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_FIRE, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 was burnt up into a crisp by ^BG%s^K1%s\n"), _("^BG%s^K1 felt a little hot from ^BG%s^K1's fire^K1%s\n")) \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_CRUSH, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 was crushed by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_SPID_MINIGUN, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 got shredded by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_SPID_ROCKET, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 was blasted to bits by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_SPID_DEATH, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_WAKI_GUN, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 was bolted down by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_WAKI_ROCKET, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 couldn't find shelter from ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_WAKI_DEATH, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_RAPT_CANNON, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 couldn't resist ^BG%s^K1 purple blobs%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_RAPT_BOMB, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 was cluster bombed by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_RAPT_FRAGMENT, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 was cluster bombed by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_RAPT_DEATH, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_BUMB_GUN, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 foobar by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_BUMB_RAY, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 foobar by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_BUMB_RAY_HEAL, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 foobar by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_BUMB_DEATH, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 foobar by ^BG%s^K1%s\n"), "") \ MULTITEAM_INFO(1, INFO_FREEZETAG_ROUND_WIN_, 4, 0, 0, "", "", "", _("^TC^TT^BG team wins the round, all other teams were frozen\n"), "") \ MSG_INFO_NOTIF(1, INFO_FREEZETAG_REVIVE, 2, 0, "s1 s2", "", "", _("^BG%s^K3 was revived by ^BG%s\n"), "") \ MSG_INFO_NOTIF(1, INFO_FREEZETAG_FREEZE, 2, 0, "s1 s2", "", "", _("^BG%s^K1 was frozen by ^BG%s\n"), "") \ @@ -258,55 +256,55 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, MSG_INFO_NOTIF(1, INFO_VERSION_OLD, 2, 0, "s1 s2", "", "", _("\{1}^F4NOTE: ^BGThe server is running ^F1Xonotic %s^BG, you have ^F2Xonotic %s\n"), "") \ MSG_INFO_NOTIF(1, INFO_VERSION_OUTDATED, 2, 0, "s1 s2", "", "", _("\{1}^F4NOTE: ^F1Xonotic %s^BG is out, and you still have ^F2Xonotic %s^BG - get the update from ^F3http://www.xonotic.org/^BG!\n"), "") \ MSG_INFO_NOTIF(1, INFO_WATERMARK, 1, 0, "s1", "", "", _("^F3SVQC Build information: ^F4%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_THINKING_WITH_PORTALS, 1, 1, "s1 spree_end", "s1", "notify_selfkill", _("^BG%s^K1 is now thinking with portals%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_CRYLINK_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponcrylink", _("^BG%s^K1 felt the strong pull of their Crylink%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_CRYLINK_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponcrylink", _("^BG%s^K1 felt the strong pull of ^BG%s^K1's Crylink%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_ELECTRO_SUICIDE_ORBS, 1, 1, "s1 spree_end", "s1", "weaponelectro", _("^BG%s^K1 could not remember where they put their Electro plasma%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_ELECTRO_SUICIDE_BOLT, 1, 1, "s1 spree_end", "s1", "weaponelectro", _("^BG%s^K1 played with Electro plasma%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_ELECTRO_MURDER_BOLT, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponelectro", _("^BG%s^K1 was blasted by ^BG%s^K1's Electro bolt%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_ELECTRO_MURDER_ORBS, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponelectro", _("^BG%s^K1 got too close to ^BG%s^K1's Electro plasma%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_ELECTRO_MURDER_COMBO, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponelectro", _("^BG%s^K1 felt the electrifying air of ^BG%s^K1's Electro combo%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_FIREBALL_SUICIDE_FIREMINE, 1, 1, "s1 spree_end", "s1", "weaponfireball", _("^BG%s^K1 forgot about their firemine%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_FIREBALL_SUICIDE_BLAST, 1, 1, "s1 spree_end", "s1", "weaponfireball", _("^BG%s^K1 should have used a smaller gun%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_FIREBALL_MURDER_FIREMINE, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponfireball", _("^BG%s^K1 got burnt by ^BG%s^K1's firemine%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_FIREBALL_MURDER_BLAST, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponfireball", _("^BG%s^K1 got too close to ^BG%s^K1's fireball%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_MORTAR_SUICIDE_EXPLODE, 1, 1, "s1 spree_end", "s1", "weapongrenadelauncher", _("^BG%s^K1 blew themself up with their own Mortar%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_MORTAR_SUICIDE_BOUNCE, 1, 1, "s1 spree_end", "s1", "weapongrenadelauncher", _("^BG%s^K1 didn't see their own Mortar grenade%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_MORTAR_MURDER_EXPLODE, 2, 1, "s1 s2 spree_end", "s2 s1", "weapongrenadelauncher", _("^BG%s^K1 ate ^BG%s^K1's Mortar grenade%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_MORTAR_MURDER_BOUNCE, 2, 1, "s1 s2 spree_end", "s2 s1", "weapongrenadelauncher", _("^BG%s^K1 got too close to ^BG%s^K1's Mortar grenade%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_HAGAR_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponhagar", _("^BG%s^K1 played with tiny Hagar rockets%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_HAGAR_MURDER_BURST, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponhagar", _("^BG%s^K1 was pummeled by a burst of ^BG%s^K1's Hagar rockets%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_HAGAR_MURDER_SPRAY, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponhagar", _("^BG%s^K1 was pummeled by ^BG%s^K1's Hagar rockets%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_HLAC_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponhlac", _("^BG%s^K1 got a little jumpy with their HLAC%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_HLAC_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponhlac", _("^BG%s^K1 was cut down with ^BG%s^K1's HLAC%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_HOOK_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponhook", _("^BG%s^K1 was caught in ^BG%s^K1's Hook gravity bomb%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_LASER_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponlaser", _("^BG%s^K1 shot themself to hell with their Laser%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_LASER_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponlaser", _("^BG%s^K1 was shot to death by ^BG%s^K1's Laser%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_MINELAYER_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponminelayer", _("^BG%s^K1 forgot about their mine%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_MINELAYER_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponminelayer", _("^BG%s^K1 got too close to ^BG%s^K1's mine%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_MINSTANEX_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponminstanex", _("^BG%s^K1 has been vaporized by ^BG%s^K1's Minstanex%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_NEX_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponnex", _("^BG%s^K1 has been vaporized by ^BG%s^K1's Nex%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_RIFLE_MURDER_HAIL_PIERCING, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponrifle", _("^BG%s^K1 failed to hide from ^BG%s^K1's Rifle bullet hail%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_RIFLE_MURDER_HAIL, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponrifle", _("^BG%s^K1 died in ^BG%s^K1's Rifle bullet hail%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_RIFLE_MURDER_PIERCING, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponrifle", _("^BG%s^K1 failed to hide from ^BG%s^K1's Rifle%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_RIFLE_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponrifle", _("^BG%s^K1 was sniped with a Rifle by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_RIFLE_MURDER_HEADSHOT, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_headshot", _("^BG%s^K1 was shot in the head with a Rifle by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_ROCKETLAUNCHER_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponrocketlauncher", _("^BG%s^K1 blew themself up with their Rocketlauncher%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_ROCKETLAUNCHER_MURDER_DIRECT, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponrocketlauncher", _("^BG%s^K1 ate ^BG%s^K1's rocket%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_ROCKETLAUNCHER_MURDER_SPLASH, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponrocketlauncher", _("^BG%s^K1 got too close ^BG%s^K1's rocket%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_SEEKER_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponseeker", _("^BG%s^K1 played with tiny Seeker rockets%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_SEEKER_MURDER_TAG, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponseeker", _("^BG%s^K1 was tagged by ^BG%s^K1's Seeker%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_SEEKER_MURDER_SPRAY, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponseeker", _("^BG%s^K1 was pummeled by ^BG%s^K1's Seeker rockets%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_SHOTGUN_MURDER_SLAP, 2, 1, "s2 s1 spree_end", "s2 s1", "notify_melee_shotgun", _("^BG%s^K1 slapped ^BG%s^K1 around a bit with a large Shotgun%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_SHOTGUN_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponshotgun", _("^BG%s^K1 was gunned down by ^BG%s^K1's Shotgun%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_TUBA_SUICIDE, 1, 1, "s1 spree_end", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Tuba%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_TUBA_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Tuba%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_ACCORDEON_SUICIDE, 1, 1, "s1 spree_end", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Accordeon%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_ACCORDEON_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Accordeon%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_KLEINBOTTLE_SUICIDE, 1, 1, "s1 spree_end", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Klein Bottle%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_KLEINBOTTLE_MURDER, 2, 1, "s1 s2 spree_end", "s2 s1", "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Klein Bottle%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_UZI_MURDER_SNIPE, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponuzi", _("^BG%s^K1 was sniped by ^BG%s^K1's Machine Gun%s\n"), "") \ - MSG_INFO_NOTIF(1, INFO_WEAPON_UZI_MURDER_SPRAY, 2, 1, "s1 s2 spree_end", "s2 s1", "weaponuzi", _("^BG%s^K1 was riddled full of holes by ^BG%s^K1's Machine Gun%s\n"), "") + MSG_INFO_NOTIF(1, INFO_WEAPON_THINKING_WITH_PORTALS, 1, 1, "s1 spree_end", "s1", "notify_selfkill", _("^BG%s^K1 is now thinking with portals%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_CRYLINK_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponcrylink", _("^BG%s^K1 felt the strong pull of their Crylink%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_CRYLINK_MURDER, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponcrylink", _("^BG%s%s^K1 felt the strong pull of ^BG%s^K1's Crylink%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_ELECTRO_SUICIDE_ORBS, 1, 1, "s1 spree_end", "s1", "weaponelectro", _("^BG%s^K1 could not remember where they put their Electro plasma%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_ELECTRO_SUICIDE_BOLT, 1, 1, "s1 spree_end", "s1", "weaponelectro", _("^BG%s^K1 played with Electro plasma%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_ELECTRO_MURDER_BOLT, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponelectro", _("^BG%s%s^K1 was blasted by ^BG%s^K1's Electro bolt%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_ELECTRO_MURDER_ORBS, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponelectro", _("^BG%s%s^K1 got too close to ^BG%s^K1's Electro plasma%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_ELECTRO_MURDER_COMBO, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponelectro", _("^BG%s%s^K1 felt the electrifying air of ^BG%s^K1's Electro combo%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_FIREBALL_SUICIDE_FIREMINE, 1, 1, "s1 spree_end", "s1", "weaponfireball", _("^BG%s^K1 forgot about their firemine%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_FIREBALL_SUICIDE_BLAST, 1, 1, "s1 spree_end", "s1", "weaponfireball", _("^BG%s^K1 should have used a smaller gun%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_FIREBALL_MURDER_FIREMINE, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponfireball", _("^BG%s%s^K1 got burnt by ^BG%s^K1's firemine%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_FIREBALL_MURDER_BLAST, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponfireball", _("^BG%s%s^K1 got too close to ^BG%s^K1's fireball%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_MORTAR_SUICIDE_EXPLODE, 1, 1, "s1 spree_end", "s1", "weapongrenadelauncher", _("^BG%s^K1 blew themself up with their own Mortar%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_MORTAR_SUICIDE_BOUNCE, 1, 1, "s1 spree_end", "s1", "weapongrenadelauncher", _("^BG%s^K1 didn't see their own Mortar grenade%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_MORTAR_MURDER_EXPLODE, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weapongrenadelauncher", _("^BG%s%s^K1 ate ^BG%s^K1's Mortar grenade%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_MORTAR_MURDER_BOUNCE, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weapongrenadelauncher", _("^BG%s%s^K1 got too close to ^BG%s^K1's Mortar grenade%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_HAGAR_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponhagar", _("^BG%s^K1 played with tiny Hagar rockets%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_HAGAR_MURDER_BURST, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponhagar", _("^BG%s%s^K1 was pummeled by a burst of ^BG%s^K1's Hagar rockets%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_HAGAR_MURDER_SPRAY, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponhagar", _("^BG%s%s^K1 was pummeled by ^BG%s^K1's Hagar rockets%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_HLAC_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponhlac", _("^BG%s^K1 got a little jumpy with their HLAC%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_HLAC_MURDER, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponhlac", _("^BG%s%s^K1 was cut down with ^BG%s^K1's HLAC%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_HOOK_MURDER, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponhook", _("^BG%s%s^K1 was caught in ^BG%s^K1's Hook gravity bomb%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_LASER_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponlaser", _("^BG%s^K1 shot themself to hell with their Laser%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_LASER_MURDER, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponlaser", _("^BG%s%s^K1 was shot to death by ^BG%s^K1's Laser%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_MINELAYER_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponminelayer", _("^BG%s^K1 forgot about their mine%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_MINELAYER_MURDER, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponminelayer", _("^BG%s%s^K1 got too close to ^BG%s^K1's mine%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_MINSTANEX_MURDER, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponminstanex", _("^BG%s%s^K1 has been vaporized by ^BG%s^K1's Minstanex%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_NEX_MURDER, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponnex", _("^BG%s%s^K1 has been vaporized by ^BG%s^K1's Nex%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_RIFLE_MURDER_HAIL_PIERCING, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponrifle", _("^BG%s%s^K1 failed to hide from ^BG%s^K1's Rifle bullet hail%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_RIFLE_MURDER_HAIL, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponrifle", _("^BG%s%s^K1 died in ^BG%s^K1's Rifle bullet hail%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_RIFLE_MURDER_PIERCING, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponrifle", _("^BG%s%s^K1 failed to hide from ^BG%s^K1's Rifle%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_RIFLE_MURDER, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponrifle", _("^BG%s%s^K1 was sniped with a Rifle by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_RIFLE_MURDER_HEADSHOT, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "notify_headshot", _("^BG%s%s^K1 was shot in the head with a Rifle by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_ROCKETLAUNCHER_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponrocketlauncher", _("^BG%s^K1 blew themself up with their Rocketlauncher%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_ROCKETLAUNCHER_MURDER_DIRECT, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponrocketlauncher", _("^BG%s%s^K1 ate ^BG%s^K1's rocket%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_ROCKETLAUNCHER_MURDER_SPLASH, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponrocketlauncher", _("^BG%s%s^K1 got too close ^BG%s^K1's rocket%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_SEEKER_SUICIDE, 1, 1, "s1 spree_end", "s1", "weaponseeker", _("^BG%s^K1 played with tiny Seeker rockets%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_SEEKER_MURDER_TAG, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponseeker", _("^BG%s%s^K1 was tagged by ^BG%s^K1's Seeker%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_SEEKER_MURDER_SPRAY, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponseeker", _("^BG%s%s^K1 was pummeled by ^BG%s^K1's Seeker rockets%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_SHOTGUN_MURDER_SLAP, 2, 1, "spree_inf s2 s1 spree_end", "s2 s1", "notify_melee_shotgun", _("^BG%s%s^K1 slapped ^BG%s^K1 around a bit with a large Shotgun%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_SHOTGUN_MURDER, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponshotgun", _("^BG%s%s^K1 was gunned down by ^BG%s^K1's Shotgun%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_TUBA_SUICIDE, 1, 1, "s1 spree_end", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Tuba%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_TUBA_MURDER, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weapontuba", _("^BG%s%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Tuba%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_ACCORDEON_SUICIDE, 1, 1, "s1 spree_end", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Accordeon%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_ACCORDEON_MURDER, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weapontuba", _("^BG%s%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Accordeon%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_KLEINBOTTLE_SUICIDE, 1, 1, "s1 spree_end", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Klein Bottle%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_KLEINBOTTLE_MURDER, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weapontuba", _("^BG%s%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Klein Bottle%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_UZI_MURDER_SNIPE, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponuzi", _("^BG%s%s^K1 was sniped by ^BG%s^K1's Machine Gun%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_WEAPON_UZI_MURDER_SPRAY, 2, 1, "spree_inf s1 s2 spree_end", "s2 s1", "weaponuzi", _("^BG%s%s^K1 was riddled full of holes by ^BG%s^K1's Machine Gun%s\n"), "") #define MULTITEAM_CENTER(default,prefix,teams,strnum,flnum,args,cpid,durcnt,normal,gentle) \ MSG_CENTER_NOTIF(default, prefix##RED, strnum, flnum, args, cpid, durcnt, TCR(normal, COL_TEAM_1, strtoupper(STR_TEAM_1)), TCR(gentle, COL_TEAM_1, strtoupper(STR_TEAM_1))) \ @@ -581,6 +579,8 @@ string arg_slot[NOTIF_MAX_ARGS]; #define NOTIF_HIT_MAX(count,funcname) if(sel_num == count) { backtrace(sprintf("%s: Hit maximum arguments!\n", funcname)); break; } #define NOTIF_HIT_UNKNOWN(token,funcname) default: { backtrace(sprintf("%s: Hit unknown token in selected string! '%s'\n", funcname, selected)); break; } +#define IS_SPREE_NUM(n) ((n == 3) || (n == 5) || (n == 10) || (n == 15) || (n == 20) || (n == 25) || (n == 30)) + #define NOTIF_ARGUMENT_LIST \ ARG_CASE(ARG_TRIPLE, "s1", s1) \ ARG_CASE(ARG_TRIPLE, "s2", s2) \ @@ -595,16 +595,16 @@ string arg_slot[NOTIF_MAX_ARGS]; ARG_CASE(ARG_CSQC, "pass_key", ((((tmp_s = getcommandkey("pass", "+use")) != "pass") && !(strstrofs(tmp_s, "not bound", 0) >= 0)) ? sprintf(CCR(_(" ^F1(Press %s)")), tmp_s) : "")) \ ARG_CASE(ARG_CSQC, "frag_ping", ((f2 != NO_MSG) ? sprintf(CCR(_("\n(Ping ^2%d^BG)")), f2) : "")) \ ARG_CASE(ARG_CSQC, "frag_stats", sprintf(CCR(_("\n(Health ^1%d^BG / Armor ^2%d^BG)%s")), f1, f2, ((f3 != NO_MSG) ? sprintf(CCR(_(" (Ping ^2%d^BG)")), f3) : ""))) \ - /*ARG_CASE(ARG_CSQC, "frag_pos", ((Should_Print_Score_Pos(f1)) ? sprintf("\n^BG%s", Read_Score_Pos(f1)) : ""))*/ \ - ARG_CASE(ARG_CSQC, "spree_cen", (((f1 == 3) || (f1 == 5) || (f1 == 10) || (f1 == 15) || (f1 == 20) || (f1 == 25) || (f1 == 30)) ? sprintf(normal_or_gentle(_("%d frag spree! "), _("%d score spree! ")), f1) : "")) \ - ARG_CASE(ARG_CSQC, "spree_inf", (((f1 == 3) || (f1 == 5) || (f1 == 10) || (f1 == 15) || (f1 == 20) || (f1 == 25) || (f1 == 30)) ? sprintf(normal_or_gentle(_("%d frag spree! "), _("%d score spree! ")), f1) : "")) \ - ARG_CASE(ARG_CSQC, "spree_end", ((f1 >= 3) ? sprintf(normal_or_gentle(_(", ending their %d frag spree"), _(", ending their %d score spree")), f1) : "")) \ - ARG_CASE(ARG_CSQC, "spree_lost", ((f1 >= 3) ? sprintf(normal_or_gentle(_(", losing their %d frag spree"), _(", losing their %d score spree")), f1) : "")) \ + /*ARG_CASE(ARG_CSQC, "frag_pos", ((Should_Print_Score_Pos(f1)) ? sprintf("\n^BG%s", Read_Score_Pos(f1)) : ""))*/ \ + ARG_CASE(ARG_CSQC, "spree_cen", ((autocvar_notification_show_sprees && IS_SPREE_NUM(f1)) ? sprintf(normal_or_gentle(_("%d frag spree! "), _("%d score spree! ")), f1) : "")) \ + ARG_CASE(ARG_CSQC, "spree_inf", ((autocvar_notification_show_sprees && IS_SPREE_NUM(f1)) ? sprintf(CCR(normal_or_gentle(_("%s^BG is on a %d frag spree! "), _("%s^BG is on a %d score spree! "))), s2, f1) : "")) \ + ARG_CASE(ARG_CSQC, "spree_end", ((autocvar_notification_show_sprees && (f1 >= 3)) ? sprintf(normal_or_gentle(_(", ending their %d frag spree"), _(", ending their %d score spree")), f1) : "")) \ + ARG_CASE(ARG_CSQC, "spree_lost", ((autocvar_notification_show_sprees && (f1 >= 3)) ? sprintf(normal_or_gentle(_(", losing their %d frag spree"), _(", losing their %d score spree")), f1) : "")) \ ARG_CASE(ARG_CSQC, "death_team", Team_ColoredFullName(f1 - 1)) \ ARG_CASE(ARG_CSQC, "weapon_name", ftos(f1)) \ - ARG_CASE(ARG_SVQC, "spree_inf", (((f1 == 3) || (f1 == 5) || (f1 == 10) || (f1 == 15) || (f1 == 20) || (f1 == 25) || (f1 == 30)) ? sprintf(normal_or_gentle(_("%d frag spree! "), _("%d score spree! ")), f1) : "")) \ - ARG_CASE(ARG_SVQC, "spree_end", ((f1 >= 3) ? sprintf(normal_or_gentle(_(", ending their %d frag spree"), _(", ending their %d score spree")), f1) : "")) \ - ARG_CASE(ARG_SVQC, "spree_lost", ((f1 >= 3) ? sprintf(normal_or_gentle(_(", losing their %d frag spree"), _(", losing their %d score spree")), f1) : "")) \ + ARG_CASE(ARG_SVQC, "spree_inf", ((autocvar_notification_show_sprees && IS_SPREE_NUM(f1)) ? sprintf(CCR(normal_or_gentle(_("%s^BG is on a %d frag spree! "), _("%s^BG is on a %d score spree! "))), s2, f1) : "")) \ + ARG_CASE(ARG_SVQC, "spree_end", ((autocvar_notification_show_sprees && (f1 >= 3)) ? sprintf(normal_or_gentle(_(", ending their %d frag spree"), _(", ending their %d score spree")), f1) : "")) \ + ARG_CASE(ARG_SVQC, "spree_lost", ((autocvar_notification_show_sprees && (f1 >= 3)) ? sprintf(normal_or_gentle(_(", losing their %d frag spree"), _(", losing their %d score spree")), f1) : "")) \ ARG_CASE(ARG_SVQC, "death_team", Team_ColoredFullName(f1)) \ ARG_CASE(ARG_SVQC, "weapon_name", ftos(f1)) @@ -619,15 +619,16 @@ string arg_slot[NOTIF_MAX_ARGS]; #define NOTIF_ADD_AUTOCVAR(name,default) var float autocvar_notification_##name = default; NOTIF_ADD_AUTOCVAR(version, NOTIF_VERSION) -NOTIF_ADD_AUTOCVAR(version_mismatch_client_error, FALSE) -NOTIF_ADD_AUTOCVAR(version_mismatch_server_error, TRUE) +NOTIF_ADD_AUTOCVAR(show_sprees, TRUE) NOTIF_ADD_AUTOCVAR(errors_are_fatal, TRUE) #ifdef SVQC .float FRAG_VERBOSE; void Notification_GetCvars(void); +NOTIF_ADD_AUTOCVAR(version_mismatch_server_error, TRUE) #else NOTIF_ADD_AUTOCVAR(frag_verbose, TRUE) +NOTIF_ADD_AUTOCVAR(version_mismatch_client_error, FALSE) #endif