Merge pull request #403 from mekolat/npctalk

allow to specify emitter and receiver in npctalk

1 files changed, 6 insertions, 6 deletions

diff --git a/world/map/npc/029-2/tanisha.txt b/world/map/npc/029-2/tanisha.txt
index 0a594410..012f93ff 100644
--- a/world/map/npc/029-2/tanisha.txt
+++ b/world/map/npc/029-2/tanisha.txt
@@ -211,7 +211,7 @@ L_Next2:
     goto L_Fight_Again;
 
 L_Fighting:
-    message strcharinfo(0), "Tanisha: I believe in you!";
+    npctalk strnpcinfo(0), "##3I believe in you!", strcharinfo(0);
     end;
 
 OnTimer1000:
@@ -238,16 +238,16 @@ OnTick:
     if (Hp > 20)
         end;
     heal MaxHp, 0;
-    message strcharinfo(0), "Tanisha: You're doing good!";
+    npctalk strnpcinfo(0), "##3You're doing good!", strcharinfo(0);
     end;
 
 OnMaggotDeath:
     if (@Maggot_Kills == 1)
-        message strcharinfo(0), "Tanisha: Aaahhhh... another one! It will crawl up your legs!";
+        npctalk strnpcinfo(0), "##3Aaahhhh... another one! It will crawl up your legs!", strcharinfo(0);
     if (@Maggot_Kills == 2)
-        message strcharinfo(0), "Tanisha: Ohh... Irrhk... Eeeeww... They just appear from nowhere!";
+        npctalk strnpcinfo(0), "##3Ohh... Irrhk... Eeeeww... They just appear from nowhere!", strcharinfo(0);
     if (@Maggot_Kills == 3)
-        message strcharinfo(0), "Tanisha: Yuck... I think I am getting sick.";
+        npctalk strnpcinfo(0), "##3Yuck... I think I am getting sick.", strcharinfo(0);
     if (isin("029-2", 98, 84, 106, 89))
         set @Maggot_Kills, @Maggot_Kills + 1;
     if (@Maggot_Kills < 5)
@@ -283,6 +283,6 @@ L_Warp:
     end;
 
 L_Block:
-    message strcharinfo(0), "Tanisha: Please come here. I'd like some help!";
+    npctalk "Tanisha", "##3##BPlease come here. ##bI'd like some help!", strcharinfo(0);
     end;
 }