Merge branch 'gameplay-typos' into 'master'

Batch of typo fixes and rewording

See merge request ml/serverdata!71

18 files changed, 214 insertions, 205 deletions

diff --git a/npc/007-1/caelum.txt b/npc/007-1/caelum.txt
index 4cc3dda52..97f25f1f3 100644
--- a/npc/007-1/caelum.txt
+++ b/npc/007-1/caelum.txt
@@ -26,17 +26,17 @@ L_GiveTask:
     next;
 
     menu
-        l("To be honest, I don't know. I was only walking, seeking for adventure!"), L_Quest,
+        l("To be honest, I don't know. I was only exploring, seeking for adventure!"), L_Quest,
         l("It's none of your business."), L_Quit;
 
 
 L_Quest:
     mes "";
     mesn;
-    mesq l("You perchance said in adventure? Good, because I just hurt my arm while mining!");
+    mesq l("You said adventure? Good, because I just hurt my arm while mining!");
     next;
     mesn;
-    mesq l("If you bring me some items to I do a bandage and heal myself, I'll give you my gloves!");
+    mesq l("If you bring me some items so that I can bandage my wound, I'll give you my gloves!");
     next;
 
     menu
@@ -68,12 +68,12 @@ L_List:
     mes l("@@/10 @@", countitem(BatTeeth), getitemlink(BatTeeth));
     mes l("@@/10 @@", countitem(CactusDrink), getitemlink(CactusDrink));
     mes l("@@/20 @@", countitem(MaggotSlime), getitemlink(MaggotSlime));
-    mes l("@@/8 @@, just because I'm hungry as a bear.", countitem(BugLeg), getitemlink(BugLeg));
+    mes l("@@/8 @@, just because I'm famished.", countitem(PiouLegs), getitemlink(PiouLegs));
     close;
 
 L_Check:
     mesn;
-    mesq l("Did you brought me everything I asked for?");
+    mesq l("Did you bring me everything I asked for?");
     next;
     menu
         l("Yes!"), L_Give,
@@ -85,7 +85,7 @@ L_Give:
         countitem(Lifestone)            < 1  ||
         countitem(CottonCloth)          < 1  ||
         countitem(RedScorpionStinger)   < 2  ||
-        countitem(BugLeg)               < 8  ||
+        countitem(PiouLegs)             < 8  ||
         countitem(BatTeeth)             < 10 ||
         countitem(CactusDrink)          < 10 ||
         countitem(MaggotSlime)          < 20 ||
@@ -97,7 +97,7 @@ L_Give:
     delitem(Lifestone, 1);
     delitem(CottonCloth, 1);
     delitem(RedScorpionStinger, 2);
-    delitem(BugLeg, 8);
+    delitem(PiouLegs, 8);
     delitem(BatTeeth, 10);
     delitem(CactusDrink, 10);
     delitem(MaggotSlime, 20);
@@ -109,12 +109,12 @@ L_Give:
 
     mes "";
     mesn;
-    mesq l("Here, all yours. I can't use them like I am now. Thank you.");
+    mesq l("Here, all yours. I can't use them while I am this hurt anyways. Thank you.");
     close;
 
 L_Complete:
     mesn;
-    mesq l("Wandering too much? Take care to don't get lost.");
+    mesq l("Wandering too much? Take care to not get lost.");
     if (getq(MineQuest_Pickaxe) < 2) {
         next;
         select
@@ -124,7 +124,7 @@ L_Complete:
         if (@menu == 2) {
             compareandsetq MineQuest_Pickaxe, 0, 1;
             mesn;
-            mesq l("Uh, you should ask %s, he is the miners leader.", b(l("Tycoon")));
+            mesq l("Uh, you should ask %s, he is the leader of us miners.", b(l("Tycoon")));
             next;
         }
     }
@@ -152,7 +152,7 @@ L_Lying:
 
 L_TooWeak:
     mesn;
-    mesq l("Wanderer, here is dangerous! Go back!");
+    mesq l("Wanderer, this is a dangerous place! Go back!");
     close;
 
 OnInit:
diff --git a/npc/007-1/dracoula.txt b/npc/007-1/dracoula.txt
index be6d2aa6e..ee45a66ce 100644
--- a/npc/007-1/dracoula.txt
+++ b/npc/007-1/dracoula.txt
@@ -11,22 +11,22 @@
     mesn;
     mesq lg("Hello adventurer! Are you lost?");
     next;
-    mesq l("This is not a place for non-experimented people!");
+    mesq l("This is not a place for unexperienced people!");
     next;
-    mesq l("Mine exit is top left!");
+    mesq l("The exit is north-west!");
     mes "";
     if (BaseLevel >= 15) goto L_Menu;
     close;
 
 L_Menu:
     mesn;
-    mesq l("But as you're here now, could you do me a favour?");
+    mesq l("But as you're here now, could you do me a favor?");
     mes "";
     menu
-        l("Hum, Which type of favor?"),L_Quest,
-        l("Can I find a mana source here?"),L_Mana,
-        l("Can I become a miner?"),L_Miner,
-        l("No, thanks. I gonna leave this place."),L_Close;
+        l("Which type of favor?"), L_Quest,
+        l("Can I find a mana source here?"), L_Mana,
+        l("Can I become a miner?"), L_Miner,
+        l("No, thanks. I gonna leave this place."), L_Close;
 
 L_Quest:
     mes "";
@@ -36,35 +36,35 @@ L_Quest:
         mesq l("Nice! First let me introduce myself. I am Dracoula, a miner!");
         next;
         mesn;
-        mesq l("I mine here since a while. My favorite activity is to scare other miners!");
+        mesq l("I mine here since quite a while. My favorite activity is to scare other miners!");
         next;
     }
     if (.@q == 0) goto L_Continue;
     .@q2=getq2(MineQuest_Dracoula) + 60 * 60 * 23;
     if (santime() >= .@q2) goto L_Repeat;
     mesn;
-    mesq l("But come back in a few hours, I didn't lost all @@!", getitemlink(BatTeeth));
+    mesq l("But come back in a few hours, I didn't lose all my %s yet!", getitemlink(BatTeeth));
     close;
 
 L_Continue:
-    mesq l("I love seeing their terrorize face.");
+    mesq l("I love seeing their faces tremble in terror.");
     mes "";
     menu
-        l("Ok. Cool life!"), L_Close,
-        l("Haha, Nice, but how do you do that?"), L_Next;
+        l("You are weird."), L_Close,
+        l("But how do you do that?"), L_Next;
 
 L_Next:
     mes "";
-    mesq l("I disguise myself into a giant mutated bat, but every time I break or lose my fake teeth.");
+    mesq l("I disguise myself as a giant mutated bat, but every time I break or lose my fake teeth.");
     next;
     mesq l("I usually ask adventurers for 11 @@, but new miners should be arriving soon. I need to make them cry!", getitemlink(BatTeeth));
     next;
-    mesq l("So it could be nice, if you could bring me 20 @@,", getitemlink(BatTeeth));
+    mesq l("So it would be really nice if you could bring me %d %s,", 20, getitemlink(BatTeeth));
     mes "";
     menu
         rif(countitem(BatTeeth) >= 20, l("Hey! I already got them!")), L_Finish,
         l("I'll get to it."), L_Close;
-    close; // double sure
+    close; // double check
 
 L_Repeat:
     mesn;
@@ -76,7 +76,7 @@ L_Repeat:
     mesq l("Do you have an extra of 11 @@ for me?", getitemlink(BatTeeth));
     mes "";
     menu
-        rif(countitem(BatTeeth) >= 11, l("Yep, I bring them for you!")), L_Finish2,
+        rif(countitem(BatTeeth) >= 11, l("Yep, I have them right here for you!")), L_Finish2,
         l("Actually not."), L_Close;
     close;
 
@@ -107,19 +107,16 @@ L_Finish2:
 L_Mana:
     mes "";
     mesn;
-    mesq l("Ah! Actually nobody found one.");
+    mesq l("Actually nobody found one.");
     next;
     mesn;
-    mesq l("But it's ultimate goal of miners there.");
+    mesq l("But it's the ultimate goal of us miners here.");
     next;
     mesn;
-    mesq l("If one of us found a Mana stone. They would become rich!");
+    mesq l("If one of us found a Mana stone we would become rich!");
     next;
     mesn;
-    mesq l("Twelve times more if it is an elusive Mana Fragment no one knows where they are!");
-    next;
-    mesn;
-    mesq l("That is.");
+    mesq l("Twelve times more if it is a pinch of the elusive Mylarin Dust. But no one knows where any of that is!");
     next;
     goto L_Menu;
 
@@ -129,7 +126,7 @@ L_Miner:
     mesq l("You should ask %s.", b(l("Tycoon")));
     next;
     mesn;
-    mesq l("He is the Miners leader.");
+    mesq l("He is the leader of us miners.");
     if (getq(MineQuest_Dracoula)) {
         compareandsetq MineQuest_Pickaxe, 0, 1;
     } else {
diff --git a/npc/007-1/pylon.txt b/npc/007-1/pylon.txt
index a326955c2..20f8023a4 100644
--- a/npc/007-1/pylon.txt
+++ b/npc/007-1/pylon.txt
@@ -30,15 +30,15 @@ L_Menu:
     mesn strcharinfo(0);
     // We could add a drag zone, and allow players to drag their gems, but... Meh.
     select
-        l("Hum, how many gem powders can I get from one gem?"),
+        l("How many gem powders can I get from one gem?"),
         rif(countitem(Diamond) >= 1 && Zeny >= 100, l("Yeah sure, take my Diamond!")),
         rif(countitem(Ruby) >= 1 && Zeny >= 100, l("Yeah sure, take my Ruby!")),
         rif(countitem(Emerald) >= 1 && Zeny >= 100, l("Yeah sure, take my Emerald!")),
         rif(countitem(Sapphire) >= 1 && Zeny >= 100, l("Yeah sure, take my Sapphire!")),
         rif(countitem(Topaz) >= 1 && Zeny >= 100, l("Yeah sure, take my Topaz!")),
         rif(countitem(Amethyst) >= 1 && Zeny >= 100, l("Yeah sure, take my Amethyst!")),
-        rif(countitem(IronOre) >= 1 && Zeny >= 100, l("And what's about Iron Ore?")),
-        rif(countitem(SunnyCrystal) >= 1 && Zeny >= 1000, l("And what's about Sunny Crystal?")),
+        rif(countitem(IronOre) >= 1 && Zeny >= 100, l("And what about Iron Ore?")),
+        rif(countitem(SunnyCrystal) >= 1 && Zeny >= 1000, l("And what about Sunny Crystals?")),
         l("No, thanks, I will keep my gems.");
 
     mes "";
@@ -65,9 +65,7 @@ L_Question:
     mesn;
     mesq lg("That depends on your luck!");
     next;
-    mesq l("With one gem you can expect to get 1 to 3 powders!");
-    next;
-    mesc l("We must blame Saulc!");
+    mesq l("With one gem you can expect to get 2 to 4 powders!");
     next;
     mesq lg("By the way would you like to transform your gem?");
     next;
@@ -87,7 +85,7 @@ L_Ore:
 
 L_MenuOre:
     menu
-        rif(countitem(IronOre) >= 1 && Zeny >= 100, l("Make me an Iron Powder.")), L_OreOk,
+        rif(countitem(IronOre) >= 1 && Zeny >= 100, l("Make me some Iron Powder.")), L_OreOk,
         l("Nah, thank you."), L_Close;
 
 L_OreOk:
@@ -103,7 +101,7 @@ L_OreOk:
         getitem SulfurPowder, 1;
     mes "";
     mesn;
-    mesq l("Here you go, I tried my best! Do you want another?");
+    mesq l("Here you go, I tried my best! Do you want more?");
     next;
     goto L_MenuOre;
 
@@ -115,7 +113,7 @@ L_Powder:
     .@pw=DiamondPowder+@menu-2;
 
     // Amount
-    .@am=rand2(1,3);
+    .@am=rand2(2,4);
     inventoryplace .@pw, .@am;
 
     // Del items and EXP
@@ -132,13 +130,13 @@ L_Powder:
     mesn;
     mesq l("Here is your powder! I hope it will be useful.");
     next;
-    mesq l("Would you like to transform one more?");
+    mesq l("Would you like to transform some more?");
     next;
     goto L_Menu;
 
 
 L_Savior:
-	// FIXME This is a dirt hack. TODO There should be no such checks
+	// FIXME This is a dirty hack. TODO There should be no such checks
 	if (checkbound(SunnyCrystal)) {
 		mesn;
 		mesc l("Not every @@ with you belongs to you.", getitemlink(SunnyCrystal)), 1;
diff --git a/npc/007-1/torches.txt b/npc/007-1/torches.txt
index 5dd82e217..d00009621 100644
--- a/npc/007-1/torches.txt
+++ b/npc/007-1/torches.txt
@@ -22,7 +22,7 @@ function	script	CheckTorch	{
     if (getq2(TulimsharQuest_DarkInvocator) & $@TorchBits[@torch])
         goto L_Empty;
     if (countitem(EverburnPowder) <= 0) {
-        dispbottom(l("I do not have Everburn Powder to lit the torch."));
+        dispbottom(l("You need %s to light this torch."), getitemlink(EverburnPowder));
         end;
     }
     setq2 TulimsharQuest_DarkInvocator, getq2(TulimsharQuest_DarkInvocator) | $@TorchBits[@torch];
@@ -65,7 +65,7 @@ L_TorchTally:
 
     delitem EverburnPowder, 1;
     if (@torch_count == 5) {
-        message strcharinfo(0), l("All torches are lit!");
+        message strcharinfo(0), l("All torches are lit! Return to Zarkor.");
         //killmonsterall("007-1");
         setq1 TulimsharQuest_DarkInvocator, 6;
     }
diff --git a/npc/007-1/tycoon.txt b/npc/007-1/tycoon.txt
index e9922198c..c7d08ac08 100644
--- a/npc/007-1/tycoon.txt
+++ b/npc/007-1/tycoon.txt
@@ -44,9 +44,9 @@
     mesn;
     mesq lg("Hello my friend!");
     next;
-    mesq lg("Some of my miners friends died in this mine, because there are plenty of dangerous monsters.");
+    mesq lg("Some of my miners died in this mine because there are plenty of dangerous monsters.");
     next;
-    mesq lg("Would you like to help us? Maybe you just need some information.");
+    mesq lg("Would you like to help us?");
     next;
     goto L_Menu;
 
@@ -61,7 +61,7 @@ L_Menu:
     menu
         rif(getq(MineQuest_Tycoon) < 15, l("I am a brave adventurer! How can I help you?")),           L_Purge,
         rif(getq(MineQuest_Pickaxe) < 2, l("Can I become a miner?")), L_Miner,
-        l("What does miners do in cave?"),             L_CaveMiner,
+        l("What do you miners do here?"),              L_CaveMiner,
         l("Can you give me a tip?"),                   L_Tip,
         l("Are you a terranite?"),                     L_Terranite,
         l("I don't care about dirty miners problem."), L_Close,
@@ -75,26 +75,26 @@ L_Purge:
 
     mesn;
     if (.@q == 0) {
-        mesq l("Ok, you look strong enough. Now, let me think on an easy task for you...");
+        mesq l("Ok, you look strong enough. Now, let me think of an easy task for you...");
         next;
-        mesq l("Ah! I know. Kill 10 @@. They usually are near the mine's inn.", getmonsterlink(Ratto));
+        mesq l("Ah! I know. Kill 10 @@. They usually are near the mine's entrance.", getmonsterlink(Ratto));
         setq MineQuest_Tycoon, 1, 0;
     } else if (.@q == 1) {
-        mesq l("You are killing @@/10 @@. They usually are near the mine's Inn.", .@k, getmonsterlink(Ratto));
+        mesq l("You are killing @@/10 @@. They usually are near the mine's entrance.", .@k, getmonsterlink(Ratto));
     } else if (.@q == 2) {
         mesq l("Good job! Here is your reward!");
         getexp 300, 0; // 10% of level requeriment (r7.4) (53->83->300)
         set Zeny, Zeny + 50;
         setq MineQuest_Tycoon, 3, 0;
     } else if (.@q == 3 && BaseLevel >= 19) {
-        mesq l("Less rattos means more food. So, this time the monsters will be a little stronger.");
+        mesq l("Thanks, now with less rattos there are less pests attacking our food storage. So, this time the monsters will be a little stronger.");
         next;
-        mesq l("Ok, now I want you to purge the cave from maggots. Kill 25 @@. They keep respawning and annoy miners team.", getmonsterlink(CaveMaggot));
+        mesq l("I want you to purge the cave from cave maggots. Kill 25 @@. They keep respawning and annoy my miners.", getmonsterlink(CaveMaggot));
         setq MineQuest_Tycoon, 4, 0;
     } else if (.@q == 3 && BaseLevel < 19) {
-        mesq l("You are too weak for my task, please come back later with some levels.");
+        mesq l("You are too weak for my task, please come back later at level %d.", 19);
     } else if (.@q == 4) {
-        mesq l("You are killing @@/25 @@ at the cave. Good progress!", .@k, getmonsterlink(CaveMaggot));
+        mesq l("You are currently tasked with killing @@/25 @@. Good progress!", getmonsterlink(CaveMaggot));
     } else if (.@q == 5) {
         mesq l("Perfect! Here is your reward!");
         getexp 800, 0; // (r7.5 158→800)
@@ -107,42 +107,43 @@ L_Purge:
         mesq l("Now, please kill 50 @@, Try to collect some lamps in the same time, they could be useful later.", getmonsterlink(CaveSnake));
         setq MineQuest_Tycoon, 7, 0;
     } else if (.@q == 6 && BaseLevel < 24) {
-        mesq l("You are too weak for my task, please come back later with some levels.");
+        mesq l("You are too weak for my task, please come back later at level 24.");
     } else if (.@q == 7) {
-        mesq l("You are killing %d/%d %s at the cave.", .@k, 50, getmonsterlink(CaveSnake));
+        mesq l("You are currently tasked with killing @@/50 @@", .@k, getmonsterlink(CaveSnake));
     } else if (.@q == 8) {
-        mesq l("I hope you got a Jean Shorts, but that depends on luck. Anyway, here is your reward.");
+        mesq l("I hope you got some good drops, but that depends on your luck. Anyway, here is your reward.");
         getexp 1150, 0; // (r7.5 1050 → 1150)
         set Zeny, Zeny + 350;
         setq MineQuest_Tycoon, 9, 0;
     } else if (.@q == 9 && BaseLevel >= 29) {
-        mesq l("If you want to be a real miner friend, do this hard task for me. I will reward you with a @@.", getitemlink(MinerHat));
+        mesq l("If you want to be a true friend of us miners, complete this hard task. I will reward you with a @@.", getitemlink(MinerHat));
         next;
-        mesq l("I'll ask you to kill %d %s. This will prove your worth. Good luck.", 75, getmonsterlink(RedScorpion));
+        mesq l("Kill %d %s This will prove your worth. They are usually to be found in the south-west part of the mine. Good luck.", 75, getmonsterlink(RedScorpion));
         setq MineQuest_Tycoon, 10, 0;
     } else if (.@q == 9 && BaseLevel < 29) {
-        mesq l("You are too weak for my task, please come back later with some levels.");
+        mesq l("You are too weak for my task, please come back later at level 29.");
     } else if (.@q == 10) {
-        mesq l("You are killing %d/%d %s. It's still in progress.", .@k, 75, getmonsterlink(RedScorpion));
+        mesq l("You currently tasked with killing %d/%d %s.", .@k, getmonsterlink(RedScorpion));
     } else if (.@q == 11) {
         mesq l("Congratulations! Here is your reward, a @@!", getitemlink(MinerHat));
-        mesq l("Mining opearations advance steadly day by day with your help, thanks! Maybe one day, we find a Mana Stone here!");
+        mesq l("Mining operations advance steadly day by day with your help, thanks! Maybe one day, we find a Mana Stone in here!");
         inventoryplace MinerHat, 1;
         getitem MinerHat, 1;
         getexp 3800, 0; // r7.5 1365→3800
         setq MineQuest_Tycoon, 12, 0;
     } else if (.@q == 12 && BaseLevel >= 40) {
-        mesq l("The last task I could give you is to exterminate %d %s. They actually stop miners progress on the mine.", 150, getmonsterlink(BlackScorpion));
+        mesq l("The last task I could give you is to exterminate %d %s. These pests actually hinder our progress here.", 150, getmonsterlink(BlackScorpion));
         if (BaseLevel < 45)
             mesc l("WARNING: This is a level 45 quest!"), 1;
+        mesq l("You can usually find them in the north-east part of the mine.");
         setq MineQuest_Tycoon, 13, 0;
         next;
         mesn;
         mesq l("The plataforms are usually safe enough to work, you might be able to use them to your advantage.");
     } else if (.@q == 12 && BaseLevel < 40) {
-        mesq l("You are too weak for my last task, please come back later with some levels.");
+        mesq l("You are too weak for my last task, please come back later at level 40.");
     } else if (.@q == 13) {
-        mesq l("You are killing %d/%d %s at the cave.", .@k, 150, getmonsterlink(BlackScorpion));
+        mesq l("You are currently tasked with killing %d/%d %s", .@k, 150, getmonsterlink(BlackScorpion));
         if (BaseLevel < 45)
             mesc l("WARNING: This is a level 45 quest!"), 1;
     } else if (.@q == 14) {
@@ -161,12 +162,10 @@ L_NoLevel:
     mesq l("Ah, yes... You see, there is just no task I can give to you right now. You are too weak to fight these monsters.");
     next;
     mesn;
-    mesq l("come back stronger, and I will give you a task.");
+    mesq l("Come back when you are stronger, and I will give you a task.");
     next;
     goto L_Close;
 
-
-
 L_Miner:
     if (!getq(MineQuest_Pickaxe)) {
         mesn;
@@ -177,7 +176,7 @@ L_Miner:
             mesq l("I'm not neutral, so my vouch have no effect.");
             next;
         }
-        tutmes l("You should do the other miners quest first! Some, however, are harder than others. This will unlock the %s, an important item to advance as a crafter.", getitemlink(Pickaxe));
+        tutmes l("You should do the other miners quests first! Some, however, are harder than others. This will also unlock the %s, an important item to advance as a crafter.", getitemlink(Pickaxe));
         goto L_Menu;
     }
 
@@ -194,11 +193,11 @@ L_Miner:
 
     mes "";
     mesn;
-    mesq l("Well, I'm the miner leader, indeed. A miner need to have the full set.");
+    mesq l("Well, I'm the leader of the miners, indeed. A miner needs to have the full set.");
     next;
     mesn;
-    mesq l("The uniform would be: @@, @@, @@ and @@", getitemlink(LeatherShirt), getitemlink(MinerHat), getitemlink(MinerGloves), getitemlink(Pickaxe));
-    mesc l("But you can also wear a %s instead, no problem.", getitemlink(MinerTankTop));
+    mesq l("The uniform would be: @@, @@, @@ and @@", getitemlink(MinerTankTop), getitemlink(MinerHat), getitemlink(MinerGloves), getitemlink(Pickaxe));
+    mesc l("But you can also wear a %s instead, no problem.", getitemlink(LeatherShirt));
     next;
     mesn;
     mesq l("I can sell you the Pickaxe for @@ GP if you have and @@ the remaining equipment.", .@price, b(l("equip")));
@@ -226,38 +225,37 @@ L_Miner:
         if (TUTORIAL) {
             next;
             mesc l("@@ is a two-handed weapon with very low damage and attack speed.", getitemlink(Pickaxe));
-            mesc l("While it may not be suitable for fighting, by using it against Bifs and other mineral formations, you'll be able to get more ore.");
+            mesc l("While it is unsuitable for fighting, by using it against Bifs and other mineral formations, you'll be able to get more ore.");
             next;
-            mesc l("You may even obtain ores which you wouldn't otherwise obtain normally, and the drop rate is fixed.");
-            mesc l("A Miner is a must-have for a craftsman/craftswoman, as they are in constant need of ores and coal.");
+            mesc l("You may even obtain minerals which you wouldn't otherwise obtain normally, and the drop rate is fixed.");
+            mesc l("A pickaxe is a must-have for a craftsman/craftswoman, as they are in constant need of ores and coal.");
         }
         next;
     }
     goto L_Menu;
 
-
 L_CaveMiner:
     mes "";
     mesn;
     mesq l("Tulimshar miners mainly try to obtain gems.");
     next;
-    mesq l("In this cave we can easily find Coal, Iron ore, and sometimes @@.", getitemlink(Ruby)); // maybe add link for coal and iron ?
+    mesq l("In this cave we can easily find %s, %s, and sometimes %s.", getitemlink(Coal), getitemlink(IronOre), getitemlink(Ruby));
     next;
     goto L_Menu;
 
 L_Tip:
     mes "";
     mesn;
-    mesq l("If you fight Black scorpion or others dangerous monster you should use the 'hit and run' tactic.");
+    mesq l("If you fight Black scorpion or other dangerous monsters you should use the 'hit and run' tactic.");
     next;
     mesn;
-    mesq l("To do this you need to disable auto move to target in 'yellow bar'.");
+    mesq l("To do this you need to disable auto move to target in the 'yellow bar'.");
     next;
     mesn;
-    mesq l("To open yellow Bar you need to right click on your health bar and active status bar, also called yellow bar. Or you can press '8' on numeric keypad.");
+    mesq l("To open the yellow bar you need to right click on your health bar and active status bar, also called yellow bar. Or you can press '8' on numeric keypad.");
     next;
     mesn;
-    mesq l("Now you need to fight monster with the maximum range, you can to do this do these steps in order: lock enemy, Attack, hit, move backwards of one tile, hit, ETC.");
+    mesq l("Now you need to fight monsters at the maximum range, do these steps in order: lock enemy, attack, hit, move backwards of one tile, hit, rinse and repeat.");
     next;
     mesn;
     mesq l("With this tip you will be able to fight strong monsters. It's on Saul's Strategy Guide Against Archwizards.");
@@ -270,7 +268,7 @@ L_Terranite:
     mesq l("Haha, no, I'm not! But we found traces of them.");
     next;
     mesn;
-    mesq l("Terranite probably mined part of this mine long time ago.");
+    mesq l("Terranites probably mined part of this mine long time ago.");
     next;
     mesn;
     mesq l("That can explain why we have difficulties to find rare gems here. They probably were already extracted.");
@@ -281,7 +279,6 @@ L_Terranite:
 L_Close:
     close;
 
-
     function tycoon_add_kills
     {
         .@qp=getq(MineQuest_Tycoon);
@@ -326,6 +323,7 @@ OnKillCaveMaggot:
     }
     fix_mobkill(CaveMaggot);
     end;
+
 OnKillCaveSnake:
     .@q=getq(MineQuest_Tycoon);
     .@k=getq2(MineQuest_Tycoon); // Get number of kills (via getq2)
@@ -340,6 +338,7 @@ OnKillCaveSnake:
     }
     fix_mobkill(CaveSnake);
     end;
+
 OnKillRedScorpion:
     .@q=getq(MineQuest_Tycoon);
     .@k=getq2(MineQuest_Tycoon); // Get number of kills (via getq2)
@@ -354,6 +353,7 @@ OnKillRedScorpion:
     }
     fix_mobkill(RedScorpion);
     end;
+
 OnKillBlackScorpion:
     .@q=getq(MineQuest_Tycoon);
     .@k=getq2(MineQuest_Tycoon); // Get number of kills (via getq2)
diff --git a/npc/007-1/zarkor.txt b/npc/007-1/zarkor.txt
index 2eba3685b..e5291a15e 100644
--- a/npc/007-1/zarkor.txt
+++ b/npc/007-1/zarkor.txt
@@ -20,7 +20,7 @@
             break;
         case 1:
             mesn "Zarkor, the Dark Summoner";
-            mesq l("Talk to Zitoni, the Alchemist of Candor. He may look humble, but he is the greatest alchemist of this world. I need five @@.", getitemlink(EverburnPowder));
+            mesq l("Talk to Zitoni, the Alchemist of Candor. He may look humble, but he is the greatest alchemist of this world. Tell him to make you five %s.", getitemlink(EverburnPowder));
             close;
             break;
         case 2:
@@ -28,18 +28,17 @@
             break;
         case 3:
             mesn "Zarkor, the Dark Summoner";
-            mesq l("Talk to Zitoni, and deliver the @@. I can't give you another one, they're super rare.", getitemlink(DarkDesertMushroom));
+            mesq l("Talk to Zitoni, and deliver the %s. I can't give you another one, they're extremely rare.", getitemlink(DarkDesertMushroom));
             close;
             break;
         case 4:
             goto L_Quest;
             break;
         case 5:
-            mesn "Saulc, the Bug Master";
-            mesq col("What, are we really letting you do something so insane as summoning the Monster King?! Blame Saulc!!");
-            next;
             mesn "Zarkor, the Dark Summoner";
-            mesq l("You didn't lit every torch yet! Hurry up!!");
+            mesq l("You didn't light every torch yet! Hurry up before they stop burning!");
+            mesn "";
+            mesc l("You have a vague bad feeling about this.");
             close;
             break;
         case 6:
@@ -57,7 +56,7 @@
 
 L_Weak:
     mesn;
-    mesq l("Stay out of harm way. Nothing to see here. Stay away, pathetically weak %s.", get_race());
+    mesq l("Stay out of harms way. Nothing to see here. Stay away, pathetically weak %s.", get_race());
     close;
 
 L_Start:
@@ -65,20 +64,20 @@ L_Start:
     mesq l("Hey... You... Come here.");
     next;
     mesn "Zarkor, the Dark Summoner";
-    mesq l("I am Zarkor, the Dark Summoner. I want to do a dark summoning ritual, but there are strings attached.");
+    mesq l("I am Zarkor, the Dark Summoner. I want to do a ritual, but there are strings attached.");
     next;
     mesn "Zarkor, the Dark Summoner";
     mesq l("I need to buy your silence. I'll reward you greatly when I'm done. But first, I need to know if you'll be loyal to me.");
     next;
     mesn "Zarkor, the Dark Summoner";
-    mesq l("To prove me your faith, bring me 1 @@ or 1 @@.",getitemlink(Ruby),getitemlink(Topaz));
-    mesq l("Such precious gem, is not something you would give for free, unless you are interested on my... rituals.");
+    mesq l("To prove me your trustworthyness, bring me 1 %s or 1 %s.",getitemlink(Ruby),getitemlink(Topaz));
+    mesq l("Such a precious gem is not something you would give away for free, unless you are truly interested in my ritual.");
     next;
     mesn strcharinfo(0);
     select
         l("Indeed. Sorry. I'm not giving you anything."),
-        rif(countitem(Ruby) >= 1, l("I swear silence, over this bloody ruby.")),
-        rif(countitem(Topaz) >= 1, l("I swear silence, over this shining topaz."));
+        rif(countitem(Ruby) >= 1, l("I swear silence, over this sanguine ruby.")),
+        rif(countitem(Topaz) >= 1, l("I swear silence, over this radiant topaz."));
 
     mes "";
     switch (@menu) {
@@ -100,16 +99,16 @@ L_Start:
             break;
     }
     mesn "Zarkor, the Dark Summoner";
-    mesq l("Very well. I shall now share with you the details of this rite.");
+    mesq l("Very well. I shall now share the details of this rite with you.");
     next;
     mesn "Zarkor, the Dark Summoner";
-    mesq l("I will summon the Monster King. Don't ask me my reasons. I know this will put Tulimshar in danger. But I will still do it.");
+    mesq l("I will summon the Monster King. Don't ask me for my reasons. I know this will put Tulimshar in danger. But I will still do it.");
     next;
     mesn "Zarkor, the Dark Summoner";
-    mesq l("For that, I need to light five torches. The pentagram, the magic, and all the else are with me. Just light the torches.");
+    mesq l("For that, I need to light the five torches. I already prepared everything, so you do not need to do anything else. Just light the torches.");
     next;
     mesn "Zarkor, the Dark Summoner";
-    mesq l("Talk to Zitoni, the Alchemist of Candor. He may look humble, but he is the greatest alchemist of this world. I need five @@.", getitemlink(EverburnPowder));
+    mesq l("Talk to Zitoni, the Alchemist of Candor. He may look humble, but he is the greatest alchemist of this world. Procure 5 %s from him.", getitemlink(EverburnPowder));
     close;
 
 L_Price:
@@ -120,13 +119,13 @@ L_Price:
     mesq l("I thought he would. After all, Everburn Powder... is not a mere powder.");
     next;
     mesn "Zarkor, the Dark Summoner";
-    mesq l("Well, you gave me the gems, so I trust you. Here, take this @@.", getitemlink(DarkDesertMushroom));
+    mesq l("Well, you gave me the gems, so I trust you with this. Here, take the reagent you need, a %s.", getitemlink(DarkDesertMushroom));
     next;
     mesn "Zarkor, the Dark Summoner";
-    mesq l("Take much care with it. It is a very, very rare drop from a rare monster from a difficult, high level area.");
+    mesq l("Do not lose it. It is a very, very rare fungus you can only find on a tough monster, in a particularly dangerous area.");
     next;
     mesn "Zarkor, the Dark Summoner";
-    mesq l("Deliver it to Zitoni on my name. He'll trust it. The relation between me and Zitoni... goes way back.");
+    mesq l("Deliver it to Zitoni in my name. He'll trust you. The relation between me and Zitoni... goes way back.");
     getitem DarkDesertMushroom, 1;
     setq TulimsharQuest_DarkInvocator, 3;
     close;
@@ -134,27 +133,27 @@ L_Price:
 L_Quest:
     if (countitem(EverburnPowder) < 5) {
         mesn "Zarkor, the Dark Summoner";
-        mesq l("This is not enough, I need 5 @@ to perform the rite. Go talk with Zitoni.", getitemlink(EverburnPowder));
+        mesq l("This is not enough, I need 5 %s to perform the rite. Go talk to Zitoni.", getitemlink(EverburnPowder));
         close;
     }
     mesn "Zarkor, the Dark Summoner";
-    mesq l("Good, good, you have enough powder. Now I need you to lit all five torches with them.");
+    mesq l("Good, good, you have enough powder. Now I need you to light all five torches with them.");
     next;
     mesn "Zarkor, the Dark Summoner";
-    mesq l("Once you lit one of them, monsters will pour out, so take care to don't die.");
+    mesq l("Once you light one of them, monsters will be summoned, so take care to not die. The amount and difficulty of the summoned monsters increases with every torch you light. I advice you to run away and hurry to the next torch.");
     next;
     mesn "Zarkor, the Dark Summoner";
     mesq l("If you die, you'll have to begin again. And there is the experience penalty, too.");
     next;
     mesn "Zarkor, the Dark Summoner";
-    mesq l("Good luck, because you'll need it. Talk to me once all of them are lit, and I'll SUMMON DAH MONSTER KING.");
+    mesq l("Good luck, because you'll need it. Talk to me once all of them are lit, and I'll SUMMON THE MONSTER KING.");
     setq TulimsharQuest_DarkInvocator, 5;
     close;
 
 L_Ritual:
     percentheal 100, 0;
     specialeffect(56);
-    mesc l("Zarkor spills many fluids on the lake, with much concentration.");
+    mesc l("Zarkor spills many fluids on the surface of the little lake while being in a deep trance.");
     next;
     specialeffect(56);
     mesn "Zarkor, the Dark Summoner";
@@ -165,33 +164,32 @@ L_Ritual:
     mesn "Zarkor, the Dark Summoner";
     mesq l("MONSTER KING, APPEAR TO ME!");
     next;
-    mesn "MONSTER KING";
+    mesn "The Monster King";
     mesc l("...Foolish human... Do you really think I will attend your summon?"), 1;
     next;
     mesn "Zarkor, the Dark Summoner";
     mesq l("But... But! Where are you?! That summon ritual is equivalent to GM magic!");
     next;
-    mesn "MONSTER KING";
-    mesc l("And who do you think that created GM Magic in first place, inexperienced kid?"), 1;
+    mesn "The Monster King";
+    mesc l("And who do you think that created GM Magic in first place, pathetic worm?"), 1;
     next;
     mesn "Zarkor, the Dark Summoner";
-    mesq l("You... You killed my father during Nivalis siege! I'll make you pay for that!!");
-    next;
-    mesn "MONSTER KING";
-    mesc l("You humans are so greedy... Just like me. I have more important things to do, other than waste time with you."), 1;
+    mesq l("You... You killed my father during the Nivalis siege! I'll make you pay for that!!");
     next;
-    mesn "MONSTER KING";
-    mesc l("Zarkor, fell a small taste of my power. That is nothing. If you can't handle that, you're not even near my lowest lieutenant."), 1;
-    mesc l("And you got help from a kid, Zarkor? Lucky is that kid, that I don't have time to deal with them. Farewell."), 1;
+    mesn "The Monster King";
+    mesc l("You humans are so greedy... Just like me. I have more important things to do. I won't waste my time on you any longer."), 1;
     next;
+    mesn "The Monster King";
+    mesc l("Zarkor, you may feel a small taste of my power. If you can't handle that, you're not even near my lowest lieutenant."), 1;
+    mesc l("And you got help from that kid? You are even more pathetic than I thought."), 1;
+    mesc l("You may consider yourself exceptionally lucky, kid. I will not waste my time on you, too so consider me sparing you an act of mercy."), 1;
+    dnext;
     specialeffect(312);
     mesn "Zarkor, the Dark Summoner";
     mes l("GAAAAAAAAAAAAAAAAHHHHHHH!");
     next;
     goto L_Finish;
 
-
-
 L_Finish:
     setq TulimsharQuest_DarkInvocator, 7;
     // These values were taken from Experience table, and are magic numbers
@@ -206,10 +204,10 @@ L_Finish:
     mesq l("*Ugh* Thanks for your help. Here... Take this, as promised.");
     next;
     mesn strcharinfo(0);
-    mesq l("Are you feeling well? That was a pretty powerful attack!");
+    mesq l("Are you feeling alright? That was a pretty powerful blast!");
     next;
     mesn;
-    mesq lg("Do not worry with me, youngling... I'll be fine.");
+    mesq lg("Do not worry about me, youngling... I'll be fine.");
     close;
 
 OnMonster:
diff --git a/npc/010-1-1/boss.txt b/npc/010-1-1/boss.txt
index 3ee49d753..3e9449f6d 100644
--- a/npc/010-1-1/boss.txt
+++ b/npc/010-1-1/boss.txt
@@ -22,9 +22,9 @@ OnBossDeath:
     initnpctimer;
     .@party=getcharid(1);
     if (.@party > 0) {
-        mapannounce getmap(), "Boss deafeated by Party: " + getpartyname(.@party), bc_all;
+        mapannounce getmap(), "Giant Cave Maggot defeated by Party: " + getpartyname(.@party), bc_all;
     } else {
-        mapannounce getmap(), "Boss deafeated by: " + strcharinfo(0), bc_all;
+        mapannounce getmap(), "Giant Cave Maggot defeated by: " + strcharinfo(0), bc_all;
     }
     fix_mobkill(GiantCaveMaggot);
     end;
diff --git a/npc/012-1/jack.txt b/npc/012-1/jack.txt
index 047a7de86..9169dc8fc 100644
--- a/npc/012-1/jack.txt
+++ b/npc/012-1/jack.txt
@@ -15,7 +15,7 @@
     mes "";
     select
         l("Nothing at the moment, thanks."),
-        l("I want you to transform my raw log in a wooden log"),
+        l("I want you to transform my raw log into a wooden beam"),
         rif(.@q1 == 1, l("I need a sturdy wood piece for a Forest Bow."));
 
     mes "";
@@ -36,8 +36,8 @@
 
 L_Polish:
     mesn;
-    mes l("Yes, unless you're doing something VERY special, a Wooden Log is what you need.");
-    mes l("I can make a @@ for just one @@ and @@ GP for my work.", getitemlink(WoodenLog), getitemlink(RawLog), .cost);
+    mes l("Yes, unless you're doing something VERY special, a %s is what you need.", getitemlink(WoodenLog));
+    mes l("I can make a %s for just one %s and %d GP for my work.", getitemlink(WoodenLog), getitemlink(RawLog), .cost);
     input .@count;
     mes "";
 
diff --git a/npc/012-2/helena.txt b/npc/012-2/helena.txt
index cb3fdb2f2..79e7edd5e 100644
--- a/npc/012-2/helena.txt
+++ b/npc/012-2/helena.txt
@@ -38,10 +38,10 @@ L_Daily:
     .@k=getq2(HurnscaldQuest_Bandits);
     .@h=getq3(HurnscaldQuest_Bandits);
     mesn;
-    mesq l("Ah, @@, my friend! Are you here to help us with 5 @@? Or perhaps you have 5 more @@ to show that Hurnscald is getting safer?", strcharinfo(0), getitemlink(TreasureKey), getitemlink(BanditHood));
+    mesq l("Ah, %s my friend! Are you here to help us with 5 %ss Or perhaps you have 5 more %s to show that Hurnscald is getting safer?", strcharinfo(0), getitemlink(TreasureKey), getitemlink(BanditHood));
     mes "";
     select
-        rif((.@k < santime()) && countitem(TreasureKey) >= 5, l("I have 5 Treasure keys with me.")),
+        rif((.@k < santime()) && countitem(TreasureKey) >= 5, l("I have 5 Treasure Keys with me.")),
         rif((.@h < santime()) && countitem(BanditHood) >= 5, l("I have 5 Bandit Hoods with me.")),
         l("Nothing at the moment.");
     mes "";
@@ -72,10 +72,10 @@ L_Daily:
 
 L_TooWeak:
     mesn;
-    mesq lg("Hello, madam!", "Hello, sir!");
+    mesq lg("Good day, adventureress.", "Good day, adventurer.");
     next;
     mesn;
-    mesq l("Ah, we have serious problems of robbery. I need someone really strong to help me, and you don't qualify.");
+    mesq l("We have some serious problems involving bandits. I need someone strong to help me, and you don't qualify. Yet.");
     close;
 
 L_Weak:
@@ -85,45 +85,42 @@ L_Weak:
 
 L_Busy:
     mesn;
-    mesq l("Ah, @@! I'm busy now, can we talk again later?", strcharinfo(0));
+    mesq l("Sorry, %s. Please come back later, I am busy.", strcharinfo(0));
     close;
 
 L_DoIt:
     mesn;
-    mesq l("@@, we are counting on you! We, the whole Hurnscald town!", strcharinfo(0));
+    mesq l("%s, we are counting on you! We, the whole town of Hurnscald!", strcharinfo(0));
     close;
 
 ///////////////////////// Stage 1
 L_Start:
     mesn;
-    mesq l("Ah, hello.");
+    mesq l("Bandits ransacked this tavern and left with a giant haul.");
     next;
     mesn;
-    mesq l("We actually have a problem. Bandits ransacked this tavern, and took a huge loot.");
+    mesq l("We chased after them after they fled into the deep tunnels of the mines. It was a heated battle but we have slain them all and got the chests with our stuff back.");
     next;
     mesn;
-    mesq l("We pursued them until the mines, slayed them, and took the chests where they locked our stuff into.");
-    next;
-    mesn;
-    mesq l("The problem is... The slimes ate the keys for the chests. This is not the first time such thing happens.");
+    mesq l("The problem is... The slimes ate all the keys for the chests. Blasted slimes! This is not the first time such thing happened.");
     next;
     // 5 ÷ 4.5% = 112 Copper Slimes. You can kill Yellow Slimes too
     mesn;
-    mesq l("If you bring us 5 @@, we'll be forever grateful.", getitemlink(TreasureKey));
+    mesq l("If you bring us 5 %ss I'll be forever grateful.", getitemlink(TreasureKey));
     select
-        l("Don't worry ma'm, I'll recover the Treasure Keys at once."),
-        l("Ah... Slimes... Sorry, not my cup of tea...");
+        l("Don't worry ma'am, I'll recover the Treasure Keys at once."),
+        l("Slimes... Sorry, not my cup of tea...");
     mes "";
     if (@menu == 2)
         close;
     setq HurnscaldQuest_Bandits, 1;
     mesn;
-    mesq l("Wonderful! I'll be expecting you back.");
+    mesq l("I'll be expecting you back.");
     close;
 
 L_Return:
     mesn;
-    mesq lg("Adventurer, did you brought me what I asked? I see you have @@/5 @@.","Adventurer, did you brought me what I asked? I see you have @@/5 @@.", countitem(TreasureKey), getitemlink(TreasureKey));
+    mesq l("Did you bring me what I asked? You have %d/5 %s.", countitem(TreasureKey), getitemlink(TreasureKey));
     mes "";
     select
         rif(countitem(TreasureKey) >= 5, l("Yes, take it.")),
@@ -137,99 +134,105 @@ L_Return:
     getexp 1599,0; // 20% from needed exp
     setq HurnscaldQuest_Bandits, 2;
     mesn;
-    mesq l("Hey hey... Good job! We can now use again the stuff we recovered from the bandits.");
+    mesq l("Finally! The regulars were close to rioting due to lack of ale.");
+    next;
+    mesn;
+    mesq l("Here are %s GP for your efforts. Thanks for making Hurnscald a better place to live.", fnum(1000));
     next;
     mesn;
-    mesq l("Here is 1000 GP for your efforts. Thanks for making Hurnscald a better place to live.");
+    mesq l("This might happen again in the future, so we are always gathering them, just in case.");
     next;
     mesn;
-    mesq l("This happens quite often, too. My friends and I are always collecting keys to reduce beer price on Hurnscald. %%2");
+    mesq l("If you continue gathering %ss, we are able to lower our ale price! %%2", getitemlink(TreasureKey));
     close;
 
 
 ///////////////////////// Stage 2
 L_Quest:
     mesn;
-    mesq l("Ah, @@, good thing you are here.", strcharinfo(0));
+    mesq l("%s, good thing you are here.", strcharinfo(0));
     next;
     mesn;
     mesq l("Bandits are a huge threat to Hurnscald. We're just a small farming town, and they're countless.");
     next;
     mesn;
-    mesq l("I did a travel to their cave, I wondered why their faces are never seen. Reason is that they're monsters.");
+    mesq l("I did travel to their cave, wondering why they hide their faces. I found out most of them are monsters after I ripped their hoods off.");
     next;
     mesn;
-    mesq l("Well, perhaps a few of them are rebels, I mean, people like us, but many of them are monsters.");
+    mesq l("A few of them are rebels, outcasts and the like but the vast majority are monsters.");
     next;
     mesn;
-    mesq l("Unfortunately, I was cursed to never enter their cave again. They used a @@ to do that!", getitemlink(BlueManaPearl));
+    mesq l("Unfortunately, they placed a curse on me using a %s preventing me from entering their cave ever again.", getitemlink(BlueManaPearl));
     next;
     if (countitem(BlueManaPearl) >= 1) {
         mesn;
-        mesq l("Ah... You have one too. Be careful with it, please. Many people lost their lives because they didn't handled that correctly.");
+        mesq l("Be very, very careful with your %s. Handling it incorrectly may be fatal and many people died to that.", getitemlink(BlueManaPearl));
         next;
     }
     mesn;
-    mesq l("Thankfully that item is too rare. I want somebody to slay the bandit leader, but if you want to do it, you must prove yourself.");
+    mesq l("Thankfully that item is very rare, so they will not be able to place a curse on you. Probably.");
+    next;
+    mesq l("I want somebody to slay the bandit leader, but if you want to do it, you must prove yourself first.");
     next;
-    mesn;
-    mesq l("I will reward whoever kills the current bandit leader, of course.");
     select
         l("I would gladly aid you to get rid of that scourge."),
-        l("Sorry, I forgot my courage on my other set of pants.");
+        l("Sorry, I forgot my courage in my other set of pants.");
     mes "";
     if (@menu == 2)
         close;
     setq HurnscaldQuest_Bandits, 3;
     mesn;
-    mesq l("Wonderful! So, how about a warm up?");
+    mesq l("Perfect!");
     next;
     // 8% drop. 10 / 8% = avg. 125 bandits to kill
     // And for once, I won't require these bandits to be from Hurnscald Bandit Cave.
     mesn;
-    mesq l("Bring me 10 @@. I'll pay you some money for that, of course.", getitemlink(BanditHood));
+    mesq l("As a warm-up, bring me 10 %ss. I'll pay you some money for that, of course.", getitemlink(BanditHood));
     close;
 
 L_Hood:
     mesn;
-    mesq lg("Adventurer, did you brought me what I asked? I see you have @@/10 @@.","Adventurer, did you brought me what I asked? I see you have @@/10 @@.", countitem(BanditHood), getitemlink(BanditHood));
+    mesq l("%s, did you bring me the hoods I asked for? I see you have %d/10 %ss.", strcharinfo(0), countitem(BanditHood), getitemlink(BanditHood));
     mes "";
     select
-        rif(countitem(BanditHood) >= 10, l("Yes, take it.")),
+        rif(countitem(BanditHood) >= 10, l("Yes, take them.")),
         rif(countitem(BanditHood) < 10, l("No, I'll be back with them.")),
         l("Hm, can we talk again later?");
     mes "";
     if (@menu != 1)
         close;
-    inventoryplace LeatherPatch, 1;
+    inventoryplace LeatherPatch, 1, Beer, 1;
     delitem BanditHood, 10;
+    getitem LeatherPatch, 1;
+    getitem Beer, 1;
     Zeny=Zeny+2000;
     getexp 6842,0; // 20% from needed exp
-    getitem LeatherPatch, 1;
     setq HurnscaldQuest_Bandits, 4;
     mesn;
-    mesq l("Hey hey... Good job! I was worried you would ruin their hoods before being able to take them.");
+    mesq l("Great job. I was worried you would ruin their hoods in combat.");
     next;
     mesn;
-    mesq l("Here is 2000 GP for your efforts. Thanks for making Hurnscald a better place to live.");
+    mesq l("Here are 2000 GP for your efforts. Thanks for making Hurnscald a better place to live.");
     next;
-    mesc l("You also gained a @@. Bows are very slow, so you should talk to the Blacksmith to make a Quiver.", getitemlink(LeatherPatch));
+    mesc l("I also gave you a fresh ale and a %s. Bows are awkward to handle, so you should talk to the Blacksmith to make you a %s.", getitemlink(LeatherPatch), getitemlink(LeatherQuiver));
     close;
 
 
 ///////////////////////// Stage 3
 L_BanditLord:
     mesn;
-    mesq l("So... I won't say you can't do it, @@. I will just say killing the Bandit Lord is no easy task.", strcharinfo(0));
+    mesq l("I won't say you can't do it, %s. But I will just say killing the Bandit Lord is no easy task.", strcharinfo(0));
     next;
     mesn;
-    mesq l("The @@ is not only a fearsome and ruthless leader. He is strong, and he have tricks on his sleeve.", getmonsterlink(BanditLord));
+    mesq l("The %s is not only a fearsome and ruthless opponent, he has some tricks up his sleeve.", getmonsterlink(BanditLord));
     next;
     mesn;
-    mesq l("He will summon allies if he think you have the upper hand. So take care if you are going ranged.");
+    mesq l("He will summon allies if he thinks you have the upper hand, depending on how you fight.");
+    next;
+    mesq l("If you go for melee, he will summon archers to keep his distance. If you use a bow, he will summon normal bandits to cut your throat.");
     next;
     mesn;
-    mesq l("I know another Bandit Lord will take up his place, but the loss of their leader will make bandits scatter long enough.");
+    mesq l("I know another Bandit Lord will take his place, but the loss of their leader will make the bandits scatter long enough.");
     next;
     mesn;
     mesq l("Will you help me- no, I mean, will you help us, the whole town of Hurnscald?");
@@ -242,31 +245,37 @@ L_BanditLord:
         close;
     setq HurnscaldQuest_Bandits, 5;
     mesn;
-    mesq l("...You have courage. Many people tried and failed.");
+    mesq l("...You are brave. Or very foolish. Many people tried and failed.");
     next;
     mesn;
-    mesq l("I know where the Bandit Lord room is, and I have a guard stationed not far from there. Ask him for the key.");
+    mesq l("The den of the bandit lord is located northeast from here in a cave, hidden quite deep inside.");
+    next;
+    mesq l("I have a guard stationed not far from there. Ask him for the key.");
     next;
     mesn;
-    mesq l("One last thing... Good luck. This is a long shot, so don't hesit in running away.");
+    mesq l("Good luck, you'll need it. This is a difficult task, so don't hesitate in running away if you need to.");
     close;
 
 L_Finish:
     mesn;
-    mesq l("Ah... You did it!");
+    mesq l("...The bandits are in disarray. And you arrive victorious. I have to admit, I thought had fallen, just like the other ones.");
     next;
     mesn;
-    mesq l("That's easy to know, because the bandits are less coordinated. Perhaps we will be able to sleep in peace this night!");
+    mesq l("I am pleasantly surprised. Good job. Perhaps we will all be able to sleep in peace this night!");
     next;
-    inventoryplace ForestArmor, 1;
+    inventoryplace ForestArmor, 1, Beer, 3;
+    inventoryplace Beer, 3;
+    getitem Beer, 3;
     getitem ForestArmor, 1;
     getexp 5842,93; // 10% from needed exp + JExp level 6
     setq HurnscaldQuest_Bandits, 8;
     mesn;
-    mesq l("Here is the @@, like my armor, and one of the best for rangers.", getitemlink(ForestArmor));
+    mesq l("You deserve this old %s of mine. They are great for skilled rangers and offer good protection.", getitemlink(ForestArmor));
     next;
     mesn;
-    mesq l("Any friend of Hurnscald is my friend too. Come to me again, if you want to do daily quests!");
+    mesq l("You are always welcome in the tavern and I would truly like to see you come by for some ale sometime.");
+    next;
+    mesq l("Of course, there are also always daily chores to do, if you are more interested in that. %%Q");
     close;
 
 OnInit:
diff --git a/npc/015-1/boss.txt b/npc/015-1/boss.txt
index 1591e05f5..943e1a8e9 100644
--- a/npc/015-1/boss.txt
+++ b/npc/015-1/boss.txt
@@ -16,12 +16,7 @@ OnInit:
 
 OnBossDeath:
     initnpctimer;
-    .@party=getcharid(1);
-    if (.@party > 0) {
-        mapannounce getmap(), "Boss deafeated by Party: " + getpartyname(.@party), bc_all;
-    } else {
-        mapannounce getmap(), "Boss deafeated by: " + strcharinfo(0), bc_all;
-    }
+    announce_bosskill(getmap(), SpiderQueen);
     fix_mobkill(SpiderQueen);
     end;
 
diff --git a/npc/015-2/guard.txt b/npc/015-2/guard.txt
index 28d505e25..2ff63ed64 100644
--- a/npc/015-2/guard.txt
+++ b/npc/015-2/guard.txt
@@ -3,7 +3,7 @@
 //    Jesusalva
 // Description:
 //    Part of Helena's quest
-//    Gives spoilers about what Jesusalva plans in doing with Bryant
+//    Gives spoilers about what Jesusalva plans on doing with Bryant
 
 015-2,28,199,0	script	Helena's Teammate	NPC_ORC,{
     .@q=getq(HurnscaldQuest_Bandits);
@@ -11,7 +11,7 @@
     if (.@q == 6) goto L_BanditLord;
     mesn;
     mesq lg("Welcome.");
-    mesq l("This small island is a good place to heal our wounds, and the monsters here are not threating.");
+    mesq l("This small island is a good place to rest, as the monsters here are not very threatening.");
     close;
 
 L_SilverKey:
@@ -23,13 +23,13 @@ L_SilverKey:
     getitem PiberriesInfusion, 3;
     setq HurnscaldQuest_Bandits, 6;
     mesn;
-    mesq l("I guess she sent you to kill another Bandit Lord, right? Ok, I'll give you the key for his room.");
+    mesq l("I guess she sent you to kill another Bandit Lord, right? I'll give you the key for his room.");
     next;
     mesn;
-    mesq l("It is pretty close to here. I advise you to use a good sword, and heal yourself often.");
+    mesq l("It is pretty close to this island. I advise you to use a good weapon, like a well-made sword, and heal yourself often.");
     next;
     mesn;
-    mesq l("I will give you 3 @@. Use them on this fight, or you're doomed to fail.", getitemlink(PiberriesInfusion));
+    mesq l("I gave you 3 @@. Use them in this fight, or you're doomed to fail.", getitemlink(PiberriesInfusion));
     close;
 
 L_BanditLord:
@@ -44,13 +44,13 @@ L_BanditLord:
         close;
     mes "";
     mesn;
-    mesq l("...Have you ever gone there yet?");
+    mesq l("...Have you even gone there yet?");
     next;
     mesn;
     mesq l("This is not The Mana World. My name is not Bryant.");
     next;
     mesn;
-    mesq l("In fact, Bryant is my brother, and he lives in a cave, and he probably have a high level quest too, but that's not important now.");
+    mesq l("In fact, Bryant is my brother, and he lives in a cave, and he probably has a high level quest too, but that's not important now.");
     next;
     mesn;
     mesq l("Go kill the Bandit Lord!");
diff --git a/npc/015-2/lordcave.txt b/npc/015-2/lordcave.txt
index 6303b2c19..e39c4e72a 100644
--- a/npc/015-2/lordcave.txt
+++ b/npc/015-2/lordcave.txt
@@ -21,7 +21,7 @@ OnLordDeath:
     .@q=getq(HurnscaldQuest_Bandits);
     if (.@q == 6 && !ispcdead()) {
         setq HurnscaldQuest_Bandits, 7;
-        dispbottom l("Phew! The Bandit Lord was killed.");
+        dispbottom l("The Bandit Lord was killed. Return to Helena.");
     }
     end;
 }
diff --git a/npc/015-6/boss.txt b/npc/015-6/boss.txt
index d8434968c..0fe8ee6b9 100644
--- a/npc/015-6/boss.txt
+++ b/npc/015-6/boss.txt
@@ -21,9 +21,9 @@ OnBossDeath:
     initnpctimer;
     .@party=getcharid(1);
     if (.@party > 0) {
-        mapannounce "015-6", "Boss deafeated by Party: " + getpartyname(.@party), bc_all;
+        mapannounce "015-6", "Terranite King defeated by Party: " + getpartyname(.@party), bc_all;
     } else {
-        mapannounce "015-6", "Boss deafeated by: " + strcharinfo(0), bc_all;
+        mapannounce "015-6", "Terranite King defeated by: " + strcharinfo(0), bc_all;
     }
     fix_mobkill(TerraniteKing);
     end;
diff --git a/npc/025-2-3/boss.txt b/npc/025-2-3/boss.txt
index 7621eb17d..5cd42c822 100644
--- a/npc/025-2-3/boss.txt
+++ b/npc/025-2-3/boss.txt
@@ -22,10 +22,10 @@ OnBossDeath:
     .@party=getcharid(1);
     getitem StrangeCoin, 1;
     if (.@party > 0) {
-        mapannounce "025-2-3", "Boss deafeated by Party: " + getpartyname(.@party), bc_all;
+        mapannounce "025-2-3", "Pinkie Emperor defeated by Party: " + getpartyname(.@party), bc_all;
         partytimer("025-2-3", 200, "#BossCtrl_025-2-3::OnBossReward");
     } else {
-        mapannounce "025-2-3", "Boss deafeated by: " + strcharinfo(0), bc_all;
+        mapannounce "025-2-3", "Pinkie Emperor defeated by: " + strcharinfo(0), bc_all;
     }
     callfunc "02524_Revenge_BlackBox";
     fix_mobkill(PinkieEmperor);
diff --git a/npc/031-0/boss.txt b/npc/031-0/boss.txt
index efd24256b..003d22b49 100644
--- a/npc/031-0/boss.txt
+++ b/npc/031-0/boss.txt
@@ -2,7 +2,7 @@
 // Author:
 //  Jesusalva
 // Description:
-//  Spider Queen Boss
+//  Tengu Boss
 
 031-0,0,0,0	script	#BossCtrl_031-0	NPC_HIDDEN,{
     end;
@@ -19,9 +19,9 @@ OnBossDeath:
     initnpctimer;
     .@party=getcharid(1);
     if (.@party > 0) {
-        mapannounce getmap(), "Boss deafeated by Party: " + getpartyname(.@party), bc_all;
+        mapannounce getmap(), "Tengu defeated by Party: " + getpartyname(.@party), bc_all;
     } else {
-        mapannounce getmap(), "Boss deafeated by: " + strcharinfo(0), bc_all;
+        mapannounce getmap(), "Tengu defeated by: " + strcharinfo(0), bc_all;
     }
     getexp 0, 1000+BaseLevel*8+JobLevel;
     fix_mobkill(Tengu);
diff --git a/npc/functions/lockpicks.txt b/npc/functions/lockpicks.txt
index 3a27d4749..9775fa3ed 100644
--- a/npc/functions/lockpicks.txt
+++ b/npc/functions/lockpicks.txt
@@ -55,7 +55,7 @@ function	script	LockPicking	{
     @chance=min(.@d*.@m-1, THIEF_RANK+.@d);
     mesc l("You insert the hook pick inside the lock, and, without applying any tension, you discover there are only @@ pins to set.", .@d);
 
-    // You have as many attempts as pins and appliable strenghts.
+    // You have as many attempts as pins and appliable strength.
     // Each thief rank grants you an extra attempt.
     // Each pin takes one attempt.
     // It's not multiplied, so 3 pins with 3 positions: 6 chances, 9 possibilities.
@@ -146,7 +146,7 @@ function	script	LootableVault	{
     .@level=getarg(1);
     .@var$=getarg(2);
     mesn;
-    mesq l("There's a shiny safe here. How much money is inside? Nobody is looking at you, great!");
+    mesq l("There's a shiny safe here. How much money is inside? Nobody is looking at you, too.");
     // 2*3 = 6 possibilities, 5 attempts
     if (LockPicking(.@tier, .@level)) {
         Zeny=Zeny+getd("$VAULT_"+.@var$);
@@ -163,9 +163,9 @@ function	script	LootableVault	{
             atcommand("@jailfor 5mn "+strcharinfo(0));
         } else {
             if (is_night())
-                .@p$=l("The darkness of night gives you cover.");
+                .@p$=l("The darkness of the night gives you cover.");
             else
-                .@p$=l("Your agile legs and sheer luck allows you to outrun the cops.");
+                .@p$=l("Your agile legs and sheer luck allows you to outrun the guards.");
             mesc l("You run as far as you could. %s", .@p$);
             warp "000-1", 22, 22;
         }
diff --git a/npc/functions/mounts.txt b/npc/functions/mounts.txt
index 12d56d71f..af797cbf2 100644
--- a/npc/functions/mounts.txt
+++ b/npc/functions/mounts.txt
@@ -10,6 +10,7 @@ function	script	MoubooRent	{
     if (MOUBOO_RENTTIME > gettimetick(2) || BaseLevel < 20) {
         mesn .@n$;
         mesq l("Moo!");
+        tutmes l("You are already renting a mount or are below level 20.");
         return;
     }
 
@@ -57,6 +58,7 @@ function	script	TortugaRent	{
     if (MOUBOO_RENTTIME > gettimetick(2)) {
         mesn .@n$;
         mesq l("Boo!");
+        tutmes l("You are already renting a mount or are below level 20.");
         return;
     }
 
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 5063a23a3..77a1c073a 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -1328,3 +1328,13 @@ function	script	api_send	{
     return;
 }
 
+function	script	announce_bosskill	{
+    .@party=getcharid(1);
+    if (.@party > 0) {
+        mapannounce getmap(getarg(0)), getmonsterlink(getarg(1)) + " defeated by Party: " + getpartyname(.@party), bc_all;
+    } else {
+        mapannounce getmap(getarg(0)), getmonsterlink(getarg(1)) + " defeated by: " + strcharinfo(0), bc_all;
+    }
+    return;
+}
+