Fix Shaabty bug

1 files changed, 15 insertions, 14 deletions

diff --git a/npc/018-5-3/shaabty.txt b/npc/018-5-3/shaabty.txt
index 021ae7913..682ea32fa 100644
--- a/npc/018-5-3/shaabty.txt
+++ b/npc/018-5-3/shaabty.txt
@@ -16,7 +16,7 @@
 // Var3:
 //      Timer for state 3
 
-018-5-3,29,38,0	script	Shaabty the Fairy	NPC_FAIRY_A,{
+018-5-3,29,38,0	script	Shaabty	NPC_FAIRY_A,{
     function LTask;
     .@q=getq(LilitQuest_Shaabty);
     switch (.@q) {
@@ -35,25 +35,25 @@
     close;
 
 L_Start:
-    mesn;
+    mesn l("Shaabty the Fairy");
     mesq l("I always wanted to live in this town. I'm glad I managed to move from LoF Village to here.");
     next;
-    mesn;
+    mesn l("Shaabty the Fairy");
     mesq l("A shame there are snakes below the ground. I really, really hate snakes, like every fairy.");
     if (BaseLevel < 45 || .@q >= 3)
         close;
     next;
-    mesn;
+    mesn l("Shaabty the Fairy");
     mesq l("Maybe you could do me a favour, though?");
     setq1 LilitQuest_Shaabty, 1;
     LTask();
     close;
 
 function LTask {
-    mesn;
+    mesn l("Shaabty the Fairy");
     mesq l("I would love to see the skin of two @@.", getmonsterlink(MountainSnake));
     next;
-    mesn;
+    mesn l("Shaabty the Fairy");
     mesq l("They live below this town. Can you do this for me?");
     next;
     return;
@@ -66,13 +66,13 @@ L_Return:
     // 2 snake skins should take ~200 kills
     if (countitem(MountainSnakeSkin) >= 2) {
         if (.@q2 < 150) {
-            mesn;
+            mesn l("Shaabty the Fairy");
             mesq l("I see two snake skins, but you didn't killed them down there. That defeats the whole purpose.");
         } else {
             goto L_Finish;
         }
     } else {
-        mesn;
+        mesn l("Shaabty the Fairy");
         mesq l("That's not a couple of skins.");
     }
     close;
@@ -84,16 +84,16 @@ L_Finish:
         delitem MountainSnakeSkin, 2;
         setq1 LilitQuest_Shaabty, 2;
         getexp 20000, 200;
-        mesn;
+        mesn l("Shaabty the Fairy");
         mesq l("Thanks. Please come back later, there is something I want to do for you.");
     }
     close;
 
 L_Craft:
-    mesn;
+    mesn l("Shaabty the Fairy");
     mesq l("So, I was thinking in crafting a @@ for you.", getitemlink(LeatherTrousers));
     next;
-    mesn;
+    mesn l("Shaabty the Fairy");
     mes l("For that, I'll need @@/@@ @@.", countitem(LeatherPatch), 10, getitemlink(LeatherPatch));
     mes l("And a commission of @@/@@ GP.", format_number(Zeny), format_number(8000));
     if (countitem(LeatherPatch) < 10 ||
@@ -107,7 +107,7 @@ L_Craft:
         setq1 LilitQuest_Shaabty, 3;
         //setq3 LilitQuest_Shaabty, gettimeparam(GETTIME_HOUR)+2;
         setq3 LilitQuest_Shaabty, gettimetick(2)+7200;
-        mesn;
+        mesn l("Shaabty the Fairy");
         mesq l("Thanks! Please come back in two hours, then I'll have the trousers ready.");
     }
     close;
@@ -116,7 +116,7 @@ L_Craft:
 L_Craft2:
     .@q3=getq3(LilitQuest_Shaabty);
     if (gettimetick(2) < .@q3) {
-        mesn;
+        mesn l("Shaabty the Fairy");
         .@mg$=any(l("stop interrupting me while I make your trousers."), l("stop making me lose the line by talking to me."));
         mesq l("Please be patient and "+.@mg$);
         mesc l("Remaining time: @@", FuzzyTime(.@q3));
@@ -127,13 +127,14 @@ L_Craft2:
         getexp 0, 1000;
         setq3 LilitQuest_Shaabty, 0;
         setq1 LilitQuest_Shaabty, 4;
-        mesn;
+        mesn l("Shaabty the Fairy");
         mesq l("Here you go. Please enjoy and thanks for making this town better to live. Maybe one day the snakes leave ^.^");
     }
     close;
 
 /////////////////////////////////////////////////////////
 OnKillSnake:
+    dispbottom l("Acknowledgement");
     .@q1=getq(LilitQuest_Shaabty);
     .@q2=getq2(LilitQuest_Shaabty);
     setq2 LilitQuest_Shaabty, .@q2+1;