Merge branch 'master' into 'master'

NPC improvements

See merge request TMW2/serverdata!67

7 files changed, 63 insertions, 89 deletions

diff --git a/npc/003-1/quirino.txt b/npc/003-1/quirino.txt
index c492a7819..dbc88e2e5 100644
--- a/npc/003-1/quirino.txt
+++ b/npc/003-1/quirino.txt
@@ -110,6 +110,7 @@ function quirinHonor {
     mesq l("And it might be changed in a future patch %%g");
     tutmes l("If you kill an opponent stronger than you, you will gain honor points. But if the oponent is 15 levels weaker than you, it will be NEGATIVE!"), l("About Scoreboards and Honor Points");
     tutmes l("If you kill the same person within 30 minutes, honor will not fluctuate. The whole honor system is very experimental."), l("About Scoreboards and Honor Points");
+    tutmes l("Honor only applies to PvP fights. It can be seen on \"%s\" and rewards are given monthly for it.", b("@scoreboards"));
     next;
     return;
 }
@@ -129,12 +130,12 @@ L_SignUp:
     // Prevent further movements!
     setpcblock(PCBLOCK_SOFT, true);
     //dispbottom l("Stay ready!");
-    dispbottom l("##1DON'T MOVE until the signal. Stay ready! If you move, you will desync client!");
+    dispbottom l("##1DON'T MOVE until the signal. Stay ready! If you move, you will desync the client!");
     close;
 
 L_Full:
     mesn;
-    mesq l("You cannot bring anything to the arena. Please put everything on the storage.");
+    mesq l("You cannot bring anything to the arena. Please put everything into the storage.");
     next;
     mesn;
     mesq l("I can do that for you, but you'll still need to go to storage to get them back.");
diff --git a/npc/003-1/well.txt b/npc/003-1/well.txt
index b4e46f61b..c745a1672 100644
--- a/npc/003-1/well.txt
+++ b/npc/003-1/well.txt
@@ -19,16 +19,16 @@
 
     mes "";
     Zeny=Zeny-1;
-    mesc l("You throw a coin on the well.");
+    mesc l("You throw a coin into the well.");
     next;
 
     .@n=rand(0, 10000);
     if (.@n <= 10) {
         getitem StrangeCoin, 1;
-        mes l("##9Hey wait... Your coin turned on a @@!", getitemlink(StrangeCoin));
+        mes l("##9Hey wait... Your coin turned into a @@!", getitemlink(StrangeCoin));
     } else if (.@n <= 50) {
         getitem CasinoCoins, 1;
-        mes l("##9Hey wait... Your coin turned on a @@!", getitemlink(CasinoCoins));
+        mes l("##9Hey wait... Your coin turned into a @@!", getitemlink(CasinoCoins));
     } else if (.@n <= 100) {
         Zeny=Zeny+2;
         mesc l("Hey wait... You found 2 GP!");
@@ -61,7 +61,7 @@
     } else {
         mesc l("Nothing happens.");
         next;
-        mesc l("What did you expected, anyway?");
+        mesc l("What did you expect?");
     }
     close;
 
diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt
index 3053a1405..7cd6f5174 100644
--- a/npc/005-1/ayasha.txt
+++ b/npc/005-1/ayasha.txt
@@ -164,7 +164,6 @@ OnHouseMaggotDeath:
     debugmes "HMD OK";
     end;
 
-
 OnTimer5000:
     areamonster("005-1", 0, 0, 125, 125, "Black Scorpion", BlackScorpion, 1, "Ayasha::OnBlackScorpionDeath");
     areamonster("005-1", 0, 0, 125, 125, ("House Maggot"), HouseMaggot, 10, "Ayasha::OnHouseMaggotDeath");
diff --git a/npc/005-1/maya.txt b/npc/005-1/maya.txt
index 9f68af4fd..14cbe4027 100644
--- a/npc/005-1/maya.txt
+++ b/npc/005-1/maya.txt
@@ -75,9 +75,6 @@ L_QuestCompleted:
     mesq l("Thanks for the help. Here, take this shirt and some money.");
     close;
 
-
-
-
 L_Quest2:
     mesn;
     mesq l("Thanks again for the help. You have proven that you are resourceful.");
@@ -141,7 +138,6 @@ L_Close:
     goodbye;
     close;
 
-
 OnInit:
     .sex = G_FEMALE;
     .distance = 4;
diff --git a/npc/005-1/sailors.txt b/npc/005-1/sailors.txt
index b29c4afe2..633e19502 100644
--- a/npc/005-1/sailors.txt
+++ b/npc/005-1/sailors.txt
@@ -25,11 +25,11 @@
     next;
     mesq l("Arr, it is always good to be on land after so much time in sea!");
     next;
-    mesq l("We want to party this moment, but can you believe we ran out of beer?");
+    mesq l("We want to celebrate this moment, but can you believe we ran out of beer?");
     mes "";
     menu
         l("If I were you, I would drink water."),L_Water,
-        l("WHAT? How can you ever do a party without beer?!"),L_Accept;
+        l("WHAT? How can you ever party without beer?!"),L_Accept;
 
 L_Water:
     mes "";
@@ -144,7 +144,7 @@ L_questCure_failure:
     else
         Zeny = Zeny + 30;
     mesn;
-    mesq l("That... Didn't worked. I'm sorry.");
+    mesq l("That... Didn't work. I'm sorry.");
     next;
     mesn;
     mesq l("Here's some gold for your efforts.");
diff --git a/npc/005-1/vincent.txt b/npc/005-1/vincent.txt
index 2e772f362..7b6e7e2b2 100644
--- a/npc/005-1/vincent.txt
+++ b/npc/005-1/vincent.txt
@@ -11,7 +11,7 @@
     if (.@q == 2) goto L_QuestDone;
 
     speech S_LAST_BLANK_LINE,
-        l("I am making a figurin with Bug legs for the upcoming festival."),
+        l("I am making a figurine with Bug legs for the upcoming festival."),
         lg("Be a friend and bring me @@ @@.", "Be a friend and bring me @@ @@.", .LegsCount, getitemlink(BugLeg));
 
     switch (select(l("Ok, I'll be back in no time."),
@@ -56,7 +56,7 @@ L_CheckItems:
 L_QuestDone:
     speech
         l("Hey, @@!", strcharinfo(0)),
-        l("My figurin is so nice!");
+        l("My figurine is so nice!");
     tutmes l("Some quests and events, like the festival, are only available during specific times.");
     tutmes l("Some will only repeat yearly, while other events happen weekly or monthly, or in some other time aspect.");
     close;
diff --git a/npc/005-7/trainer.txt b/npc/005-7/trainer.txt
index c1dc37c8b..338765c0d 100644
--- a/npc/005-7/trainer.txt
+++ b/npc/005-7/trainer.txt
@@ -23,7 +23,7 @@
 
 // 10:  Took Scorpion Quest
 // 11:  Completed Scorpion Quest
-// 12:  Finished all trainment
+// 12:  Finished all training
 
 005-7,25,29,0	script	Trainer	NPC_PLAYER,{
     goto L_Begin;
@@ -47,20 +47,19 @@ L_PreMenu:
 L_Menu:
     mesn strcharinfo(0);
     menu
-        l("How can you help me?"),              L_ExplicaSiProprio,
-        rif(.@map$ == "005-7" && getq(CandorQuest_Trainer) < 15, l("I want to be trained!")), L_Trainment,
+        l("Why do you want to help me?"),       L_Backstory,
+        rif(.@map$ == "005-7" && getq(CandorQuest_Trainer) < 15, l("I want to be trained!")), L_Training,
         l("I wanted info about how to play."),  L_Manaplus_gap,
-        l("How do I make money?"),              L_ExplicaGrama,
-        l("Monsters."),                         L_Monstros,
+        l("How do I make money?"),              L_MakingMoney,
+        l("Monsters."),                         L_Monsters,
         l("Quests."),                           L_Quests,
         l("Status."),                           L_Status,
         l("NPCs."),                             L_NPC,
-        l("Magic."),                            L_Magica,
-        l("Rules."),                            L_Regras,
-        l("Weather & Seasons."),                L_Temporada,
-        l("Experience."),                       L_Experiencia,
-        l("Honor System."),                     L_Honra,
-        l("No, thanks!"),                       L_Fechar;
+        l("Magic."),                            L_Magic,
+        l("Rules."),                            L_Rules,
+        l("Weather & Seasons."),                L_Seasons,
+        l("Experience."),                       L_Experience,
+        l("No, thanks!"),                       L_Close;
 
 
 L_Manaplus_gap:
@@ -73,16 +72,15 @@ L_Manaplus:
     next;
     mesn strcharinfo(0);
     menu
-        l("How I see my items?"),               L_ExplicaBagagem,
-        l("How trade with other players?"),     L_ExplicaTrade,
-        l("How hunt monsters?"),                L_ExplicaBatalha,
-        l("How talk with someone?"),            L_ExplicaDialogo,
-        l("Styles."),                           L_Estilo,
-        l("Commands."),                         L_Comandos,
-        l("Shortcuts."),                        L_Teclado,
-        l("I changed my mind."),                L_Menu_gap;
-
-L_Trainment:
+        l("How do I see my items?"),             L_ArmorItems,
+        l("How do I trade with other players?"), L_Trading,
+        l("How do I hunt monsters?"),            L_HuntingMonsters,
+        l("How do I talk with someone?"),        L_Talking,
+        l("Hairstyles."),                        L_Hairstyle,
+        l("Commands."),                          L_Commands,
+        l("I changed my mind."),                 L_Menu_gap;
+
+L_Training:
     .@q=getq(CandorQuest_Trainer);
     mes "";
     if (BaseLevel < 3) goto L_NoLevel;
@@ -91,53 +89,55 @@ L_Trainment:
 
     mesn;
     if (.@q == 0) {
-        mesq l("Ok, you have some level. Now, let me think on an easy task for you...");
+        mesq l("It looks like you are ready. Let me see if there is an easy task for you...");
         next;
-        mesq l("Ah! I know. Kill 10 @@. They usually are the crops.", getmonsterlink(Maggot));
+        mesq l("Ah! I know. Kill 10 @@. They are usually found in the fields, feeding on the crops.", getmonsterlink(Maggot));
         setq CandorQuest_Trainer, 1, 0;
     } else if (.@q == 1) {
-        mesq l("You are killing @@. They are usually at the crops.", getmonsterlink(Maggot));
+        mesq l("You are currently tasked with killing @@. As a reminder, you can usually find them where we grow our crops.", getmonsterlink(Maggot));
     } else if (.@q == 2) {
         mesq l("Good job! Here is your reward!");
         getexp 30, 0;
         set Zeny, Zeny + 25;
         setq CandorQuest_Trainer, 3, 0;
     } else if (.@q == 3) {
-        mesq l("Less maggots means more food to the town. So, this time the monsters will be a little stronger.");
+        mesq l("Less maggots means a more reliable food supply. This kind of maggot will be a little more difficult to defeat, which is an excellent way to test your prowess in battle.");
         next;
-        mesq l("In the storehouse, kill 4 @@. They keep respawning and are annoying.", getmonsterlink(HouseMaggot));
+        mesq l("In the storehouse, kill 4 @@. They keep coming back and contaminate our stored goods.", getmonsterlink(HouseMaggot));
+        next;
+        mesq l("Our dear mayoress may also need help dealing with that maggot infestation.");
         setq CandorQuest_Trainer, 4, 0;
     } else if (.@q == 4) {
-        mesq l("You are killing @@ at the storehouse.", getmonsterlink(HouseMaggot));
+        mesq l("Kill the @@ at the storehouse.", getmonsterlink(HouseMaggot));
     } else if (.@q == 5) {
         mesq l("Perfect! Here is your reward!");
         getexp 42, 0;
         set Zeny, Zeny + 25;
         setq CandorQuest_Trainer, 6, 0;
     } else if (.@q == 6) {
-        mesq l("As you see, helping others is a good way to level up. You can also sell monster parts for some money.");
+        mesq l("As you learned, helping others is a good way to level up. You can also sell monster parts for some money.");
         next;
-        mesq l("So, please kill 3 @@, which are usually at beaches. You can sell their stingers.", getmonsterlink(CandorScorpion));
+        mesq l("So, please kill 3 @@, which are usually found around our beaches. You can sell their stingers if you are short on money.", getmonsterlink(CandorScorpion));
         setq CandorQuest_Trainer, 7, 0;
     } else if (.@q == 7) {
-        mesq l("You are killing @@ at the beach.", getmonsterlink(CandorScorpion));
+        mesq l("The @@ I told you to kill are usually at the beach.", getmonsterlink(CandorScorpion));
     } else if (.@q == 8) {
         inventoryplace SmallKnife, 1;
-        mesq l("Managed to drop anything? It requires more luck than skill. Here is your reward.");
+        mesq l("Managed to get any nice drops? It requires more luck than skill. Here is your reward.");
         getexp 53, 0;
         set Zeny, Zeny + 25;
         getitem SmallKnife, 1;
         setq CandorQuest_Trainer, 9, 0;
     } else if (.@q == 9) {
-        mesq l("This will be the last task. Besides the @@, the strongest monster on this island worth killing is the @@.", getmonsterlink(ManaBug), getmonsterlink(Scorpion));
+        mesq l("This will be your last task. Besides the @@, the strongest monster on this island worth killing is the @@.", getmonsterlink(ManaBug), getmonsterlink(Scorpion));
         next;
-        mesq l("I'll ask you to kill 2 @@. This will prove your worth. They are northwest of the island.", getmonsterlink(Scorpion));
+        mesq l("Kill 2 @@. This will prove your worth. They are northwest of the island.", getmonsterlink(Scorpion));
         setq CandorQuest_Trainer, 10, 0;
     } else if (.@q == 10) {
-        mesq l("You are killing @@ at northwest from the island.", getmonsterlink(Scorpion));
+        mesq l("I want you to kill @@, which are located near the northwest coast of the island.", getmonsterlink(Scorpion));
     } else if (.@q == 11) {
         mesq l("Congratulations! Here is your reward.");
-        mesq l("You completed your trainment, so you're getting 50 bonus experience points. If you level up, use your stat points wisely!");
+        mesq l("You completed your training, so you're getting 50 bonus experience points. If you level up, use your stat points wisely!");
         getexp 70, 0;
         set Zeny, Zeny + 25;
         setq CandorQuest_Trainer, 12, 0;
@@ -191,7 +191,7 @@ L_NoKnife:
 
 // Anything below this line is copy-pasted from SG:ManaBird, a TMW-BR clone
 // It was translated by Google and therefore may have bad terms about ManaPlus interface.
-L_ExplicaSiProprio:
+L_Backstory:
     mes "";
     mesn;
     mesq l("Saxso, the former mayor, commanded me to strengthen the youngsters, so that they have sufficient power to fight monsters.");
@@ -204,7 +204,7 @@ L_ExplicaSiProprio:
     next;
     goto L_PreMenu;
 
-L_ExplicaGrama:
+L_MakingMoney:
     mes "";
     mesn;
     mes l("Merchants like to buy body parts of killed monsters and animals because they can make items and equipment.");
@@ -224,7 +224,7 @@ L_ExplicaGrama:
     next;
     goto L_PreMenu;
 
-L_ExplicaBagagem:
+L_ArmorItems:
     mes "";
     mesn;
     mes l("You can see all your equipment by pressing the F3 key.");
@@ -259,7 +259,7 @@ L_ExplicaBagagem:
     next;
     goto L_Manaplus;
 
-L_ExplicaTrade:
+L_Trading:
     mes "";
     mesn;
     mes l("Press the 'R' key to ignore or accept business proposals. You and the other citizen who want to negotiate need to be in the configuration that accepts negotiations. if your configuration is 'Ignoring business proposals', then you will not receive the warning from any citizen wanting to negotiate with you, and you will not be able to initiate negotiations.");
@@ -285,7 +285,7 @@ L_ExplicaTrade:
     goto L_Manaplus;
 
 // TODO: We have over nine instructions here. You usually can only memorise from three to five at a time!
-L_ExplicaBatalha:
+L_HuntingMonsters:
     mes "";
     mesn;
     mesq l("Note down. To hunt a target you must click the primary mouse button on it. Avoid fighting monsters or citizens much stronger than you. ##BYou will lose experience if you are defeated.##b");
@@ -313,7 +313,7 @@ L_ExplicaBatalha:
     next;
     goto L_Manaplus;
 
-L_ExplicaDialogo:
+L_Talking:
     mes "";
     mesn;
     mes l("To display the dialog box with other citizens, press the F7 key.");
@@ -338,10 +338,10 @@ L_ExplicaDialogo:
     next;
     goto L_Manaplus;
 
-L_Fechar:
+L_Close:
     close;
 
-L_Monstros:
+L_Monsters:
     mes "";
     mesn;
     mesq l("Monsters are everywhere. They're a plague we're trying to get rid of.");
@@ -372,11 +372,11 @@ L_Monstros:
     next;
     goto L_PreMenu;
 
-L_Estilo:
+L_Hairstyle:
     mes "";
     mesn;
-    mes l("NPC stylists will cut your hair!");
-    mes l("They are known to use a revolutionary hair growth formula.");
+    mes l("NPC stylists can cut your hair and give you a new style, which means the hair style you woke up is something that can be changed.");
+    mes l("They are known to use a revolutionary hair growth formula, which can give you a wild thatch even if you are bald!");
     next;
     goto L_Manaplus;
 
@@ -402,7 +402,7 @@ L_NPC:
     mes l("If you are above the NPC and they still doesn't hear you, this mean they are deaf - you should report this!");
     goto L_PreMenu;
 
-L_Comandos:
+L_Commands:
     mes "";
     mesn;
     mes l("/ clear clears the text box.");
@@ -457,7 +457,7 @@ L_Status:
     next;
     goto L_PreMenu;
 
-L_Magica:
+L_Magic:
     mes "";
     mesn;
     mesq l("Magic is dead. Well, not yet, we still have some mana stones left - but only the strongest ones are allowed to use them and acquire magic.");
@@ -467,14 +467,7 @@ L_Magica:
     next;
     goto L_PreMenu;
 
-L_Teclado:
-    mes "";
-    mesn;
-    mesq l("There are many key combinations, press F1 to see a short list of them!");
-    next;
-    goto L_Manaplus;
-
-L_Temporada:
+L_Seasons:
     mes "";
     mesn;
     mes l("First of, there's a day/night cycle on the game.");
@@ -504,7 +497,7 @@ L_Temporada:
     next;
     goto L_PreMenu;
 
-L_Experiencia:
+L_Experience:
     mes "";
     mesn;
     mes l("Experience can be gained by completing quests and killing monsters. When you accumulate enough experience, you'll level up!");
@@ -522,22 +515,7 @@ L_Experiencia:
     next;
     goto L_PreMenu;
 
-L_Honra:
-    mesn;
-    mes l("Honor only applies to PvP fights. It can be seen on \"%s\" and rewards are given monthly for it.", b("@scoreboards"));
-    next;
-    mesn ".:: "+l("About Scoreboards and Honor Points")+" ::.";
-    mes l("If you kill an opponent stronger than you, you will gain honor points. But if the oponent is 15 levels weaker than you, it will be NEGATIVE!");
-    next;
-    mesn ".:: "+l("About Scoreboards and Honor Points")+" ::.";
-    mes l("You will also LOSE honor if the opponent is below level 30. If you are a bandit (negative honor), all fights versus you will be honorable.");
-    next;
-    mesn ".:: "+l("About Scoreboards and Honor Points")+" ::.";
-    mes l("If you kill the same person within 30 minutes, honor will not fluctuate. The whole honor system is very experimental.");
-    next;
-    goto L_PreMenu;
-
-L_Regras:
+L_Rules:
     mes "";
     callfunc "GameRules";
     next;