From: terencehill Date: Sun, 10 Nov 2019 16:48:45 +0000 (+0100) Subject: Display number of extralives taken in LMS and Instagib in the centerprint message X-Git-Tag: xonotic-v0.8.5~1227 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8af3a886784a6a31a93d914dc9d2cf7a5d4b5b0c;p=xonotic%2Fxonotic-data.pk3dir.git Display number of extralives taken in LMS and Instagib in the centerprint message --- diff --git a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc index aceb66e03..d590895a4 100644 --- a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc +++ b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc @@ -384,7 +384,7 @@ MUTATOR_HOOKFUNCTION(lms, ItemTouch) if(item.itemdef == ITEM_ExtraLife) { - Send_Notification(NOTIF_ONE, toucher, MSG_CENTER, CENTER_EXTRALIVES); + Send_Notification(NOTIF_ONE, toucher, MSG_CENTER, CENTER_EXTRALIVES, autocvar_g_lms_extra_lives); GameRules_scoring_add(toucher, LMS_LIVES, autocvar_g_lms_extra_lives); return MUT_ITEMTOUCH_PICKUP; } diff --git a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc index 1952dc09a..09eca7d30 100644 --- a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc +++ b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc @@ -528,7 +528,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, ItemTouch) if(item.itemdef == ITEM_ExtraLife) { GiveResource(toucher, RES_ARMOR, autocvar_g_instagib_extralives); - Send_Notification(NOTIF_ONE, toucher, MSG_CENTER, CENTER_EXTRALIVES); + Send_Notification(NOTIF_ONE, toucher, MSG_CENTER, CENTER_EXTRALIVES, autocvar_g_instagib_extralives); return MUT_ITEMTOUCH_PICKUP; } diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc index 743e10f2a..036a8b5e3 100644 --- a/qcsrc/common/notifications/all.inc +++ b/qcsrc/common/notifications/all.inc @@ -659,7 +659,7 @@ MSG_CENTER_NOTIF(DOOR_LOCKED_ALSONEED, N_ENABLE, 1, 0, "s1", CPID_Null, "0 0", _("^BGYou also need %s^BG!"), "") MSG_CENTER_NOTIF(DOOR_UNLOCKED, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^BGDoor unlocked!"), "") - MSG_CENTER_NOTIF(EXTRALIVES, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^F2You picked up some extra lives"), "") + MSG_CENTER_NOTIF(EXTRALIVES, N_ENABLE, 0, 1, "f1", CPID_Null, "0 0", _("^F2Extra lives taken: ^K1%s"), "") MSG_CENTER_NOTIF(FREEZETAG_REVIVE, N_ENABLE, 1, 0, "s1", CPID_Null, "0 0", _("^K3You revived ^BG%s"), "") MSG_CENTER_NOTIF(FREEZETAG_REVIVE_SELF, N_ENABLE, 0, 0, "", CPID_Null, "0 0", _("^K3You revived yourself"), "")