From e6834dc497489e3219daf3f2770a975817de64e7 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 9 Jul 2021 14:30:19 -0300
Subject: Systematically fix most if not every improper instance of npctalk

---
 npc/052-2/lobby.txt     | 32 ++++++++++++++++----------------
 npc/052-2/partyroom.txt |  8 ++++----
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'npc/052-2')

diff --git a/npc/052-2/lobby.txt b/npc/052-2/lobby.txt
index 0245cc6b..d6bfb824 100644
--- a/npc/052-2/lobby.txt
+++ b/npc/052-2/lobby.txt
@@ -129,7 +129,7 @@ L_Continue:
 end;
 
 OnCommandTalk:
-    npctalk strnpcinfo(0), $@illia_lobby_voices$[$@illia_lobby_voices_index];
+    npctalk $@illia_lobby_voices$[$@illia_lobby_voices_index];
     end;
 
 }
@@ -162,49 +162,49 @@ L_TalkToHero:
 OnTimer1500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "Yes " + $@iLLIA_HERO$ + ", I am Luvia.";
+    npctalk "Yes " + $@iLLIA_HERO$ + ", I am Luvia.";
     end;
 
 OnTimer4500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "How nice of all of you to have come to save me!";
+    npctalk "How nice of all of you to have come to save me!";
     end;
 
 OnTimer7500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "But I fear...";
+    npctalk "But I fear...";
     end;
 
 OnTimer10500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "... that you are mistaken about who has to be saved!";
+    npctalk "... that you are mistaken about who has to be saved!";
     end;
 
 OnTimer13500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "Don't make these faces...";
+    npctalk "Don't make these faces...";
     end;
 
 OnTimer16500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "Valia is just helping me by sending new soldiers for my personal army!";
+    npctalk "Valia is just helping me by sending new soldiers for my personal army!";
     end;
 
 OnTimer21500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "So, if I may... Let's see what you are made of!";
+    npctalk "So, if I may... Let's see what you are made of!";
     end;
 
 OnTimer24500:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "Demonotis!";
+    npctalk "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";
@@ -214,7 +214,7 @@ OnTimer24500:
 OnTimer44000:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "Demonotis!";
+    npctalk "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";
@@ -224,7 +224,7 @@ OnTimer44000:
 OnTimer77000:
     if ($@illia_level_5_progress != 4)
         end;
-    npctalk strnpcinfo(0), "Demonotis!";
+    npctalk "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";
@@ -237,25 +237,25 @@ OnTimer77000:
 OnTimer6500:
     if ($@illia_level_5_progress != 6)
         end;
-    npctalk strnpcinfo(0), "Okay. You have some skill.";
+    npctalk "Okay. You have some skill.";
     end;
 
 OnTimer10000:
     if ($@illia_level_5_progress != 6)
         end;
-    npctalk strnpcinfo(0), "But that was only the beginning!";
+    npctalk "But that was only the beginning!";
     end;
 
 OnTimer13000:
     if ($@illia_level_5_progress != 6)
         end;
-    npctalk strnpcinfo(0), "I'll leave you in the good hands of your predecessors. Farewell!";
+    npctalk "I'll leave you in the good hands of your predecessors. Farewell!";
     end;
 
 OnTimer18500:
     if ($@illia_level_5_progress != 6)
         end;
-    npctalk strnpcinfo(0), "Demonotis Major!";
+    npctalk "Demonotis Major!";
     misceffect FX_EVIL_SUMMON;
     misceffect FX_MAGIC_DARK_EXPLOSION;
     callsub S_GetHeroRect;
@@ -279,7 +279,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") > 21))
-        npctalk strnpcinfo(0), "Ahaha! Run... Run!";
+        npctalk "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/npc/052-2/partyroom.txt b/npc/052-2/partyroom.txt
index 399c690d..dfd0613e 100644
--- a/npc/052-2/partyroom.txt
+++ b/npc/052-2/partyroom.txt
@@ -48,19 +48,19 @@ L_ShouldNotBeHere:
     end;
 
 OnTimer1000:
-    npctalk strnpcinfo(0), "Oh well, who thought you would survive so far?";
+    npctalk "Oh well, who thought you would survive so far?";
     end;
 
 OnTimer5000:
-    npctalk strnpcinfo(0), "All this way, for nothing, only to die from my hands...";
+    npctalk "All this way, for nothing, only to die from my hands...";
     end;
 
 OnTimer10000:
-    npctalk strnpcinfo(0), "Don't worry, you will continue to live, for my sake.";
+    npctalk "Don't worry, you will continue to live, for my sake.";
     end;
 
 OnTimer15000:
-    npctalk strnpcinfo(0), "One piece of advice: get prepared!";
+    npctalk "One piece of advice: get prepared!";
     stopnpctimer;
     setnpctimer 0;
     donpcevent "#LuviaDaemon::OnCommandInvoke";
-- 
cgit v1.2.3-70-g09d2