From 6a4b842ff663b1d812d5b476287b1a9d08d34bd7 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Mon, 4 Feb 2013 14:16:38 -0500 Subject: [PATCH] HUD notify messages should always be ATTACKER -> VICTIM --- qcsrc/common/notifications.qh | 88 +++++++++++++++++------------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index 692198784a..37e8396179 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -239,7 +239,7 @@ void Send_CSQC_Centerprint_Generic_Expire(entity e, float id); MULTITEAM_INFO(INFO_CTF_CAPTURE_TIME_, 2, 1, 1, XPD(s1, f1/100), XPD(s1, ""), "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F1%.2f^BG seconds\n"), "") \ MULTITEAM_INFO(INFO_CTF_CAPTURE_BROKEN_, 2, 2, 2, XPD(s1, f1/100, s2, f2/100), XPD(s1, ""), "notify_%s_captured", _("^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, XPD(s1, f1/100, s2, f2/100), XPD(s1, ""), "notify_%s_captured", _("^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"), "") \ - MULTITEAM_INFO(INFO_DEATH_TEAMKILL_, 4, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "notify_teamkill_%s", _("^BG%s^K1 was betrayed by ^BG%s^K1%s\n"), "") \ + MULTITEAM_INFO(INFO_DEATH_TEAMKILL_, 4, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_teamkill_%s", _("^BG%s^K1 was betrayed by ^BG%s^K1%s\n"), "") \ MSG_INFO_NOTIF(INFO_DEATH_FIRSTBLOOD, 2, 0, s2, XPD("", ""), "", _("^BG%s^K1 drew first blood\n"), _("^F1%s^K1 got the first score\n")) \ MSG_INFO_NOTIF(INFO_DEATH_SELF_CUSTOM, 2, 1, XPD(s1, s2, SPREE_LOST), XPD(s1, ""), "notify_void", _("^BG%s^K1 %s^K1%s\n"), "") \ MSG_INFO_NOTIF(INFO_DEATH_SELF_GENERIC, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "notify_selfkill", _("^BG%s^K1 died%s\n"), "") \ @@ -260,17 +260,17 @@ void Send_CSQC_Centerprint_Generic_Expire(entity e, float id); MSG_INFO_NOTIF(INFO_DEATH_SELF_SWAMP, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "notify_slime", _("^BG%s^K1 is now preserved for centuries to come%s\n"), "") \ MSG_INFO_NOTIF(INFO_DEATH_SELF_CHEAT, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "notify_selfkill", _("^BG%s^K1 unfairly eliminated themself%s\n"), "") \ MSG_INFO_NOTIF(INFO_DEATH_SELF_TOUCHEXPLODE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "notify_death", _("^BG%s^K1 died in an accident%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_TELEFRAG, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "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(INFO_DEATH_MURDER_FALL, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "notify_fall", _("^BG%s^K1 was grounded by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_DROWN, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "notify_water", _("^BG%s^K1 was drowned by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_LAVA, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "notify_lava", _("^BG%s^K1 was cooked by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_SLIME, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "notify_slime", _("^BG%s^K1 was slimed by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_SHOOTING_STAR, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "notify_shootingstar", _("^BG%s^K1 was shot into space by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_SWAMP, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "notify_slime", _("^BG%s^K1 was preserved by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_VOID, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "notify_void", _("^BG%s^K1 was thrown into a world of hurt by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_TOUCHEXPLODE, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "notify_death", _("^BG%s^K1 died in an accident with ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_CHEAT, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "notify_death", _("^BG%s^K1 was unfairly eliminated by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_MURDER_FIRE, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "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(INFO_DEATH_MURDER_TELEFRAG, 2, 1, XPD(s1, s2, SPREE_END), XPD(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(INFO_DEATH_MURDER_FALL, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_fall", _("^BG%s^K1 was grounded by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_DROWN, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_water", _("^BG%s^K1 was drowned by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_LAVA, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_lava", _("^BG%s^K1 was cooked by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_SLIME, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_slime", _("^BG%s^K1 was slimed by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_SHOOTING_STAR, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_shootingstar", _("^BG%s^K1 was shot into space by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_SWAMP, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_slime", _("^BG%s^K1 was preserved by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_VOID, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_void", _("^BG%s^K1 was thrown into a world of hurt by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_TOUCHEXPLODE, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 died in an accident with ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_CHEAT, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 was unfairly eliminated by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_MURDER_FIRE, 2, 1, XPD(s1, s2, SPREE_END), XPD(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")) \ MULTITEAM_INFO(INFO_FREEZETAG_ROUND_WIN_, 4, 0, 0, NO_STR_ARG, XPD("", ""), "", _("^TC^TT^BG team wins the round, all other teams were frozen\n"), "") \ MSG_INFO_NOTIF(INFO_FREEZETAG_REVIVE, 2, 0, XPD(s1, s2), XPD("", ""), "", _("^BG%s^K3 was revived by ^BG%s\n"), "") \ MSG_INFO_NOTIF(INFO_FREEZETAG_FREEZE, 2, 0, XPD(s1, s2), XPD("", ""), "", _("^BG%s^K1 was frozen by ^BG%s\n"), "") \ @@ -284,53 +284,53 @@ void Send_CSQC_Centerprint_Generic_Expire(entity e, float id); MULTITEAM_INFO(INFO_SCORES_, 4, 0, 0, NO_STR_ARG, XPD("", ""), "", _("^TC^TT ^BGteam scores!\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_THINKING_WITH_PORTALS, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "notify_selfkill", _("^BG%s^K1 is now thinking with portals%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_CRYLINK_SUICIDE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weaponcrylink", _("^BG%s^K1 felt the strong pull of their Crylink%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_CRYLINK_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponcrylink", _("^BG%s^K1 felt the strong pull of ^BG%s^K1's Crylink%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_CRYLINK_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponcrylink", _("^BG%s^K1 felt the strong pull of ^BG%s^K1's Crylink%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_SUICIDE_ORBS, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weaponelectro", _("^BG%s^K1 could not remember where they put their Electro plasma%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_SUICIDE_BOLT, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weaponelectro", _("^BG%s^K1 played with Electro plasma%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_BOLT, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponelectro", _("^BG%s^K1 was blasted by ^BG%s^K1's Electro bolt%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_ORBS, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponelectro", _("^BG%s^K1 got too close to ^BG%s^K1's Electro plasma%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_COMBO, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponelectro", _("^BG%s^K1 felt the electrifying air of ^BG%s^K1's Electro combo%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_BOLT, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponelectro", _("^BG%s^K1 was blasted by ^BG%s^K1's Electro bolt%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_ORBS, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponelectro", _("^BG%s^K1 got too close to ^BG%s^K1's Electro plasma%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ELECTRO_MURDER_COMBO, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponelectro", _("^BG%s^K1 felt the electrifying air of ^BG%s^K1's Electro combo%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_SUICIDE_FIREMINE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weaponfireball", _("^BG%s^K1 forgot about their firemine%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_SUICIDE_BLAST, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weaponfireball", _("^BG%s^K1 should have used a smaller gun%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_MURDER_FIREMINE, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponfireball", _("^BG%s^K1 got burnt by ^BG%s^K1's firemine%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_MURDER_BLAST, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponfireball", _("^BG%s^K1 got too close to ^BG%s^K1's fireball%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_MURDER_FIREMINE, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponfireball", _("^BG%s^K1 got burnt by ^BG%s^K1's firemine%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_FIREBALL_MURDER_BLAST, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponfireball", _("^BG%s^K1 got too close to ^BG%s^K1's fireball%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_SUICIDE_EXPLODE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weapongrenadelauncher", _("^BG%s^K1 blew themself up with their own Mortar%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_SUICIDE_BOUNCE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weapongrenadelauncher", _("^BG%s^K1 didn't see their own Mortar grenade%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_MURDER_EXPLODE, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weapongrenadelauncher", _("^BG%s^K1 ate ^BG%s^K1's Mortar grenade%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_MURDER_BOUNCE, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weapongrenadelauncher", _("^BG%s^K1 got too close to ^BG%s^K1's Mortar grenade%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_MURDER_EXPLODE, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weapongrenadelauncher", _("^BG%s^K1 ate ^BG%s^K1's Mortar grenade%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_MORTAR_MURDER_BOUNCE, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weapongrenadelauncher", _("^BG%s^K1 got too close to ^BG%s^K1's Mortar grenade%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_SUICIDE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weaponhagar", _("^BG%s^K1 played with tiny Hagar rockets%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_MURDER_BURST, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponhagar", _("^BG%s^K1 was pummeled by a burst of ^BG%s^K1's Hagar rockets%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_MURDER_SPRAY, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponhagar", _("^BG%s^K1 was pummeled by ^BG%s^K1's Hagar rockets%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_MURDER_BURST, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponhagar", _("^BG%s^K1 was pummeled by a burst of ^BG%s^K1's Hagar rockets%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_HAGAR_MURDER_SPRAY, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponhagar", _("^BG%s^K1 was pummeled by ^BG%s^K1's Hagar rockets%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_HLAC_SUICIDE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weaponhlac", _("^BG%s^K1 got a little jumpy with their HLAC%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_HLAC_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponhlac", _("^BG%s^K1 was cut down with ^BG%s^K1's HLAC%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_HOOK_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponhook", _("^BG%s^K1 was caught in ^BG%s^K1's Hook gravity bomb%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_HLAC_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponhlac", _("^BG%s^K1 was cut down with ^BG%s^K1's HLAC%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_HOOK_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponhook", _("^BG%s^K1 was caught in ^BG%s^K1's Hook gravity bomb%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_LASER_SUICIDE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weaponlaser", _("^BG%s^K1 shot themself to hell with their Laser%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_LASER_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponlaser", _("^BG%s^K1 was shot to death by ^BG%s^K1's Laser%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_LASER_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponlaser", _("^BG%s^K1 was shot to death by ^BG%s^K1's Laser%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_MINELAYER_SUICIDE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weaponminelayer", _("^BG%s^K1 forgot about their mine%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_MINELAYER_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponminelayer", _("^BG%s^K1 got too close to ^BG%s^K1's mine%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_MINSTANEX_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponminstanex", _("^BG%s^K1 has been vaporized by ^BG%s^K1's Minstanex%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_NEX_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponnex", _("^BG%s^K1 has been vaporized by ^BG%s^K1's Nex%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HAIL_PIERCING, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponrifle", _("^BG%s^K1 failed to hide from ^BG%s^K1's Rifle bullet hail%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HAIL, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponrifle", _("^BG%s^K1 died in ^BG%s^K1's Rifle bullet hail%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_PIERCING, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponrifle", _("^BG%s^K1 failed to hide from ^BG%s^K1's Rifle%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponrifle", _("^BG%s^K1 was sniped with a Rifle by ^BG%s^K1%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HEADSHOT, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "notify_headshot", _("^BG%s^K1 was shot in the head with a Rifle by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_MINELAYER_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponminelayer", _("^BG%s^K1 got too close to ^BG%s^K1's mine%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_MINSTANEX_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponminstanex", _("^BG%s^K1 has been vaporized by ^BG%s^K1's Minstanex%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_NEX_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponnex", _("^BG%s^K1 has been vaporized by ^BG%s^K1's Nex%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HAIL_PIERCING, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponrifle", _("^BG%s^K1 failed to hide from ^BG%s^K1's Rifle bullet hail%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HAIL, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponrifle", _("^BG%s^K1 died in ^BG%s^K1's Rifle bullet hail%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_PIERCING, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponrifle", _("^BG%s^K1 failed to hide from ^BG%s^K1's Rifle%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponrifle", _("^BG%s^K1 was sniped with a Rifle by ^BG%s^K1%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_RIFLE_MURDER_HEADSHOT, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_headshot", _("^BG%s^K1 was shot in the head with a Rifle by ^BG%s^K1%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_SUICIDE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weaponrocketlauncher", _("^BG%s^K1 blew themself up with their Rocketlauncher%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_MURDER_DIRECT, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponrocketlauncher", _("^BG%s^K1 ate ^BG%s^K1's rocket%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_MURDER_SPLASH, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponrocketlauncher", _("^BG%s^K1 got too close ^BG%s^K1's rocket%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_MURDER_DIRECT, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponrocketlauncher", _("^BG%s^K1 ate ^BG%s^K1's rocket%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ROCKETLAUNCHER_MURDER_SPLASH, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponrocketlauncher", _("^BG%s^K1 got too close ^BG%s^K1's rocket%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_SUICIDE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weaponseeker", _("^BG%s^K1 played with tiny Seeker rockets%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_MURDER_TAG, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponseeker", _("^BG%s^K1 was tagged by ^BG%s^K1's Seeker%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_MURDER_SPRAY, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponseeker", _("^BG%s^K1 was pummeled by ^BG%s^K1's Seeker rockets%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_SHOTGUN_MURDER_SLAP, 2, 1, XPD(s2, s1, SPREE_END), XPD(s1, s2), "notify_melee_shotgun", _("^BG%s^K1 slapped ^BG%s^K1 around a bit with a large Shotgun%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_SHOTGUN_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponshotgun", _("^BG%s^K1 was gunned down by ^BG%s^K1's Shotgun%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_MURDER_TAG, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponseeker", _("^BG%s^K1 was tagged by ^BG%s^K1's Seeker%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_SEEKER_MURDER_SPRAY, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponseeker", _("^BG%s^K1 was pummeled by ^BG%s^K1's Seeker rockets%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_SHOTGUN_MURDER_SLAP, 2, 1, XPD(s2, s1, SPREE_END), XPD(s2, s1), "notify_melee_shotgun", _("^BG%s^K1 slapped ^BG%s^K1 around a bit with a large Shotgun%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_SHOTGUN_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponshotgun", _("^BG%s^K1 was gunned down by ^BG%s^K1's Shotgun%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_TUBA_SUICIDE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Tuba%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_TUBA_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Tuba%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_TUBA_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Tuba%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_ACCORDEON_SUICIDE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Accordeon%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_ACCORDEON_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Accordeon%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_ACCORDEON_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Accordeon%s\n"), "") \ MSG_INFO_NOTIF(INFO_WEAPON_KLEINBOTTLE_SUICIDE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weapontuba", _("^BG%s^K1 hurt their own ears with the @!#%%'n Klein Bottle%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_KLEINBOTTLE_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Klein Bottle%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_UZI_MURDER_SNIPE, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponuzi", _("^BG%s^K1 was sniped by ^BG%s^K1's Machine Gun%s\n"), "") \ - MSG_INFO_NOTIF(INFO_WEAPON_UZI_MURDER_SPRAY, 2, 1, XPD(s1, s2, SPREE_END), XPD(s1, s2), "weaponuzi", _("^BG%s^K1 was riddled full of holes by ^BG%s^K1's Machine Gun%s\n"), "") + MSG_INFO_NOTIF(INFO_WEAPON_KLEINBOTTLE_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weapontuba", _("^BG%s^K1 died of ^BG%s^K1's great playing on the @!#%%'n Klein Bottle%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_UZI_MURDER_SNIPE, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponuzi", _("^BG%s^K1 was sniped by ^BG%s^K1's Machine Gun%s\n"), "") \ + MSG_INFO_NOTIF(INFO_WEAPON_UZI_MURDER_SPRAY, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponuzi", _("^BG%s^K1 was riddled full of holes by ^BG%s^K1's Machine Gun%s\n"), "") #define MULTITEAM_CENTER(prefix,teams,strnum,flnum,args,cpid,durcnt,normal,gentle) \ MSG_CENTER_NOTIF(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))) \ -- 2.39.2