From 497b37952d519057cb29353977b784ca99b3c790 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Sat, 23 Feb 2013 12:53:42 -0500 Subject: [PATCH] Updates to how frag sprees are shown in info notifications --- qcsrc/common/notifications.qh | 116 +++++++++++++++++----------------- qcsrc/server/g_damage.qc | 12 ++-- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index cd4858309..e2d55ebef 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -204,30 +204,30 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, MSG_INFO_NOTIF(1, INFO_DEATH_SELF_VH_WAKI_DEATH, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 got caught in the blast of a Racer explosion%s\n"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_VH_RAPT_DEATH, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 got caught in the blast of a Raptor explosion%s\n"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_VH_BUMB_DEATH, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 got caught in the blast of a Bumblebee explosion%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 Spiderbot%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 Spiderbot%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 Spiderbot exploded%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 Racer%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 Racer%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 Racer exploded%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 Raptor%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 Raptor%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 Raptor exploded%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 saw the pretty lights of ^BG%s^K1's Bumblebee gun%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 got caught in the blast when ^BG%s^K1's Bumblebee exploded%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_TELEFRAG, 2, 2, "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, 2, "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, 2, "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, 2, "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, 2, "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, 2, "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, 2, "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, 2, "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, 2, "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, 2, "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, 2, "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, 2, "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, 2, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 got shredded by ^BG%s^K1's Spiderbot%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_SPID_ROCKET, 2, 2, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 was blasted to bits by ^BG%s^K1's Spiderbot%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_SPID_DEATH, 2, 2, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 got caught in the blast when ^BG%s^K1's Spiderbot exploded%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_WAKI_GUN, 2, 2, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 was bolted down by ^BG%s^K1's Racer%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_WAKI_ROCKET, 2, 2, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 couldn't find shelter from ^BG%s^K1's Racer%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_WAKI_DEATH, 2, 2, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 got caught in the blast when ^BG%s^K1's Racer exploded%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_RAPT_CANNON, 2, 2, "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, 2, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 was cluster bombed by ^BG%s^K1's Raptor%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_RAPT_FRAGMENT, 2, 2, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 was cluster bombed by ^BG%s^K1's Raptor%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_RAPT_DEATH, 2, 2, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 got caught in the blast when ^BG%s^K1's Raptor exploded%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_BUMB_GUN, 2, 2, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 saw the pretty lights of ^BG%s^K1's Bumblebee gun%s\n"), "") \ + MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_VH_BUMB_DEATH, 2, 2, "spree_inf s1 s2 spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 got caught in the blast when ^BG%s^K1's Bumblebee exploded%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"), "") \ @@ -267,53 +267,53 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, 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, "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_CRYLINK_MURDER, 2, 2, "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_ELECTRO_MURDER_BOLT, 2, 2, "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, 2, "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, 2, "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_FIREBALL_MURDER_FIREMINE, 2, 2, "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, 2, "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_MORTAR_MURDER_EXPLODE, 2, 2, "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, 2, "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_HAGAR_MURDER_BURST, 2, 2, "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, 2, "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_HLAC_MURDER, 2, 2, "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, 2, "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_LASER_MURDER, 2, 2, "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_MINELAYER_MURDER, 2, 2, "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, 2, "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, 2, "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, 2, "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, 2, "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, 2, "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, 2, "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, 2, "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_ROCKETLAUNCHER_MURDER_DIRECT, 2, 2, "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, 2, "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_SEEKER_MURDER_TAG, 2, 2, "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, 2, "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, 2, "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, 2, "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_TUBA_MURDER, 2, 2, "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_ACCORDEON_MURDER, 2, 2, "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"), "") + MSG_INFO_NOTIF(1, INFO_WEAPON_KLEINBOTTLE_MURDER, 2, 2, "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, 2, "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, 2, "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))) \ @@ -614,12 +614,12 @@ string arg_slot[NOTIF_MAX_ARGS]; 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", ((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_inf", ((autocvar_notification_show_sprees && IS_SPREE_NUM(f2)) ? sprintf(CCR(normal_or_gentle(_("%s^K1 is on a %d frag spree!\n^BG"), _("%s^K1 is on a %d score spree!\n^BG"))), s2, f2) : "")) \ 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", ((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_inf", ((autocvar_notification_show_sprees && IS_SPREE_NUM(f2)) ? sprintf(CCR(normal_or_gentle(_("%s^K1 is on a %d frag spree!\n^BG"), _("%s^K1 is on a %d score spree!\n^BG"))), s2, f2) : "")) \ 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)) \ diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 86d0e7c67..ad2b99044 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -342,7 +342,7 @@ void Obituary_SpecialDeath(entity notif_target, float murder, float deathtype, s } float w_deathtype; -float Obituary_WeaponDeath(entity notif_target, float murder, float deathtype, string s1, string s2, float f1) +float Obituary_WeaponDeath(entity notif_target, float murder, float deathtype, string s1, string s2, float f1, float f2) { float death_weapon = DEATH_WEAPONOF(deathtype); @@ -354,8 +354,8 @@ float Obituary_WeaponDeath(entity notif_target, float murder, float deathtype, s if(death_message) { - Send_Notification_WOVA(NOTIF_ONE, notif_target, MSG_WEAPON, death_message, s1, s2, "", "", f1, 0, 0, 0); - Send_Notification_WOVA(NOTIF_ANY_EXCEPT, notif_target, MSG_INFO, msg_weapon_notifs[death_message - 1].nent_msginfo.nent_id, s1, s2, "", "", f1, 0, 0, 0); + Send_Notification_WOVA(NOTIF_ONE, notif_target, MSG_WEAPON, death_message, s1, s2, "", "", f1, f2, 0, 0); + Send_Notification_WOVA(NOTIF_ANY_EXCEPT, notif_target, MSG_INFO, msg_weapon_notifs[death_message - 1].nent_msginfo.nent_id, s1, s2, "", "", f1, f2, 0, 0); //print(Get_Field_Value(F_INFVAL, MSG_WEAPON, death_message), "\n"); } else { dprint(sprintf("Obituary_WeaponDeath(): ^1Deathtype ^7(%s-%d)^1 has no notification for weapon %d!\n", Deathtype_Name(deathtype), deathtype, death_weapon)); } @@ -415,7 +415,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) Obituary_SpecialDeath(targ, FALSE, deathtype, s1, s2, f1, f2, 0); } - else if not(Obituary_WeaponDeath(targ, FALSE, deathtype, targ.netname, "", targ.killcount)) + else if not(Obituary_WeaponDeath(targ, FALSE, deathtype, targ.netname, "", targ.killcount, 0)) { backtrace("SUICIDE: what the hell happened here?\n"); } @@ -535,8 +535,8 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) } //print("targ_killcount = ", ftos(targ.killcount), ", attacker_killcount = ", ftos(attacker.killcount), ".\n"); - if not(Obituary_WeaponDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, targ.killcount)) - Obituary_SpecialDeath(targ, TRUE, deathtype, s2, s1, targ.killcount, 0, 0); + if not(Obituary_WeaponDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, targ.killcount, attacker.killcount)) + Obituary_SpecialDeath(targ, TRUE, deathtype, s2, s1, targ.killcount, attacker.killcount, 0); } } -- 2.39.2