From e6834dc497489e3219daf3f2770a975817de64e7 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 9 Jul 2021 14:30:19 -0300 Subject: Systematically fix most if not every improper instance of npctalk --- npc/009-7/debug.txt | 6 +++--- npc/009-7/rouge.txt | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'npc/009-7') diff --git a/npc/009-7/debug.txt b/npc/009-7/debug.txt index 47ee823c..00fcc643 100644 --- a/npc/009-7/debug.txt +++ b/npc/009-7/debug.txt @@ -142,14 +142,14 @@ OnInit: // debug messages below OnKillerNotInDuel: - npctalk strnpcinfo(0), "WARNING: The victim was not killed by its adversary. Aborting duel..."; + npctalk "WARNING: The victim was not killed by its adversary. Aborting duel..."; end; OnVictimNotInDuel: - npctalk strnpcinfo(0), "WARNING: The victim is not part of the duel"; + npctalk "WARNING: The victim is not part of the duel"; end; OnVictimInDuelNoDuel: - npctalk strnpcinfo(0), "WARNING: The victim is part of the duel but no duel is ongoing at the moment."; + npctalk "WARNING: The victim is part of the duel but no duel is ongoing at the moment."; end; } diff --git a/npc/009-7/rouge.txt b/npc/009-7/rouge.txt index 157da9fb..fb26d42a 100644 --- a/npc/009-7/rouge.txt +++ b/npc/009-7/rouge.txt @@ -100,30 +100,30 @@ L_End: close; OnAnnounceNext: - 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."; + 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."; end; OnAnnounceIntrusion: - npctalk strnpcinfo(0), "Intrusion detected. Annihilation in progress... Done."; + npctalk "Intrusion detected. Annihilation in progress... Done."; end; OnAnnounceTimeOut: - npctalk strnpcinfo(0), "Time limit reached! Both player lose!"; + npctalk "Time limit reached! Both player lose!"; end; OnAnnounceRedWins: - npctalk strnpcinfo(0), $@Duel_Queue_Red$[0] + " wins the duel against "+ $@Duel_Queue_Blue$[0] +"!"; + npctalk $@Duel_Queue_Red$[0] + " wins the duel against "+ $@Duel_Queue_Blue$[0] +"!"; end; OnAnnounceRedForfeit: - npctalk strnpcinfo(0), $@Duel_Queue_Red$[0] + " wins by forfeit!"; + npctalk $@Duel_Queue_Red$[0] + " wins by forfeit!"; end; OnAnnounceBlueWins: - npctalk strnpcinfo(0), $@Duel_Queue_Blue$[0] + " wins the duel against "+ $@Duel_Queue_Red$[0] +"!"; + npctalk $@Duel_Queue_Blue$[0] + " wins the duel against "+ $@Duel_Queue_Red$[0] +"!"; end; OnAnnounceBlueForfeit: - npctalk strnpcinfo(0), $@Duel_Queue_Blue$[0] + " wins by forfeit!"; + npctalk $@Duel_Queue_Blue$[0] + " wins by forfeit!"; end; } -- cgit v1.2.3-70-g09d2