diff options
author | Wushin <pasekei@gmail.com> | 2015-06-24 12:28:42 -0500 |
---|---|---|
committer | Wushin <pasekei@gmail.com> | 2015-06-24 12:28:42 -0500 |
commit | 9c42e7f35fc15a8424742593c09282aaeeec69a9 (patch) | |
tree | 7a18c6593fc8fdf5b0d330b824b4ac9dcec626e7 /world/map/npc/009-7 | |
parent | 49b85f23157c2bd7e6919bf2a809e0893276f749 (diff) | |
parent | 9c80735ee437f90b2baefbbfcdf6c5829234c908 (diff) | |
download | serverdata-9c42e7f35fc15a8424742593c09282aaeeec69a9.tar.gz serverdata-9c42e7f35fc15a8424742593c09282aaeeec69a9.tar.bz2 serverdata-9c42e7f35fc15a8424742593c09282aaeeec69a9.tar.xz serverdata-9c42e7f35fc15a8424742593c09282aaeeec69a9.zip |
Merge pull request #403 from mekolat/npctalk
allow to specify emitter and receiver in npctalk
Diffstat (limited to 'world/map/npc/009-7')
-rw-r--r-- | world/map/npc/009-7/debug.txt | 6 | ||||
-rw-r--r-- | world/map/npc/009-7/rouge.txt | 14 |
2 files changed, 10 insertions, 10 deletions
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; } |