Update miner

1 files changed, 42 insertions, 240 deletions

diff --git a/npc/004-1/miner b/npc/004-1/miner
index 32df96c7f..5233cc1c5 100644
--- a/npc/004-1/miner
+++ b/npc/004-1/miner
@@ -1,6 +1,6 @@
 // TMW2 scripts.
 // Authors:
-//    Saulc
+//    Saulc, jesusava
 // Objective:        Farm miner cave monster
 // License:          GPL v3
 // https://www.idleminertycoon.com/ reference of npc name
@@ -52,11 +52,9 @@ L_Menu:
     menu
         rif(getq(TulimQuest_Tycoon) < 15, l("I am a brave adventurer! how can i help you ?")),           L_Purge,
         l("What does miners do in cave ?"),              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("can you give me a tip?"),            L_ExplicaBagagem,
+        l("Are you a terrenite?"),  L_ExplicaTrade,
+        l("I dont care about dirty miners problem."), L_Close,
         l("No, thanks, its not my job!"),           L_Close;
 
 L_Purge:
@@ -166,7 +164,7 @@ L_ExplicaGrama:
 L_ExplicaBagagem:
     mes "";
     mesn;
-    mesq l("You can see all your equipment by pressing the F3 key.");
+    mesq l("If you fight Black scorpion .");
     next;
     mesn;
     mesq l("To equip or unequip an item, select it and press the 'Equip' or 'Unequip' button. You can not 'Equip' or 'Unequip' when talking to someone.");
@@ -204,208 +202,12 @@ L_ExplicaTrade:
     next;
     goto L_PreMenu;
 
-// 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("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");
-    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.");
-    next;
-    mesn;
-mesq l("There are some stones scattered around the world that mark your point of return in case of defeats. Some ship chests may also serve as a return point. You can also select some beds in case of defeats.");
-    next;
-    mesn;
-    mesq l("Almost all creatures drop useful items when defeated. To get the dropped item press the 'Z' key next to the item or click the primary button on the item.");
-    next;
-    mesn;
-    mesq l("To focus on a creature, press the 'A' key. To focus on another citizen, press the 'Q' key. To attack the focused target press the 'X' key or click the primary button on the creature.");
-    next;
-    mesn;
-    mesq l("To focus on an NPC, press the 'N' key. To talk to him press the 'T' key.");
-    next;
-    mesn;
-    mesq l("To defocus or stop attacking, press Shift + A.");
-    next;
-    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;
-
-L_ExplicaDialogo:
-    mes "";
-    mesn;
-    mesq l("To display the dialog box with other citizens, press the F7 key.");
-    next;
-    mesn;
-    mesq l("To speak in public select the 'General' tab. It serves to talk to people who are appearing on your screen.");
-    next;
-    mesn;
-    mesq l("To speak privately with someone, click the second mouse button on the citizen and select the 'Whisper' option.");
-    next;
-    mesn;
-    mesq l("In order to enter a message press the 'Enter' key, this will display the white box of typing. Type your message there and press 'Enter' again to send your speech.");
-    next;
-    mesn;
-    mesq l("To speak privately to a friend who is not appearing on your screen, type the command '##B /q Citizen Name ##b' and press 'Enter'. This command will open a long-distance dialog that has the name of who you want to talk to. Select this new tab and send your message through it.");
-    next;
-    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;
 
 L_Close:
     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:
-    mes "";
-    mesn;
-    mesq l("Monsters are everywhere. They're a plague we're trying to get rid of.");
-    next;
-    mesn;
-    mesq l("There are three types of monsters: the aggressive, the neutral, and the collaborative.");
-    next;
-    mesn;
-    mesq l("Aggressors always know when they are in danger! Therefore, they are always on standby, attacking anyone who appears ahead.");
-    next;
-    mesn;
-    mesq l("Neutral monsters do not have such a sense of danger.");
-    mesq l("They will not attack anyone unless they are attacked first.");
-    next;
-    mesn;
-    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;
-
-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;
-
-L_Quests:
-    mes "";
-    mesn;
-    mesq l("There are people in the world who need help!");
-    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;
-
-L_NPC:
-    mes "";
-    mesn;
-    mesq l("NPCs(Non Playable Characters) or non-playable characters are characters that are always in the game, offering a wide variety of reactions, from a simple friendly conversation to a desperate request for help.");
-    next;
-    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;
-
-L_comandos:
-    mes "";
-    mesn;
-    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 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.");
-    next;
-    goto L_OutrasInformacoes;
-
-L_status:
-    mes "";
-    mesn;
-    mesq l("People vary greatly in the amount of strength, agility, dexterity, intelligence, vitality and luck.");
-    next;
-    mesn;
-    mesq l("Strength helps you carry more items and also gives you a more forceful blow, but ends up not being very interesting if you focus on weapons that use projectiles, such as the bow.");
-    mesq l("Greater agility allows you to attack faster and has a greater chance of evading attacks.");
-    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("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;
-    mesn;
-    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;
-
-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;
-
-L_teclado:
-    mes "";
-    mesn;
-    mesq l("There are many key combinations, press F1 to see a short list of them!");
-    next;
-    goto L_OutrasInformacoes;
-
-L_regras:
-    mes "";
-    callfunc "GameRules";
-    next;
-    goto L_OutrasInformacoes;
-
-L_Menu_gap:
-    mes "";
-    goto L_PreMenu;
 
-    function trainer_add_kills
+    function tycoon_add_kills
     {
         .@qp=getq(TulimQuest_Tycoon);
         .@kp=getq2(TulimQuest_Tycoon); // Get number of kills (via getq2)
@@ -413,92 +215,92 @@ L_Menu_gap:
         //message strcharinfo(0), l("Set status @@ with @@ kills", .@qp, .@kp);
     }
 
-    function trainer_max_kills
+    function tycoon_max_kills
     {
         .@qp=getq(TulimQuest_Tycoon);
         setq TulimQuest_Tycoon, .@qp+1, 0;
         //message strcharinfo(0), l("End status @@", .@qp);
     }
 
-OnKillMaggot:
+OnKillRatto:
     .@q=getq(TulimQuest_Tycoon);
     .@k=getq2(TulimQuest_Tycoon); // Get number of kills (via getq2)
     if (.@q == 1) {
         if (.@k+1 >= 10) {
-            trainer_max_kills();
-            message strcharinfo(0), l("All maggots are dead!");
+            tycoon_max_kills();
+            message strcharinfo(0), l("All rattos are dead! Go back to Tycoon");
         } else {
-            trainer_add_kills();
-            message strcharinfo(0), l("@@/10 Maggots", .@k+1);
+            tycoon_add_kills();
+            message strcharinfo(0), l("@@/10 Rattos", .@k+1);
         }
     }
     end;
-OnKillHouseMaggot:
+OnKillCaveMaggot:
     .@q=getq(TulimQuest_Tycoon);
     .@k=getq2(TulimQuest_Tycoon); // Get number of kills (via getq2)
     if (.@q == 4) {
-        if (.@k+1 >= 5) {
-            trainer_max_kills();
-            message strcharinfo(0), l("All house maggots are dead!");
+        if (.@k+1 >= 25) {
+            tycoon_max_kills();
+            message strcharinfo(0), l("All cave maggots are dead! Go back to Tycoon");
         } else {
-            trainer_add_kills();
-            message strcharinfo(0), l("@@/5 House Maggots", .@k+1);
+            tycoon_add_kills();
+            message strcharinfo(0), l("@@/25 Cave Maggots", .@k+1);
         }
     } else {
         if (is_staff()) 
             dispbottom "It's working. (T:OKHM)";
     }
     end;
-OnKillCandorScorpion:
+OnKillCaveSnake:
     .@q=getq(TulimQuest_Tycoon);
     .@k=getq2(TulimQuest_Tycoon); // Get number of kills (via getq2)
     if (.@q == 7) {
-        if (.@k+1 >= 3) {
-            trainer_max_kills();
-            message strcharinfo(0), l("All candor scorpions are dead!");
+        if (.@k+1 >= 50) {
+            tycoon_max_kills();
+            message strcharinfo(0), l("All cave snakes are dead! Go back to Tycoon");
         } else {
-            trainer_add_kills();
-            message strcharinfo(0), l("@@/3 Candor Scorpions", .@k+1);
+            tycoon_add_kills();
+            message strcharinfo(0), l("@@/50 Cave Snakes", .@k+1);
         }
     }
     end;
-OnKillScorpion:
+OnKillRedScorpion:
     .@q=getq(TulimQuest_Tycoon);
     .@k=getq2(TulimQuest_Tycoon); // Get number of kills (via getq2)
     if (.@q == 10) {
-        if (.@k+1 >= 2) {
-            trainer_max_kills();
-            message strcharinfo(0), l("All scorpions are dead!");
+        if (.@k+1 >= 100) {
+            tycoon_max_kills();
+            message strcharinfo(0), l("All red scorpions are dead! Go back to Tycoon");
         } else {
-            trainer_add_kills();
-            message strcharinfo(0), l("@@/2 Scorpion", .@k+1);
+            tycoon_add_kills();
+            message strcharinfo(0), l("@@/100 Red Scorpions", .@k+1);
         }
     }
     end;
-OnKillManaBug:
+OnKillBlackScorpion:
     .@q=getq(TulimQuest_Tycoon);
     .@k=getq2(TulimQuest_Tycoon); // Get number of kills (via getq2)
     if (.@q == 13) {
-        if (.@k+1 >= 1) {
-            trainer_max_kills();
-            message strcharinfo(0), l("All mana bugs are dead!");
+        if (.@k+1 >= 200) {
+            tycoon_max_kills();
+            message strcharinfo(0), l("All black scorpions are dead! Go back to Tycoon");
         } else {
-            trainer_add_kills();
-            message strcharinfo(0), l("@@/1 Mana Bug", .@k+1);
+            tycoon_add_kills();
+            message strcharinfo(0), l("@@/1 Black Scorpions", .@k+1);
         }
     }
     end;
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, LeatherShirt);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, CottonTrousers);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADTOP, ArtisTankTop);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, BromenalPants);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, MinerHat);
     setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots);
-    setunitdata(.@npcId, UDT_HAIRSTYLE, 20);
-    setunitdata(.@npcId, UDT_HAIRCOLOR, 7);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 19);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 8);
 
     .sex = G_MALE;
-    .distance = 5;
+    .distance = 4;
     end;
 }