Various dialog fixes in Tulim

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

1 files changed, 22 insertions, 21 deletions

diff --git a/world/map/npc/002-2/bakery.txt b/world/map/npc/002-2/bakery.txt
index 5a21678a..28a16b3a 100644
--- a/world/map/npc/002-2/bakery.txt
+++ b/world/map/npc/002-2/bakery.txt
@@ -16,10 +16,9 @@
         && (countitem ("MopoxCurePotion") > 0))
             goto L_lace_cupcake;
 
-    mes "\"Would you mind bringing me 6 acorns please? I need them to make flour for the chocolate cakes. I will be so delicious!\"";
+    mes "\"Would you mind bringing me ##B6 acorns##b please? I need them to make flour so I can bake some chocolate cakes. I will be so delicious!\"";
     next;
-    mes "\"Um, I mean, the cakes will be delicious...\"";
-    emotion EMOTE_BLUSH;
+    mes "\"Uh... I mean... the cakes will be delicious...\" %%;";
     next;
 
     set @dq_level, 15;
@@ -33,28 +32,28 @@
     callfunc "DailyQuest";
 
     next;
-    mes "\"And don't forget, our bakery is the best!\"";
+    mes "\"Don't forget: our bakery is the best!\"";
     close;
 
 L_lace_chococake:
     next;
     menu
-        "Thanks!  Let me have a look around...", L_End,
+        "Thanks! Let me have a look around...", L_End,
         "Can you put this potion into a Chocolate Cake?", L_Next,
         "Goodbye!", L_End;
 
 L_Next:
     mes "[Riskim]";
     mes "";
-    mes "As you show Riskim the potion, he leans back, away from it.";
-    mes "\"Ooooh, I remember that smell...\"";
-    mes "\"Elanore's Mopox potion, right?  She made me drink that, too...\"";
+    mes "You take the potion out and attempt to show it to Riskim, but he takes a step back.";
+    mes "\"Oh! I remember that smell...\"";
+    mes "\"Elanore's Mopox potion, right?  She made me drink that too...\"";
     mes "He chuckles.";
-    mes "\"Yes, well, you do want to hide that somehow.\"";
+    mes "\"Yes. Well, you definitely want to hide that somehow.\"";
     next;
     mes "[Riskim]";
     mes "";
-    mes "\"We'll need extra chocolate for that one. If you can give me ten pieces of chocolate and that potion, plus 400 GP, I will bake you a special Chocolate Cake that hides the taste.\"";
+    mes "\"We'll need extra chocolate for that one. If you can give me ten pieces of chocolate, the Mopox potion, and a payment of 400 GP, I'll bake you a special Chocolate Cake that hides the taste.\"";
     next;
     menu
         "I will get them for you.", L_End,
@@ -76,42 +75,42 @@ L_Continue:
     mes "[Riskim]";
     mes "";
     mes "\"Please have a seat!\"";
-    mes "You watch as Riskim melts the chocolate and stirs in the potion, then glazes a cake with the mixture.";
-    mes "\"It's a bit more chocolatey than your average chocolate cake, of course...\"";
+    mes "You watch as Riskim melts the chocolate, stirs in the potion, and then glazes a cake with the mixture.";
+    mes "\"It's a bit more chocolaty than your average chocolate cake, so it should help mask that awful taste.\"";
     next;
     mes "[Riskim]";
     mes "";
     mes "Riskim hands you the cake.";
-    mes "\"Here you are. I hope that this works.\"";
+    mes "\"Here you are! I hope this helps.\"";
     close;
 
 L_lacking_Zeny:
     mes "[Riskim]";
     mes "";
-    mes "\"I'm sorry, but I have to charge 400 GP.\"";
+    mes "\"I'm sorry, but I have to charge 400 GP. I've got to make a living somehow.\"";
     close;
 
 L_lacking_ingredients:
     mes "[Riskim]";
     mes "";
-    mes "\"Sorry, but I need ten Chocolate Bars AND your cure potion for this. Please come back later when you have everything.\"";
+    mes "\"Sorry, but I need both the ten Chocolate Bars and your potion for this. Please come back later when you have everything.\"";
     close;
 
 L_lace_cupcake:
     next;
     menu
-        "Thanks!  Let me have a look around...", L_End,
-        "Can you put this potion into an Orange Cupcake?", L_More,
+        "Thanks! Let me have a look around...", L_End,
+        "Can mix a potion into an Orange Cupcake?", L_More,
         "Goodbye!", L_End;
 
 L_More:
     mes "[Riskim]";
     mes "";
-    mes "\"Orange Cupcakes?  Oh dear... I'm sorry, but I have a very bad orange allergy.\"";
+    mes "\"Orange Cupcakes? Oh dear... I'm sorry, but I have a very bad allergy to oranges.\"";
     next;
     mes "[Riskim]";
     mes "";
-    mes "\"Perhaps the Chef at Dimond's Cove can help you?  We get all our cupcakes from him.\"";
+    mes "\"Perhaps the Chef at Dimond's Cove can help you. We get all of our cupcakes from him.\"";
     next;
     goto L_End;
 
@@ -125,6 +124,8 @@ L_End:
     mes "[Sara]";
     mes "";
     mes "\"Hello!\"";
+    mes "\"If you'd like to buy something, just ask Drabur.\"";
+    mes "\"If you need something made-to-order, talk to Riskim.\"";
     close;
 }
 
@@ -136,7 +137,7 @@ L_End:
 {
     mes "[Iormo]";
     mes "";
-    mes "\"This room can get messy.\"";
+    mes "\"The cake sure is good, but this room can get messy with all the flour.\"";
     close;
 }
 
@@ -153,6 +154,6 @@ L_End:
 {
     mes "[Ontas]";
     mes "";
-    mes "\"We come here every week. This place has some of the best bread I've ever eaten!\"";
+    mes "\"We come here almost every week! This place has some of the best bread I've ever eaten!\"";
     close;
 }