From: Mario Date: Thu, 17 Apr 2025 23:23:11 +0000 (+1000) Subject: Remove now-unused DEATH_NADE_ICE_FREEZE deathtype X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F1468%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Remove now-unused DEATH_NADE_ICE_FREEZE deathtype --- diff --git a/notifications.cfg b/notifications.cfg index 1f891f7ce..98db7e9eb 100644 --- a/notifications.cfg +++ b/notifications.cfg @@ -139,7 +139,6 @@ seta notification_INFO_DEATH_MURDER_MONSTER "1" "\"0\" = off, \"1\" = print to c seta notification_INFO_DEATH_MURDER_NADE "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_DEATH_MURDER_NADE_HEAL "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_DEATH_MURDER_NADE_ICE "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" -seta notification_INFO_DEATH_MURDER_NADE_ICE_FREEZE "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_DEATH_MURDER_NADE_NAPALM "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_DEATH_MURDER_SHOOTING_STAR "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_DEATH_MURDER_SLIME "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" @@ -181,7 +180,6 @@ seta notification_INFO_DEATH_SELF_MON_ZOMBIE_MELEE "1" "\"0\" = off, \"1\" = pri seta notification_INFO_DEATH_SELF_NADE "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_DEATH_SELF_NADE_HEAL "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_DEATH_SELF_NADE_ICE "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" -seta notification_INFO_DEATH_SELF_NADE_ICE_FREEZE "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_DEATH_SELF_NADE_NAPALM "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_DEATH_SELF_NOAMMO "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_DEATH_SELF_ROT "1" "\"0\" = off, \"1\" = print to console, \"2\" = print to console and chatbox (if notification_allow_chatboxprint is enabled)" @@ -438,7 +436,6 @@ seta notification_CENTER_DEATH_SELF_LAVA "1" "\"0\" = off, \"1\" = centerprint" seta notification_CENTER_DEATH_SELF_MONSTER "1" "\"0\" = off, \"1\" = centerprint" seta notification_CENTER_DEATH_SELF_NADE "1" "\"0\" = off, \"1\" = centerprint" seta notification_CENTER_DEATH_SELF_NADE_HEAL "1" "\"0\" = off, \"1\" = centerprint" -seta notification_CENTER_DEATH_SELF_NADE_ICE_FREEZE "1" "\"0\" = off, \"1\" = centerprint" seta notification_CENTER_DEATH_SELF_NADE_NAPALM "1" "\"0\" = off, \"1\" = centerprint" seta notification_CENTER_DEATH_SELF_NOAMMO "1" "\"0\" = off, \"1\" = centerprint" seta notification_CENTER_DEATH_SELF_ROT "1" "\"0\" = off, \"1\" = centerprint" @@ -596,7 +593,6 @@ seta notification_DEATH_MURDER_MONSTER "1" "enable this multiple notification" seta notification_DEATH_MURDER_NADE "1" "enable this multiple notification" seta notification_DEATH_MURDER_NADE_HEAL "1" "enable this multiple notification" seta notification_DEATH_MURDER_NADE_ICE "1" "enable this multiple notification" -seta notification_DEATH_MURDER_NADE_ICE_FREEZE "1" "enable this multiple notification" seta notification_DEATH_MURDER_NADE_NAPALM "1" "enable this multiple notification" seta notification_DEATH_MURDER_SHOOTING_STAR "1" "enable this multiple notification" seta notification_DEATH_MURDER_SLIME "1" "enable this multiple notification" @@ -638,7 +634,6 @@ seta notification_DEATH_SELF_MON_ZOMBIE_MELEE "1" "enable this multiple notifica seta notification_DEATH_SELF_NADE "1" "enable this multiple notification" seta notification_DEATH_SELF_NADE_HEAL "1" "enable this multiple notification" seta notification_DEATH_SELF_NADE_ICE "1" "enable this multiple notification" -seta notification_DEATH_SELF_NADE_ICE_FREEZE "1" "enable this multiple notification" seta notification_DEATH_SELF_NADE_NAPALM "1" "enable this multiple notification" seta notification_DEATH_SELF_NOAMMO "1" "enable this multiple notification" seta notification_DEATH_SELF_ROT "1" "enable this multiple notification" diff --git a/qcsrc/common/deathtypes/all.inc b/qcsrc/common/deathtypes/all.inc index 19de656e0..f5e93ed9f 100644 --- a/qcsrc/common/deathtypes/all.inc +++ b/qcsrc/common/deathtypes/all.inc @@ -22,7 +22,6 @@ REGISTER_DEATHTYPE(MONSTER_ZOMBIE_MELEE, DEATH_SELF_MON_ZOMBIE_MELEE, DEAT REGISTER_DEATHTYPE(NADE, DEATH_SELF_NADE, DEATH_MURDER_NADE, NULL, NULL, "") REGISTER_DEATHTYPE(NADE_NAPALM, DEATH_SELF_NADE_NAPALM, DEATH_MURDER_NADE_NAPALM, NULL, NULL, "") REGISTER_DEATHTYPE(NADE_ICE, DEATH_SELF_NADE_ICE, DEATH_MURDER_NADE_ICE, NULL, NULL, "") -REGISTER_DEATHTYPE(NADE_ICE_FREEZE, DEATH_SELF_NADE_ICE_FREEZE, DEATH_MURDER_NADE_ICE_FREEZE, NULL, NULL, "") REGISTER_DEATHTYPE(NADE_HEAL, DEATH_SELF_NADE_HEAL, DEATH_MURDER_NADE_HEAL, NULL, NULL, "") REGISTER_DEATHTYPE(NOAMMO, DEATH_SELF_NOAMMO, NULL, NULL, NULL, "") REGISTER_DEATHTYPE(ROT, DEATH_SELF_ROT, NULL, NULL, NULL, "") diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc index 836fef289..1e475b168 100644 --- a/qcsrc/common/notifications/all.inc +++ b/qcsrc/common/notifications/all.inc @@ -284,7 +284,6 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_INFO_NOTIF(DEATH_MURDER_NADE, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "nade_normal", _("^BG%s%s^K1 was blown up by ^BG%s^K1's Nade%s%s"), "") MSG_INFO_NOTIF(DEATH_MURDER_NADE_NAPALM, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "nade_napalm", _("^BG%s%s^K1 was burned to death by ^BG%s^K1's Napalm Nade%s%s"), _("^BG%s%s^K1 got too close to a napalm explosion%s%s")) MSG_INFO_NOTIF(DEATH_MURDER_NADE_ICE, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "nade_ice", _("^BG%s%s^K1 was blown up by ^BG%s^K1's Ice Nade%s%s"), "") - MSG_INFO_NOTIF(DEATH_MURDER_NADE_ICE_FREEZE, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "nade_ice", _("^BG%s%s^K1 was frozen to death by ^BG%s^K1's Ice Nade%s%s"), "") MSG_INFO_NOTIF(DEATH_MURDER_NADE_HEAL, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "nade_heal", _("^BG%s%s^K1 has not been healed by ^BG%s^K1's Healing Nade%s%s"), "") MSG_INFO_NOTIF(DEATH_MURDER_SHOOTING_STAR, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "notify_shootingstar", _("^BG%s%s^K1 was shot into space by ^BG%s^K1%s%s"), "") MSG_INFO_NOTIF(DEATH_MURDER_SLIME, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "notify_slime", _("^BG%s%s^K1 was slimed by ^BG%s^K1%s%s"), "") @@ -327,7 +326,6 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_INFO_NOTIF(DEATH_SELF_NADE, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "nade_normal", _("^BG%s^K1 mastered the art of self-nading%s%s"), "") MSG_INFO_NOTIF(DEATH_SELF_NADE_NAPALM, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "nade_napalm", _("^BG%s^K1 was burned to death by their own Napalm Nade%s%s"), _("^BG%s^K1 decided to take a look at the results of their napalm explosion%s%s")) MSG_INFO_NOTIF(DEATH_SELF_NADE_ICE, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "nade_ice", _("^BG%s^K1 mastered the art of self-nading%s%s"), "") - MSG_INFO_NOTIF(DEATH_SELF_NADE_ICE_FREEZE, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "nade_ice", _("^BG%s^K1 was frozen to death by their own Ice Nade%s%s"), _("^BG%s^K1 felt a little chilly%s%s")) MSG_INFO_NOTIF(DEATH_SELF_NADE_HEAL, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "nade_heal", _("^BG%s^K1's Healing Nade didn't quite heal them%s%s"), "") MSG_INFO_NOTIF(DEATH_SELF_NOAMMO, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_outofammo", _("^BG%s^K1 died%s%s. What's the point of living without ammo?"), _("^BG%s^K1 ran out of ammo%s%s")) MSG_INFO_NOTIF(DEATH_SELF_ROT, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "notify_death", _("^BG%s^K1 rotted away%s%s"), "") @@ -660,7 +658,6 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != 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"))) @@ -864,7 +861,6 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_MULTI_NOTIF(DEATH_MURDER_NADE, N_ENABLE, NULL, INFO_DEATH_MURDER_NADE, NULL) MSG_MULTI_NOTIF(DEATH_MURDER_NADE_NAPALM, N_ENABLE, NULL, INFO_DEATH_MURDER_NADE_NAPALM, NULL) MSG_MULTI_NOTIF(DEATH_MURDER_NADE_ICE, N_ENABLE, NULL, INFO_DEATH_MURDER_NADE_ICE, NULL) - MSG_MULTI_NOTIF(DEATH_MURDER_NADE_ICE_FREEZE, N_ENABLE, NULL, INFO_DEATH_MURDER_NADE_ICE_FREEZE, NULL) MSG_MULTI_NOTIF(DEATH_MURDER_NADE_HEAL, N_ENABLE, NULL, INFO_DEATH_MURDER_NADE_HEAL, NULL) MSG_MULTI_NOTIF(DEATH_MURDER_SHOOTING_STAR, N_ENABLE, NULL, INFO_DEATH_MURDER_SHOOTING_STAR, NULL) MSG_MULTI_NOTIF(DEATH_MURDER_SLIME, N_ENABLE, NULL, INFO_DEATH_MURDER_SLIME, NULL) @@ -906,8 +902,7 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input != MSG_MULTI_NOTIF(DEATH_SELF_MON_ZOMBIE_MELEE, N_ENABLE, NULL, INFO_DEATH_SELF_MON_ZOMBIE_MELEE, CENTER_DEATH_SELF_MONSTER) MSG_MULTI_NOTIF(DEATH_SELF_NADE, N_ENABLE, NULL, INFO_DEATH_SELF_NADE, CENTER_DEATH_SELF_NADE) MSG_MULTI_NOTIF(DEATH_SELF_NADE_NAPALM, N_ENABLE, NULL, INFO_DEATH_SELF_NADE_NAPALM, CENTER_DEATH_SELF_NADE_NAPALM) - MSG_MULTI_NOTIF(DEATH_SELF_NADE_ICE, N_ENABLE, NULL, INFO_DEATH_SELF_NADE_ICE, CENTER_DEATH_SELF_NADE_ICE_FREEZE) - MSG_MULTI_NOTIF(DEATH_SELF_NADE_ICE_FREEZE, N_ENABLE, NULL, INFO_DEATH_SELF_NADE_ICE_FREEZE, CENTER_DEATH_SELF_NADE_ICE_FREEZE) + MSG_MULTI_NOTIF(DEATH_SELF_NADE_ICE, N_ENABLE, NULL, INFO_DEATH_SELF_NADE_ICE, CENTER_DEATH_SELF_NADE) MSG_MULTI_NOTIF(DEATH_SELF_NADE_HEAL, N_ENABLE, NULL, INFO_DEATH_SELF_NADE_HEAL, CENTER_DEATH_SELF_NADE_HEAL) MSG_MULTI_NOTIF(DEATH_SELF_NOAMMO, N_ENABLE, NULL, INFO_DEATH_SELF_NOAMMO, CENTER_DEATH_SELF_NOAMMO) MSG_MULTI_NOTIF(DEATH_SELF_ROT, N_ENABLE, NULL, INFO_DEATH_SELF_ROT, CENTER_DEATH_SELF_ROT)