Merge pull request #327 from nashley/more_dialog_changes

Various dialog fixes in Tulimshar

13 files changed, 251 insertions, 213 deletions

diff --git a/world/map/npc/001-1/adrian.txt b/world/map/npc/001-1/adrian.txt
index dba78c21..de2966b5 100644
--- a/world/map/npc/001-1/adrian.txt
+++ b/world/map/npc/001-1/adrian.txt
@@ -10,29 +10,31 @@
     set @state, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
 
     mes "[Adrian]";
-    mes "\"Hello. Are you here to get the luggage for some of our passengers?\"";
+    mes "\"Hello. Are you here to pick up some luggage?\"";
     if (@state == 1)
         menu
-            "Yes, Kylian sent me to get his luggage.",L_Get,
+            "Yes. Kylian sent me to get his luggage.",L_Get,
             "No.",L_No;
     menu
         "No.",L_No;
 L_No:
+    next;
     mes "[Adrian]";
-    mes "\"Too bad. I want to go and drink a beer, but I have to wait here until all the luggage is picked up.\"";
+    mes "\"Too bad. I'd like to go get a beer, but I have to wait here until all the luggage is picked up.\"";
     mes "He sighs.";
     goto L_Close;
 
 L_Get:
+    next;
     mes "[Adrian]";
-    mes "\"Wonderful! Show me the ticket.\"";
-    mes "He checks the paper Kylian gave you and then takes a critical look at you.";
+    mes "\"Wonderful! Please show me your ticket.\"";
+    mes "He checks the paper Kylian gave you and then gives you a critical look.";
     next;
     getinventorylist;
     if ((checkweight("LeatherSuitcase", 1) == 0) || (@inventorylist_count == 100))
         goto L_Inventory;
     mes "[Adrian]";
-    mes "\"Alright, here it is.\"";
+    mes "\"Alright. Here it is. Good luck carrying that thing.\"";
     mes "Adrain hands you a very heavy suitcase.";
     getitem "LeatherSuitcase", 1;
     set @state, 2;
@@ -41,8 +43,8 @@ L_Get:
 
 L_Inventory:
     mes "[Adrian]";
-    mes "\"The suitcase is rather heavy. You doesn't look as if you can handle that.";
-    mes "Maybe if you get rid of some of the other stuff you're carrying.\"";
+    mes "\"The suitcase is rather heavy. No offense, but you don't look like you can carry it.\"";
+    mes "Maybe you should get rid of some of the other stuff you're carrying.\"";
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/001-1/ched.txt b/world/map/npc/001-1/ched.txt
index b6159583..ddfddd95 100644
--- a/world/map/npc/001-1/ched.txt
+++ b/world/map/npc/001-1/ched.txt
@@ -3,21 +3,21 @@
 001-1,43,48,0|script|Ched|113
 {
     mes "[Ched]";
-    mes "\"I'm trying to get a spell to work. It's supposed to combine two potions, but I can't seem to figure out which two those are...\"";
+    mes "\"I'm trying to get a spell to work, but I'm having some trouble.\"";
+    mes "\"It's supposed to combine two potions, but I can't seem to figure out which two to combine...\"";
     next;
     menu
-        "Well, good luck with that!", L_Done,
-        "What spell is that?", L_Next;
+        "Good luck with that.", L_Done,
+        "What spell is it?", L_Next;
 
 L_Next:
+    mes "";
     mes "[Ched]";
-    mes "\"Well, I don't know what it's called... I took it out of `Timbleweed's Advanced Transmutations.'  It seems awfully hard to cast, somehow.\"";
+    mes "\"Well, I don't remember what it's called... I took it out of 'Timbleweed's Advanced Transmutations,' but it seems awfully hard to cast.\"";
     next;
-    mes "[Ched]";
-    mes "\"Well, the invocation is `" + getspellinvocation("merge-concentration-potions") + "'. You're supposed to just hold up the potions and cast it, and then they're supposed to merge.\"";
+    mes "\"If you want to try it, the invocation is '" + getspellinvocation("merge-concentration-potions") + ".' I just can't get the hang of it though.\"";
     next;
-    mes "[Ched]";
-    mes "\"Maybe I should go back to `detect magic' until I can cast that one properly.\"";
+    mes "\"Maybe I should go back to practicing '" + getspellinvocation("detect-magic") + "' until I can cast it properly.\" %%6";
     goto L_Done;
 
 L_Done:
diff --git a/world/map/npc/001-1/tombstones.txt b/world/map/npc/001-1/tombstones.txt
index 39c98ade..e064a60d 100644
--- a/world/map/npc/001-1/tombstones.txt
+++ b/world/map/npc/001-1/tombstones.txt
@@ -4,7 +4,7 @@
 {
 
     mes "~ wushin ~";
-    mes "Tonori swallowed him whole.";
+    mes "\"Tonori swallowed him whole.\"";
     close;
 }
 
@@ -12,7 +12,7 @@
 {
 
     mes "~ Nard ~";
-    mes "Crushed by a loom.";
+    mes "\"Crushed by a loom.\"";
     close;
 }
 
@@ -20,7 +20,7 @@
 {
 
     mes "~ tux9th ~";
-    mes "Eaten by bugs.";
+    mes "\"Eaten by bugs.\"";
     close;
 }
 
@@ -28,7 +28,7 @@
 {
 
     mes "~ o11c ~";
-    mes "He asked for it. So they gave it to him.";
+    mes "\"He asked for it, so they gave it to him.\"";
     close;
 }
 
@@ -36,41 +36,41 @@
 {
 
     mes "~ " + strcharinfo(0) + " ~";
-    mes "The tombstone is blank and the grave freshly dug.";
+    mes "The epitath is blank and the grave freshly dug.";
     close;
 }
 001-1,56,106,0|script|RIP#6|400
 {
 
     mes "~ Cassy ~";
-    mes "Eaten by trolls.";
+    mes "\"Eaten by trolls.\"";
     close;
 }
 
 001-1,57,106,0|script|RIP#7|400
 {
     mes "~ George ~";
-    mes "Eaten by Snakes.";
+    mes "\"Eaten by snakes.\"";
     close;
 }
 
 001-1,58,106,0|script|RIP#8|400
 {
     mes "~ Kieron ~";
-    mes "He was right, monsters were in the cave.";
+    mes "\"He was right; monsters were in the cave.\"";
     close;
 }
 
 001-1,59,106,0|script|RIP#9|400
 {
     mes "~ William ~";
-    mes "Kieron was definitely right.";
+    mes "\"Kieron was definitely right.\"";
     close;
 }
 
 001-1,60,106,0|script|RIP#10|400
 {
     mes "~ Tyer ~";
-    mes "An experiement went wrong.";
+    mes "\"An experiement went wrong.\"";
     close;
 }
diff --git a/world/map/npc/001-2/government_building.txt b/world/map/npc/001-2/government_building.txt
index d62159cb..51b43a8c 100644
--- a/world/map/npc/001-2/government_building.txt
+++ b/world/map/npc/001-2/government_building.txt
@@ -1,22 +1,22 @@
-// The government builing in the south west
+// The government building in the south west
 
 // A clerk
 001-2,25,21,0|script|Estard|107
 {
     mes "[Estard]";
-    mes "\"Hello what can I do for you?\"";
+    mes "\"Hello. What can I do for you?\"";
     next;
     if (getpartnerid2())
         goto L_main_married;
 
     menu
-        "I'm looking at getting married.", L_marry,
-        "Nothing, I guess.", L_Close;
+        "I'd like to get married.", L_marry,
+        "Never mind.", L_Close;
 
 L_main_married:
     menu
-        "I'd like a divorce.", L_divorce,
-        "Nothing, I guess.", L_Close;
+        "I'd like to file for divorce.", L_divorce,
+        "Never mind.", L_Close;
 
 L_marry:
     if (BaseLevel < WEDDING_MIN_LEVEL)
@@ -24,51 +24,56 @@ L_marry:
     if (Zeny < WEDDING_FEE)
         goto L_marry_too_poor;
 
+    mes "";
     mes "[Estard]";
-    mes "\"Are you sure you want to get married? It'll cost " + WEDDING_FEE + " GP.\"";
+    mes "\"Are you sure that you want to get married? It'll cost you ##B" + WEDDING_FEE + " GP##b.\"";
     menu
-        "Yes", L_marry_do,
-        "No", L_Close;
+        "Yes!", L_marry_do,
+        "I'm having second thoughts...", L_Close;
 
 L_marry_do:
     callsub S_give_rings;
-
+    mes "";
     mes "[Estard]";
-    mes "\"Here are your rings. You can get married by standing in one of the designated places (like that small rug over there) with your partner, give them their ring, and say 'marry (their name here)'. You both need to have your rings on.\"";
+    mes "\"Here are your rings. In order to marry each other, you both must stand within one of the designated areas (like that small rug over there in the corner), wear your rings, and say 'marry (your partner's name).'\"";
     close;
 
 L_marry_too_young:
+    mes "";
     mes "[Estard]";
-    mes "\"I'm sorry, but you are too young to get married. You must be atleast " + WEDDING_MIN_LEVEL + " levels old.\"";
+    mes "\"I'm sorry, but you are too young to get married. You must be at least " + WEDDING_MIN_LEVEL + " levels old.\"";
     next;
 
     menu
-        "Can I at least get wedding rings?", L_get_rings,
+        "Can I at least get the wedding rings now?", L_get_rings,
         "Thanks anyways.", L_Close;
 
 L_marry_too_poor:
+    mes "";
     mes "[Estard]";
-    mes "\"You need " + WEDDING_FEE + " GP to get married. That covers all administrative fees for the marriage and provides two wedding rings.\"";
+    mes "\"It costs ##B" + WEDDING_FEE + " GP##b to get married. That covers all the processing fees for the marriage and provides you with two wedding rings.\"";
     close;
 
 L_get_rings:
+    mes "";
     mes "[Estard]";
-    mes "\"Yes. They are " + WEDDING_FEE + " GP. That covers all administrative fees for the marriage.\"";
+    mes "\"Yes! You certainly can. They're ##B" + WEDDING_FEE + " GP##b. That covers all the processing fees for the marriage and provides you with two wedding rings.\"";
 
     if (Zeny < WEDDING_FEE)
         menu
-            "Thanks anyways. I don't have enough with me.", L_Close;
+            "Thanks, but I don't have enough with me right now.", L_Close;
     if (Zeny >= WEDDING_FEE)
         menu
-            "I'll buy a pair.", L_get_rings_pay,
-            "Thanks anyways.", L_Close;
+            "Sounds great!", L_get_rings_pay,
+            "No thanks.", L_Close;
     goto L_get_rings_pay;
 
 L_get_rings_pay:
     callsub S_give_rings;
 
+    mes "";
     mes "[Estard]";
-    mes "\"There you go. Come again.\"";
+    mes "\"There you go! %%1\"";
     close;
 
 L_divorce:
@@ -78,11 +83,11 @@ L_divorce:
         goto L_divorce_not_enough;
 
     mes "[Estard]";
-    mes "\"If you're sure you want a divorce, it'll cost you " + @divorce_cost + " GP.\"";
+    mes "\"I'm sorry to hear that. If you're sure you want a divorce, it'll cost you %%B" + @divorce_cost + " GP%%b.\"";
     next;
     menu
-        "I am sure I want it.", L_do_divorce,
-        "I don't want it.", L_Close;
+        "I'm sure.", L_do_divorce,
+        "I'm having second thoughts...", L_Close;
 
 L_do_divorce:
     if (Zeny < @divorce_cost)
@@ -91,35 +96,45 @@ L_do_divorce:
     if (divorce())
         goto L_divorce_done;
 
+    mes "";
     mes "[Estard]";
-    mes "\"I'm having trouble finding the record. \"";
+    mes "\"I'm having trouble finding your documents. Please come back later.\"";
+    mes "";
     mes "[Server]";
-    mes "Try again when your partner is online too.";
+    mes "There was an unexpected error when processing your divorce. Please report this to the developers.";
     close;
 
 L_divorce_done:
     set Zeny, Zeny - @divorce_cost;
 
+    mes "";
     mes "[Estard]";
-    mes "\"You have been divorced. Come again.\"";
+    mes "\"You have now officially divorced your spouse.\"";
     close;
 
 L_divorce_not_enough:
+    mes "";
     mes "[Estard]";
-    mes "\"I'm sorry , but you don't have enough money to get a divorce. You need " + @divorce_cost + " GP.\"";
+    mes "\"I'm sorry, but you don't have enough money to get a divorce. You need ##B" + @divorce_cost + " GP##b.\"";
     close;
 
 L_not_enough_money:
+    mes "";
     mes "[Estard]";
-    mes "\"Seems you don't have enough money.\"";
+    mes "\"I'm sorry, but it seems as though you don't have enough money.\"";
     close;
 
 L_no_room_for_rings:
+    mes "";
     mes "[Estard]";
-    mes "\"You don't have enough room to carry these rings.\"";
+    mes "\"Hm... it doesn't look like you have enough room to carry these rings.";
+    mes "Free up some space, and then I'd be happy to give them to you.\"";
     close;
 
 L_Close:
+    mes "";
+    mes "[Estard]";
+    mes "\"OK. Just come back whenever you're ready.\"";
     close;
 
 S_give_rings:
@@ -139,6 +154,6 @@ S_give_rings:
 001-2,22,21,0|script|Guard#govt_in|123
 {
     mes "[Guard]";
-    mes "\"You can't come back here.\"";
+    mes "\"You're not allowed back here.\"";
     close;
 }
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;
 }
diff --git a/world/map/npc/002-2/barber.txt b/world/map/npc/002-2/barber.txt
index 076dbfab..0ed69626 100644
--- a/world/map/npc/002-2/barber.txt
+++ b/world/map/npc/002-2/barber.txt
@@ -2,7 +2,7 @@
 002-2,117,30,0|script|Issay|156
 {
     mes "[Issay the Barber]";
-    mes "\"Do you need a change of style?\"";
+    mes "\"Want to change your hairstyle?\"";
     next;
     callfunc "Barber";
     mes "[Issay the Barber]";
diff --git a/world/map/npc/002-2/casino.txt b/world/map/npc/002-2/casino.txt
index 14ac5226..b99f6911 100644
--- a/world/map/npc/002-2/casino.txt
+++ b/world/map/npc/002-2/casino.txt
@@ -7,7 +7,7 @@
     set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
     if (@kylian != 6)
         goto L_End;
-    message strcharinfo(0), "You wonder if Kylian would like to visit the casino in the evening.";
+    message strcharinfo(0), "You wonder if Kylian would be interested in visiting the Casino.";
     goto L_End;
 
 L_End:
@@ -18,7 +18,7 @@ L_End:
 002-2,86,29,0|script|Valdo|117
 {
     mes "[Valdo the Worker]";
-    mes "\"Please let me work. I'm really in a hurry!\"";
+    mes "\"Please let me work. I've got a lot to do and not enough time to do it!\"";
     close;
 }
 
@@ -49,8 +49,8 @@ L_End:
     mes "You will need 15 casino coins.\"";
     next;
     menu
-        "Yes", L_Begin,
-        "No", L_Close;
+        "Sure.", L_Begin,
+        "Not now.", L_Close;
 
 L_Begin:
     if(countitem("CasinoCoins") < 15) goto L_NoCoin;
@@ -58,13 +58,12 @@ L_Begin:
     set @croupier, rand(0, 4);
     set @croupier, @croupier + 17;
     set @player, rand(4, 21);
-    mes "\"You got " + @player + " with your cards.";
+    mes "Your cards are worth " + @player + " points.";
     if(@player == 21) goto L_End;
     mes "Do you want another card?\"";
-    next;
     menu
-        "Yes", L_Another,
-        "No", L_End;
+        "Yes.", L_Another,
+        "No.", L_End;
 
 L_Another:
     set @tempace, rand(2, 11);
@@ -72,29 +71,29 @@ L_Another:
     set @player, @player + @tempace;
     if (@player > 21) goto L_Lost;
     if (@player == 21) goto L_End;
-    mes "\"You got " + @player + " with your cards.";
+    mes "Your cards are worth " + @player + " points.";
     mes "Do you want another card?\"";
-    next;
     menu
-        "Yes", L_Another,
-        "No", L_End;
+        "Yes.", L_Another,
+        "No.", L_End;
 
 L_End:
     if (@player <= @croupier) goto L_Lost;
-    mes "\"Congratulations, you won!";
-    mes "I had " + @croupier + ".";
-    mes "You get 45 casino coins.\"";
+    mes "Your cards are worth " + @player + " points.";
+    mes "\"I have " + @croupier + " points.";
+    mes "Congratulations! You won!";
+    mes "You get 45 casino coins!\"";
     getitem "CasinoCoins", 45;
     goto L_Close;
 
 L_NoCoin:
-    mes "\"You need at least 15 coins.\"";
+    mes "\"Sorry, but you need at least 15 coins to play.\"";
     goto L_Close;
 
 L_Lost:
-    mes "\"I'm sorry but you lost.";
-    mes "You got " + @player + " with your cards.";
-    mes "I had " + @croupier + ".\"";
+    mes "\"I'm sorry, but you lost.";
+    mes "Your cards are worth " + @player + " points.";
+    mes "I have " + @croupier + " points.\"";
     goto L_Close;
 
 L_Ace:
@@ -102,15 +101,14 @@ L_Ace:
     if (@player > 21) set @player, @player - 10;
     if (@player > 21) goto L_Lost;
     if (@player == 21) goto L_End;
-    mes "You got " + @player + " with your cards.";
-    mes "Do you want another card?";
-    next;
+    mes "Your cards are worth " + @player + " points.";
+    mes "Do you want to take another card?";
     menu
         "Yes", L_Another,
         "No", L_End;
 
 L_Close:
-    mes "\"As you wish.\"";
+    mes "\"Be sure to come back again.\"";
     set @croupier, 0;
     set @player, 0;
     set @tempace, 0;
@@ -129,7 +127,7 @@ L_Close:
         "10 coins", L_b10,
         "50 coins", L_b50,
         "100 coins", L_b100,
-        "Maybe I'll play later", L_Close;
+        "Maybe I'll play later.", L_Close;
 
 L_b1:
     set @bet, 1;
@@ -154,13 +152,13 @@ L_b100:
 L_Check:
     if(countitem("CasinoCoins") < @bet) goto L_NoCoin;
     menu
-        "Choose a color", L_PickColor,
-        "Choose a number", L_Number;
+        "Choose a color...", L_PickColor,
+        "Choose a number...", L_Number;
 
 L_PickColor:
     menu
-        "Black", L_Color,
-        "Red", L_Color;
+        "Black.", L_Color,
+        "Red.", L_Color;
 
 L_Color:
     delitem "CasinoCoins", @bet;
@@ -184,23 +182,23 @@ L_Menuitems:
     if (@menu >= 3) set @number, @menu - 2;
 
     set @roulette, rand(38);
-    if (@roulette == 37) mes "The ball stopped on 00";
-    if (@roulette < 37) mes "The ball stopped on " + @roulette;
+    if (@roulette == 37) mes "The ball stopped on 00.";
+    if (@roulette < 37) mes "The ball stopped on " + @roulette + ".";
     if (@number != @roulette) goto L_Lost;
     mes "\"You won!\"";
     getitem "CasinoCoins", @bet * 10;
     goto L_Close;
 
 L_NoCoin:
-    mes "\"You don't have enough coins.\"";
+    mes "\"You don't have enough coins to play.\"";
     goto L_Close;
 
 L_Lost:
-    mes "\"I'm sorry, you lost.\"";
+    mes "\"I'm sorry, but you lost.\"";
     goto L_Close;
 
 L_Close:
-    mes "Come again.";
+    mes "Come again!";
     set @number, 0;
     set @roulette, 0;
     set @color, 0;
diff --git a/world/map/npc/002-2/eurni.txt b/world/map/npc/002-2/eurni.txt
index c63a71eb..87df4dc2 100644
--- a/world/map/npc/002-2/eurni.txt
+++ b/world/map/npc/002-2/eurni.txt
@@ -2,31 +2,32 @@
 
 002-2,22,77,0|script|Eurni|136
 {
+    set @SERVICES_ZENY, 10000;
+
     set @halloween_npc_id, $@halloween_npc_eurni;
     callfunc "TrickOrTreat";
 
     if (BaseLevel < 10) goto L_TooYoung;
-    if (Zeny < 10000) goto L_NoMoney;
+    if (Zeny < @SERVICES_ZENY) goto L_NoMoney;
 
     mes "[Eurni the Surgeon]";
-    mes "\"Are you tired of being what you are?\"";
+    mes "\"Are you tired of who you are?\"";
     next;
-
-    mes "[Eurni the Surgeon]";
-    mes "\"Would you maybe be interested in a sex change?\"";
+    mes "\"Would you be interested in changing your sex?";
+    mes "It'll cost ##B" + @SERVICES_ZENY + " GP##b.\"";
     next;
 
     mes "[Server]";
-    mes "Warning: All characters under this login will be changed. Once it's done, you will be kicked from the server. Don't panic, as everything is fine.";
+    mes "Warning: All characters under this login will be changed. Once it's done, you will be kicked from the server. Don't panic; this is normal.";
     next;
     menu
-        "Please do, my dear...", L_Change,
-        "Leave alone my family treasure!", L_Close;
+        "Please do.", L_Change,
+        "Leave my family treasures alone!", L_Close;
 
 L_Change:
-    if (Zeny < 10000)
+    if (Zeny < @SERVICES_ZENY)
         goto L_NoMoney;
-    set Zeny, Zeny - 10000;
+    set Zeny, Zeny - @SERVICES_ZENY;
     changesex;
     close;
 
@@ -37,7 +38,7 @@ L_TooYoung:
 
 L_NoMoney:
     mes "[Eurni the Surgeon]";
-    mes "\"You don't have enough to pay for my services.\"";
+    mes "\"You don't have the kind of money to pay for my services.\"";
     close;
 
 L_Close:
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";
diff --git a/world/map/npc/002-2/kps.txt b/world/map/npc/002-2/kps.txt
index 558166ec..73b40466 100644
--- a/world/map/npc/002-2/kps.txt
+++ b/world/map/npc/002-2/kps.txt
@@ -25,23 +25,25 @@
 
 L_Default:
     mes "[KPS Manager]";
-    mes "\"Kylian staying at the Inn bought this shop recently.\"";
-    mes "\"I'm waiting for him to open the shop.\"";
+    mes "\"A rich salesman named Kylian bought this shop recently.\"";
+    mes "\"I'm waiting for him to give the go-ahead on opening it up, but I haven't heard from him in a while.\"";
     next;
-    mes "\"I wonder if he needs any help?\"";
+    mes "\"I wonder if he needs any help...\"";
+    next;
+    mes "\"If you could go over and check on him in the inn while I tend to the store, I'd really appreciate it.\"";
     goto L_Close;
 
 L_OfferJob:
     mes "[KPS Manager]";
-    mes "\"Hello and what how can I help you today?\"";
+    mes "\"Hello! How can I help you today?\"";
     menu
-        "My name is " + strcharinfo(0), L_MyName,
+        "My name is " + strcharinfo(0) + ".", L_MyName,
         "Nothing.", L_Close;
 
 L_MyName:
     set @state, 11;
     callfunc "SetKylianQuest";
-    mes "\"Ahhh, Kylian said you would be dropping by.\"";
+    mes "\"Ah. Kylian said you would be dropping by.\"";
     next;
     mes "\"I assume you are looking for some work?\"";
     menu
@@ -84,10 +86,10 @@ L_RandJob:
     goto L_JobInfo;
 
 L_JobInfo:
-    mes "\"We have a delivery for:* " + $@random_quests$[@rand_quest] + "\"";
+    mes "\"We have a delivery for ##B" + $@random_quests$[@rand_quest] + "##b.\"";
     menu
-        "Take It.", L_StartRun,
-        "Anything Else?", L_RandJob,
+        "I'll take it.", L_StartRun,
+        "Anything else?", L_RandJob,
         "I need a break.", L_Close;
 
 L_StartRun:
@@ -99,7 +101,7 @@ L_StartRun:
     goto L_Close;
 
 L_RunStarted:
-    mes "Deliver this package to:* " + $@random_quests$[@run] + "\"";
+    mes "Deliver this package to ##B" + $@random_quests$[@run] + "##b.\"";
     goto L_Close;
 
 L_RunComplete:
@@ -118,7 +120,7 @@ L_SeeKylian:
     goto L_Close;
 
 L_Failed:
-    mes "\"You need to be faster next time to earn a bonus.\"";
+    mes "\"If you're faster next time, you can earn a bonus.\"";
     next;
     goto L_RunAgain;
 
@@ -131,7 +133,7 @@ L_KylianReward:
     mes "[" + $@delivery_money + " money]";
     mes "[" + ($@delivery_exp_mod * BaseLevel) + " experience points]";
     next;
-    mes "\"I have a message Kylian wants me to send you over right away.\"";
+    mes "\"I've got news for you! Kylian wants me to send you over right away.\"";
     goto L_Close;
 
 L_RunAgain:
@@ -141,12 +143,13 @@ L_RunAgain:
     mes "[" + $@delivery_money + " money]";
     mes "[" + ($@delivery_exp_mod * BaseLevel) + " experience points]";
     next;
-    mes "\"Good job, keep up the nice work and I'm sure the bonus will give you a bonus.\"";
+    mes "\"Good job! Keep up the nice work, and I'm sure the boss will give you a bonus.\"";
     next;
     goto L_StartJobAgain;
 
 L_NoPackages:
-    mes "\"Come back tomorrow, maybe we will have some more work.\"";
+    mes "\"Sorry, but we don't have any more jobs open right now.\"";
+    mes "\"Come back tomorrow; maybe we will have some more work then.\"";
     goto L_Close;
 
 L_Close:
diff --git a/world/map/npc/002-2/kylian.txt b/world/map/npc/002-2/kylian.txt
index b1dadac2..346fcffa 100644
--- a/world/map/npc/002-2/kylian.txt
+++ b/world/map/npc/002-2/kylian.txt
@@ -102,62 +102,65 @@ OnInit:
     if (@state >= 1) goto L_Suitcase;
 
     mes "[Kylian]";
-    mes "\"Ah, are you the room service? I've some requests.\"";
+    mes "\"Ah! Are you the room service? I've some requests.\"";
     menu
-        "Sure, what can I do for you?",L_Luggage,
-        "No, I'm not!",L_Next;
+        "Sure... What can I do for you?",L_Luggage,
+        "No I'm not!",L_Next;
 
 L_Next:
     mes "[Kylian]";
     mes "\"Too bad. Would you be interested in earning some quick money with some errands regardless?\"";
     menu
-        "I'm a great adventurer! I don't do errands.",L_Close,
-        "No, I'm busy.",L_Close,
-        "Mh, ok.",L_Luggage;
+        "I'm a great adventurer! I don't do petty errands.",L_Close,
+        "No. I'm busy.",L_Close,
+        "Well... OK.",L_Luggage;
 
 L_Luggage:
     mes "[Kylian]";
-    mes "\"I need someone to get my luggage from the docks. Show this paper to the sailor who's watching the luggage.\"";
-    mes "He gives you his ticket which you store in your pocket, separated from your inventory.";
+    mes "\"I need you to get my luggage from the docks. Just show this paper to the sailor who's watching the luggage.\"";
+    mes "He gives you his ticket, which you promptly store in a safe pocket outside of your inventory.";
     set @state, 1;
     callfunc "SetKylianQuest";
     goto L_Close;
 
 L_Suitcase: // @state >= 1, but below 3
     mes "[Kylian]";
-    mes "\"Did you already get my luggage from the docks?\"";
+    mes "\"Did you get my luggage from the docks?\"";
     if (@state != 2)
         goto L_Close;
     menu
         "Here it is.",L_Continue,
-        "I'm on my way, don't worry.",L_Close;
+        "Don't worry; I'm on my way.",L_Close;
 
 L_Continue:
     if (countitem("LeatherSuitcase") < 1)
         goto L_NoItem;
     delitem "LeatherSuitcase", 1;
     set Zeny, Zeny + @suitcase_money;
+    getitem "Acorn", @acorn_amount;
     getexp @suitcase_exp, 0;
     set @state, 3;
     callfunc "SetKylianQuest";
+    next;
     mes "[Kylian]";
-    mes "\"Ah, very good. I really need to have a look at some of my papers in there.\"";
+    mes "\"Ah! Very good. I have some urgent paperwork that I've been needing to attend to.\"";
     mes "He gives you some money.";
     next;
     mes "[Kylian]";
-    mes "\"Oh, and I have some acorns left, I had them with me as travelling fare. You can have them, they're tasty.";
-    mes "In case you don't like them, you could also bring them to the Tulimshar bakery. I heard they use them to make some special flour.\"";
-    getitem "Acorn", @acorn_amount;
+    mes "\"Before you go, I also happen to have some acorns left over from my trip.\"";
+    mes "\"You can have them if you wish; they're rather tasty.\"";
+    mes "If, however, you don't like them, you could take them to the Tulimshar bakery. I heard they use them to make a special kind of flour.\"";
     next;
     goto L_ShopLicense;
 
 L_ShopLicense: // @state == 3
     mes "[Kylian]";
-    mes "\"I'm a salesman and came to Tulimshar because I'm thinking about establishing a shop here. While I'm going through my papers, could you find out who I have to talk to about opening a shop in this city?\"";
+    mes "\"I'm a salesman and came to Tulimshar because I'm thinking about establishing a shop here.\"";
+    mes "\"While I'm going through my papers, could you find out whom I have to talk to about opening up a shop in this city?\"";
     if (!(QUEST_NorthTulimshar & $@knowYanisNT))
         goto L_Close;
     menu
-        "You need to talk to Yanis in the government building.",L_GovBuild,
+        "You need to go and talk to Yanis in the government building.",L_GovBuild,
         "I'll see what I can do.",L_Close;
 
 L_GovBuild:
@@ -167,24 +170,24 @@ L_GovBuild:
     callfunc "SetKylianQuest";
     set @KylianNTLicense, 1;
     mes "[Kylian]";
-    mes "\"Ah, excellent. That's very helpful. Could you tell me how to get to that building?\"";
-    mes "You explain the way to the building.";
+    mes "\"Ah... excellent! That's very helpful. Could you tell me how to get to that building?\"";
+    mes "You give him directions to the building.";
     next;
     goto L_LicenseDone;
 
 L_LicenseDone: // the player didn't log out yet after telling about Yanis
     mes "[Kylian]";
-    mes "\"I need to prepare my papers now. I might have some more questions later.\"";
+    mes "\"I need to prepare my papers now. I might have some more questions later on though.\"";
     goto L_Close;
 
 L_SightSeeing: // @state == 4 and logged out sometime between getting to that state and now
     mes "[Kylian]";
-    mes "\"You just came here the right moment. I have finished my business affairs. I think I should use my time here to also get a bit of cultural knowledge about the area. Can you tell me if there are any historical places to visit?\"";
+    mes "\"You came here at just the right moment! I have finished my business affairs, and I think I should use my time here to learn a bit about the culture in the area. Can you tell me if there are any historical places or landmarks to visit?\"";
     if (!(QUEST_NorthTulimshar & $@knowWeellosNT))
         goto L_Close;
     menu
-        "There is a very old historic building not far from here.",L_HistBuild,
-        "I don't know, but will have a look around.",L_Close;
+        "There's a very old building not far from here.",L_HistBuild,
+        "I don't know, but I'll have a look around.",L_Close;
 
 L_HistBuild:
     set Zeny, Zeny + @sightseeing_money;
@@ -199,12 +202,12 @@ L_HistBuild:
 
 L_Food: // @state == 5
     mes "[Kylian]";
-    mes "\"While I'm out, I could also get something to eat. Maybe some typical dish for this region. Do you have a good suggestion for that?\"";
+    mes "\"While I'm out, I could also get something to eat. Do you have any suggestions for local cuisine?\"";
     if (@fieri < 4) // didn't yet help Fieri make Tonori Delight
         goto L_Close;
     menu
-        "Fieri at the castle makes great Tonori Delight.",L_SoupBer,
-        "No idea, I'll try to find out.",L_Close;
+        "A man named Fieri makes a tasty Tonori Delight over at the castle.",L_SoupBer,
+        "No idea. I'll try to find out.",L_Close;
 
 L_SoupBer:
     set Zeny, Zeny + @food_money;
@@ -216,14 +219,14 @@ L_SoupBer:
 
 L_SightSeeingDone:
     mes "[Kylian]";
-    mes "\"I'm going to see the historic building you told me about and try this local food at the castle. Thank you for the suggestions.\"";
+    mes "\"I'm going to see the historic building you told me about and try the local food at the castle. Thank you for the suggestions.\"";
     goto L_Close;
 
 L_Casino: // @state == 6 and logged out sometime between getting to that state and now
     mes "[Kylian]";
-    mes "\"Hello. I just came back from my sight-seeing tour. And this Tonori Delight really was delicious. I wonder what it's made of...\"";
+    mes "\"Hello. I just came back from my sight-seeing tour, and this Tonori Delight really was delicious. I wonder what it's made of...\"";
     next;
-    mes "\"However, I was wondering if you know about a good place to spend the evening? Some place to have fun?\"";
+    mes "\"However, I was wondering if you know about some evening attractions. Maybe somewhere to have fun?\"";
     if (!(QUEST_NorthTulimshar & $@knowCasinoNT))
         goto L_Close;
     menu
@@ -236,19 +239,19 @@ L_CasinoFound:
     set @state, 7;
     callfunc "SetKylianQuest";
     mes "[Kylian]";
-    mes "\"Oh, there's a casino in this city? That's a wonderful thing. Where can I find it?\"";
+    mes "\"Oh! There's a casino in this city? That's wonderful! Where can I find it?\"";
     mes "You explain how to get to the casino.";
     next;
     goto L_Clothes;
 
 L_Clothes: // @state == 7
     mes "[Kylian]";
-    mes "\"I should get proper clothing before I go to the casino tonight. Do you know a reputable shop where clothing of high quality is sold?\"";
+    mes "\"I should acquire proper clothing before I go to the casino tonight. Do you know a reputable shop where high-quality clothing is sold?\"";
     if (!(QUEST_NorthTulimshar & $@knowLatoyNT))
         goto L_Close;
     menu
-        "Latoy's shop. On the west side of Tulimshar.",L_HarborDistrict,
-        "Mh, I don't know.",L_Close;
+        "Latoy's shop. It's on the west side of Tulimshar.",L_HarborDistrict,
+        "Hmmm... I don't know.",L_Close;
 
 L_HarborDistrict:
     set Zeny, Zeny + @clothes_money;
@@ -256,23 +259,25 @@ L_HarborDistrict:
     set @state, 8;
     callfunc "SetKylianQuest";
     set @KylianNTCasino, 1;
-    mes "You explain about Latoy and the high quality shop.";
+    mes "You explain about Latoy and the quality of his shop.";
+    next;
     mes "[Kylian]";
     mes "\"This seems to be exactly what I need. Thanks a lot.\"";
     goto L_Close;
 
 L_CasinoDone:
     mes "[Kylian]";
-    mes "\"I'm looking forward to going to the casino tonight. See me tomorrow.\"";
+    mes "\"I'm looking forward to going to the casino tonight. See me tomorrow, and I might have more requests.\"";
     goto L_Close;
 
 L_DesertHat: // @state == 8
     mes "Kylian looks a bit tired.";
+    next;
     mes "[Kylian]";
     mes "\"That was an interesting night. Thanks for your suggestion to visit the casino.\"";
     next;
     getinventorylist;
-    mes "\"You helped me a lot, so I bought a souvenir for you while I was shopping.\"";
+    mes "\"You helped me out a lot, so I bought a souvenir for you while I was out shopping.\"";
     if ((checkweight("DesertHat", 1) == 0) || (@inventorylist_count == 100))
         goto L_Inventory;
     getitem "DesertHat", 1;
@@ -284,33 +289,33 @@ L_DesertHat: // @state == 8
 L_Shop:
     mes "[Kylian]";
     mes "\"The Council of Wizards approved my shop license!\"";
-    mes "\"I purchased a store just acorss the way from the hotel exit.\"";
+    mes "\"I purchased a store just across the way from the inn.\"";
     next;
-    mes "\"If you are looking for work, go see the shop keeper I have working for me.\"";
-    mes "\"Mention your name and he will know I sent you.\"";
+    mes "\"If you are looking for work, go see the shop keeper I have working for me there.\"";
+    mes "\"Mention your name, and he will know I sent you.\"";
     set @state, 10;
     callfunc "SetKylianQuest";
     goto L_Close;
 
 L_OfferedJob:
     mes "[Kylian]";
-    mes "\"I spoke with the shopkeeper, They said you haven't stopped in yet.\"";
+    mes "\"I spoke with the shopkeeper, and he said you haven't stopped in yet.\"";
     next;
-    mes "\"I wish you would consider working for KPS.\"";
+    mes "\"I wish you would consider working for me.\"";
     next;
-    mes "\"KPS needs a well-traveled go getter like you.\"";
+    mes "\"KPS needs a determined, experienced adventurer like you.\"";
     goto L_Close;
 
 L_Helping:
     mes "[Kylian]";
-    mes "\"I've heard you decided to come work for me. That is great news.\"";
-    mes "\"Keep up the good work and I might have something a little extra for you.\"";
+    mes "\"I've heard you decided to come work for me. That's great news!\"";
+    mes "\"Keep up the good work, and I might have something a little extra for you.\"";
     goto L_Close;
 
 L_Done:
     mes "[Kylian]";
-    mes "\"Thanks a bunch, buisness is booming!\"";
-    mes "\"For your hard work take this.\"";
+    mes "\"Thanks a bunch, business is booming!\"";
+    mes "\"Please, take this for all your hard work.\"";
     next;
     set Zeny, Zeny + $@delivery_money;
     getexp ($@delivery_exp_mod * BaseLevel), 0;
@@ -325,12 +330,12 @@ L_Done:
 
 L_Inventory:
     mes "[Kylian]";
-    mes "\"Oh, you're carrying a lot of things. Come back when you have more room.\"";
+    mes "\"Oh my. You're carrying quite a lot. Come back when you have more room.\"";
     goto L_Close;
 
 L_NoItem:
     mes "[Kylian]";
-    mes "\"I don't see it! Are you trying to tease me? This is not funny!\"";
+    mes "\"I don't see it! Are you trying to tease me? This isn't funny!\"";
     goto L_Close;
 
 L_Close:
@@ -372,8 +377,8 @@ L_Menu:
     menu
         "Show Quest State", L_ShowState,
         "Set Quest State", L_SetState,
-        "Reset Timer to now", L_WorkTimer,
-        "Reset Timer + 24 hours", L_MoreWorkTimer,
+        "Reset Timer to Now", L_WorkTimer,
+        "Reset Timer + 24 Hours", L_MoreWorkTimer,
         "Close.", L_Close;
 
 L_ShowState:
diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt
index 3446c191..03e38c31 100644
--- a/world/map/npc/009-1/jack.txt
+++ b/world/map/npc/009-1/jack.txt
@@ -259,7 +259,6 @@ L_NohMask_Answer:
     goto L_Close;
 
 L_Made_Shield:
-    next;
     mes "[Jack Lumber]";
     mes "\"Speaking of that shield...\"";
     mes "\"It has put me behind on all these new Nivalis orders, now that the ship is running there.\"";
diff --git a/world/map/npc/009-1/old_woman.txt b/world/map/npc/009-1/old_woman.txt
index 83e59eaa..ac026357 100644
--- a/world/map/npc/009-1/old_woman.txt
+++ b/world/map/npc/009-1/old_woman.txt
@@ -10,21 +10,19 @@
 
     mes "[Old Woman]";
     mes "\"Hello deary.\"";
-    next;
-    goto L_Continue;
+    if ((@inspector >= 1  && @inspector <= 7) || @inspector == 9)
+        goto L_NohMask;
+    close;
 
 L_Lower:
     mes "[Old Woman]";
     mes "\"Watch out for these flowers. They don't like to be messed with.\"";
-    next;
-    goto L_Continue;
-
-L_Continue:
     if ((@inspector >= 1  && @inspector <= 7) || @inspector == 9)
         goto L_NohMask;
-    goto L_Close;
+    close;
 
 L_NohMask:
+    next;
     if (@inspector == 7)
         goto L_NohMask_Alibi;
     callfunc "ProcessEquip";