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/033-1/kimarr.txt | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'npc/033-1')

diff --git a/npc/033-1/kimarr.txt b/npc/033-1/kimarr.txt
index 74ae45a1..cc76ce97 100644
--- a/npc/033-1/kimarr.txt
+++ b/npc/033-1/kimarr.txt
@@ -70,7 +70,7 @@ L_Ask:
         "Maybe later.",L_close;
 
 L_AlreadyGotReward:
-    npctalk strnpcinfo(0), strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and has once again proven to be a good hunter.";
+    npctalk strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and has once again proven to be a good hunter.";
     message strcharinfo(0), "Kimarr: Once again you prove your worth as a hunter! You killed " + $@Fluffy_Kills + " Fluffies.";
     callsub S_Clean;
     goto L_close;
@@ -81,7 +81,7 @@ L_Reward1:
     if (@state >= 2)
         goto L_AlreadyGotReward;
 
-    npctalk strnpcinfo(0), "Hooray! " + strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and is now a worthy hunter.";
+    npctalk "Hooray! " + strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and is now a worthy hunter.";
 
     // as far as I can tell, this fails because it won't resume from the "next"
     // when the script is executed via the "OnFluffyDeath" callback
@@ -161,19 +161,19 @@ L_Action:
         areatimer 0, "033-1", 79, 28, 88, 42, 10, "Kimarr::OnTooMany";
 
     if ($@Fluffy_Time == 180)
-        npctalk strnpcinfo(0), strcharinfo(0) + ", you have 3 minutes.";
+        npctalk strcharinfo(0) + ", you have 3 minutes.";
     if ($@Fluffy_Time == 120)
-        npctalk strnpcinfo(0), "You have 2 minutes left.";
+        npctalk "You have 2 minutes left.";
     if ($@Fluffy_Time == 60)
-        npctalk strnpcinfo(0), "You have 1 minute left.";
+        npctalk "You have 1 minute left.";
     if ($@Fluffy_Time == 30)
-        npctalk strnpcinfo(0), "You have 30 seconds left.";
+        npctalk "You have 30 seconds left.";
     if ($@Fluffy_Time == 15)
-        npctalk strnpcinfo(0), "You have 15 seconds left.";
+        npctalk "You have 15 seconds left.";
     if ($@Fluffy_Time == 10)
-        npctalk strnpcinfo(0), "You have 10 seconds left.";
+        npctalk "You have 10 seconds left.";
     if ($@Fluffy_Time == 5)
-        npctalk strnpcinfo(0), "You have 5 seconds left.";
+        npctalk "You have 5 seconds left.";
     $@Fluffy_Time = $@Fluffy_Time - 1;
     if ($@Fluffy_Time < 0)
         goto L_TimeOver;
@@ -184,21 +184,21 @@ L_ContinueTimer:
     end;
 
 L_GotOut:
-    npctalk strnpcinfo(0), "What a strange thing... " + $@Fluffy_Fighter$ + " just disappeared!";
+    npctalk "What a strange thing... " + $@Fluffy_Fighter$ + " just disappeared!";
     callsub S_Clean;
     end;
 
 OnTooMany:
     if (getcharid(3) == $@Fluffy_FighterID)
         end;
-    npctalk strnpcinfo(0), "Hey " + strcharinfo(0) + "! What are you doing there? This hunt is for " + $@Fluffy_Fighter$ + " alone!";
+    npctalk "Hey " + strcharinfo(0) + "! What are you doing there? This hunt is for " + $@Fluffy_Fighter$ + " alone!";
     warp "033-1", 77, 34;
     end;
 
 L_Died:
     warp "033-1", 77, 34;
     message strcharinfo(0), "You are dead.";
-    npctalk strnpcinfo(0), "Oh no! " + $@Fluffy_Fighter$ + " got overwhelmed!";
+    npctalk "Oh no! " + $@Fluffy_Fighter$ + " got overwhelmed!";
     callsub S_Clean;
     end;
 
@@ -291,7 +291,7 @@ L_Punish:
     if (@mobId == 1072)
         areamonster "033-1", 79, 29, 88, 42, "", 1072, 1, "Kimarr::OnYetiDeath";
 
-    npctalk strnpcinfo(0), strcharinfo(0) + "! This hunt is for " + $@Fluffy_Fighter$ + " alone!";
+    npctalk strcharinfo(0) + "! This hunt is for " + $@Fluffy_Fighter$ + " alone!";
     heal -Hp, 0;
     @mobId = 0;
     end;
@@ -369,7 +369,7 @@ L_FinallyInsertMe:
     goto L_Reward1;
 
 L_NotGoodEnough:
-    npctalk strnpcinfo(0),  "What a disappointment, " + strcharinfo(0) + " hunted only " + $@Fluffy_Kills + " Fluffies.";
+    npctalk  "What a disappointment, " + strcharinfo(0) + " hunted only " + $@Fluffy_Kills + " Fluffies.";
     message strcharinfo(0), "Kimarr: What a disappointment, you hunted only " + $@Fluffy_Kills + " Fluffies.";
     callsub S_Clean;
     end;
-- 
cgit v1.2.3-60-g2f50