save stop at XXX

1 files changed, 45 insertions, 63 deletions

diff --git a/npc/004-1/miner b/npc/004-1/miner
index 966ec8b32..4afc039ab 100644
--- a/npc/004-1/miner
+++ b/npc/004-1/miner
@@ -1,34 +1,34 @@
 // TMW2 scripts.
 // Authors:
-//    Jesusalva
-// Originals:        Ernando <ernando.quirino@hotmail.com>
-// Original review:  Lunovox <rui.gravata@gmail.com>; Ernando <ernando.quirino@hotmail.com>; Jesusalva <supremo@brasil.byethost22.com>
-// Objective:        Train the player and give some experience.
+//    Saulc
+// Objective:        Farm miner cave monster
 // License:          GPL v3
 // https://www.idleminertycoon.com/ reference of npc name
 // TulimQuest_Tycoon
 //  0:  Not started
 
-//  1:  Took Maggot Quest
-//  2:  Completed Maggot Quest
+//  1:  Took ratto Quest 10 kills 
+//  2:  Completed ratto Quest - 50 EXP 50 GP
 //  3:  Awaiting next quest
 
-//  4:  Took House Maggot Quest
-//  5:  Completed House Maggot Quest
+//  4:  Took Cave Maggot Quest 25 kills
+//  5:  Completed Cave Maggot Quest - 200 EXP 150 GP
 //  6:  Awaiting next quest
 
-//  7:  Took Candor Scorpion Quest
-//  8:  Completed Candor Scorpion Quest
+//  7:  Took Cave Snake Quest 50 kills
+//  8:  Completed Cave Snake Quest - 1000 EXP 350 GP
 //  9:  Awaiting next quest
 
-// 10:  Took Scorpion Quest
-// 11:  Completed Scorpion Quest
-// 12:  Finished all trainment
+// 10:  Took Red Scorpion Quest 100 kills
+// 11:  Completed  Red Scorpion Quest - Miner Hat
+// 12:  Awaiting next quest
+
+// 13:  Took  Black Scorpion Quest 200 kills
+// 14:  Completed Black Scorpion Quest - 12 000 EXP 5 000 GP
+// 15:  Finished all trainment
 
 004-,25,29,0	script	Tycoon	NPC_PLAYER,{
     .@q=getq(TulimQuest_Tycoon);
-    .@b=getq(ShipQuests_Knife); // TODO: We should check if user is with weapon equipped instead
-
 
     mesn;
     mesq lg(Hello my friend!");
@@ -51,68 +51,67 @@ L_Menu:
     mesn strcharinfo(0);
     menu
         l("How can you help me?"),           L_ExplicaSiProprio,
-        rif(getq(TulimQuest_Tycoon) < 15, l("I want to be trained!")),           L_Trainment,
+        rif(getq(TulimQuest_Tycoon) < 15, l("I want to be trained!")),           L_Purge,
         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("No, thanks, its not my job!"),           L_Close;
 
-L_Trainment:
+L_Purge:
     .@q=getq(TulimQuest_Tycoon);
     mes "";
-    if (BaseLevel < 3) goto L_NoLevel;
-    if (.@b == 0) goto L_NoKnife;
+    if (BaseLevel < 15) goto L_NoLevel;
     .@k=getq2(TulimQuest_Tycoon); // Get number of kills (via getq2)
 
     mesn;
     if (.@q == 0) {
-        mesq l("Ok, you have some level. Now, let me think on an easy task for you...");
+        mesq l("Ok, you look strong enough. 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));
+        mesq l("Ah! I know. Kill 10 @@. They usually are near the refectory.", getmonsterlink(Ratto));
         setq TulimQuest_Tycoon, 1, 0;
     } else if (.@q == 1) {
-        mesq l("You are killing @@. They are usually at the crops.", getmonsterlink(Maggot));
+        mesq l("You are killing @@. They usually are near the refectory.", getmonsterlink(Ratto));
     } else if (.@q == 2) {
-        mesq l("Good job! Here is your reward! (40 xp 25 gp)");
-        getexp 40, 0;
-        set Zeny, Zeny + 25;
+        mesq l("Good job! Here is your reward! (50 xp 50 gp)");
+        getexp 50, 0;
+        set Zeny, Zeny + 50;
         setq TulimQuest_Tycoon, 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 rattos means more food. 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));
+        mesq l("Ok now i want you to purge cave of Maggot, kill 25 @@. They keep respawning and annoy miners team.", getmonsterlink(CaveMaggot));
         setq TulimQuest_Tycoon, 4, 0;
     } else if (.@q == 4) {
-        mesq l("You are killing @@ at the storehouse.", getmonsterlink(HouseMaggot));
+        mesq l("You are killing @@ at the cave. Good progress", getmonsterlink(CaveMaggot));
     } else if (.@q == 5) {
-        mesq l("Perfect! Here is your reward! (40 xp 25 gp)");
-        getexp 40, 0;
-        set Zeny, Zeny + 25;
+        mesq l("Perfect! Here is your reward! (200 xp 150 gp)");
+        getexp 200, 0;
+        set Zeny, Zeny + 150;
         setq TulimQuest_Tycoon, 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 see, That was fast. You can also sell monster parts to inn keeper for some extra 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 50 @@, Try to collect some lamps in the same time, that could be useful later.", getmonsterlink(CaveSnake));
         setq TulimQuest_Tycoon, 7, 0;
     } else if (.@q == 7) {
-        mesq l("You are killing @@ at the beach.", getmonsterlink(CandorScorpion));
+        mesq l("You are killing @@ at the cave.", getmonsterlink(CaveSnake));
     } else if (.@q == 8) {
-        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;
+        mesq l("I hope you get some lamps or maybe a short if you re lucky. By the way here is your reward. (1000 xp 350 gp)");
+        getexp 1000, 0;
+        set Zeny, Zeny + 350;
         setq TulimQuest_Tycoon, 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("Ok now you are near to be a real miner if you succes this hard part i will reward you as a @@.", getitemlink(MinerHat));
         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("I'll ask you to kill 100 @@. This will prove your worth. Good luck.", getmonsterlink(RedScorpion));
         setq TulimQuest_Tycoon, 10, 0;
     } else if (.@q == 10) {
-        mesq l("You are killing @@ at northwest from the island.", getmonsterlink(Scorpion));
+        mesq l("You are killing @@ it's still in progress.", getmonsterlink(RedScorpion));
     } else if (.@q == 11) {
-        mesq l("Congratulations! Here is your reward (40 xp 25 gp).");
+        mesq l("Congratulations! Here is your reward ( XXX xp 25 gp).");
         mesq l("You completed your trainment, so you're getting 50 bonus experience points. If you level up, use your stat points wisely!");
         getexp 90, 0;
         set Zeny, Zeny + 25;
@@ -137,30 +136,13 @@ L_Trainment:
 
 L_NoLevel:
     mesn;
-    mesq l("Ah, yes... You see, there is just no task I can give to you right now. ##BYou are too weak to fight monsters.##b");
-    next;
-    mesn;
-    mesq l("Try doing quests which doesn't involve monster hunting first. I'm sure ##B Ayasha ##b could use your help.");
-    next;
-    mesn;
-    mesq l("Otherwise, the monsters here usually won't attack you unless provoked.");
+    mesq l("Ah, yes... You see, there is just no task I can give to you right now. ##BYou are too weak to fight these monsters.##b");
     next;
     mesn;
-    mesq l("Complete quests, gain some experience, allocate some status, and you'll be ready for my training.");
+    mesq l("come back stronger and i will give you tast");
     next;
-    goto L_PreMenu;
+    goto L_Close;
 
-L_NoKnife:
-    mesn;
-    mesq l("And with what you expect to fight monsters? You must arrange yourself a weapon!");
-    next;
-    mesn;
-    mesq l("I don't know. Try getting a Rusty Knife or something. Maybe the chef of Nard's ship can spare you one.");
-    next;
-    mesn;
-    mesq l("There probably is a huge, flashing orange exclamation mark over a suitable knife you could take and nobody would mind.");
-    next;
-    goto L_PreMenu;
 
 // Anything below this line is copy-pasted from SG:ManaBird, a TMW-BR clone
 // Do not attention to it, unless you need to. Translated by Google.
@@ -278,7 +260,7 @@ L_ExplicaDialogo:
     next;
     goto L_PreMenu;
 
-L_Fechar:
+L_Close:
     close;
 
 L_OutrasInformacoes_gap: