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/052-2/lobby.txt     | 32 ++++++++++++++++----------------
 world/map/npc/052-2/partyroom.txt |  8 ++++----
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'world/map/npc/052-2')

diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index a8a2dfa2..efc0a20a 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -154,7 +154,7 @@ L_Continue:
 end;
 
 OnCommandTalk:
-    npctalk $@illia_lobby_voices$[$@illia_lobby_voices_index];
+    npctalk strnpcinfo(0), $@illia_lobby_voices$[$@illia_lobby_voices_index];
     end;
 
 }
@@ -189,50 +189,50 @@ L_TalkToHero:
 OnTimer1500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk "Yes " + $@ILLIA_HERO$ + ", I am Luvia.";
+    npctalk strnpcinfo(0), "Yes " + $@ILLIA_HERO$ + ", I am Luvia.";
     end;
 
 OnTimer4500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk "How nice of all of you to have come to save me!";
+    npctalk strnpcinfo(0), "How nice of all of you to have come to save me!";
     end;
 
 OnTimer7500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk "But I fear...";
+    npctalk strnpcinfo(0), "But I fear...";
     end;
 
 OnTimer10500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk "... that you are mistaken about who has to be saved!";
+    npctalk strnpcinfo(0), "... that you are mistaken about who has to be saved!";
     end;
 
 OnTimer13500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk "Don't make these faces...";
+    npctalk strnpcinfo(0), "Don't make these faces...";
     end;
 
 OnTimer16500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk "Valia is just helping me by sending new soldiers for my personal army!";
+    npctalk strnpcinfo(0), "Valia is just helping me by sending new soldiers for my personal army!";
     end;
 
 OnTimer21500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk "So, if I may... Let's see what you are made of!";
+    npctalk strnpcinfo(0), "So, if I may... Let's see what you are made of!";
     end;
 
 // Monster invokes timers
 OnTimer24500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk "Demonotis!";
+    npctalk strnpcinfo(0), "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
     areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
@@ -242,7 +242,7 @@ OnTimer24500:
 OnTimer44000:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk "Demonotis!";
+    npctalk strnpcinfo(0), "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
     areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
@@ -252,7 +252,7 @@ OnTimer44000:
 OnTimer77000:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk "Demonotis!";
+    npctalk strnpcinfo(0), "Demonotis!";
     misceffect FX_EVIL_SUMMON;
     callsub S_GetHeroRect;
     areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
@@ -266,25 +266,25 @@ OnTimer77000:
 OnTimer6500:
     if ($@illia_level_5_progress != 6)
         end;
-    npctalk "Okay. You have some skill.";
+    npctalk strnpcinfo(0), "Okay. You have some skill.";
     end;
 
 OnTimer10000:
     if ($@illia_level_5_progress != 6)
         end;
-    npctalk "But that was only the beginning!";
+    npctalk strnpcinfo(0), "But that was only the beginning!";
     end;
 
 OnTimer13000:
     if ($@illia_level_5_progress != 6)
         end;
-    npctalk "I'll leave you in the good hands of your predecessors. Farewell!";
+    npctalk strnpcinfo(0), "I'll leave you in the good hands of your predecessors. Farewell!";
     end;
 
 OnTimer18500:
     if ($@illia_level_5_progress != 6)
         end;
-    npctalk "Demonotis Major!";
+    npctalk strnpcinfo(0), "Demonotis Major!";
     misceffect FX_EVIL_SUMMON;
     misceffect FX_MAGIC_DARK_EXPLOSION;
     callsub S_GetHeroRect;
@@ -309,7 +309,7 @@ OnTimer2000:
     setnpctimer 0;
     // Mock players randomly (more or less once every 40 secs) and if still enough mobs running after them
     if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2", "Luvia?::OnDSDeath") > 20))
-        npctalk "Ahaha! Run... Run!";
+        npctalk strnpcinfo(0), "Ahaha! Run... Run!";
     if ($@illia_level_5_progress == 5 && (mobcount("052-2", "Luvia?::OnDSDeath") < 0))
         goto L_AllWavesClear;
     if ($@illia_level_5_progress == 7 && (mobcount("052-2", "Luvia?::OnWGDeath") < 0))
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index a602704e..02d7a7ac 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -63,19 +63,19 @@ L_ShouldNotBeHere:
     end;
 
 OnTimer1000:
-    npctalk "Oh well, who thought you would survive so far?";
+    npctalk strnpcinfo(0), "Oh well, who thought you would survive so far?";
     end;
 
 OnTimer5000:
-    npctalk "All this way, for nothing, only to die from my hands...";
+    npctalk strnpcinfo(0), "All this way, for nothing, only to die from my hands...";
     end;
 
 OnTimer10000:
-    npctalk "Don't worry, you will continue to live, for my sake.";
+    npctalk strnpcinfo(0), "Don't worry, you will continue to live, for my sake.";
     end;
 
 OnTimer15000:
-    npctalk "One piece of advice: get prepared!";
+    npctalk strnpcinfo(0), "One piece of advice: get prepared!";
     stopnpctimer;
     setnpctimer 0;
     donpcevent "#LuviaDaemon::OnCommandInvoke";
-- 
cgit v1.2.3-60-g2f50