X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fnotifications%2Fall.inc;h=d34e929cb1f1cdcd1ffd18093057a5505eaa27d7;hb=4a854740ac1884b274e38f5273849d4c9c415976;hp=d692d73c8df82aa1f5463f31e03e50b20aeb8901;hpb=ac7deb97b1a0e73ceea4684be73e72912fb3f1aa;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc index d692d73c8..d34e929cb 100644 --- a/qcsrc/common/notifications/all.inc +++ b/qcsrc/common/notifications/all.inc @@ -87,6 +87,11 @@ If you send a notification with mismatching arguments, Send_Notification() will error. */ +// NOTE: leaving BOLD_OPERATOR outside of translatable messages has 2 advantages: +// 1. translators don't have to deal with it +// 2. messages can be changed to bold / normal without the need to translate them again +#define BOLD(translatable_msg) strcat(BOLD_OPERATOR, translatable_msg) + // default value for annce notification cvars (notification_ANNCE_*): // 0: off, 1: announce only if gentle mode is off, 2: announce always #define N___NEVER 0 @@ -149,17 +154,6 @@ MSG_ANNCE_NOTIF(NUM_GAMESTART_9, N___NEVER, "9", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) MSG_ANNCE_NOTIF(NUM_GAMESTART_10, N___NEVER, "10", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) - MSG_ANNCE_NOTIF(NUM_IDLE_1, N___NEVER, "1", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) - MSG_ANNCE_NOTIF(NUM_IDLE_2, N___NEVER, "2", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) - MSG_ANNCE_NOTIF(NUM_IDLE_3, N___NEVER, "3", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) - MSG_ANNCE_NOTIF(NUM_IDLE_4, N___NEVER, "4", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) - MSG_ANNCE_NOTIF(NUM_IDLE_5, N___NEVER, "5", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) - MSG_ANNCE_NOTIF(NUM_IDLE_6, N___NEVER, "6", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) - MSG_ANNCE_NOTIF(NUM_IDLE_7, N___NEVER, "7", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) - MSG_ANNCE_NOTIF(NUM_IDLE_8, N___NEVER, "8", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) - MSG_ANNCE_NOTIF(NUM_IDLE_9, N___NEVER, "9", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) - MSG_ANNCE_NOTIF(NUM_IDLE_10, N___NEVER, "10", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) - MSG_ANNCE_NOTIF(NUM_KILL_1, N___NEVER, "1", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) MSG_ANNCE_NOTIF(NUM_KILL_2, N___NEVER, "2", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) MSG_ANNCE_NOTIF(NUM_KILL_3, N___NEVER, "3", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) @@ -295,7 +289,7 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_INFO_NOTIF(DEATH_MURDER_VH_WAKI_ROCKET, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "notify_death", _("^BG%s%s^K1 couldn't find shelter from ^BG%s^K1's Racer%s%s"), "") MSG_INFO_NOTIF(DEATH_MURDER_VOID, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "notify_void", _("^BG%s%s^K1 was thrown into a world of hurt by ^BG%s^K1%s%s"), "") - MSG_INFO_NOTIF(DEATH_SELF_AUTOTEAMCHANGE, N_CONSOLE, 2, 1, "s1 s2loc death_team", "", "", _("^BG%s^K1 was moved into the %s%s"), "") + MSG_INFO_NOTIF(DEATH_SELF_AUTOTEAMCHANGE, N_CONSOLE, 2, 1, "s1 death_team s2loc", "", "", _("^BG%s^K1 was moved into the %s%s"), "") MSG_INFO_NOTIF(DEATH_SELF_BETRAYAL, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_teamkill_red", _("^BG%s^K1 became enemies with the Lord of Teamplay%s%s"), "") MSG_INFO_NOTIF(DEATH_SELF_CAMP, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_camping", _("^BG%s^K1 thought they found a nice camping ground%s%s"), "") MSG_INFO_NOTIF(DEATH_SELF_CHEAT, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_selfkill", _("^BG%s^K1 unfairly eliminated themself%s%s"), "") @@ -324,7 +318,7 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_INFO_NOTIF(DEATH_SELF_SLIME, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_slime", _("^BG%s^K1 was slimed%s%s"), "") MSG_INFO_NOTIF(DEATH_SELF_SUICIDE, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_selfkill", _("^BG%s^K1 couldn't take it anymore%s%s"), "") MSG_INFO_NOTIF(DEATH_SELF_SWAMP, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_slime", _("^BG%s^K1 is now preserved for centuries to come%s%s"), "") - MSG_INFO_NOTIF(DEATH_SELF_TEAMCHANGE, N_CONSOLE, 2, 1, "s1 s2loc death_team", "", "", _("^BG%s^K1 switched to the %s%s"), "") + MSG_INFO_NOTIF(DEATH_SELF_TEAMCHANGE, N_CONSOLE, 2, 1, "s1 death_team s2loc", "", "", _("^BG%s^K1 switched to the %s%s"), "") MSG_INFO_NOTIF(DEATH_SELF_TOUCHEXPLODE, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_death", _("^BG%s^K1 died in an accident%s%s"), "") MSG_INFO_NOTIF(DEATH_SELF_TURRET, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_death", _("^BG%s^K1 ran into a turret%s%s"), "") MSG_INFO_NOTIF(DEATH_SELF_TURRET_EWHEEL, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_death", _("^BG%s^K1 was blasted away by an eWheel turret%s%s"), "") @@ -347,7 +341,7 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_INFO_NOTIF(DEATH_SELF_VH_SPID_ROCKET, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_death", _("^BG%s^K1 was blasted to bits by a Spiderbot rocket%s%s"), "") MSG_INFO_NOTIF(DEATH_SELF_VH_WAKI_DEATH, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_death", _("^BG%s^K1 got caught in the blast of a Racer explosion%s%s"), "") MSG_INFO_NOTIF(DEATH_SELF_VH_WAKI_ROCKET, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_death", _("^BG%s^K1 couldn't find shelter from a Racer rocket%s%s"), "") - MSG_INFO_NOTIF(DEATH_SELF_VOID, N_CONSOLE, 3, 1, "s1 s2 s2loc spree_lost", "s1", "notify_void", "^BG%s^K1 %s^K1%s%s", "") + MSG_INFO_NOTIF(DEATH_SELF_VOID, N_CONSOLE, 3, 1, "s1 s2 s3loc spree_lost", "s1", "notify_void", "^BG%s^K1 %s^K1%s%s", "") MULTITEAM_INFO(DEATH_TEAMKILL, N_CONSOLE, 3, 1, "s1 s2 s3loc spree_end", "s2 s1", "notify_teamkill_%s", _("^BG%s^K1 was betrayed by ^BG%s^K1%s%s"), "", NAME) @@ -408,16 +402,17 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MULTITEAM_INFO(ONSLAUGHT_GENDESTROYED, N_CONSOLE, 0, 0, "", "", "", _("^TC^TT^BG generator has been destroyed"), "", GENERATOR) MULTITEAM_INFO(ONSLAUGHT_GENDESTROYED_OVERTIME, N_CONSOLE, 0, 0, "", "", "", _("^TC^TT^BG generator spontaneously combusted due to overtime!"), "", GENERATOR) - MSG_INFO_NOTIF(POWERUP_INVISIBILITY, N_CONSOLE, 1, 0, "s1", "s1", "strength", _("^BG%s^K1 picked up Invisibility"), "") - MSG_INFO_NOTIF(POWERUP_SHIELD, N_CONSOLE, 1, 0, "s1", "s1", "shield", _("^BG%s^K1 picked up Shield"), "") - MSG_INFO_NOTIF(POWERUP_SPEED, N_CONSOLE, 1, 0, "s1", "s1", "shield", _("^BG%s^K1 picked up Speed"), "") - MSG_INFO_NOTIF(POWERUP_STRENGTH, N_CONSOLE, 1, 0, "s1", "s1", "strength", _("^BG%s^K1 picked up Strength"), "") + MSG_INFO_NOTIF(POWERUP_INVISIBILITY, N_CONSOLE, 1, 0, "s1", "s1", "buff_invisible", _("^BG%s^K1 picked up Invisibility"), "") + MSG_INFO_NOTIF(POWERUP_SHIELD, N_CONSOLE, 1, 0, "s1", "s1", "shield", _("^BG%s^K1 picked up Shield"), "") + MSG_INFO_NOTIF(POWERUP_SPEED, N_CONSOLE, 1, 0, "s1", "s1", "buff_speed", _("^BG%s^K1 picked up Speed"), "") + MSG_INFO_NOTIF(POWERUP_STRENGTH, N_CONSOLE, 1, 0, "s1", "s1", "strength", _("^BG%s^K1 picked up Strength"), "") MSG_INFO_NOTIF(QUIT_DISCONNECT, N_CHATCON, 1, 0, "s1", "", "", _("^BG%s^F3 disconnected"), "") - MSG_INFO_NOTIF(QUIT_KICK_IDLING, N_CHATCON, 1, 0, "s1", "", "", _("^BG%s^F3 was kicked for idling"), "") + MSG_INFO_NOTIF(QUIT_KICK_IDLING, N_CHATCON, 1, 1, "s1 f1", "", "", _("^BG%s^F3 was kicked after idling for %s seconds"), "") + MSG_INFO_NOTIF(MOVETOSPEC_IDLING, N_CHATCON, 1, 1, "s1 f1", "", "", _("^BG%s^F3 was moved to^BG spectators^F3 after idling for %s seconds"), "") MSG_INFO_NOTIF(QUIT_KICK_SPECTATING, N_CONSOLE, 0, 0, "", "", "", _("^F2You were kicked from the server because you are a spectator and spectators aren't allowed at the moment."), "") MSG_INFO_NOTIF(QUIT_KICK_TEAMKILL, N_CHATCON, 1, 0, "s1", "", "", _("^BG%s^F3 was kicked for excessive teamkilling"), "") - MSG_INFO_NOTIF(QUIT_SPECTATE, N_CHATCON, 1, 0, "s1", "", "", _("^BG%s^F3 is now spectating"), "") + MSG_INFO_NOTIF(QUIT_SPECTATE, N_CHATCON, 1, 0, "s1", "", "", _("^BG%s^F3 is now^BG spectating"), "") MSG_INFO_NOTIF(RACE_ABANDONED, N_CONSOLE, 1, 0, "s1", "", "", _("^BG%s^BG has abandoned the race"), "") MSG_INFO_NOTIF(RACE_FAIL_RANKED, N_CONSOLE, 1, 3, "s1 race_col f1ord race_col f3race_time race_diff", "s1 f3race_time", "race_newfail", _("^BG%s^BG couldn't break their %s%s^BG place record of %s%s %s"), "") @@ -531,9 +526,9 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_CENTER_NOTIF(ASSAULT_DEFENDING, N_ENABLE, 0, 0, "", CPID_ASSAULT_ROLE, "0 0", _("^BGYou are defending!"), "") MSG_CENTER_NOTIF(ASSAULT_OBJ_DESTROYED, N_ENABLE, 0, 1, "f1time", CPID_ASSAULT_ROLE, "0 0", _("^BGObjective destroyed in ^F4%s^BG!"), "") - MSG_CENTER_NOTIF(COUNTDOWN_BEGIN, N_ENABLE, 0, 0, "", CPID_ROUND, "2 0", _("^F4Begin!"), "") - MSG_CENTER_NOTIF(COUNTDOWN_GAMESTART, N_ENABLE, 0, 1, "", CPID_ROUND, "1 f1", _("^F4Game starts in ^COUNT"), "") - MSG_CENTER_NOTIF(COUNTDOWN_ROUNDSTART, N_ENABLE, 0, 1, "", CPID_ROUND, "1 f1", _("^F4Round starts in ^COUNT"), "") + MSG_CENTER_NOTIF(COUNTDOWN_BEGIN, N_ENABLE, 0, 0, "", CPID_ROUND, "2 0", BOLD(_("^BGBegin!")), "") + MSG_CENTER_NOTIF(COUNTDOWN_GAMESTART, N_ENABLE, 0, 1, "", CPID_ROUND, "1 f1", strcat(_("^BGGame starts in"), "\n", BOLD("^COUNT")), "") + MSG_CENTER_NOTIF(COUNTDOWN_ROUNDSTART, N_ENABLE, 0, 2, "f1", CPID_ROUND, "1 f2", strcat(_("^BGRound %s starts in"), "\n", BOLD("^COUNT")), "") MSG_CENTER_NOTIF(COUNTDOWN_ROUNDSTOP, N_ENABLE, 0, 0, "", CPID_ROUND, "2 0", _("^F4Round cannot start"), "") MSG_CENTER_NOTIF(ROUND_TIED, N_ENABLE, 0, 0, "", CPID_ROUND, "0 0", _("^BGRound tied"), "") @@ -557,10 +552,10 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_CENTER_NOTIF(CTF_PASS_REQUESTING, N_ENABLE, 1, 0, "s1", CPID_CTF_PASS, "0 0", _("^BGRequesting %s^BG to pass you the flag"), "") MULTITEAM_CENTER(CTF_PASS_SENT, N_ENABLE, 1, 0, "s1", CPID_CTF_PASS, "0 0", _("^BGYou passed the ^TC^TT^BG flag to %s"), "", FLAG) MSG_CENTER_NOTIF(CTF_PASS_SENT_NEUTRAL, N_ENABLE, 1, 0, "s1", CPID_CTF_PASS, "0 0", _("^BGYou passed the flag to %s"), "") - MULTITEAM_CENTER(CTF_PICKUP, N_ENABLE, 0, 0, "", CPID_CTF_LOWPRIO, "0 0", _("^BGYou got the ^TC^TT^BG flag!"), "", FLAG) - MSG_CENTER_NOTIF(CTF_PICKUP_NEUTRAL, N_ENABLE, 0, 0, "", CPID_CTF_LOWPRIO, "0 0", _("^BGYou got the flag!"), "") - MSG_CENTER_NOTIF(CTF_PICKUP_RETURN, N_ENABLE, 1, 0, "s1", CPID_CTF_LOWPRIO, "0 0", _("^BGYou got your %steam^BG's flag, return it!"), "") - MSG_CENTER_NOTIF(CTF_PICKUP_RETURN_ENEMY, N_ENABLE, 1, 0, "s1", CPID_CTF_LOWPRIO, "0 0", _("^BGYou got the %senemy^BG's flag, return it!"), "") + MULTITEAM_CENTER(CTF_PICKUP, N_ENABLE, 0, 0, "", CPID_CTF_LOWPRIO, "0 0", BOLD(_("^BGYou got the ^TC^TT^BG flag!")), "", FLAG) + MSG_CENTER_NOTIF(CTF_PICKUP_NEUTRAL, N_ENABLE, 0, 0, "", CPID_CTF_LOWPRIO, "0 0", BOLD(_("^BGYou got the flag!")), "") + MSG_CENTER_NOTIF(CTF_PICKUP_RETURN, N_ENABLE, 1, 0, "s1", CPID_CTF_LOWPRIO, "0 0", BOLD(_("^BGYou got your %steam^BG's flag, return it!")), "") + MSG_CENTER_NOTIF(CTF_PICKUP_RETURN_ENEMY, N_ENABLE, 1, 0, "s1", CPID_CTF_LOWPRIO, "0 0", BOLD(_("^BGYou got the %senemy^BG's flag, return it!")), "") MSG_CENTER_NOTIF(CTF_PICKUP_ENEMY, N_ENABLE, 1, 0, "s1", CPID_CTF_LOWPRIO, "0 0", _("^BGThe %senemy^BG got your flag! Retrieve it!"), "") MSG_CENTER_NOTIF(CTF_PICKUP_ENEMY_VERBOSE, N_ENABLE, 2, 0, "s1 s2 s1", CPID_CTF_LOWPRIO, "0 0", _("^BGThe %senemy (^BG%s%s)^BG got your flag! Retrieve it!"), "") MSG_CENTER_NOTIF(CTF_PICKUP_ENEMY_NEUTRAL, N_ENABLE, 1, 0, "s1", CPID_CTF_LOWPRIO, "0 0", _("^BGThe %senemy^BG got the flag! Retrieve it!"), "") @@ -578,37 +573,37 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != #define VERBOSE_MURDER(type) strcat(MURDER_##type, "^BG%s") - #define MURDER_FRAG strcat(BOLD_OPERATOR, _("^K3%sYou fragged ^BG%s")) - #define MURDER_FRAG2 strcat(BOLD_OPERATOR, _("^K3%sYou scored against ^BG%s")) - #define MURDER_FRAGGED _("^K1%sYou were fragged by ^BG%s") - #define MURDER_FRAGGED2 _("^K1%sYou were scored against by ^BG%s") + #define MURDER_FRAG BOLD(_("^K3%sYou fragged ^BG%s")) + #define MURDER_FRAG2 BOLD(_("^K3%sYou scored against ^BG%s")) + #define MURDER_FRAGGED BOLD(_("^K1%sYou were fragged by ^BG%s")) + #define MURDER_FRAGGED2 BOLD(_("^K1%sYou were scored against by ^BG%s")) MSG_CENTER_NOTIF(DEATH_MURDER_FRAG, N_ENABLE, 1, 1, "spree_cen s1", CPID_Null, "0 0", MURDER_FRAG, MURDER_FRAG2 ) MSG_CENTER_NOTIF(DEATH_MURDER_FRAGGED, N_ENABLE, 1, 1, "spree_cen s1", CPID_Null, "0 0", MURDER_FRAGGED, MURDER_FRAGGED2 ) MSG_CENTER_NOTIF(DEATH_MURDER_FRAGGED_VERBOSE, N_ENABLE, 1, 4, "spree_cen s1 frag_stats", CPID_Null, "0 0", VERBOSE_MURDER(FRAGGED), VERBOSE_MURDER(FRAGGED2) ) MSG_CENTER_NOTIF(DEATH_MURDER_FRAG_VERBOSE, N_ENABLE, 1, 2, "spree_cen s1 frag_ping", CPID_Null, "0 0", VERBOSE_MURDER(FRAG), VERBOSE_MURDER(FRAG2) ) - #define MURDER_FRAG_FIRE strcat(BOLD_OPERATOR, _("^K3%sYou burned ^BG%s")) - #define MURDER_FRAG_FIRE2 strcat(BOLD_OPERATOR, _("^K3%sYou scored against ^BG%s")) - #define MURDER_FRAGGED_FIRE _("^K1%sYou were burned by ^BG%s") - #define MURDER_FRAGGED_FIRE2 _("^K1%sYou were scored against by ^BG%s") + #define MURDER_FRAG_FIRE BOLD(_("^K3%sYou burned ^BG%s")) + #define MURDER_FRAG_FIRE2 BOLD(_("^K3%sYou scored against ^BG%s")) + #define MURDER_FRAGGED_FIRE BOLD(_("^K1%sYou were burned by ^BG%s")) + #define MURDER_FRAGGED_FIRE2 BOLD(_("^K1%sYou were scored against by ^BG%s")) MSG_CENTER_NOTIF(DEATH_MURDER_FRAG_FIRE, N_ENABLE, 1, 1, "spree_cen s1", CPID_Null, "0 0", MURDER_FRAG_FIRE, MURDER_FRAG_FIRE2 ) MSG_CENTER_NOTIF(DEATH_MURDER_FRAGGED_FIRE, N_ENABLE, 1, 1, "spree_cen s1", CPID_Null, "0 0", MURDER_FRAGGED_FIRE, MURDER_FRAGGED_FIRE2 ) MSG_CENTER_NOTIF(DEATH_MURDER_FRAGGED_FIRE_VERBOSE, N_ENABLE, 1, 4, "spree_cen s1 frag_stats", CPID_Null, "0 0", VERBOSE_MURDER(FRAGGED_FIRE), VERBOSE_MURDER(FRAGGED_FIRE2) ) MSG_CENTER_NOTIF(DEATH_MURDER_FRAG_FIRE_VERBOSE, N_ENABLE, 1, 2, "spree_cen s1 frag_ping", CPID_Null, "0 0", VERBOSE_MURDER(FRAG_FIRE), VERBOSE_MURDER(FRAG_FIRE2) ) - #define MURDER_FRAG_FREEZE strcat(BOLD_OPERATOR, _("^K3%sYou froze ^BG%s")) - #define MURDER_FRAG_FREEZE2 strcat(BOLD_OPERATOR, _("^K3%sYou scored against ^BG%s")) - #define MURDER_FRAGGED_FREEZE _("^K1%sYou were frozen by ^BG%s") - #define MURDER_FRAGGED_FREEZE2 _("^K1%sYou were scored against by ^BG%s") + #define MURDER_FRAG_FREEZE BOLD(_("^K3%sYou froze ^BG%s")) + #define MURDER_FRAG_FREEZE2 BOLD(_("^K3%sYou scored against ^BG%s")) + #define MURDER_FRAGGED_FREEZE BOLD(_("^K1%sYou were frozen by ^BG%s")) + #define MURDER_FRAGGED_FREEZE2 BOLD(_("^K1%sYou were scored against by ^BG%s")) MSG_CENTER_NOTIF(DEATH_MURDER_FRAG_FREEZE, N_ENABLE, 1, 1, "spree_cen s1", CPID_Null, "0 0", MURDER_FRAG_FREEZE, MURDER_FRAG_FREEZE2 ) MSG_CENTER_NOTIF(DEATH_MURDER_FRAGGED_FREEZE, N_ENABLE, 1, 1, "spree_cen s1", CPID_Null, "0 0", MURDER_FRAGGED_FREEZE, MURDER_FRAGGED_FREEZE2 ) MSG_CENTER_NOTIF(DEATH_MURDER_FRAGGED_FREEZE_VERBOSE, N_ENABLE, 1, 4, "spree_cen s1 frag_stats", CPID_Null, "0 0", VERBOSE_MURDER(FRAGGED_FREEZE), VERBOSE_MURDER(FRAGGED_FREEZE2)) MSG_CENTER_NOTIF(DEATH_MURDER_FRAG_FREEZE_VERBOSE, N_ENABLE, 1, 2, "spree_cen s1 frag_ping", CPID_Null, "0 0", VERBOSE_MURDER(FRAG_FREEZE), VERBOSE_MURDER(FRAG_FREEZE2) ) - #define MURDER_TYPEFRAG strcat(BOLD_OPERATOR, _("^K1%sYou typefragged ^BG%s")) - #define MURDER_TYPEFRAG2 strcat(BOLD_OPERATOR, _("^K1%sYou scored against ^BG%s^K1 while they were typing")) - #define MURDER_TYPEFRAGGED _("^K1%sYou were typefragged by ^BG%s") - #define MURDER_TYPEFRAGGED2 _("^K1%sYou were scored against by ^BG%s^K1 while typing") + #define MURDER_TYPEFRAG BOLD(_("^K1%sYou typefragged ^BG%s")) + #define MURDER_TYPEFRAG2 BOLD(_("^K1%sYou scored against ^BG%s^K1 while they were typing")) + #define MURDER_TYPEFRAGGED BOLD(_("^K1%sYou were typefragged by ^BG%s")) + #define MURDER_TYPEFRAGGED2 BOLD(_("^K1%sYou were scored against by ^BG%s^K1 while typing")) MSG_CENTER_NOTIF(DEATH_MURDER_TYPEFRAG, N_ENABLE, 1, 1, "spree_cen s1", CPID_Null, "0 0", MURDER_TYPEFRAG, MURDER_TYPEFRAG2 ) MSG_CENTER_NOTIF(DEATH_MURDER_TYPEFRAGGED, N_ENABLE, 1, 1, "spree_cen s1", CPID_Null, "0 0", MURDER_TYPEFRAGGED, MURDER_TYPEFRAGGED2 ) MSG_CENTER_NOTIF(DEATH_MURDER_TYPEFRAGGED_VERBOSE, N_ENABLE, 1, 4, "spree_cen s1 frag_stats", CPID_Null, "0 0", VERBOSE_MURDER(TYPEFRAGGED), VERBOSE_MURDER(TYPEFRAGGED2) ) @@ -617,46 +612,47 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_CENTER_NOTIF(NADE_THROW, N_ENABLE, 0, 0, "nade_key", CPID_NADES, "0 0", _("^BGPress ^F2%s^BG again to toss the nade!"), "") MSG_CENTER_NOTIF(NADE_BONUS, N_ENABLE, 0, 0, "", CPID_NADES, "0 0", _("^F2You got a ^K1BONUS GRENADE^F2!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_AUTOTEAMCHANGE, N_ENABLE, 0, 1, "death_team", CPID_Null, "0 0", _("^BGYou have been moved into a different team\nYou are now on: %s"), "") - MSG_CENTER_NOTIF(DEATH_SELF_BETRAYAL, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1Don't shoot your team mates!"), _("^K1Don't go against your team mates!")) - MSG_CENTER_NOTIF(DEATH_SELF_CAMP, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1Die camper!"), _("^K1Reconsider your tactics, camper!")) - MSG_CENTER_NOTIF(DEATH_SELF_CHEAT, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You unfairly eliminated yourself!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_CUSTOM, N_ENABLE, 2, 0, "s2", CPID_Null, "0 0", _("^K1You were %s"), "") - MSG_CENTER_NOTIF(DEATH_SELF_DROWN, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You couldn't catch your breath!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_FALL, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You hit the ground with a crunch!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_FIRE, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You got a little bit too crispy!"), _("^K1You felt a little too hot!")) - MSG_CENTER_NOTIF(DEATH_SELF_GENERIC, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You killed your own dumb self!"), _("^K1You need to be more careful!")) - MSG_CENTER_NOTIF(DEATH_SELF_LAVA, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You couldn't stand the heat!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_MONSTER, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You were killed by a monster!"), _("^K1You need to watch out for monsters!")) - MSG_CENTER_NOTIF(DEATH_SELF_NADE, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You forgot to put the pin back in!"), _("^K1Tastes like chicken!")) - MSG_CENTER_NOTIF(DEATH_SELF_NADE_NAPALM, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1Hanging around a napalm explosion is bad!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_NADE_ICE_FREEZE, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You got a little bit too cold!"), _("^K1You felt a little chilly!")) - MSG_CENTER_NOTIF(DEATH_SELF_NADE_HEAL, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1Your Healing Nade is a bit defective"), "") - MSG_CENTER_NOTIF(DEATH_SELF_NOAMMO, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You were killed for running out of ammo..."), _("^K1You are respawning for running out of ammo...")) - MSG_CENTER_NOTIF(DEATH_SELF_ROT, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You grew too old without taking your medicine"), _("^K1You need to preserve your health")) - MSG_CENTER_NOTIF(DEATH_SELF_SHOOTING_STAR, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You became a shooting star!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_SLIME, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You melted away in slime!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_SUICIDE, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You committed suicide!"), _("^K1You ended it all!")) - MSG_CENTER_NOTIF(DEATH_SELF_SWAMP, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You got stuck in a swamp!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_TEAMCHANGE, N_ENABLE, 0, 1, "death_team", CPID_Null, "0 0", _("^BGYou are now on: %s"), "") - MSG_CENTER_NOTIF(DEATH_SELF_TOUCHEXPLODE, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You died in an accident!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_TURRET, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You were fragged by a turret!"), _("^K1You had an unfortunate run in with a turret!")) - MSG_CENTER_NOTIF(DEATH_SELF_TURRET_EWHEEL, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You were fragged by an eWheel turret!"), _("^K1You had an unfortunate run in with an eWheel turret!")) - MSG_CENTER_NOTIF(DEATH_SELF_TURRET_WALK, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You were fragged by a Walker turret!"), _("^K1You had an unfortunate run in with a Walker turret!")) - MSG_CENTER_NOTIF(DEATH_SELF_VH_BUMB_DEATH, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You got caught in the blast of a Bumblebee explosion!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_VH_CRUSH, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You were crushed by a vehicle!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_VH_RAPT_BOMB, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You were caught in a Raptor cluster bomb!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_VH_RAPT_DEATH, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You got caught in the blast of a Raptor explosion!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_VH_SPID_DEATH, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You got caught in the blast of a Spiderbot explosion!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_VH_SPID_ROCKET, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You were blasted to bits by a Spiderbot rocket!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_VH_WAKI_DEATH, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You got caught in the blast of a Racer explosion!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_VH_WAKI_ROCKET, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1You couldn't find shelter from a Racer rocket!"), "") - MSG_CENTER_NOTIF(DEATH_SELF_VOID, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K1Watch your step!"), "") - - MSG_CENTER_NOTIF(DEATH_TEAMKILL_FRAG, N_ENABLE, 1, 0, "s1", CPID_Null, "0 0", _("^K1Moron! You fragged ^BG%s^K1, a team mate!"), _("^K1Moron! You went against ^BG%s^K1, a team mate!")) - MSG_CENTER_NOTIF(DEATH_TEAMKILL_FRAGGED, N_ENABLE, 1, 0, "s1", CPID_Null, "0 0", _("^K1You were fragged by ^BG%s^K1, a team mate"), _("^K1You were scored against by ^BG%s^K1, a team mate")) - - MSG_CENTER_NOTIF(DISCONNECT_IDLING, N_ENABLE, 0, 1, "", CPID_IDLING, "1 f1", _("^K1Stop idling!\n^BGDisconnecting in ^COUNT..."), "") + MSG_CENTER_NOTIF(DEATH_SELF_AUTOTEAMCHANGE, N_ENABLE, 0, 1, "death_team", CPID_Null, "0 0", BOLD(_("^BGYou have been moved into a different team\nYou are now on: %s")), "") + MSG_CENTER_NOTIF(DEATH_SELF_BETRAYAL, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You were punished for attacking your team mates!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_CAMP, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1Die camper!")), BOLD(_("^K1Reconsider your tactics, camper!"))) + MSG_CENTER_NOTIF(DEATH_SELF_CHEAT, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You unfairly eliminated yourself!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_CUSTOM, N_ENABLE, 2, 0, "s2", CPID_Null, "0 0", BOLD(_("^K1You were %s")), "") + MSG_CENTER_NOTIF(DEATH_SELF_DROWN, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You couldn't catch your breath!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_FALL, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You hit the ground with a crunch!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_FIRE, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You got a little bit too crispy!")), BOLD(_("^K1You felt a little too hot!"))) + MSG_CENTER_NOTIF(DEATH_SELF_GENERIC, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You fragged yourself!")), BOLD(_("^K1You need to be more careful!"))) + MSG_CENTER_NOTIF(DEATH_SELF_LAVA, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You couldn't stand the heat!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_MONSTER, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You were killed by a monster!")), BOLD(_("^K1You need to watch out for monsters!"))) + MSG_CENTER_NOTIF(DEATH_SELF_NADE, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You forgot to put the pin back in!")), BOLD(_("^K1Tastes like chicken!"))) + MSG_CENTER_NOTIF(DEATH_SELF_NADE_NAPALM, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1Hanging around a napalm explosion is bad!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_NADE_ICE_FREEZE, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You got a little bit too cold!")), BOLD(_("^K1You felt a little chilly!"))) + MSG_CENTER_NOTIF(DEATH_SELF_NADE_HEAL, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1Your Healing Nade is a bit defective")), "") + MSG_CENTER_NOTIF(DEATH_SELF_NOAMMO, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You were killed for running out of ammo...")), BOLD(_("^K1You are respawning for running out of ammo..."))) + MSG_CENTER_NOTIF(DEATH_SELF_ROT, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You grew too old without taking your medicine")), BOLD(_("^K1You need to preserve your health"))) + MSG_CENTER_NOTIF(DEATH_SELF_SHOOTING_STAR, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You became a shooting star!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_SLIME, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You melted away in slime!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_SUICIDE, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You committed suicide!")), BOLD(_("^K1You ended it all!"))) + MSG_CENTER_NOTIF(DEATH_SELF_SWAMP, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You got stuck in a swamp!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_TEAMCHANGE, N_ENABLE, 0, 1, "death_team", CPID_Null, "0 0", BOLD(_("^BGYou are now on: %s")), "") + MSG_CENTER_NOTIF(DEATH_SELF_TOUCHEXPLODE, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You died in an accident!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_TURRET, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You were fragged by a turret!")), BOLD(_("^K1You had an unfortunate run in with a turret!"))) + MSG_CENTER_NOTIF(DEATH_SELF_TURRET_EWHEEL, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You were fragged by an eWheel turret!")), BOLD(_("^K1You had an unfortunate run in with an eWheel turret!"))) + MSG_CENTER_NOTIF(DEATH_SELF_TURRET_WALK, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You were fragged by a Walker turret!")), BOLD(_("^K1You had an unfortunate run in with a Walker turret!"))) + MSG_CENTER_NOTIF(DEATH_SELF_VH_BUMB_DEATH, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You got caught in the blast of a Bumblebee explosion!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_VH_CRUSH, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You were crushed by a vehicle!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_VH_RAPT_BOMB, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You were caught in a Raptor cluster bomb!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_VH_RAPT_DEATH, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You got caught in the blast of a Raptor explosion!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_VH_SPID_DEATH, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You got caught in the blast of a Spiderbot explosion!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_VH_SPID_ROCKET, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You were blasted to bits by a Spiderbot rocket!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_VH_WAKI_DEATH, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You got caught in the blast of a Racer explosion!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_VH_WAKI_ROCKET, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1You couldn't find shelter from a Racer rocket!")), "") + MSG_CENTER_NOTIF(DEATH_SELF_VOID, N_ENABLE, 0, 0, "", CPID_Null, "0 0", BOLD(_("^K1Watch your step!")), "") + + MSG_CENTER_NOTIF(DEATH_TEAMKILL_FRAG, N_ENABLE, 1, 0, "s1", CPID_Null, "0 0", BOLD(_("^K1Traitor! You team killed ^BG%s")), BOLD(_("^K1Traitor! You betrayed team mate ^BG%s"))) + MSG_CENTER_NOTIF(DEATH_TEAMKILL_FRAGGED, N_ENABLE, 1, 0, "s1", CPID_Null, "0 0", BOLD(_("^K1You were team killed by ^BG%s")), BOLD(_("^K1You were betrayed by team mate ^BG%s"))) + + MSG_CENTER_NOTIF(DISCONNECT_IDLING, N_ENABLE, 0, 1, "", CPID_IDLING, "1 f1", BOLD(_("^K1Stop idling!\n^BGDisconnecting in ^COUNT...")), "") + MSG_CENTER_NOTIF(MOVETOSPEC_IDLING, N_ENABLE, 0, 1, "", CPID_IDLING, "1 f1", BOLD(_("^K1Stop idling!\n^BGMoving to spectators in ^COUNT...")), "") MSG_CENTER_NOTIF(DOOR_LOCKED_NEED, N_ENABLE, 1, 0, "s1", CPID_Null, "0 0", _("^BGYou need %s^BG!"), "") MSG_CENTER_NOTIF(DOOR_LOCKED_ALSONEED, N_ENABLE, 1, 0, "s1", CPID_Null, "0 0", _("^BGYou also need %s^BG!"), "") @@ -707,6 +703,7 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MULTITEAM_CENTER(KEYHUNT_START, N_ENABLE, 0, 0, "", CPID_KEYHUNT, "0 0", _("^BGYou are starting with the ^TC^TT Key"), "", KEY) MSG_CENTER_NOTIF(LMS_NOLIVES, N_ENABLE, 0, 0, "", CPID_LMS, "0 0", _("^BGYou have no lives left, you must wait until the next match"), "") + MSG_CENTER_NOTIF(LMS_SPECWARN, N_ENABLE, 0, 0, "", CPID_LMS, "0 0", _("^F4WARNING:^BG you can't rejoin this match after spectating.\nUse the same command again to spectate anyway."), "") MSG_CENTER_NOTIF(MISSING_TEAMS, N_ENABLE, 0, 1, "missing_teams", CPID_MISSING_TEAMS, "-1 0", _("^BGWaiting for players to join...\nNeed active players for: %s"), "") MSG_CENTER_NOTIF(MISSING_PLAYERS, N_ENABLE, 0, 1, "f1", CPID_MISSING_PLAYERS, "-1 0", _("^BGWaiting for %s player(s) to join..."), "") @@ -716,7 +713,6 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_CENTER_NOTIF(INSTAGIB_FINDAMMO_FIRST, N_ENABLE, 0, 0, "", CPID_INSTAGIB_FINDAMMO, "1 10", _("^BGGet some ammo or you'll be dead in ^F4^COUNT^BG!"), _("^BGGet some ammo! ^F4^COUNT^BG left!")) MSG_CENTER_NOTIF(INSTAGIB_LIVES_REMAINING, N_ENABLE, 0, 1, "f1", CPID_Null, "0 0", _("^F2Extra lives remaining: ^K1%s"), "") - MSG_CENTER_NOTIF(CAMPAIGN_MESSAGE, N_ENABLE, 1, 1, "f1 s1 join_key", CPID_CAMPAIGN_MESSAGE, "-1 0", strcat(_("Level %s: "), "^BG%s\n^3\n", _("^BGPress ^F2%s^BG to enter the game")), "") MSG_CENTER_NOTIF(MOTD, N_ENABLE, 1, 0, "s1", CPID_MOTD, "-1 0", "^BG%s", "") MSG_CENTER_NOTIF(NIX_COUNTDOWN, N_ENABLE, 0, 2, "item_wepname", CPID_NIX, "1 f2", _("^F2^COUNT^BG until weapon change...\nNext weapon: ^F1%s"), "")