From: Samual Lenks Date: Mon, 26 Nov 2012 05:59:06 +0000 (-0500) Subject: Make a separate "MSG_DEATH" notification category, cleans up stuff a bit X-Git-Tag: xonotic-v0.7.0~62^2~23^2~372 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=f5503021a9924d88ba6e446ed64374796b54117d;p=xonotic%2Fxonotic-data.pk3dir.git Make a separate "MSG_DEATH" notification category, cleans up stuff a bit --- diff --git a/qcsrc/common/deathtypes.qh b/qcsrc/common/deathtypes.qh index c4a3ba59f..f8ef560b5 100644 --- a/qcsrc/common/deathtypes.qh +++ b/qcsrc/common/deathtypes.qh @@ -6,7 +6,7 @@ float DT_COUNT; #define DT_MATCH(a,b) if(min(DT_MAX, a) == b) -#define DEATHTYPE(name,msg_info,msg_center,msg_info_by,msg_center_by,position) \ +#define DEATHTYPE(name,msg_death_by,msg_death,position) \ float name; \ float position; \ void RegisterDeathtype_##name() \ @@ -18,55 +18,55 @@ float DT_COUNT; ACCUMULATE_FUNCTION(RegisterDeathtypes, RegisterDeathtype_##name) #define DEATHTYPES \ - DEATHTYPE(DEATH_FALL, FALSE, CENTER_DEATH_FALL, FALSE, FALSE, DEATH_SPECIAL_START) \ - DEATHTYPE(DEATH_TELEFRAG, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_DROWN, FALSE, CENTER_DEATH_DROWN, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_HURTTRIGGER, FALSE, CENTER_DEATH_CUSTOM, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_LAVA, FALSE, CENTER_DEATH_LAVA, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_SLIME, FALSE, CENTER_DEATH_SLIME, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_KILL, FALSE, CENTER_DEATH_SUICIDE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_NOAMMO, FALSE, CENTER_DEATH_NOAMMO, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_SWAMP, FALSE, CENTER_DEATH_SWAMP, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TEAMCHANGE, FALSE, CENTER_DEATH_TEAMCHANGE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_AUTOTEAMCHANGE, FALSE, CENTER_DEATH_AUTOTEAMCHANGE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_CAMP, FALSE, CENTER_DEATH_CAMP, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_SHOOTING_STAR, FALSE, CENTER_DEATH_SHOOTING_STAR, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_ROT, FALSE, CENTER_DEATH_ROT, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_MIRRORDAMAGE, FALSE, CENTER_DEATH_BETRAYAL, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TOUCHEXPLODE, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_CHEAT, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_FIRE, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_VHCRUSH, FALSE, FALSE, FALSE, FALSE, DEATH_VHFIRST) \ - DEATHTYPE(DEATH_SBMINIGUN, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_SBROCKET, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_SBBLOWUP, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_WAKIGUN, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_WAKIROCKET, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_WAKIBLOWUP, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_RAPTOR_CANNON, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_RAPTOR_BOMB, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_RAPTOR_BOMB_SPLIT, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_RAPTOR_DEATH, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_BUMB_GUN, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_BUMB_RAY, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_BUMB_RAY_HEAL, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_BUMB_DEATH, FALSE, FALSE, FALSE, FALSE, DEATH_VHLAST) \ - DEATHTYPE(DEATH_TURRET, FALSE, FALSE, FALSE, FALSE, DEATH_TURRET_FIRST) \ - DEATHTYPE(DEATH_TURRET_EWHEEL, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_FLAC, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_MACHINEGUN, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_WALKER_GUN, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_WALKER_MEELE, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_WALKER_ROCKET, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_HELLION, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_HK, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_MLRS, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_PLASMA, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_PHASER, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_TESLA, FALSE, FALSE, FALSE, FALSE, DEATH_TURRET_LAST) \ - DEATHTYPE(DEATH_GENERIC, FALSE, CENTER_DEATH_GENERIC, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_WEAPON, FALSE, FALSE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_CUSTOM, FALSE, CENTER_DEATH_CUSTOM, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_FALL, FALSE, DEATH_SELF_FALL, DEATH_SPECIAL_START) \ + DEATHTYPE(DEATH_TELEFRAG, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_DROWN, FALSE, DEATH_SELF_DROWN, NORMAL_POS) \ + DEATHTYPE(DEATH_HURTTRIGGER, FALSE, DEATH_SELF_CUSTOM, NORMAL_POS) \ + DEATHTYPE(DEATH_LAVA, FALSE, DEATH_SELF_LAVA, NORMAL_POS) \ + DEATHTYPE(DEATH_SLIME, FALSE, DEATH_SELF_SLIME, NORMAL_POS) \ + DEATHTYPE(DEATH_KILL, FALSE, DEATH_SELF_SUICIDE, NORMAL_POS) \ + DEATHTYPE(DEATH_NOAMMO, FALSE, DEATH_SELF_NOAMMO, NORMAL_POS) \ + DEATHTYPE(DEATH_SWAMP, FALSE, DEATH_SELF_SWAMP, NORMAL_POS) \ + DEATHTYPE(DEATH_TEAMCHANGE, FALSE, DEATH_SELF_TEAMCHANGE, NORMAL_POS) \ + DEATHTYPE(DEATH_AUTOTEAMCHANGE, FALSE, DEATH_SELF_AUTOTEAMCHANGE, NORMAL_POS) \ + DEATHTYPE(DEATH_CAMP, FALSE, DEATH_SELF_CAMP, NORMAL_POS) \ + DEATHTYPE(DEATH_SHOOTING_STAR, FALSE, DEATH_SELF_SHOOTING_STAR, NORMAL_POS) \ + DEATHTYPE(DEATH_ROT, FALSE, DEATH_SELF_ROT, NORMAL_POS) \ + DEATHTYPE(DEATH_MIRRORDAMAGE, FALSE, DEATH_SELF_BETRAYAL, NORMAL_POS) \ + DEATHTYPE(DEATH_TOUCHEXPLODE, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_CHEAT, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_FIRE, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_VHCRUSH, FALSE, FALSE, DEATH_VHFIRST) \ + DEATHTYPE(DEATH_SBMINIGUN, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_SBROCKET, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_SBBLOWUP, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_WAKIGUN, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_WAKIROCKET, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_WAKIBLOWUP, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_RAPTOR_CANNON, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_RAPTOR_BOMB, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_RAPTOR_BOMB_SPLIT, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_RAPTOR_DEATH, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_BUMB_GUN, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_BUMB_RAY, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_BUMB_RAY_HEAL, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_BUMB_DEATH, FALSE, FALSE, DEATH_VHLAST) \ + DEATHTYPE(DEATH_TURRET, FALSE, FALSE, DEATH_TURRET_FIRST) \ + DEATHTYPE(DEATH_TURRET_EWHEEL, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_FLAC, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_MACHINEGUN, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_WALKER_GUN, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_WALKER_MEELE, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_WALKER_ROCKET, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_HELLION, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_HK, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_MLRS, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_PLASMA, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_PHASER, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_TESLA, FALSE, FALSE, DEATH_TURRET_LAST) \ + DEATHTYPE(DEATH_GENERIC, FALSE, DEATH_SELF_GENERIC, NORMAL_POS) \ + DEATHTYPE(DEATH_WEAPON, FALSE, FALSE, NORMAL_POS) \ + DEATHTYPE(DEATH_CUSTOM, FALSE, DEATH_SELF_CUSTOM, NORMAL_POS) \ #undef DEATHTYPE DEATHTYPES @@ -83,7 +83,7 @@ string Deathtype_Name(float deathtype) { if(DEATH_ISSPECIAL(deathtype)) { - #define DEATHTYPE(name,msg_info,msg_center,msg_info_by,msg_center_by,position) \ + #define DEATHTYPE(name,msg_death_by,msg_death,position) \ { if(deathtype == max(0, name)) return VAR_TO_TEXT(name); } DEATHTYPES diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc index ecbdb5231..e0aab87a0 100644 --- a/qcsrc/common/notifications.qc +++ b/qcsrc/common/notifications.qc @@ -7,6 +7,7 @@ #define MSG_INFO 1 // "Global" information messages (sent to console, and notify panel if it has an icon) #define MSG_CENTER 2 // "Personal" centerprint messages #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_STR_ARG "" #define NO_FL_ARG -12345 @@ -181,44 +182,47 @@ float Form_Score_Pos(entity player) MSG_CENTER_NOTIF(CENTER_CTF_STALEMATE_CARRIER, 0, 0, NO_STR_ARG, CPID_STALEMATE, XPND2(0, 0), _("^BGStalemate! Enemies can now see you on radar!"), "") \ MSG_CENTER_NOTIF(CENTER_CTF_STALEMATE_OTHER, 0, 0, NO_STR_ARG, CPID_STALEMATE, XPND2(0, 0), _("^BGStalemate! Flag carriers can now be seen by enemies on radar!"), "") \ MSG_CENTER_NOTIF(CENTER_CTF_FLAG_THROW_PUNISH, 0, 1, f1, CPID_CTF_LOWPRIO, XPND2(0, 0), _("^BGToo many flag throws! Throwing disabled for %d seconds."), "") \ - MSG_CENTER_NOTIF(CENTER_DEATH_CUSTOM, 2, 0, XPND2(s1, s2), NO_CPID, XPND2(0, 0), _("^K1You were %s, %s"), "") \ - MSG_CENTER_NOTIF(CENTER_DEATH_GENERIC, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1Watch your step!"), "") \ - MSG_CENTER_NOTIF(CENTER_DEATH_SELFKILL, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You killed your own dumb self!"), _("^K1You need to be more careful!")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_SUICIDE, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You committed suicide!"), _("^K1You ended it all!")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_NOAMMO, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You were killed for running out of ammo..."), _("^K1You are reinserted into the game for running out of ammo...")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_ROT, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You grew too old without taking your medicine"), _("^K1You need to preserve your health")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_CAMP, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1Die camper!"), _("^K1Reconsider your tactics, camper!")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_BETRAYAL, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1Don't shoot your team mates!"), _("^K1Don't go against your team mates!")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_TEAMCHANGE, 0, 1, DEATH_TEAM, NO_CPID, XPND2(0, 0), _("^BGYou are now on: %s"), "") \ - MSG_CENTER_NOTIF(CENTER_DEATH_AUTOTEAMCHANGE, 0, 1, DEATH_TEAM, NO_CPID, XPND2(0, 0), _("^BGYou have been moved into a different team to improve team balance\nYou are now on: %s"), "") \ - MSG_CENTER_NOTIF(CENTER_DEATH_FALL, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You hit the ground with a bit too much force"), "") \ - MSG_CENTER_NOTIF(CENTER_DEATH_DROWN, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You couldn't catch your breath in time!"), "") \ - MSG_CENTER_NOTIF(CENTER_DEATH_LAVA, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You couldn't stand the heat!"), "") \ - MSG_CENTER_NOTIF(CENTER_DEATH_SLIME, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You melted away in slime!"), "") \ - MSG_CENTER_NOTIF(CENTER_DEATH_SHOOTING_STAR, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You went faster than the speed of light!"), "") \ - MSG_CENTER_NOTIF(CENTER_DEATH_SWAMP, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You got stuck in a swamp!"), "") \ - MSG_CENTER_NOTIF(CENTER_DEATH_FRAG, 1, 1, XPND2(FRAG_SPREE, s1), NO_CPID, XPND2(0, 0), _("^K3%sYou fragged ^BG%s"), _("^K3%sYou scored against ^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_FRAGGED, 1, 0, s1, NO_CPID, XPND2(0, 0), _("^K1You were fragged by ^BG%s"), _("^K1You were scored against by ^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_TYPEFRAG, 1, 1, XPND2(FRAG_SPREE, s1), NO_CPID, XPND2(0, 0), _("^K1%sYou typefragged ^BG%s"), _("^K1%sYou scored against ^BG%s^K1 while they were typing")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_TYPEFRAGGED, 1, 0, s1, NO_CPID, XPND2(0, 0), _("^K1You were typefragged by ^BG%s"), _("^K1You were scored against by ^BG%s^K1 while typing!")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_FRAG_FIRST, 1, 0, s1, NO_CPID, XPND2(0, 0), _("^K3First blood! You fragged ^BG%s"), _("^K3First score! You scored against ^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_FRAGGED_FIRST, 1, 0, s1, NO_CPID, XPND2(0, 0), _("^K1First victim! You were fragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_TYPEFRAG_FIRST, 1, 0, s1, NO_CPID, XPND2(0, 0), _("^K1First blood! You typefragged ^BG%s"), _("^K1First score! You scored against ^BG%s^K1 while they were typing")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_TYPEFRAGGED_FIRST, 1, 0, s1, NO_CPID, XPND2(0, 0), _("^K1First victim! You were typefragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s^K1 while typing!")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_FRAG_VERBOSE, 1, 2, XPND3(FRAG_SPREE, s1, FRAG_PING), NO_CPID, XPND2(0, 0), _("^K3You fragged ^BG%s^BG%s"), _("^K3You scored against ^BG%s^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_FRAGGED_VERBOSE, 1, 3, XPND2(s1, FRAG_STATS), NO_CPID, XPND2(0, 0), _("^K1You were fragged by ^BG%s^BG%s"), _("^K1You were scored against by ^BG%s^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_TYPEFRAG_VERBOSE, 1, 2, XPND3(FRAG_SPREE, s1, FRAG_PING), NO_CPID, XPND2(0, 0), _("^K1You typefragged ^BG%s^BG%s"), _("^K1You scored against ^BG%s^K1 while they were typing^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_TYPEFRAGGED_VERBOSE, 1, 3, XPND2(s1, FRAG_STATS), NO_CPID, XPND2(0, 0), _("^K1You were typefragged by ^BG%s^BG%s"), _("^K1You were scored against by ^BG%s^K1 while typing^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_FRAG_FIRST_VERBOSE, 1, 1, s1, NO_CPID, XPND2(0, 0), _("^K3First blood! You fragged ^BG%s"), _("^K3First score! You scored against ^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_FRAGGED_FIRST_VERBOSE, 1, 3, s1, NO_CPID, XPND2(0, 0), _("^K1First victim! You were fragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_TYPEFRAG_FIRST_VERBOSE, 1, 1, s1, NO_CPID, XPND2(0, 0), _("^K1First blood! You typefragged ^BG%s"), _("^K1First score! You scored against ^BG%s^K1 while they were typing")) \ - MSG_CENTER_NOTIF(CENTER_DEATH_TYPEFRAGGED_FIRST_VERBOSE,1, 3, s1, NO_CPID, XPND2(0, 0), _("^K1First victim! You were typefragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s^K1 while typing!")) \ #undef MSG_CENTER_NOTIF #define MSG_WEAPON_NOTIFICATIONS \ MSG_WEAPON_NOTIF(DEATH_MARBLES_LOST3, 2, 1, XPND3(s1, s2, f1), _("^F1%s^BG lost their marbles against ^F1%s^BG using the ^F2%s^BG\n"), "") \ #undef MSG_WEAPON_NOTIF +#define MSG_DEATH_NOTIFICATIONS \ + MSG_DEATH_NOTIF(DEATH_SELF_CUSTOM, 2, 0, XPND2(s1, s2), NO_CPID, XPND2(0, 0), _("^K1You were %s, %s"), "") \ + MSG_DEATH_NOTIF(DEATH_SELF_GENERIC, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1Watch your step!"), "") \ + MSG_DEATH_NOTIF(DEATH_SELF_SELFKILL, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You killed your own dumb self!"), _("^K1You need to be more careful!")) \ + MSG_DEATH_NOTIF(DEATH_SELF_SUICIDE, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You committed suicide!"), _("^K1You ended it all!")) \ + MSG_DEATH_NOTIF(DEATH_SELF_NOAMMO, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You were killed for running out of ammo..."), _("^K1You are reinserted into the game for running out of ammo...")) \ + MSG_DEATH_NOTIF(DEATH_SELF_ROT, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You grew too old without taking your medicine"), _("^K1You need to preserve your health")) \ + MSG_DEATH_NOTIF(DEATH_SELF_CAMP, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1Die camper!"), _("^K1Reconsider your tactics, camper!")) \ + MSG_DEATH_NOTIF(DEATH_SELF_BETRAYAL, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1Don't shoot your team mates!"), _("^K1Don't go against your team mates!")) \ + MSG_DEATH_NOTIF(DEATH_SELF_TEAMCHANGE, 0, 1, DEATH_TEAM, NO_CPID, XPND2(0, 0), _("^BGYou are now on: %s"), "") \ + MSG_DEATH_NOTIF(DEATH_SELF_AUTOTEAMCHANGE, 0, 1, DEATH_TEAM, NO_CPID, XPND2(0, 0), _("^BGYou have been moved into a different team to improve team balance\nYou are now on: %s"), "") \ + MSG_DEATH_NOTIF(DEATH_SELF_FALL, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You hit the ground with a bit too much force"), "") \ + MSG_DEATH_NOTIF(DEATH_SELF_DROWN, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You couldn't catch your breath in time!"), "") \ + MSG_DEATH_NOTIF(DEATH_SELF_LAVA, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You couldn't stand the heat!"), "") \ + MSG_DEATH_NOTIF(DEATH_SELF_SLIME, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You melted away in slime!"), "") \ + MSG_DEATH_NOTIF(DEATH_SELF_SHOOTING_STAR, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You went faster than the speed of light!"), "") \ + MSG_DEATH_NOTIF(DEATH_SELF_SWAMP, 0, 0, NO_STR_ARG, NO_CPID, XPND2(0, 0), _("^K1You got stuck in a swamp!"), "") \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAG, 1, 1, XPND2(FRAG_SPREE, s1), NO_CPID, XPND2(0, 0), _("^K3%sYou fragged ^BG%s"), _("^K3%sYou scored against ^BG%s")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED, 1, 0, s1, NO_CPID, XPND2(0, 0), _("^K1You were fragged by ^BG%s"), _("^K1You were scored against by ^BG%s")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG, 1, 1, XPND2(FRAG_SPREE, s1), NO_CPID, XPND2(0, 0), _("^K1%sYou typefragged ^BG%s"), _("^K1%sYou scored against ^BG%s^K1 while they were typing")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED, 1, 0, s1, NO_CPID, XPND2(0, 0), _("^K1You were typefragged by ^BG%s"), _("^K1You were scored against by ^BG%s^K1 while typing!")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_FIRST, 1, 0, s1, NO_CPID, XPND2(0, 0), _("^K3First blood! You fragged ^BG%s"), _("^K3First score! You scored against ^BG%s")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_FIRST, 1, 0, s1, NO_CPID, XPND2(0, 0), _("^K1First victim! You were fragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_FIRST, 1, 0, s1, NO_CPID, XPND2(0, 0), _("^K1First blood! You typefragged ^BG%s"), _("^K1First score! You scored against ^BG%s^K1 while they were typing")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_FIRST, 1, 0, s1, NO_CPID, XPND2(0, 0), _("^K1First victim! You were typefragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s^K1 while typing!")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_VERBOSE, 1, 2, XPND3(FRAG_SPREE, s1, FRAG_PING), NO_CPID, XPND2(0, 0), _("^K3You fragged ^BG%s^BG%s"), _("^K3You scored against ^BG%s^BG%s")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_VERBOSE, 1, 3, XPND2(s1, FRAG_STATS), NO_CPID, XPND2(0, 0), _("^K1You were fragged by ^BG%s^BG%s"), _("^K1You were scored against by ^BG%s^BG%s")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_VERBOSE, 1, 2, XPND3(FRAG_SPREE, s1, FRAG_PING), NO_CPID, XPND2(0, 0), _("^K1You typefragged ^BG%s^BG%s"), _("^K1You scored against ^BG%s^K1 while they were typing^BG%s")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_VERBOSE, 1, 3, XPND2(s1, FRAG_STATS), NO_CPID, XPND2(0, 0), _("^K1You were typefragged by ^BG%s^BG%s"), _("^K1You were scored against by ^BG%s^K1 while typing^BG%s")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_FIRST_VERBOSE, 1, 1, s1, NO_CPID, XPND2(0, 0), _("^K3First blood! You fragged ^BG%s"), _("^K3First score! You scored against ^BG%s")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_FIRST_VERBOSE, 1, 3, s1, NO_CPID, XPND2(0, 0), _("^K1First victim! You were fragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE, 1, 1, s1, NO_CPID, XPND2(0, 0), _("^K1First blood! You typefragged ^BG%s"), _("^K1First score! You scored against ^BG%s^K1 while they were typing")) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE, 1, 3, s1, NO_CPID, XPND2(0, 0), _("^K1First victim! You were typefragged by ^BG%s"), _("^K1First casualty! You were scored against by ^BG%s^K1 while typing!")) \ + #undef MSG_DEATH_NOTIF + // ==================================== // Initialization/Create Declarations @@ -229,6 +233,7 @@ float Form_Score_Pos(entity player) float NOTIF_INFO_COUNT; float NOTIF_CENTER_COUNT; float NOTIF_WEAPON_COUNT; +float NOTIF_DEATH_COUNT; float NOTIF_CPID_COUNT; #define MSG_INFO_NOTIF(name,strnum,flnum,args,icon,normal,gentle) \ @@ -263,10 +268,21 @@ float NOTIF_CPID_COUNT; } \ ACCUMULATE_FUNCTION(RegisterNotifications, RegisterNotification_##name) +#define MSG_DEATH_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) \ + ADD_CSQC_AUTOCVAR(name) \ + float name; \ + void RegisterNotification_##name() \ + { \ + SET_FIELD_COUNT(name, NOTIF_FIRST, NOTIF_DEATH_COUNT) \ + CHECK_MAX_COUNT(name, NOTIF_MAX, NOTIF_DEATH_COUNT, "notifications") \ + } \ + ACCUMULATE_FUNCTION(RegisterNotifications, RegisterNotification_##name) + // NOW we actually activate the declarations MSG_INFO_NOTIFICATIONS MSG_CENTER_NOTIFICATIONS MSG_WEAPON_NOTIFICATIONS +MSG_DEATH_NOTIFICATIONS // ====================== @@ -340,6 +356,13 @@ string Get_Field_Value(float field, float net_type, float net_name) MSG_WEAPON_NOTIFICATIONS break; } + case MSG_DEATH: + { + #define MSG_DEATH_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) \ + { NOTIF_MATCH(name, net_name) { GET_FIELD_VALUE_OUTPUT(field,name,strnum,flnum) } } + MSG_DEATH_NOTIFICATIONS + break; + } } #undef GET_FIELD_VALUE_OUTPUT @@ -383,9 +406,11 @@ void Dump_Notifications(float fh) #define MSG_INFO_NOTIF(name,strnum,flnum,args,hudargs,icon,normal,gentle) { NOTIF_Write("MSG_INFO", VAR_TO_TEXT(name), normal); } #define MSG_CENTER_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) { NOTIF_Write("MSG_CENTER", VAR_TO_TEXT(name), normal); } #define MSG_WEAPON_NOTIF(name,strnum,flnum,args,normal,gentle) { NOTIF_Write("MSG_WEAPON", VAR_TO_TEXT(name), normal); } + #define MSG_DEATH_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) { NOTIF_Write("MSG_DEATH", VAR_TO_TEXT(name), normal); } MSG_INFO_NOTIFICATIONS MSG_CENTER_NOTIFICATIONS MSG_WEAPON_NOTIFICATIONS + MSG_DEATH_NOTIFICATIONS return; } @@ -459,6 +484,16 @@ void Local_Notification(float net_type, float net_name, string s1, string s2, fl MSG_WEAPON_NOTIFICATIONS break; } + case MSG_DEATH: + { + #define MSG_DEATH_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) \ + { NOTIF_MATCH(name, net_name) CHECK_AUTOCVAR(name) \ + { \ + centerprint_generic(HANDLE_CPID(cpid), sprintf(CCR(normal_or_gentle(normal, gentle)), args), durcnt); \ + } } + MSG_DEATH_NOTIFICATIONS + break; + } } } #endif diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 7c007c89d..65b0ebc22 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -313,15 +313,13 @@ void Obituary_SpecialDeath(entity notif_target, float murder, float deathtype, s float handled, hits; if(DEATH_ISSPECIAL(deathtype)) { - #define DEATHTYPE(name,msg_info,msg_center,msg_info_by,msg_center_by,position) \ + #define DEATHTYPE(name,msg_death_by,msg_death,position) \ { if(deathtype == max(0, name)) \ { \ #if murder \ - if(max(0, msg_info_by)) { Send_Notification(world, MSG_ALL, MSG_INFO, msg_info_by, s1, s2, f1, f2, f3); ++handled; } \ - if(max(0, msg_center_by)) { Send_Notification(notif_target, MSG_ONE, MSG_CENTER, msg_center_by, s1, s2, f1, f2, f3); ++handled; } \ + if(max(0, msg_death_by)) { Send_Notification(notif_target, MSG_ONE, MSG_DEATH, msg_death_by, s1, s2, f1, f2, f3); ++handled; } \ #else \ - if(max(0, msg_info)) { Send_Notification(world, MSG_ALL, MSG_INFO, msg_info, s1, s2, f1, f2, f3); ++handled; } \ - if(max(0, msg_center)) { Send_Notification(notif_target, MSG_ONE, MSG_CENTER, msg_center, s1, s2, f1, f2, f3); ++handled; } \ + if(max(0, msg_death)) { Send_Notification(notif_target, MSG_ONE, MSG_DEATH, msg_death, s1, s2, f1, f2, f3); ++handled; } \ #endif \ ++hits; \ } } @@ -345,11 +343,9 @@ void Obituary_WeaponDeath(entity notif_target, float deathtype, string s1, strin float handled, hits; if(DEATH_ISSPECIAL(deathtype)) { - #define DEATHTYPE(name,msg_info,msg_center,position) \ + #define DEATHTYPE(name,msg_death_by,msg_death,position) \ { if(deathtype == max(0, name)) \ { \ - if(max(0, msg_info)) { Send_Notification(world, MSG_ALL, MSG_INFO, msg_info, s1, s2, f1, f2, f3); ++handled; } \ - if(max(0, msg_center)) { Send_Notification(notif_target, MSG_ONE, MSG_CENTER, msg_center, s1, s2, f1, f2, f3); ++handled; } \ ++hits; \ } } @@ -503,18 +499,18 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) { if(targ.istypefrag) { - Send_Notification(attacker, MSG_ONE, MSG_CENTER, (attacker.FRAG_VERBOSE ? CENTER_DEATH_TYPEFRAG_FIRST_VERBOSE : CENTER_DEATH_TYPEFRAG_FIRST), + Send_Notification(attacker, MSG_ONE, MSG_DEATH, (attacker.FRAG_VERBOSE ? DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE : DEATH_MURDER_TYPEFRAG_FIRST), s2, NO_STR_ARG, (attacker.FRAG_VERBOSE ? ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping) : NO_FL_ARG), NO_FL_ARG, NO_FL_ARG); - Send_Notification(targ, MSG_ONE, MSG_CENTER, (targ.FRAG_VERBOSE ? CENTER_DEATH_TYPEFRAGGED_FIRST_VERBOSE : CENTER_DEATH_TYPEFRAGGED_FIRST), + Send_Notification(targ, MSG_ONE, MSG_DEATH, (targ.FRAG_VERBOSE ? DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE : DEATH_MURDER_TYPEFRAGGED_FIRST), s1, NO_STR_ARG, (targ.FRAG_VERBOSE ? attacker.health : NO_FL_ARG), (targ.FRAG_VERBOSE ? attacker.armorvalue : NO_FL_ARG), (targ.FRAG_VERBOSE ? ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping) : NO_FL_ARG)); } else { - Send_Notification(attacker, MSG_ONE, MSG_CENTER, (attacker.FRAG_VERBOSE ? CENTER_DEATH_FRAG_FIRST_VERBOSE : CENTER_DEATH_FRAG_FIRST), + Send_Notification(attacker, MSG_ONE, MSG_DEATH, (attacker.FRAG_VERBOSE ? DEATH_MURDER_FRAG_FIRST_VERBOSE : DEATH_MURDER_FRAG_FIRST), s2, NO_STR_ARG, (attacker.FRAG_VERBOSE ? ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping) : NO_FL_ARG), NO_FL_ARG, NO_FL_ARG); - Send_Notification(targ, MSG_ONE, MSG_CENTER, (targ.FRAG_VERBOSE ? CENTER_DEATH_FRAGGED_FIRST_VERBOSE : CENTER_DEATH_FRAGGED_FIRST), + Send_Notification(targ, MSG_ONE, MSG_DEATH, (targ.FRAG_VERBOSE ? DEATH_MURDER_FRAGGED_FIRST_VERBOSE : DEATH_MURDER_FRAGGED_FIRST), s1, NO_STR_ARG, (targ.FRAG_VERBOSE ? attacker.health : NO_FL_ARG), (targ.FRAG_VERBOSE ? attacker.armorvalue : NO_FL_ARG), (targ.FRAG_VERBOSE ? ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping) : NO_FL_ARG)); } //Send_Notification(world, MSG_INFO, INFO_DEATH_FRAG_FIRSTBLOOD, s1, s2, attacker.team, NO_FL_ARG, NO_FL_ARG); @@ -523,18 +519,18 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) { if(targ.istypefrag) { - Send_Notification(attacker, MSG_ONE, MSG_CENTER, (attacker.FRAG_VERBOSE ? CENTER_DEATH_TYPEFRAG_VERBOSE : CENTER_DEATH_TYPEFRAG), + Send_Notification(attacker, MSG_ONE, MSG_DEATH, (attacker.FRAG_VERBOSE ? DEATH_MURDER_TYPEFRAG_VERBOSE : DEATH_MURDER_TYPEFRAG), s2, NO_STR_ARG, attacker.killcount, (attacker.FRAG_VERBOSE ? ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping) : NO_FL_ARG), NO_FL_ARG); - Send_Notification(targ, MSG_ONE, MSG_CENTER, (targ.FRAG_VERBOSE ? CENTER_DEATH_TYPEFRAGGED_VERBOSE : CENTER_DEATH_TYPEFRAGGED), + Send_Notification(targ, MSG_ONE, MSG_DEATH, (targ.FRAG_VERBOSE ? DEATH_MURDER_TYPEFRAGGED_VERBOSE : DEATH_MURDER_TYPEFRAGGED), s1, NO_STR_ARG, (targ.FRAG_VERBOSE ? attacker.health : NO_FL_ARG), (targ.FRAG_VERBOSE ? attacker.armorvalue : NO_FL_ARG), (targ.FRAG_VERBOSE ? ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping) : NO_FL_ARG)); } else { - Send_Notification(attacker, MSG_ONE, MSG_CENTER, (attacker.FRAG_VERBOSE ? CENTER_DEATH_FRAG_VERBOSE : CENTER_DEATH_FRAG), + Send_Notification(attacker, MSG_ONE, MSG_DEATH, (attacker.FRAG_VERBOSE ? DEATH_MURDER_FRAG_VERBOSE : DEATH_MURDER_FRAG), s2, NO_STR_ARG, attacker.killcount, (attacker.FRAG_VERBOSE ? ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping) : NO_FL_ARG), NO_FL_ARG); - Send_Notification(targ, MSG_ONE, MSG_CENTER, (targ.FRAG_VERBOSE ? CENTER_DEATH_FRAGGED_VERBOSE : CENTER_DEATH_FRAGGED), + Send_Notification(targ, MSG_ONE, MSG_DEATH, (targ.FRAG_VERBOSE ? DEATH_MURDER_FRAGGED_VERBOSE : DEATH_MURDER_FRAGGED), s1, NO_STR_ARG, (targ.FRAG_VERBOSE ? attacker.health : NO_FL_ARG), (targ.FRAG_VERBOSE ? attacker.armorvalue : NO_FL_ARG), (targ.FRAG_VERBOSE ? ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping) : NO_FL_ARG)); } //if(DEATH_WEAPONOF(deathtype)) { Send_Notification(world, MSG_WEAPON, 50, s1, s2, attacker.killcount, targ.killcount, Obituary_Score_Position); }