Trainer is now complete and tested (I wanted display name to be Valon...)

1 files changed, 37 insertions, 27 deletions

diff --git a/npc/005-7/trainer.txt b/npc/005-7/trainer.txt
index e25339b47..57b26701b 100644
--- a/npc/005-7/trainer.txt
+++ b/npc/005-7/trainer.txt
@@ -53,6 +53,7 @@ L_Menu:
         l("No, thanks!"),           L_Fechar;
 
 L_Trainment:
+    .@q=getq(CandorQuest_Trainer);
     mes "";
     if (BaseLevel < 3) goto L_NoLevel;
     if (.@b == 0) goto L_NoKnife;
@@ -60,50 +61,59 @@ L_Trainment:
 
     mesn;
     if (.@q == 0) {
-        mesq l("Ok, you have some level. I will assign you a task to kill maggots.");
-        mesq l("I'll ask to kill 10 @@", getmonsterlink(Maggot));
+        mesq l("Ok, you have some level. Now, let me think on an easy task for you...");
+        next;
+        mesq l("Ah! I know. Kill 10 @@. They usually are the crops.", getmonsterlink(Maggot));
         setq CandorQuest_Trainer, 1, 0;
     } else if (.@q == 1) {
-        mesq l("You are killing Maggots");
+        mesq l("You are killing @@. They are usually at the crops.", getmonsterlink(Maggot));
     } else if (.@q == 2) {
-        mesq l("Here is your reward (40 xp 25 gp)");
+        mesq l("Good job! Here is your reward! (40 xp 25 gp)");
         getexp 40, 0;
         set Zeny, Zeny + 25;
         setq CandorQuest_Trainer, 3, 0;
     } else if (.@q == 3) {
-        mesq l("I'll ask to kill 5 @@", getmonsterlink(HouseMaggot));
+        mesq l("Less maggots means more food to the town. So, this time the monsters will be a little stronger.");
+        next;
+        mesq l("In the storehouse, kill 5 @@. They keep respawning and are annoying.", getmonsterlink(HouseMaggot));
         setq CandorQuest_Trainer, 4, 0;
     } else if (.@q == 4) {
-        mesq l("You are killing House Maggots");
+        mesq l("You are killing @@ at the storehouse.", getmonsterlink(HouseMaggot));
     } else if (.@q == 5) {
-        mesq l("Here is your reward (40 xp 25 gp)");
+        mesq l("Perfect! Here is your reward! (40 xp 25 gp)");
         getexp 40, 0;
         set Zeny, Zeny + 25;
         setq CandorQuest_Trainer, 6, 0;
     } else if (.@q == 6) {
-        mesq l("I'll ask to kill 3 @@", getmonsterlink(CandorScorpion));
+        mesq l("As you see, 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));
         setq CandorQuest_Trainer, 7, 0;
     } else if (.@q == 7) {
-        mesq l("You are killing Candor Scorpions");
+        mesq l("You are killing @@ at the beach.", getmonsterlink(CandorScorpion));
     } else if (.@q == 8) {
-        mesq l("Here is your reward (40 xp 25 gp)");
+        mesq l("Managed to drop anything? It requires more luck than skill. Here is your reward. (40 xp 25 gp)");
         getexp 40, 0;
         set Zeny, Zeny + 25;
         setq CandorQuest_Trainer, 9, 0;
     } else if (.@q == 9) {
-        mesq l("I'll ask to kill 1 @@", getmonsterlink(Scorpion));
-        setq CandorQuest_Trainer, 9, 0;
+        mesq l("This will be the 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));
+        setq CandorQuest_Trainer, 10, 0;
     } else if (.@q == 10) {
-        mesq l("You are killing Scorpions");
+        mesq l("You are killing @@ at northwest from the island.", getmonsterlink(Scorpion));
     } else if (.@q == 11) {
-        mesq l("Here is your reward (40 xp 25 gp) + Graduation! (+50 xp)");
+        mesq l("Congratulations! Here is your reward (40 xp 25 gp).");
+        mesq l("You completed all my tasks, so you're getting 50 bonus experience points. If you level up, use your stat points wisely!");
         getexp 90, 0;
         set Zeny, Zeny + 25;
         setq CandorQuest_Trainer, 12, 0;
     } else {
-        mesq l("Thanks!");
+        mesq l("You are already fully trained. Go to Tulimshar, and try to join a guild or something.");
     }
 
+    next;
     goto L_PreMenu;
 
 L_NoLevel:
@@ -114,7 +124,7 @@ L_NoLevel:
     mesq l("Try doing quests which doesn't involve monster hunting first. I'm sure Ayasha and Zegas could use your help.");
     next;
     mesn;
-    mesq l("The monsters here are not agressive. Complete their quests, gain some experience, allocate some status, and you'll be ready for my training.");
+    mesq l("The monsters here are not aggressive. Complete their quests, gain some experience, allocate some status, and you'll be ready for my training.");
     next;
     goto L_PreMenu;
 
@@ -131,14 +141,14 @@ L_NoKnife:
     goto L_PreMenu;
 
 // Anything below this line is copy-pasted from SG:ManaBird, a TMW-BR clone
-// Do noy attention to it, unless you need to. Translated by Google.
+// Do not attention to it, unless you need to. Translated by Google.
 L_ExplicaSiProprio:
     mes "";
     mesn;
-    mesq l("The king commanded me to strengthen the young men, so that they have sufficient power to fight monsters.");
+    mesq l("Saxso, the former mayor, commanded me to strengthen the youngsters, so that they have sufficient power to fight monsters.");
     next;
     mesn;
-    mesq l("I can give you training for that, and teach you how to fight properly.");
+    mesq lg("He died, but I plan in fulfilling his will. I can give you training for that, and teach you how to fight properly.");
     next;
     mesn;
     mesq l("I see you have arms long enough to be an archer.");
@@ -195,11 +205,11 @@ L_ExplicaTrade:
     next;
     goto L_PreMenu;
 
-// TODO: We have over nine instructions here. You usually can only memorize from three to five at a time!
+// TODO: We have over nine instructions here. You usually can only memorise from three to five at a time!
 L_ExplicaBatalha:
     mes "";
     mesn;
-    mesq l("To hunt a target you must click the primary mouse button on it. Avoid fighting monsters or citizens much stronger than you. You will lose experience if you are defeated.");
+    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. You will lose experience if you are defeated.");
     next;
     mesn;
     mesq l("Within the cities is a place safe enough not to be attacked by another person (except during wars). But outside of them there are some places where the citizen can be attacked by enemies from other realms, or even by someone from the same realm.");
@@ -282,7 +292,7 @@ L_Itens:
     mesq l("Once used, they will disappear from your inventory.");
     next;
     mesn;
-    mesq l("Equipible items are armor, weapons and accessories.");
+    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;
@@ -344,7 +354,7 @@ L_comandos:
     mesq l("/ clear clears the text box.");
     mesq l("/ whisper [name] allows you to send a private message to the player. if [name] contains spaces, it must be enclosed in quotation marks.");
     //mesq l("/who mostra o número de jogadores conectados no momento.");
-    mesq l("/ present shows the number of people in the neighborhood.");
+    mesq l("/ present shows the number of people in the neighbourhood.");
     mesq l("/ where shows the name of the map you are in.");
     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.");
@@ -401,14 +411,14 @@ L_Menu_gap:
         .@qp=getq(CandorQuest_Trainer);
         .@kp=getq2(CandorQuest_Trainer); // Get number of kills (via getq2)
         setq CandorQuest_Trainer, .@qp, .@kp+1;
-        message strcharinfo(0), l("Set status @@ with @@ kills", .@qp, .@kp);
+        //message strcharinfo(0), l("Set status @@ with @@ kills", .@qp, .@kp);
     }
 
     function trainer_max_kills
     {
         .@qp=getq(CandorQuest_Trainer);
         setq CandorQuest_Trainer, .@qp+1, 0;
-        message strcharinfo(0), l("End status @@", .@qp);
+        //message strcharinfo(0), l("End status @@", .@qp);
     }
 
 OnKillMaggot:
@@ -454,12 +464,12 @@ OnKillScorpion:
     .@q=getq(CandorQuest_Trainer);
     .@k=getq2(CandorQuest_Trainer); // Get number of kills (via getq2)
     if (.@q == 10) {
-        if (.@k+1 >= 1) {
+        if (.@k+1 >= 2) {
             trainer_max_kills();
             message strcharinfo(0), l("All scorpions are dead!");
         } else {
             trainer_add_kills();
-            message strcharinfo(0), l("@@/1 Scorpion", .@k+1);
+            message strcharinfo(0), l("@@/2 Scorpion", .@k+1);
         }
     }
     end;