From: Samual Lenks Date: Sat, 23 Feb 2013 22:58:55 +0000 (-0500) Subject: Finish vehicle notifications (REALLY this time) X-Git-Tag: xonotic-v0.7.0~62^2~23^2~149 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=def42ae99b16eea8a680f908f020c182c765e1f2;p=xonotic%2Fxonotic-data.pk3dir.git Finish vehicle notifications (REALLY this time) --- diff --git a/qcsrc/common/deathtypes.qh b/qcsrc/common/deathtypes.qh index ce3c690af..2549858d2 100644 --- a/qcsrc/common/deathtypes.qh +++ b/qcsrc/common/deathtypes.qh @@ -38,14 +38,14 @@ float DT_COUNT; DEATHTYPE(DEATH_FIRE, DEATH_SELF_FIRE, DEATH_MURDER_FIRE, NORMAL_POS) \ DEATHTYPE(DEATH_VH_CRUSH, DEATH_SELF_VH_CRUSH, DEATH_MURDER_VH_CRUSH, DEATH_VHFIRST) \ DEATHTYPE(DEATH_VH_SPID_MINIGUN, NO_MSG, DEATH_MURDER_VH_SPID_MINIGUN, NORMAL_POS) \ - DEATHTYPE(DEATH_VH_SPID_ROCKET, NO_MSG, DEATH_MURDER_VH_SPID_ROCKET, NORMAL_POS) \ + DEATHTYPE(DEATH_VH_SPID_ROCKET, DEATH_SELF_VH_SPID_ROCKET, DEATH_MURDER_VH_SPID_ROCKET, NORMAL_POS) \ DEATHTYPE(DEATH_VH_SPID_DEATH, DEATH_SELF_VH_SPID_DEATH, DEATH_MURDER_VH_SPID_DEATH, NORMAL_POS) \ DEATHTYPE(DEATH_VH_WAKI_GUN, NO_MSG, DEATH_MURDER_VH_WAKI_GUN, NORMAL_POS) \ - DEATHTYPE(DEATH_VH_WAKI_ROCKET, NO_MSG, DEATH_MURDER_VH_WAKI_ROCKET, NORMAL_POS) \ + DEATHTYPE(DEATH_VH_WAKI_ROCKET, DEATH_SELF_VH_WAKI_ROCKET, DEATH_MURDER_VH_WAKI_ROCKET, NORMAL_POS) \ DEATHTYPE(DEATH_VH_WAKI_DEATH, DEATH_SELF_VH_WAKI_DEATH, DEATH_MURDER_VH_WAKI_DEATH, NORMAL_POS) \ DEATHTYPE(DEATH_VH_RAPT_CANNON, NO_MSG, DEATH_MURDER_VH_RAPT_CANNON, NORMAL_POS) \ - DEATHTYPE(DEATH_VH_RAPT_BOMB, NO_MSG, DEATH_MURDER_VH_RAPT_BOMB, NORMAL_POS) \ - DEATHTYPE(DEATH_VH_RAPT_FRAGMENT, NO_MSG, DEATH_MURDER_VH_RAPT_FRAGMENT, NORMAL_POS) \ + DEATHTYPE(DEATH_VH_RAPT_BOMB, DEATH_SELF_VH_RAPT_BOMB, DEATH_MURDER_VH_RAPT_BOMB, NORMAL_POS) \ + DEATHTYPE(DEATH_VH_RAPT_FRAGMENT, DEATH_SELF_VH_RAPT_BOMB, DEATH_MURDER_VH_RAPT_BOMB, NORMAL_POS) \ DEATHTYPE(DEATH_VH_RAPT_DEATH, DEATH_SELF_VH_RAPT_DEATH, DEATH_MURDER_VH_RAPT_DEATH, NORMAL_POS) \ DEATHTYPE(DEATH_VH_BUMB_GUN, NO_MSG, DEATH_MURDER_VH_BUMB_GUN, NORMAL_POS) \ DEATHTYPE(DEATH_VH_BUMB_DEATH, DEATH_SELF_VH_BUMB_DEATH, DEATH_MURDER_VH_BUMB_DEATH, DEATH_VHLAST) \ diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index 3314807e6..9927ef26c 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -193,8 +193,11 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, 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_ROCKET, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 was blasted to bits by a Spiderbot rocket%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_ROCKET, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 couldn't find shelter from a Racer rocket%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_BOMB, 1, 1, "s1 spree_lost", "s1", "notify_death", _("^BG%s^K1 was caught in a Raptor cluster bomb%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")) \ @@ -361,8 +364,11 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_TURRET_EWHEEL, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You were fragged by an eWheel turret!"), _("^K1You had an unfortunate run in with an eWheel turret!")) \ MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_TURRET_WALK, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You were fragged by a Walker turret!"), _("^K1You had an unfortunate run in with a Walker turret!")) \ MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_VH_CRUSH, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You were crushed by a vehicle!"), "") \ + MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_VH_SPID_ROCKET, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You was blasted to bits by a Spiderbot rocket!"), "") \ MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_VH_SPID_DEATH, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You got caught in the blast of a Spiderbot explosion!"), "") \ + MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_VH_WAKI_ROCKET, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You couldn't find shelter from a Racer rocket!"), "") \ MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_VH_WAKI_DEATH, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You got caught in the blast of a Racer explosion!"), "") \ + MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_VH_RAPT_BOMB, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You was caught in a Raptor cluster bomb!"), "") \ MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_VH_RAPT_DEATH, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You got caught in the blast of a Raptor explosion!"), "") \ MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_VH_BUMB_DEATH, 0, 0, "", NO_CPID, XPD(0, 0), _("^K1You got caught in the blast of a Bumblebee explosion!"), "") \ MSG_CENTER_NOTIF(1, CENTER_DEATH_MURDER_FRAG, 1, 1, "spree_cen s1", NO_CPID, XPD(0, 0), _("^K3%sYou fragged ^BG%s"), _("^K3%sYou scored against ^BG%s")) \ @@ -485,8 +491,11 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, MSG_DEATH_NOTIF(1, DEATH_SELF_TURRET_PHASER, INFO_DEATH_SELF_TURRET_PHASER, CENTER_DEATH_SELF_TURRET) \ MSG_DEATH_NOTIF(1, DEATH_SELF_TURRET_TESLA, INFO_DEATH_SELF_TURRET_TESLA, CENTER_DEATH_SELF_TURRET) \ MSG_DEATH_NOTIF(1, DEATH_SELF_VH_CRUSH, INFO_DEATH_SELF_VH_CRUSH, CENTER_DEATH_SELF_VH_CRUSH) \ + MSG_DEATH_NOTIF(1, DEATH_SELF_VH_SPID_ROCKET, INFO_DEATH_SELF_VH_SPID_ROCKET, CENTER_DEATH_SELF_VH_SPID_ROCKET) \ MSG_DEATH_NOTIF(1, DEATH_SELF_VH_SPID_DEATH, INFO_DEATH_SELF_VH_SPID_DEATH, CENTER_DEATH_SELF_VH_SPID_DEATH) \ + MSG_DEATH_NOTIF(1, DEATH_SELF_VH_WAKI_ROCKET, INFO_DEATH_SELF_VH_WAKI_ROCKET, CENTER_DEATH_SELF_VH_WAKI_ROCKET) \ MSG_DEATH_NOTIF(1, DEATH_SELF_VH_WAKI_DEATH, INFO_DEATH_SELF_VH_WAKI_DEATH, CENTER_DEATH_SELF_VH_WAKI_DEATH) \ + MSG_DEATH_NOTIF(1, DEATH_SELF_VH_RAPT_BOMB, INFO_DEATH_SELF_VH_RAPT_BOMB, CENTER_DEATH_SELF_VH_RAPT_BOMB) \ MSG_DEATH_NOTIF(1, DEATH_SELF_VH_RAPT_DEATH, INFO_DEATH_SELF_VH_RAPT_DEATH, CENTER_DEATH_SELF_VH_RAPT_DEATH) \ MSG_DEATH_NOTIF(1, DEATH_SELF_VH_BUMB_DEATH, INFO_DEATH_SELF_VH_BUMB_DEATH, CENTER_DEATH_SELF_VH_BUMB_DEATH) \ MSG_DEATH_NOTIF(1, DEATH_MURDER_TELEFRAG, INFO_DEATH_MURDER_TELEFRAG, NO_MSG) \ @@ -509,7 +518,6 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, MSG_DEATH_NOTIF(1, DEATH_MURDER_VH_WAKI_DEATH, INFO_DEATH_MURDER_VH_WAKI_DEATH, NO_MSG) \ MSG_DEATH_NOTIF(1, DEATH_MURDER_VH_RAPT_CANNON, INFO_DEATH_MURDER_VH_RAPT_CANNON, NO_MSG) \ MSG_DEATH_NOTIF(1, DEATH_MURDER_VH_RAPT_BOMB, INFO_DEATH_MURDER_VH_RAPT_BOMB, NO_MSG) \ - MSG_DEATH_NOTIF(1, DEATH_MURDER_VH_RAPT_FRAGMENT, INFO_DEATH_MURDER_VH_RAPT_FRAGMENT, NO_MSG) \ MSG_DEATH_NOTIF(1, DEATH_MURDER_VH_RAPT_DEATH, INFO_DEATH_MURDER_VH_RAPT_DEATH, NO_MSG) \ MSG_DEATH_NOTIF(1, DEATH_MURDER_VH_BUMB_GUN, INFO_DEATH_MURDER_VH_BUMB_GUN, NO_MSG) \ MSG_DEATH_NOTIF(1, DEATH_MURDER_VH_BUMB_DEATH, INFO_DEATH_MURDER_VH_BUMB_DEATH, NO_MSG)