Merge branch 'random-typos' into 'master'HEADmaster

Random typo fixes

See merge request ml/serverdata!78

10 files changed, 56 insertions, 39 deletions

diff --git a/npc/024-1/guard.txt b/npc/024-1/guard.txt
index cefc16a86..e35152315 100644
--- a/npc/024-1/guard.txt
+++ b/npc/024-1/guard.txt
@@ -30,7 +30,7 @@ L_MainLogic:
     //.@tax=1001-min(1000, reputation("Frostia")*10);
     .@tax=501-min(500, reputation("Frostia")*5);
     mesn;
-    mesc l("The guard eyes you with suspcion.");
+    mesc l("The guard eyes you with suspicion.");
     mesq l("You should not be here. Get moving.");
     if (Zeny < .@tax)
         close;
@@ -71,7 +71,7 @@ L_MainQuest:
     mesq l("I hate foreigners. They know nothing about us and want to impose their \"ideals\" about democracy and whatever.");
     next;
     mesn;
-    mesq l("Anyway, you had a letter to our @@, you meant? Sure thing, I'll let him know at once.", b(l("king")));
+    mesq l("Anyway, you have a letter to our %s, you meant? Sure thing, I'll let him know at once.", b(l("king")));
     setq General_Narrator, 12;
     close;
 
@@ -80,10 +80,10 @@ L_MainQuest2:
     mesq l("King Gelid Frozenheart II will have you.");
     next;
     mesn;
-    mesq l("His policy is to never read a letter without the sender being present. Of course we checked for poison and traps.");
+    mesq l("His policy is to never read a letter without the sender being present. Of course we check it for poison and traps.");
     next;
     mesn;
-    mesq l("Behave yourself, or you'll be executed in the town square mercilessly. You have been warned.");
+    mesq l("Behave yourself, or our death penalty awaits. You have been warned.");
     next;
     closeclientdialog;
     // Maybe an instance instead?
diff --git a/npc/024-16/craftsman.txt b/npc/024-16/craftsman.txt
index 961161ec6..a67372954 100644
--- a/npc/024-16/craftsman.txt
+++ b/npc/024-16/craftsman.txt
@@ -17,10 +17,10 @@
     mesq lg("Look what we have here, it is a girl!", "Look what we have here, it is a boy!");
     next;
     mesn;
-    mesq l("I'm Thurgar the mighty craftsman. I can make anything reality! But I only work to the king!");
+    mesq l("I'm Thurgar the mighty craftsman. I can make anything reality! But I only work for the king!");
     next;
     mesn;
-    mesq l("...Unless, of course, if you're interested in learning this art. You'll not regret it, I assure you.");
+    mesq l("...Unless, of course, if you're interested in learning this art, I shall teach you. You'll not regret it, I assure you.");
     next;
     // Main Loop
     .@score=CRAFTING_SCORE_COMPLETE/40;
diff --git a/npc/024-16/generals.txt b/npc/024-16/generals.txt
index 6f420f51c..ebc4414bf 100644
--- a/npc/024-16/generals.txt
+++ b/npc/024-16/generals.txt
@@ -32,7 +32,7 @@ function	script	FrostiaTaskMaster	{
         mesq l("Good job, you've killed the @@ @@ and reported back in time!", 50, getmonsterlink(.@q2));
         next;
         mesn;
-        mesq l("It's not much of a reward, but doesn't it feels great to help others in need?! HAHAHA!");
+        mesq l("It's not much of a reward, but doesn't it feel great to help others in need?! HAHAHA!");
         Zeny+=.@lv*8;
         // Raise LV according to monster level
         .@lv+=strmobinfo(3, .@q2);
@@ -43,7 +43,7 @@ function	script	FrostiaTaskMaster	{
     }
 
     mesn;
-    mesq l("Please kill @@/@@ @@ for us and make the world a safer place!", .@q3, 50, getmonsterlink(.@q2));
+    mesq l("Please kill %d/%d %s for us and make %s a safer place!", .@q3, 50, getmonsterlink(.@q2), l("Frostia"));
     return false;
 }
 
@@ -54,7 +54,7 @@ function	script	FrostiaGeneralQuest	{
 	mesq l("Hey. You there. Time to do @@ and show what you're made of.", .@at$);
 	next;
 	mesn;
-	mesq l("If you conclude the training, you'll be suitable for the difficult mission our King have to you.");
+	mesq l("If you conclude the training, you'll be suitable for the difficult mission our King will entrust you with.");
 	next;
     mesc b(l(".:: Main Quest 6-2 ::.")), 3;
     msObjective(BaseLevel >= 52, l("* @@/@@ Base Level", BaseLevel, 52));
@@ -66,10 +66,10 @@ function	script	FrostiaGeneralQuest	{
 		mesq l("Congrats, you did it.");
 		next;
 		mesn;
-		mesq l("So, if you hired a Mercenary to protect your back... Would you prefer it to attack from rearguard, or charge against certain death, buying you time?");
+		mesq l("So, if you hired a Mercenary to protect your back... Would you prefer it to attack from rear, or charge into certain death, buying you time?");
 		next;
 		select
-			l("I honestely wouldn't hire a Mercenary."),
+			l("I honestly wouldn't hire a Mercenary."),
 			l("Running is for noobs, we should hold our ground!"),
 			l("I can protect myself, so it should attack from afar.");
 		mes "";
diff --git a/npc/024-16/guards.txt b/npc/024-16/guards.txt
index 80405dd83..d880d1098 100644
--- a/npc/024-16/guards.txt
+++ b/npc/024-16/guards.txt
@@ -23,7 +23,7 @@ end;
 OnTouch:
     if (getq(General_Narrator) <= 12) {
         slide 30, 52;
-        dispbottom l("Ops, I should not leave this room without talking to the king first.");
+        dispbottom l("I should not leave this room without talking to the king first.");
     }
     end;
 }
diff --git a/npc/024-16/king.txt b/npc/024-16/king.txt
index 676e61fe8..4790b7f96 100644
--- a/npc/024-16/king.txt
+++ b/npc/024-16/king.txt
@@ -26,7 +26,7 @@
     mesq l("Hello.");
     next;
     mesn l("King Gelid Frozenheart");
-    mesq l("Yes. Frostia is a city-estate, and is ruled by me, King Gelid Frozenheart II.");
+    mesq l("Yes. Frostia is a city-state, and ruled by me, King Gelid Frozenheart II.");
     next;
     mesn l("King Gelid Frozenheart");
     mesq l("Is this letter yours? Very well, let me read.");
@@ -44,19 +44,22 @@
     mesq lg("I'm quite interested in you, mah' girl!", "I'm quite interested in you, mah' boy!");
     next;
     mesn l("King Gelid Frozenheart");
-    mesq l("So, only citzens, elves and dwarves are normally welcome here and I'm NOT going to make you an exception.");
+    mesq l("So, only citzens, elves and dwarves are normally welcome here and I'm NOT going to make an exception.");
     next;
     mesn l("King Gelid Frozenheart");
     mesq l("In the ")+b(l("southwest part of the town"))+l(" is the Inn, and you can rent an apartment there for 30 days.");
     next;
     mesn l("King Gelid Frozenheart");
-    mesq l("If you rent an apartment, you'll become a \"citzen\" and be allowed here. Besides, you can buy stuff in your apartment to, for example, craft stuff.");
+    mesq l("If you rent an apartment, you'll become a \"citzen\" and be allowed here. Besides, you can buy stuff in your apartment to, for example, craft supplies.");
     next;
     mesn l("King Gelid Frozenheart");
-    mesq l("Did I said the best craftsman and craftswoman in the world are here? @@, the legendary bow, was proudly crafted by the first king of Frostia!", getitemlink(Tyranny));
+    mesq l("Did I said the best craftspeople in the world are here? %s, the legendary bow, was proudly crafted by the first king of Frostia!", getitemlink(Tyranny));
     next;
     mesn l("King Gelid Frozenheart");
-    mesq l("He is not alive anymore, so only a single bow of those exist in the whole world... That is why we call it a ")+b(l("legendary weapon"));
+    mesq l("He died many moons ago and his masterwork, Tyranny, will remain one of a kind forever... That is why we call it a ")+b(l("legendary weapon")+".");
+    next;
+    mesc l("Legendary weapons can not be duplicated in any form, so only a single person in the world can own it at a time.");
+    mesc l("Should the owner go missing for over a month, the legendary weapon returns to its original place and can be claimed by someone else.");
     next;
     // Finish the quest
     setq General_Narrator, 13;
@@ -81,7 +84,10 @@ L_Continue:
     mesq l("Great, I see you've already made yourself comfortable!");
     next;
     mesn l("King Gelid Frozenheart");
-    mesq l("Do not hesit to purchase furniture. The furniture belongs to the house, so if you lose the house, you'll lose it, too. But apartments are never rent to someone else!");
+    mesq l("Do not hesitate to purchase furniture, it will help you tremendously in preparing for your ardous journey.");
+    next;
+    mesn l("King Gelid Frozenheart");
+    mesq l("Keep in mind that unlike houses, furniture acquired by previous owners will not be present.");
     next;
     mesn l("King Gelid Frozenheart");
     mesq l("Bah, sorry my manners! I love to chat! Anyway, talk to any General of mine, just behind me. See if they need help.");
@@ -102,19 +108,30 @@ L_Campaign:
     // Long intro until you defeat the Yeti.
     if (!.@q) {
         mesn l("King Gelid Frozenheart");
-        mesq l("Listen. North of here, is the ruins of an old village. Said village is cursed, and nobody here wants to go there.");
+        mesq l("Listen. North of here, are the ruins of an old village. Said village is cursed, and nobody wants to go there.");
         next;
         mesn l("King Gelid Frozenheart");
-        mesq l("But if you're looking to go to the World Edge, the place where THE WORLD WILL DIE, I guess you are immune to rumors.");
+        mesq l("But if you're looking to go to the World Edge, the place where THE FATE OF THE WORLD WILL BE DECIDED...");
+        select
+            l("Really?!"),
+            l("[Say nothing]");
+        mes "";
+        switch (@menu) {
+        case 1:
+            mesc l("He laughs.");
+            mesq lg("I'm just joking, mah' girl!", "I'm just joking, mah' boy!");
+        case 2:
+            mesq l("I guess you are immune to rumors and scary stories.");
+        }
         next;
         mesn l("King Gelid Frozenheart");
-        mesq l("I would bring @@, just in case. Anyway, the place where you're going to is the village where @@ was born.", getitemlink(Coffee), b(l("the Monster King")));
+        mesq l("I would bring some %s, just in case. Anyway, the place where you're going to is the village where %s was born.", getitemlink(Coffee), b(l("the Monster King")));
         next;
         mesn l("King Gelid Frozenheart");
-        mesq l("I've sent a scout ahead of you, and he reported traps in the caves you'll be needing to use to get there.");
+        mesq l("I've sent a scout ahead, and he reported traps in the caves you'll be needing to traverse to get there.");
         next;
         mesn l("King Gelid Frozenheart");
-        mesq l("As you can guess, said village was abandoned. However, people are claiming to have seen people walking there, like shadows or zombies.");
+        mesq l("As you can guess, the village was abandoned. However, people are claiming to have seen people walking there, maybe shadows or zombies.");
         next;
         mesn l("King Gelid Frozenheart");
         mesq l("As a King, I cannot simply ignore it. Of course, I really doubt it is zombies, but nobody wants to go. That's why I'm resorting to an adventurer like you.");
@@ -165,10 +182,10 @@ L_Report:
     mesq l("What?! This changes the whole history. Not only that, but this is a serious issue!");
     next;
     mesn l("King Gelid Frozenheart");
-    mesq l("I thought I was going to send you in a nest of Yetis, but instead, I've sent you straight to the birthplace of Bandits and Assassins.");
+    mesq l("I thought I was going to send you into a nest of Yetis, but instead, I've sent you straight to the birthplace of Bandits and Assassins.");
     next;
     mesn l("King Gelid Frozenheart");
-    mesq l("Blue Sage will want to know this, I'll write him a letter.");
+    mesq l("The Blue Sage will want to know this, I'll write him a letter.");
     next;
     mesn l("King Gelid Frozenheart");
     mesq l("Now, listen to me. I know I promised to bring you to the World's Edge.");
@@ -177,7 +194,7 @@ L_Report:
     mesq l("Truth is - I cannot do that. Obviously. But I know who can.");
     next;
     mesn l("King Gelid Frozenheart");
-    mesq l("Do you know Land Of Fire Village? It is west of Hurnscald and is a major town.");
+    mesq l("Do you know the Land Of Fire Village? It is west of Hurnscald and a major town.");
     next;
     mesn l("King Gelid Frozenheart");
     mesq l("It only loses to Tulimshar, as far as political and economical importance goes.");
@@ -186,7 +203,7 @@ L_Report:
     mesq l("Go to the townhall there and show the mayor this other letter.");
     next;
     mesn l("King Gelid Frozenheart");
-    mesq l("They will try to prove your worth before, though. So be ready.");
+    mesq l("You need to prove your worth once again, though. So be ready.");
     next;
     mesn l("King Gelid Frozenheart");
     mesq l("Good luck on your journey!");
@@ -209,7 +226,7 @@ L_Complete:
         cwarp "023-3", 63, 219;
     if (@menu == 2) {
         mesn l("King Gelid Frozenheart");
-        mesq l("It is one of the five legendary weapons. Legend says it was hidden in a tree on Aethyr, and will be given to the one who proves to be an excelent archer.");
+        mesq l("It is one of the five legendary weapons. Legend says it was hidden in a tree on Aethyr, and will be given to the one who proves to be an excellent archer.");
         next;
         if ($GAME_STORYLINE < 4) {
             mesn l("King Gelid Frozenheart");
diff --git a/npc/025-1/ctrl.c b/npc/025-1/ctrl.c
index 7b1d76839..ea31873d6 100644
--- a/npc/025-1/ctrl.c
+++ b/npc/025-1/ctrl.c
@@ -88,7 +88,7 @@ function	script	FTCleanup	{
 function	script	FTStatue	{
     .@id=getarg(0);
     mesn l("Magic Statue");
-    mes l("There is a reading: The Mana Source. The Moubootaur. The Monster King.");
+    mes l("There is an inscription: The Mana Source. The Moubootaur. The Monster King.");
     mes l("The war. The blood. The inspiration. The mana. The world. The defiance.");
     mes l("The guard. The heir. The originals. The races. The later. The seal.");
     mes l("The fragments. The war. The Terranite. AEGIS MAGNA PROTECTIVE SCUTUM.");
@@ -100,7 +100,7 @@ function	script	FTStatue	{
     // Break the statues?
     mesc l("Break the Statue?"), 1;
     if (!islegendary())
-        mesc l("* May stun you for 10 seconds!");
+        mesc l("* Will stun you for 10 seconds!");
     next;
     if (askyesno() == ASK_YES) {
         if ($@FORTRESS_STATUE & .@id)
diff --git a/npc/guilds/bank.txt b/npc/guilds/bank.txt
index dadd5277d..166fe2b02 100644
--- a/npc/guilds/bank.txt
+++ b/npc/guilds/bank.txt
@@ -10,7 +10,7 @@ guilds,35,35,0	script	Guild Vault	NPC_NO_SPRITE,{
     do
     {
         mesn;
-        mesc l("This vault currently have @@ GP inside.", format_number($GUILD_BANK[.@gid]));
+        mesc l("This vault currently has %d GP inside.", format_number($GUILD_BANK[.@gid]));
         select
             l("Okay, laters"),
             l("Donate GP"),
diff --git a/npc/guilds/forge.txt b/npc/guilds/forge.txt
index a558c4c83..f7dc8c73c 100644
--- a/npc/guilds/forge.txt
+++ b/npc/guilds/forge.txt
@@ -11,7 +11,7 @@ guilds,24,27,0	script	Guild Blacksmith	NPC_NO_SPRITE,{
         mesc l("What will you forge today?");
         //mesc l("You might need to have a @@ equipped for some recipes!", getitemlink(Knife));
         mesc l("Note: Items forged here will be guild-bound, but will use player recipes and bonuses!");
-        mesc b(l("\"WHAT IS CRAFTED IN GUILD BELONGS TO GUILD.\"")), 1;
+        mesc b(l("\"WHAT IS CRAFTED HERE BELONGS TO THE GUILD.\"")), 1;
         if (SmithSystem(CRAFT_GUILD))
         {
             mesc l("Success!"), 3;
diff --git a/npc/guilds/logs.txt b/npc/guilds/logs.txt
index 4c225f0fc..57bd7cb1e 100644
--- a/npc/guilds/logs.txt
+++ b/npc/guilds/logs.txt
@@ -86,7 +86,7 @@ guilds,47,39,0	script	Guild Logs	NPC_NO_SPRITE,{
                     1, SacredLifePotion, 1, SacredManaPotion);
 
     if (.@s == 0)
-        mesc l("Your guild doesn't knows any recipes!"), 1;
+        mesc l("Your guild doesn't know any recipes!"), 1;
 
     .@role=getguildrole(.@gid, getcharid(3));
     do
@@ -105,11 +105,11 @@ guilds,47,39,0	script	Guild Logs	NPC_NO_SPRITE,{
                 .@price=.@min_lv*274;
                 if (.@cur_lv < .@min_lv)
                 {
-                    mesc l("Guild Level is not enough: @@/@@", .@cur_lv, .@min_lv);
+                    mesc l("Guild Level is not high enough: %d/%d", .@cur_lv, .@min_lv);
                     next;
                     break;
                 }
-                mesc l("Raising this skill will allow to recruit 4 more members.");
+                mesc l("Raising this skill will allow you to recruit 4 more members.");
                 mesc l("The cost for Guild Vault is @@ GP.", .@price);
                 next;
                 select
@@ -182,7 +182,7 @@ guilds,47,39,0	script	Guild Logs	NPC_NO_SPRITE,{
                     case 8:
                         GDSkillLearn(TMW2_GD_AUTOREVIVE, 3000,
                         l("Blessing of Immortality"),
-                        l("If a guild mate dies, they will revive. Don't work on self."),
+                        l("If a guild mate dies, they will revive. Doesn't work on self."),
                         7, 11, 17, 23, 26, 29, 31, 34, 38);
                         break;
                     case 9:
@@ -389,7 +389,7 @@ function GDSkillLearn {
     // Guild level insuffice
     if (.@gid_lv < .@min_lv)
     {
-        mesc l("Guild Level is not enough: @@/@@", .@gid_lv, .@min_lv);
+        mesc l("Guild Level is not high enough: %d/%d", .@gid_lv, .@min_lv);
         next;
         return 0;
     }
diff --git a/npc/guilds/storage.txt b/npc/guilds/storage.txt
index e1f30e32a..bae5c985b 100644
--- a/npc/guilds/storage.txt
+++ b/npc/guilds/storage.txt
@@ -13,13 +13,13 @@ OnStorage:
         end;
     if (getguildlvl(.@gid) < 2)
     {
-        npctalkonce l("Your guild need to have at least level 2 to use storage feature.");
+        npctalkonce l("Your guild needs to have at least level 2 to use storage feature.");
     }
     else
     {
         if (getguildrole(.@gid, getcharid(3)) > GPOS_MEMBER)
         {
-            dispbottom l("Your position must be the one of a regular member or above.");
+            dispbottom l("Your rank must be regular member or above.");
             end;
         }
         if (guildopenstorage())