Divide differently the Trainer sections.

1 files changed, 72 insertions, 69 deletions

diff --git a/npc/005-7/trainer.txt b/npc/005-7/trainer.txt
index b33e9372e..8f31e1a08 100644
--- a/npc/005-7/trainer.txt
+++ b/npc/005-7/trainer.txt
@@ -42,15 +42,37 @@ L_PreMenu:
 L_Menu:
     mesn strcharinfo(0);
     menu
-        l("How can you help me?"),           L_ExplicaSiProprio,
-        rif(getq(CandorQuest_Trainer) < 15, l("I want to be trained!")),           L_Trainment,
+        l("How can you help me?"),              L_ExplicaSiProprio,
+        rif(getq(CandorQuest_Trainer) < 15, l("I want to be trained!")), L_Trainment,
+        l("I wanted info about how to play."),  L_Manaplus_gap,
         l("How do I make money?"),              L_ExplicaGrama,
-        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("I wanted other info."), L_OutrasInformacoes_gap,
-        l("No, thanks!"),           L_Fechar;
+        l("Monsters."),                         L_Monstros,
+        l("Quests."),                           L_Quests,
+        l("NPCs."),                             L_NPC,
+        l("Magic."),                            L_Magica,
+        l("Rules."),                            L_Regras,
+        l("No, thanks!"),                       L_Fechar;
+
+
+L_Manaplus_gap:
+    mes "";
+    goto L_Manaplus;
+
+L_Manaplus:
+    mesn;
+    mesq l("What do you want to learn more about?");
+    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("Status."),                           L_Status,
+        l("Styles."),                           L_Estilo,
+        l("Commands."),                         L_Comandos,
+        l("Shortcuts."),                        L_Teclado,
+        l("I changed my mind."),                L_Menu_gap;
 
 L_Trainment:
     .@q=getq(CandorQuest_Trainer);
@@ -175,8 +197,12 @@ L_ExplicaGrama:
     mesn;
     mesq l("Merchants like to buy body parts of killed monsters and animals because they can make items and equipment.");
     next;
+    mesn;
     mesq l("Some others also like to buy them to keep as trophies. Either way, you can make some money with that.");
     next;
+    mesn;
+    mesq l("You can also make money ##Bdoing quests##b. Elmo will tell you almost every quest which can be done in Candor.");
+    next;
     goto L_PreMenu;
 
 L_ExplicaBagagem:
@@ -193,7 +219,22 @@ L_ExplicaBagagem:
     mesn;
     mesq l("To discard an item you no longer want, select it and press the 'Discard' button. Generic items can be discarded or sold. But equipment can only be sold.");
     next;
-    goto L_PreMenu;
+    mesn;
+    mesq l("There are three types of items.");
+    mesq l("Those for consumption, equipment and generics.");
+    next;
+    mesn;
+    mesq l("Items for consumption, like potions, can only be used once.");
+    mesq l("Once used, they will disappear from your inventory.");
+    next;
+    mesn;
+    mesq l("Equippable items are armour, weapons and accessories.");
+    mesq l("They can be equipped to make your look more interesting or to improve some of its features.");
+    next;
+    mesn;
+    mesq l("Generic items are used for different purposes. In creating other items, to swap and sell, to collect, etc.");
+    next;
+    goto L_Manaplus;
 
 L_ExplicaTrade:
     mes "";
@@ -218,7 +259,7 @@ L_ExplicaTrade:
     mesn;
     mesq l("Remember! You're trading things, not lending/borrowing them. You are solely responsible for everything you own.");
     next;
-    goto L_PreMenu;
+    goto L_Manaplus;
 
 // TODO: We have over nine instructions here. You usually can only memorise from three to five at a time!
 L_ExplicaBatalha:
@@ -247,7 +288,7 @@ mesq l("There are some stones scattered around the world that mark your point of
     mesn;
     mesq l("You can, however, use ##BCtrl##b to auto-select a monster and attack them. This usually also collects drops, but press Z to be sure.");
     next;
-    goto L_PreMenu;
+    goto L_Manaplus;
 
 L_ExplicaDialogo:
     mes "";
@@ -269,53 +310,12 @@ L_ExplicaDialogo:
     mesn;
     mesq l("But be careful: do not scream when using a lot of capital letters, and do not keep repeating the lines, or you may be severely penalized.");
     next;
-    goto L_PreMenu;
+    goto L_Manaplus;
 
 L_Fechar:
     close;
 
-L_OutrasInformacoes_gap:
-    mes "";
-    goto L_OutrasInformacoes;
-
-L_OutrasInformacoes:
-    mesn;
-    mesq l("What do you want to learn more about?");
-    next;
-    mesn strcharinfo(0);
-    menu
-        l("Items."),           L_Itens,
-        l("Monsters."),        L_monstros,
-        l("Styles."),         L_estilo,
-        l("Quests."),          L_Quests,
-        l("NPCs."),            L_NPC,
-        l("Commands."),        L_comandos,
-        l("Status."),          L_status,
-        l("Magic."),          L_Magica,
-        l("Shortcuts."),         L_teclado,
-        l("Rules."),          L_regras,
-        l("I changed my mind."),  L_Menu_gap;
-
-L_Itens:
-    mes "";
-    mesn;
-    mesq l("There are three types of items.");
-    mesq l("Those for consumption, equipment and generics.");
-    next;
-    mesn;
-    mesq l("Items for consumption, like potions, can only be used once.");
-    mesq l("Once used, they will disappear from your inventory.");
-    next;
-    mesn;
-    mesq l("Equippable items are armour, weapons and accessories.");
-    mesq l("They can be equipped to make your look more interesting or to improve some of its features.");
-    next;
-    mesn;
-    mesq l("Generic items are used for different purposes. In creating other items, to swap and sell, to collect, etc.");
-    next;
-    goto L_OutrasInformacoes;
-
-L_monstros:
+L_Monstros:
     mes "";
     mesn;
     mesq l("Monsters are everywhere. They're a plague we're trying to get rid of.");
@@ -334,15 +334,15 @@ L_monstros:
     mesq l("Normally, collaborative behave like neutral monsters. Unless some partner of the same species is in danger, at which point they all take an aggressive stance against the aggressor.");
     mesq l("It's always good to see if you have a lot of them around before you think about attacking one!");
     next;
-    goto L_OutrasInformacoes;
+    goto L_PreMenu;
 
-L_estilo:
+L_Estilo:
     mes "";
     mesn;
     mesq l("NPC stylists will cut your hair!");
     mesq l("They are known to use a revolutionary hair growth formula.");
     next;
-    goto L_OutrasInformacoes;
+    goto L_Manaplus;
 
 L_Quests:
     mes "";
@@ -351,7 +351,10 @@ L_Quests:
     mesq l("Most of these people will not think twice before giving a nice reward to anyone who helps them.");
     mesq l("So be nice and help people along the way!");
     next;
-    goto L_OutrasInformacoes;
+    mesn;
+    mesq l("Seldomly, they'll have an exclamation mark over their heads. But some quests are hidden, so talk to people and have fun!");
+    next;
+    goto L_PreMenu;
 
 L_NPC:
     mes "";
@@ -361,9 +364,9 @@ L_NPC:
     mesq l("##BIMPORTANT:##b People usually doesn't shout, they talk. Because this, if you are too far, an NPC won't hear you.");
     mesq l("When this is the case, you should get closer to the NPC, until they hear you.");
     mesq 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_OutrasInformacoes;
+    goto L_PreMenu;
 
-L_comandos:
+L_Comandos:
     mes "";
     mesn;
     mesq l("/ clear clears the text box.");
@@ -374,9 +377,9 @@ L_comandos:
     mesq l("/ help explains how to use all client commands.");
     mesq l("@commands lists even more advanced commands, but you can't use all of them.");
     next;
-    goto L_OutrasInformacoes;
+    goto L_Manaplus;
 
-L_status:
+L_Status:
     mes "";
     mesn;
     mesq l("People vary greatly in the amount of strength, agility, dexterity, intelligence, vitality and luck.");
@@ -387,7 +390,7 @@ L_status:
     mesq l("Your dexterity determines your ability to hit monsters and is valuable to players who prefer weapons that use projectiles.");
     next;
     mesn;
-    mesq l("Vitality determines how resistant you are to attacks and how many blows you can take before you die.");
+    mesq l("Vitality determines how resistant you are to attacks and how many blows you can take before you die. It also affects status effects, like poison.");
     mesq l("Intelligence is very useful for alchemy and magic, but nowadays there are few opportunities to use it.");
     mesq l("Your luck determines several small things, including the number of critical attacks you are going to suffer and perform.");
     next;
@@ -395,27 +398,27 @@ L_status:
     mesq l("I recommend that you train your dexterity a great deal, since most monsters out there are hard to hit without it.");
     mesq l("For now do not take too much time to work on your intelligence, after all, almost nobody have magic this day.");
     next;
-    goto L_OutrasInformacoes;
+    goto L_Manaplus;
 
 L_Magica:
     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.");
     next;
-    goto L_OutrasInformacoes;
+    goto L_PreMenu;
 
-L_teclado:
+L_Teclado:
     mes "";
     mesn;
     mesq l("There are many key combinations, press F1 to see a short list of them!");
     next;
-    goto L_OutrasInformacoes;
+    goto L_Manaplus;
 
-L_regras:
+L_Regras:
     mes "";
     callfunc "GameRules";
     next;
-    goto L_OutrasInformacoes;
+    goto L_PreMenu;
 
 L_Menu_gap:
     mes "";