Various dialog fixes in Tulim

viz., the Kylian quest, the tombstones, and various other NPCs

1 files changed, 37 insertions, 21 deletions

diff --git a/world/map/npc/002-2/imec.txt b/world/map/npc/002-2/imec.txt
index 59966ff0..b8f63e4d 100644
--- a/world/map/npc/002-2/imec.txt
+++ b/world/map/npc/002-2/imec.txt
@@ -7,82 +7,98 @@
     set @state, ((QUEST_NorthTulimshar & TWOBIT_4_MASK) >> TWOBIT_4_SHIFT);
     set @EXP, 90;
     set @money, 500;
+    set @lvl, 10;
 
     if (@state >= 3) goto L_Stingers;
     if (@state == 2) goto L_Return;
     if (@state == 1) goto L_Bring;
 
     mes "[Imec]";
+    mes "%%9";
     mes "\"The Wizard's Council shut down my shop!";
-    mes "They said I was selling illegal things, but what's so illegal about poison?\"";
+    mes "Why'd they have to make such a fuss over a little poison?\"";
+    next;
+    mes "\"Someday, I'm going to get my permit back from those self-righteous snobs!\"";
     next;
-    mes "\"Anyway, I hope to get a merchant's permit again... One of these days...\"";
     mes "He looks at you.";
     next;
     mes "[Imec]";
-    mes "\"You can do an errand for me. I just finished writing a petition to the Council about my shop.";
-    mes "If you bring it to the government building near the docks, I'll give you a small reward.\"";
+    mes "%%D";
+    mes "\"Hey... I've got an idea!";
+    next;
+    mes "I just finished writing an appeal to the Council. If you bring it to the government building near the docks, they might be less... closed-minded.\"";
     goto L_Offer;
 
 L_Offer:
     menu
-        "Where are the docks and what is the government building?",L_Explain,
-        "Ok, sounds good.",L_Next,
-        "No!",L_Close;
+        "Just tell me how to get there.",L_Explain,
+        "I'll do it.",L_Next,
+        "No way!",L_Close;
 
 L_Next:
+    mes "";
     mes "[Imec]";
-    mes "\"Very good. Here is the paper.\"";
-    mes "Imec gives you a sealed letter. You put it away in a pocket separated from your inventory, so it won't get lost.";
+    mes "\"Great! Here's the appeal.\"";
+    mes "Imec gives you a sealed letter, which you store in a safe pocket outside of your inventory.";
     set @state, 1;
     callsub S_Update_Mask;
     goto L_Close;
 
 L_Explain:
+    mes "";
     mes "[Imec]";
-    mes "\"Follow the road to the north through the gate, then go west when you reach the docks. It's right before the castle mount.\"";
+    mes "\"Head north until you get to the docks – it's just west of the ferry.\"";
     next;
-    mes "\"In the building there are several offices. If you want to join or form a party, you have to pay your taxes there first.\"";
+    mes "\"There are a couple of other offices inside. You can form a party if you want, but don't take too long.\"";
+    if (BaseLevel < WEDDING_MIN_LEVEL) mes "\"Once you're older, you can even get married there.\"";
     next;
-    mes "\"So, will you bring my petition to the office in that building?\"";
+    mes "\"So... will you submit my appeal for me?\"";
     if (@state == 0)
         goto L_Offer;
     goto L_Close;
 
 L_Bring:
     mes "[Imec]";
-    mes "\"What are you waiting for? Bring my petition to the government building.\"";
+    mes "\"What are you waiting for? I'm not paying you till after the job is done!\"";
     menu
         "Where is it again?",L_Explain,
         "I'm on my way.",L_Close;
 
 L_Return:
     mes "[Imec]";
-    mes "\"Ah, you're back.\"";
-    mes "You hand the letter of acknowledgement over to Imec.";
+    mes "\"Ah! You're back! How'd it go?\"";
+    mes "You hand the letter of acknowledgment over to Imec.";
     next;
     mes "[Imec]";
-    mes "\"Very well. I'm sure I'll be able to open my shop again soon.\"";
+    mes "\"Great! I'm sure I'll be able to open my shop again soon.\"";
     next;
-    mes "It seems Imec doesn't notice you anymore.";
+    mes "It seems as though Imec has lost interest in you already.";
     menu
-        "You mentioned a reward.",L_Next1;
+        "You mentioned a reward...",L_Next1;
 
 L_Next1:
+    mes "";
     mes "[Imec]";
-    mes "\"What? Ah, right. Here, have this.\"";
+    mes "\"What? Oh, right. Here, have this.\"";
     getexp @EXP, 0;
     set Zeny, Zeny + @money;
     set @state, 3;
     callsub S_Update_Mask;
     next;
-    mes "\"Actually, you could be of further help to me.\"";
+    if (BaseLevel >= @lvl)
+        goto L_Transition_Stingers;
+    if (BaseLevel < @lvl)
+        mes "\"Come back to see me once you grow stronger; I might have a job for you later on.\"";
+    goto L_Close;
+
+L_Transition_Stingers:
+    mes "\"Actually, you could be of further use to me.\"";
     next;
     goto L_Stingers;
 
 L_Stingers:
     mes "[Imec]";
-    set @dq_level, 10;
+    set @dq_level, @lvl;
     set @dq_cost, 3;
     set @dq_count, 3;
     set @dq_name$, "ScorpionStinger";