From f68329e13a1edf9047072ffc5f8e655d2949bb21 Mon Sep 17 00:00:00 2001
From: Samual Lenks <samual@xonotic.org>
Date: Sat, 23 Feb 2013 17:26:38 -0500
Subject: [PATCH] All suicides/self deaths/accidents should be spree_lost
---
qcsrc/common/notifications.qh | 104 +++++++++++++++++-----------------
1 file changed, 52 insertions(+), 52 deletions(-)
diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index b4dd6fc851..8f39a6cff4 100644
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -166,43 +166,43 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration,
MULTITEAM_INFO(1, INFO_CTF_CAPTURE_BROKEN_, 2, 2, 2, "s1 f1p2dec s2 f2p2dec", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F1%s^BG seconds, breaking ^BG%s^BG's previous record of ^F2%s^BG seconds\n"), "") \
MULTITEAM_INFO(1, INFO_CTF_CAPTURE_UNBROKEN_, 2, 2, 2, "s1 f1p2dec s2 f2p2dec", "s1", "notify_%s_captured", _("^BG%s^BG captured the ^TC^TT^BG flag in ^F2%s^BG seconds, failing to break ^BG%s^BG's previous record of ^F1%s^BG seconds\n"), "") \
MULTITEAM_INFO(1, INFO_DEATH_TEAMKILL_, 4, 2, 1, "s1 s2 spree_end", "s2 s1", "notify_teamkill_%s", _("^BG%s^K1 was betrayed by ^BG%s^K1%s\n"), "") \
- MSG_INFO_NOTIF(1, INFO_DEATH_SELF_CUSTOM, 2, 1, "s1 s2 spree_end", "s1", "notify_void", _("^BG%s^K1 %s^K1%s\n"), "") \
- 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"), _("^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_CUSTOM, 2, 1, "s1 s2 spree_lost", "s1", "notify_void", _("^BG%s^K1 %s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_GENERIC, 1, 1, "s1 spree_lost", "s1", "notify_selfkill", _("^BG%s^K1 died%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_VOID, 1, 1, "s1 spree_lost", "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_lost", "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_lost", "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_lost", "s1", "notify_death", _("^BG%s^K1 rotted away%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_CAMP, 1, 1, "s1 spree_lost", "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_lost", "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"), _("^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"), "") \
- MSG_INFO_NOTIF(1, INFO_DEATH_SELF_CHEAT, 1, 1, "s1 spree_end", "s1", "notify_selfkill", _("^BG%s^K1 unfairly eliminated themself%s\n"), "") \
- MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TOUCHEXPLODE, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 died in an accident%s\n"), "") \
- MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 ran into a turret%s\n"), "") \
- MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_EWHEEL, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was blasted away by an eWheel turret%s\n"), "") \
- MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_FLAC, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 got caught up in the FLAC turret fire%s\n"), "") \
- MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_MACHINEGUN, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was riddled full of holes by a Machinegun turret%s\n"), "") \
- MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_WALK_GUN, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 got served a lead enrichment by a Walker turret%s\n"), "") \
- MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_WALK_MEELE, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was impaled by a Walker turret%s\n"), "") \
- MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_WALK_ROCKET, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was blasted away by a Walker turret%s\n"), "") \
- MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_HELLION, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was blasted away by a Hellion turret%s\n"), "") \
- MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_HK, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 could not hide from the Hunter turret%s\n"), "") \
- 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_SELF_VH_CRUSH, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 was crushed by a vehicle%s\n"), "") \
- MSG_INFO_NOTIF(1, INFO_DEATH_SELF_VH_SPID_DEATH, 1, 1, "s1 spree_end", "s1", "notify_death", _("^BG%s^K1 got caught in the blast of a Spiderbot explosion%s\n"), "") \
- 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_SELF_FALL, 1, 1, "s1 spree_lost", "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_lost", "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_lost", "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_lost", "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_lost", "s1", "notify_slime", _("^BG%s^K1 was slimed%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_SHOOTING_STAR, 1, 1, "s1 spree_lost", "s1", "notify_shootingstar", _("^BG%s^K1 became a shooting star%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_SWAMP, 1, 1, "s1 spree_lost", "s1", "notify_slime", _("^BG%s^K1 is now preserved for centuries to come%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_CHEAT, 1, 1, "s1 spree_lost", "s1", "notify_selfkill", _("^BG%s^K1 unfairly eliminated themself%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TOUCHEXPLODE, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 died in an accident%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 ran into a turret%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_EWHEEL, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 was blasted away by an eWheel turret%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_FLAC, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 got caught up in the FLAC turret fire%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_MACHINEGUN, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 was riddled full of holes by a Machinegun turret%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_WALK_GUN, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 got served a lead enrichment by a Walker turret%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_WALK_MEELE, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 was impaled by a Walker turret%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_WALK_ROCKET, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 was blasted away by a Walker turret%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_HELLION, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 was blasted away by a Hellion turret%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_HK, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 could not hide from the Hunter turret%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_MLRS, 1, 1, "s1 spree_lost", "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_lost", "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_lost", "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_lost", "s1", "notify_death", _("^BG%s^K1 was electrocuted by a Tesla turret%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_VH_CRUSH, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 was crushed by a vehicle%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_VH_SPID_DEATH, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 got caught in the blast of a Spiderbot explosion%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_VH_WAKI_DEATH, 1, 1, "s1 spree_lost", "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_lost", "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_lost", "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, 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"), "") \
@@ -264,31 +264,31 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration,
MSG_INFO_NOTIF(2, INFO_VERSION_OLD, 2, 0, "s1 s2", "", "", _("^F4NOTE: ^BGThe server is running ^F1Xonotic %s^BG, you have ^F2Xonotic %s\n"), "") \
MSG_INFO_NOTIF(2, INFO_VERSION_OUTDATED, 2, 0, "s1 s2", "", "", _("^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_THINKING_WITH_PORTALS, 1, 1, "s1 spree_lost", "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_lost", "s1", "weaponcrylink", _("^BG%s^K1 felt the strong pull of their 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_SUICIDE_ORBS, 1, 1, "s1 spree_lost", "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_lost", "s1", "weaponelectro", _("^BG%s^K1 played with Electro plasma%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_SUICIDE_FIREMINE, 1, 1, "s1 spree_lost", "s1", "weaponfireball", _("^BG%s^K1 forgot about their firemine%s\n"), "") \
+ MSG_INFO_NOTIF(1, INFO_WEAPON_FIREBALL_SUICIDE_BLAST, 1, 1, "s1 spree_lost", "s1", "weaponfireball", _("^BG%s^K1 should have used a smaller gun%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_SUICIDE_EXPLODE, 1, 1, "s1 spree_lost", "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_lost", "s1", "weapongrenadelauncher", _("^BG%s^K1 didn't see their own 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_SUICIDE, 1, 1, "s1 spree_lost", "s1", "weaponhagar", _("^BG%s^K1 played with tiny 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_SUICIDE, 1, 1, "s1 spree_lost", "s1", "weaponhlac", _("^BG%s^K1 got a little jumpy with their HLAC%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_SUICIDE, 1, 1, "s1 spree_lost", "s1", "weaponlaser", _("^BG%s^K1 shot themself to hell with their 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_SUICIDE, 1, 1, "s1 spree_lost", "s1", "weaponminelayer", _("^BG%s^K1 forgot about their mine%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"), "") \
@@ -297,19 +297,19 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration,
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_SUICIDE, 1, 1, "s1 spree_lost", "s1", "weaponrocketlauncher", _("^BG%s^K1 blew themself up with their Rocketlauncher%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_SUICIDE, 1, 1, "s1 spree_lost", "s1", "weaponseeker", _("^BG%s^K1 played with tiny Seeker rockets%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_SUICIDE, 1, 1, "s1 spree_lost", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with 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_SUICIDE, 1, 1, "s1 spree_lost", "s1", "weapontuba", _("^BG%s^K1 hurt their own ears with 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_SUICIDE, 1, 1, "s1 spree_lost", "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, 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"), "")
--
2.39.5