From 9c80735ee437f90b2baefbbfcdf6c5829234c908 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Sat, 23 May 2015 11:00:00 -0400
Subject: allow to specify emitter and receiver in npctalk

---
 world/map/npc/007-1/witch.txt | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'world/map/npc/007-1/witch.txt')

diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index e8eb1ffc..b8cb3850 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -551,18 +551,18 @@ L_ReactToPlayersReturn:
     end;
 
 L_SurprisedByHeroWin:
-    npctalk "(How is it possible... " + $@ILLIA_HERO$ + " survived...)";
+    npctalk strnpcinfo(0), "(How is it possible... " + $@ILLIA_HERO$ + " survived...)";
     emotion EMOTE_SURPRISE;
     goto L_EndQuest;
 
 L_Disappoint:
-    npctalk "Oh no... It seems " + $@ILLIA_HERO$ + " did not make it... Who will save my sister now?";
+    npctalk strnpcinfo(0), "Oh no... It seems " + $@ILLIA_HERO$ + " did not make it... Who will save my sister now?";
     emotion EMOTE_SAD;
     goto L_EndQuest;
 
 L_PlayerGaveUp:
     close2;
-    npctalk "Well... It seems you can't do it " + $@ILLIA_HERO$ + ". I knew it as soon as I saw you!";
+    npctalk strnpcinfo(0), "Well... It seems you can't do it " + $@ILLIA_HERO$ + ". I knew it as soon as I saw you!";
     emotion EMOTE_UPSET;
     goto L_EndQuest;
 
@@ -608,30 +608,30 @@ OnTimer3000:
 OnTimer2500:
     if ($@ILLIA_STATUS != 3)
         end;
-    npctalk $@ILLIA_HERO$ + ", " + $@ILLIA_HELPER1$ + ", " + $@ILLIA_HELPER2$ + ", " + $@ILLIA_HELPER3$ + ", listen!";
+    npctalk strnpcinfo(0), $@ILLIA_HERO$ + ", " + $@ILLIA_HELPER1$ + ", " + $@ILLIA_HELPER2$ + ", " + $@ILLIA_HELPER3$ + ", listen!";
     end;
 
 OnTimer7500:
     if ($@ILLIA_STATUS != 3)
         end;
-    npctalk "I will teleport the 4 of you in a forest that isn't far from the waterfall.";
+    npctalk strnpcinfo(0), "I will teleport the 4 of you in a forest that isn't far from the waterfall.";
     end;
 
 OnTimer14000:
     if ($@ILLIA_STATUS != 3)
         end;
-    npctalk "Each of you takes one of these rings. They will allow you to come back here when needed.";
+    npctalk strnpcinfo(0), "Each of you takes one of these rings. They will allow you to come back here when needed.";
     end;
 
 OnTimer24000:
     if ($@ILLIA_STATUS != 3)
         end;
     if ($Illia_Luvia_Harvest < 10)
-        npctalk "Do your best and save my sister!";
+        npctalk strnpcinfo(0), "Do your best and save my sister!";
     if ($Illia_Luvia_Harvest >= 10 && $Illia_Luvia_Harvest < 35)
-        npctalk "This will be quite dangerous, but do your best and save my sister!";
+        npctalk strnpcinfo(0), "This will be quite dangerous, but do your best and save my sister!";
     if ($Illia_Luvia_Harvest >= 35)
-        npctalk "This will be awfully dangerous, but do your best and save my sister!";
+        npctalk strnpcinfo(0), "This will be awfully dangerous, but do your best and save my sister!";
     end;
 
 OnTimer34000:
@@ -643,7 +643,7 @@ OnTimer34000:
     areatimer "007-1", 66, 73, 92, 88, 3500, "Valia::OnWarpHelper1";
     areatimer "007-1", 66, 73, 92, 88, 4000, "Valia::OnWarpHelper2";
     areatimer "007-1", 66, 73, 92, 88, 4500, "Valia::OnWarpHelper3";
-    npctalk "Spiralis Major!";
+    npctalk strnpcinfo(0), "Spiralis Major!";
     misceffect FX_BLUE_MAGIC_CAST;
     end;
 
@@ -662,19 +662,19 @@ OnTimer150000:
     if ($@ILLIA_STATUS != 1)
         end;
     set $@ILLIA_STATUS, 2;
-    npctalk $@ILLIA_HERO$ + ", I am ready to cast the teleport spell. You and your comrades should not wait any longer!";
+    npctalk strnpcinfo(0), $@ILLIA_HERO$ + ", I am ready to cast the teleport spell. You and your comrades should not wait any longer!";
     end;
 
 OnTimer280000:
     if ($@ILLIA_STATUS != 2)
         end;
-    npctalk "Hurry up " + $@ILLIA_HERO$ + ", I am losing patience.";
+    npctalk strnpcinfo(0), "Hurry up " + $@ILLIA_HERO$ + ", I am losing patience.";
     end;
 
 OnTimer300000:
     if ($@ILLIA_STATUS != 2)
         end;
-    npctalk $@ILLIA_HERO$ + ", you and your missing comrades made me lose a precious time! Out of my sight!";
+    npctalk strnpcinfo(0), $@ILLIA_HERO$ + ", you and your missing comrades made me lose a precious time! Out of my sight!";
     emotion EMOTE_UPSET;
     if (attachrid($@ILLIA_HERO_ID))
         goto L_KillHero;
-- 
cgit v1.2.3-70-g09d2