From 0629d4e3b780f12f04ff421cf9ce368aec7d3fca Mon Sep 17 00:00:00 2001 From: byteManiak Date: Sat, 26 Oct 2019 16:09:10 +0100 Subject: [PATCH] Removed secondary damage centerprint. Moved nade throw message to show up only when suiciding with it. --- qcsrc/common/mutators/mutator/instagib/sv_instagib.qc | 1 - qcsrc/common/mutators/mutator/nades/nades.qc | 4 ++-- qcsrc/common/mutators/mutator/overkill/sv_overkill.qc | 1 - qcsrc/common/notifications/all.inc | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc index c4f4b5d00c..1952dc09a3 100644 --- a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc +++ b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc @@ -353,7 +353,6 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, Damage_Calculate) if(frag_target != frag_attacker) { - if(frag_damage <= 0 && GetResource(frag_target, RES_HEALTH) > 0) { Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_SECONDARY_NODAMAGE); } if(!autocvar_g_instagib_blaster_keepforce) frag_force = '0 0 0'; } diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index d48319a421..8966cd9c96 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -1189,7 +1189,6 @@ void nades_CheckThrow(entity this) this.nade_altbutton = true; if(time > this.nade_refire) { - Send_Notification(NOTIF_ONE, this, MSG_CENTER, CENTER_NADE_THROW); nade_prime(this); this.nade_refire = time + autocvar_g_nades_nade_refire; } @@ -1453,7 +1452,8 @@ MUTATOR_HOOKFUNCTION(nades, PlayerDies, CBC_ORDER_LAST) { float killcount_bonus = ((CS(frag_attacker).killcount >= 1) ? bound(0, autocvar_g_nades_bonus_score_minor * CS(frag_attacker).killcount, autocvar_g_nades_bonus_score_medium) : autocvar_g_nades_bonus_score_minor); - + if (frag_attacker == frag_target) + Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_NADE_THROW); if (SAME_TEAM(frag_attacker, frag_target) || frag_attacker == frag_target) nades_RemoveBonus(frag_attacker); else if(GameRules_scoring_is_vip(frag_target)) diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc index 8176669dea..26cd9c23c8 100644 --- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc +++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc @@ -81,7 +81,6 @@ MUTATOR_HOOKFUNCTION(ok, Damage_Calculate, CBC_ORDER_LAST) if(!STAT(FROZEN, frag_target)) if(!IS_DEAD(frag_target)) { - Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_SECONDARY_NODAMAGE); M_ARGV(6, vector) = '0 0 0'; // force } diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc index 46e0c88643..743e10f2af 100644 --- a/qcsrc/common/notifications/all.inc +++ b/qcsrc/common/notifications/all.inc @@ -751,8 +751,6 @@ MSG_CENTER_NOTIF(RACE_FINISHLAP, N_ENABLE, 0, 0, "", CPID_RACE_FINISHLAP, "0 0", _("^F2The race is over, finish your lap!"), "") - MSG_CENTER_NOTIF(SECONDARY_NODAMAGE, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^BGSecondary fire inflicts no damage!"), "") - MSG_CENTER_NOTIF(SEQUENCE_COMPLETED, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^BGSequence completed!"), "") MSG_CENTER_NOTIF(SEQUENCE_COUNTER, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^BGThere are more to go..."), "") MSG_CENTER_NOTIF(SEQUENCE_COUNTER_FEWMORE, N_ENABLE, 0, 1, "f1", CPID_Null, "0 0", _("^BGOnly %s^BG more to go..."), "") -- 2.39.2