From 9c80735ee437f90b2baefbbfcdf6c5829234c908 Mon Sep 17 00:00:00 2001 From: mekolat Date: Sat, 23 May 2015 11:00:00 -0400 Subject: allow to specify emitter and receiver in npctalk --- world/map/npc/009-7/debug.txt | 6 +++--- world/map/npc/009-7/rouge.txt | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'world/map/npc/009-7') diff --git a/world/map/npc/009-7/debug.txt b/world/map/npc/009-7/debug.txt index 94735b3e..997d64f1 100644 --- a/world/map/npc/009-7/debug.txt +++ b/world/map/npc/009-7/debug.txt @@ -153,14 +153,14 @@ OnInit: // debug messages below OnKillerNotInDuel: - npctalk "WARNING: The victim was not killed by its adversary. Aborting duel..."; + npctalk strnpcinfo(0), "WARNING: The victim was not killed by its adversary. Aborting duel..."; end; OnVictimNotInDuel: - npctalk "WARNING: The victim is not part of the duel"; + npctalk strnpcinfo(0), "WARNING: The victim is not part of the duel"; end; OnVictimInDuelNoDuel: - npctalk "WARNING: The victim is part of the duel but no duel is ongoing at the moment."; + npctalk strnpcinfo(0), "WARNING: The victim is part of the duel but no duel is ongoing at the moment."; end; } diff --git a/world/map/npc/009-7/rouge.txt b/world/map/npc/009-7/rouge.txt index 4ce3be8e..7660683e 100644 --- a/world/map/npc/009-7/rouge.txt +++ b/world/map/npc/009-7/rouge.txt @@ -102,30 +102,30 @@ L_End: //announcements below OnAnnounceNext: - npctalk "##0The next battle ("+ $@Duel_Queue_ID[0] +") is ##1" + $@Duel_Queue_Red$[0] + "##0 vs. ##3" + $@Duel_Queue_Blue$[0] + "##0.The battle will start in "+ $@Duel_TimeBeforeWarp +" seconds."; + npctalk strnpcinfo(0), "##0The next battle ("+ $@Duel_Queue_ID[0] +") is ##1" + $@Duel_Queue_Red$[0] + "##0 vs. ##3" + $@Duel_Queue_Blue$[0] + "##0.The battle will start in "+ $@Duel_TimeBeforeWarp +" seconds."; end; OnAnnounceIntrusion: - npctalk "Intrusion detected. Annihilation in progress... Done."; + npctalk strnpcinfo(0), "Intrusion detected. Annihilation in progress... Done."; end; OnAnnounceTimeOut: - npctalk "Time limit reached! Both player lose!"; + npctalk strnpcinfo(0), "Time limit reached! Both player lose!"; end; OnAnnounceRedWins: - npctalk $@Duel_Queue_Red$[0] + " wins the duel against "+ $@Duel_Queue_Blue$[0] +"!"; + npctalk strnpcinfo(0), $@Duel_Queue_Red$[0] + " wins the duel against "+ $@Duel_Queue_Blue$[0] +"!"; end; OnAnnounceRedForfeit: - npctalk $@Duel_Queue_Red$[0] + " wins by forfeit!"; + npctalk strnpcinfo(0), $@Duel_Queue_Red$[0] + " wins by forfeit!"; end; OnAnnounceBlueWins: - npctalk $@Duel_Queue_Blue$[0] + " wins the duel against "+ $@Duel_Queue_Red$[0] +"!"; + npctalk strnpcinfo(0), $@Duel_Queue_Blue$[0] + " wins the duel against "+ $@Duel_Queue_Red$[0] +"!"; end; OnAnnounceBlueForfeit: - npctalk $@Duel_Queue_Blue$[0] + " wins by forfeit!"; + npctalk strnpcinfo(0), $@Duel_Queue_Blue$[0] + " wins by forfeit!"; end; } -- cgit v1.2.3-60-g2f50