From bbe1d901a780f462347037c30856393caa5983a3 Mon Sep 17 00:00:00 2001 From: Saulc Date: Wed, 29 Aug 2018 09:05:15 +0000 Subject: Revert "Merge branch 'master' into 'master'" This reverts commit 5f62243a1da032521de53876005112d5e6e36a19 --- npc/007-1/_import.txt | 5 ++ npc/007-1/tycoon.txt | 130 +++++++++++++++++++++++++------------------------- 2 files changed, 69 insertions(+), 66 deletions(-) (limited to 'npc/007-1') diff --git a/npc/007-1/_import.txt b/npc/007-1/_import.txt index 79c6fdd2e..aeedae88a 100644 --- a/npc/007-1/_import.txt +++ b/npc/007-1/_import.txt @@ -2,4 +2,9 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/007-1/_mobs.txt", "npc/007-1/_warps.txt", +"npc/007-1/caelum.txt", +"npc/007-1/dracoula.txt", +"npc/007-1/pylon.txt", +"npc/007-1/torches.txt", "npc/007-1/tycoon.txt", +"npc/007-1/zarkor.txt", diff --git a/npc/007-1/tycoon.txt b/npc/007-1/tycoon.txt index a5031043d..e2951dc98 100644 --- a/npc/007-1/tycoon.txt +++ b/npc/007-1/tycoon.txt @@ -1,18 +1,17 @@ // TMW2 scripts. // TMW2 Authors: // Saulc -// jesusava +// Jesusalva // Description: -// Miner leader ask to purge mine +// Miner leader asks you to purge mine from monsters. Currently disabled. // Variable: // MineQuest_Tycoon -// License: ??? wich one sould i use ? // Reference: -// npc name from https://www.idleminertycoon.com/ +// npc name from https://www.idleminertycoon.com/ // Steps: // 0: Not started // -// 1: Took ratto Quest 10 kills +// 1: Took ratto Quest 10 kills // 2: Completed ratto Quest - 50 EXP 50 GP // 3: Awaiting next quest // @@ -20,7 +19,7 @@ // 5: Completed Cave Maggot Quest - 200 EXP 150 GP // 6: Awaiting next quest // -// 7: Took Cave Snake Quest 50 kills +// 7: Took Cave Snake Quest 45 kills // 8: Completed Cave Snake Quest - 1000 EXP 350 GP // 9: Awaiting next quest // @@ -32,18 +31,18 @@ // 14: Completed Black Scorpion Quest - 12 000 EXP 5 000 GP // 15: Finished all trainment -007-1,66,65,0 script Tycoon NPC_PLAYER,{ +007-1,71,65,0 script Tycoon NPC_PLAYER,{ .@q=getq(MineQuest_Tycoon); mesn; - mesq lg(Hello my friend!"); + mesq lg("Hello my friend!"); next; - mesq lg("Some of my miners friends died in this mine, cause it's plenty of dangerous monsters"); + mesq lg("Some of my miners friends died in this mine, because there are plenty of dangerous monsters."); next; - mesq l("Would you like to help us for a reward ? or maybe you just want some information"); + mesq lg("Would you like to help us? Maybe you just need some information."); next; goto L_Menu; - + L_PreMenu: mesn; mesq l("I need your help dude!"); @@ -53,12 +52,12 @@ L_PreMenu: L_Menu: mesn strcharinfo(0); menu - rif(getq(MineQuest_Tycoon) < 15, l("I am a brave adventurer! how can i help you ?")), L_Purge, - l("What does miners do in cave ?"), L_CaveMiner, - l("Can you give me a tip?"), L_Tip, - l("Are you a terrenite?"), L_Terranite, - l("I dont care about dirty miners problem."), L_Close, - l("No, thanks, its not my job!"), L_Close; + rif(getq(MineQuest_Tycoon) < 15, l("I am a brave adventurer! How can I help you?")), L_Purge, + l("What does miners do in cave?"), L_CaveMiner, + l("Can you give me a tip?"), L_Tip, + l("Are you a terranite?"), L_Terranite, + l("I don't care about dirty miners problem."), L_Close, + l("No, thanks, it's not my job!"), L_Close; L_Purge: .@q=getq(MineQuest_Tycoon); @@ -70,83 +69,83 @@ L_Purge: if (.@q == 0) { 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 near the refectory.", getmonsterlink(Ratto)); + mesq l("Ah! I know. Kill 10 @@. They usually are near the mine's inn.", getmonsterlink(Ratto)); setq MineQuest_Tycoon, 1, 0; } else if (.@q == 1) { - mesq l("You are killing @@. They usually are near the refectory.", getmonsterlink(Ratto)); + mesq l("You are killing @@/10 @@. They usually are near the mine's Inn.", .@k, getmonsterlink(Ratto)); } else if (.@q == 2) { mesq l("Good job! Here is your reward! (50 xp 50 gp)"); - getexp 50, 0; + getexp 53, 0; // 10 kills * 5 xp = 50 xp gained from killing. (100% bonus) (r4 +5%) set Zeny, Zeny + 50; setq MineQuest_Tycoon, 3, 0; } else if (.@q == 3 && BaseLevel >= 19) { mesq l("Less rattos means more food. So, this time the monsters will be a little stronger."); next; - mesq l("Ok now i want you to purge cave of Maggot, kill 25 @@. They keep respawning and annoy miners team.", getmonsterlink(CaveMaggot)); + mesq l("Ok, now I want you to purge the cave from maggots. Kill 25 @@. They keep respawning and annoy miners team.", getmonsterlink(CaveMaggot)); setq MineQuest_Tycoon, 4, 0; } else if (.@q == 3 && BaseLevel < 19) { - mesq l("You are already too weak for my task, please come back later with some levels."); + mesq l("You are too weak for my task, please come back later with some levels."); } else if (.@q == 4) { - mesq l("You are killing @@ at the cave. Good progress", getmonsterlink(CaveMaggot)); + mesq l("You are killing @@/25 @@ at the cave. Good progress!", getmonsterlink(CaveMaggot)); } else if (.@q == 5) { - mesq l("Perfect! Here is your reward! (200 xp 150 gp)"); - getexp 200, 0; + mesq l("Perfect! Here is your reward! (150 xp 150 gp)"); + getexp 158, 0; // 25 kills * 12 xp = 300 xp gained from killing. (50% bonus) (r4 +5%) set Zeny, Zeny + 150; setq MineQuest_Tycoon, 6, 0; } else if (.@q == 6 && BaseLevel >= 24) { - mesq l("As you see, That was fast. You can also sell monster parts to inn keeper for some extra money."); + mesq l("That was fast. Do not forget to sell their... parts... for some extra cash."); next; - mesq l("So, please kill 50 @@, Try to collect some lamps in the same time, that could be useful later.", getmonsterlink(CaveSnake)); + mesq l("Now, please kill 45 @@, Try to collect some lamps in the same time, they could be useful later.", getmonsterlink(CaveSnake)); setq MineQuest_Tycoon, 7, 0; } else if (.@q == 6 && BaseLevel < 24) { - mesq l("You are already too weak for my task, please come back later with some levels."); + mesq l("You are too weak for my task, please come back later with some levels."); } else if (.@q == 7) { - mesq l("You are killing @@ at the cave.", getmonsterlink(CaveSnake)); + mesq l("You are killing @@/45 @@ at the cave.", .@k, getmonsterlink(CaveSnake)); } else if (.@q == 8) { - 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; + mesq l("I hope you got a Jean Shorts, but that depends on luck. Anyway, here is your reward. (1000 xp 350 gp)"); + getexp 1050, 0; // 50 kills * 42 xp = 2100 xp gained from killing. (47.62% bonus) (r4 +5%) set Zeny, Zeny + 350; setq MineQuest_Tycoon, 9, 0; } else if (.@q == 9 && BaseLevel >= 29) { - 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)); + mesq l("If you want to be a real miner friend, do this hard task for me. I will reward you with a @@.", getitemlink(MinerHat)); next; mesq l("I'll ask you to kill 100 @@. This will prove your worth. Good luck.", getmonsterlink(RedScorpion)); setq MineQuest_Tycoon, 10, 0; } else if (.@q == 9 && BaseLevel < 29) { - mesq l("You are already too weak for my task, please come back later with some levels."); + mesq l("You are too weak for my task, please come back later with some levels."); } else if (.@q == 10) { - mesq l("You are killing @@ it's still in progress.", getmonsterlink(RedScorpion)); + mesq l("You are killing @@/100 @@. It's still in progress.", .@k, getmonsterlink(RedScorpion)); } else if (.@q == 11) { - mesq l("Congratulations! Here is your reward a @@.", getitemlink(MinerHat)); - mesq l("We done nice progress thank a lot my friend you re nwo part of the Tulimshar miner crew!"); + mesq l("Congratulations! Here is your reward, a @@!", getitemlink(MinerHat)); + mesq l("Mining opearations advance steadly day by day with your help, thanks! Maybe one day, we find a Mana Stone here! (1300 xp)"); inventoryplace MinerHat, 1; getitem MinerHat, 1; + getexp 1365, 0; // 100 kills * 52 xp = 5200 xp gained from killing. (25% bonus) (r4 +5%) setq MineQuest_Tycoon, 12, 0; } else if (.@q == 12 && BaseLevel >= 34) { - mesq l("Last task i can give you it's to exterminate @@ They actually lock miners progress in the mine.", getmonsterlink(BlackScorpion)); + mesq l("The last task I could give you is to exterminate 200 @@. They actually stop miners progress on the mine.", getmonsterlink(BlackScorpion)); setq MineQuest_Tycoon, 13, 0; } else if (.@q == 12 && BaseLevel < 34) { - mesq l("You are already too weak for my last task, please come back later with some levels."); + mesq l("You are too weak for my last task, please come back later with some levels."); } else if (.@q == 13) { - mesq l("You are killing @@ at the cave.", getmonsterlink(BlackScorpion)); + mesq l("You are killing @@/200 @@ at the cave.", .@k, getmonsterlink(BlackScorpion)); } else if (.@q == 14) { mesq l("Wow! You did it! I do not think anyone else could have done that."); - mesq l("Here, take this @@ - you deserve it! And here is 5.000 GP and 12.000 XP", getitemlink(Ruby)); + mesq l("Here, take this @@ - you deserve it! And here is 5.000 GP and 8.400 XP.", getitemlink(Ruby)); inventoryplace Ruby, 1; - getitem CandorHeadBand, 1; - getexp 12000, 0; + getitem Ruby, 1; + getexp 12000, 0; // 200 kills * 120 xp = 24'000 xp gained from killing. (50% bonus) set Zeny, Zeny + 5000; setq MineQuest_Tycoon, 15, 0; } - next; - goto L_PreMenu; + close; 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 these monsters.##b"); + mesq l("Ah, yes... You see, there is just no task I can give to you right now. You are too weak to fight these monsters."); next; mesn; - mesq l("come back stronger and i will give you task"); + mesq l("come back stronger, and I will give you a task."); next; goto L_Close; @@ -157,39 +156,39 @@ L_CaveMiner: mesn; mesq l("Tulimshar miners mainly try to optain gems."); next; - mesq l("In this cave we easily found Coal, Iron ore, and sometime @@.", getitemlink(Ruby)); // maybe add link for coal and iron ? + mesq l("In this cave we can easily find Coal, Iron ore, and sometimes @@.", getitemlink(Ruby)); // maybe add link for coal and iron ? next; goto L_Menu; L_Tip: mes ""; mesn; - mesq l("If you fight Black scorpion or others dangerous monster you should run how to 'run and hit'."); + mesq l("If you fight Black scorpion or others dangerous monster you should use the 'hit and run' tactic."); next; mesn; mesq l("To do this you need to disable auto move to target in 'yellow bar'."); next; mesn; - mesq l("To open yellow Bar you need to right clic on your health bar and active status bar also called yellow bar or you can press '8' on numeric keypad"); + mesq l("To open yellow Bar you need to right click on your health bar and active status bar, also called yellow bar. Or you can press '8' on numeric keypad."); next; mesn; - mesq l("Now you need to fight monster with the maximum range you can to do this do these steps in order: lock enemy, Attack, hit, move backwards of one tile, hit, ETC "); + mesq l("Now you need to fight monster with the maximum range, you can to do this do these steps in order: lock enemy, Attack, hit, move backwards of one tile, hit, ETC."); next; mesn; - mesq l("With this tip you will be able to fight strong monsters."); + mesq l("With this tip you will be able to fight strong monsters. It's on Saul's Strategy Guide Against Archwizards."); next; goto L_Menu; L_Terranite: mes ""; mesn; - mesq l("Haha no im not ! but we found trace of them."); + mesq l("Haha, no, I'm not! But we found traces of them."); next; mesn; - mesq l("Terranite probably undermine part of the mine long time ago."); + mesq l("Terranite probably mined part of this mine long time ago."); next; mesn; - mesq l("That can explain why we have difficulties to found rare gams here ."); + mesq l("That can explain why we have difficulties to find rare gems here. They probably were already extracted."); next; goto L_Menu; @@ -219,27 +218,25 @@ OnKillRatto: if (.@q == 1) { if (.@k+1 >= 10) { tycoon_max_kills(); - message strcharinfo(0), l("All rattos are dead! Go back to Tycoon"); + message strcharinfo(0), l("All rattos are dead! Go back to Tycoon."); } else { tycoon_add_kills(); message strcharinfo(0), l("@@/10 Rattos", .@k+1); } } end; + OnKillCaveMaggot: .@q=getq(MineQuest_Tycoon); .@k=getq2(MineQuest_Tycoon); // Get number of kills (via getq2) if (.@q == 4) { if (.@k+1 >= 25) { tycoon_max_kills(); - message strcharinfo(0), l("All cave maggots are dead! Go back to Tycoon"); + message strcharinfo(0), l("All cave maggots are dead! Go back to Tycoon."); } else { tycoon_add_kills(); message strcharinfo(0), l("@@/25 Cave Maggots", .@k+1); } - } else { - if (is_staff()) - dispbottom "It's working. (T:OKHM)"; } end; OnKillCaveSnake: @@ -248,7 +245,7 @@ OnKillCaveSnake: if (.@q == 7) { if (.@k+1 >= 50) { tycoon_max_kills(); - message strcharinfo(0), l("All cave snakes are dead! Go back to Tycoon"); + message strcharinfo(0), l("All cave snakes are dead! Go back to Tycoon."); } else { tycoon_add_kills(); message strcharinfo(0), l("@@/50 Cave Snakes", .@k+1); @@ -261,7 +258,7 @@ OnKillRedScorpion: if (.@q == 10) { if (.@k+1 >= 100) { tycoon_max_kills(); - message strcharinfo(0), l("All red scorpions are dead! Go back to Tycoon"); + message strcharinfo(0), l("All red scorpions are dead! Go back to Tycoon."); } else { tycoon_add_kills(); message strcharinfo(0), l("@@/100 Red Scorpions", .@k+1); @@ -274,24 +271,25 @@ OnKillBlackScorpion: if (.@q == 13) { if (.@k+1 >= 200) { tycoon_max_kills(); - message strcharinfo(0), l("All black scorpions are dead! Go back to Tycoon"); + message strcharinfo(0), l("All black scorpions are dead! Go back to Tycoon."); } else { tycoon_add_kills(); - message strcharinfo(0), l("@@/1 Black Scorpions", .@k+1); + message strcharinfo(0), l("@@/200 Black Scorpions", .@k+1); } } end; OnInit: .@npcId = getnpcid(0, .name$); - setunitdata(.@npcId, UDT_HEADTOP, ArtisTankTop); - setunitdata(.@npcId, UDT_HEADMIDDLE, BromenalPants); - setunitdata(.@npcId, UDT_HEADBOTTOM, MinerHat); + setunitdata(.@npcId, UDT_HEADTOP, MinerHat); + setunitdata(.@npcId, UDT_HEADMIDDLE, ArtisTankTop); + setunitdata(.@npcId, UDT_HEADBOTTOM, BromenalPants); setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); setunitdata(.@npcId, UDT_HAIRSTYLE, 19); setunitdata(.@npcId, UDT_HAIRCOLOR, 8); .sex = G_MALE; .distance = 4; + end; } -- cgit v1.2.3-60-g2f50