diff options
Diffstat (limited to 'npc')
-rw-r--r-- | npc/quests/first_class/tu_merchant.txt | 63 | ||||
-rw-r--r-- | npc/quests/first_class/tu_sword.txt | 48 |
2 files changed, 47 insertions, 64 deletions
diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt index a13ec1aa6..23696186e 100644 --- a/npc/quests/first_class/tu_merchant.txt +++ b/npc/quests/first_class/tu_merchant.txt @@ -142,8 +142,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "[Guarnien]"; mes "For your final assignment, I will ask you to learn the Vending skill up to Skill Level 4. Of course, once you do, I'll give you a little reward. I'll be waiting, so do your best~"; tu_merchant = 16; - erasequest 8239; - setquest 8240; + changequest 8239, 8240; close; } @@ -176,8 +175,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "You deserve a little"; mes "reward for your effort~"; tu_merchant = 15; - erasequest 8238; - setquest 8239; + changequest 8238, 8239; getexp 162,52; next; mes "[Guarnien]"; @@ -188,8 +186,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "Excellent!"; mes "You've actually went above and beyond mastered the Push Cart skill. Great work!"; tu_merchant = 15; - erasequest 8238; - setquest 8239; + changequest 8238, 8239; getexp 186,60; next; mes "[Guarnien]"; @@ -230,8 +227,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "speed, it shouldn't be a big deal."; mes "Well done~"; tu_merchant = 15; - erasequest 8237; - setquest 8238; + changequest 8237, 8239; getexp 162,52; next; mes "[Guarnien]"; @@ -243,8 +239,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "mastered the Push Cart skill."; mes "You truly deserve a little bit of a reward~"; tu_merchant = 15; - erasequest 8237; - setquest 8238; + changequest 8237, 8239; getexp 186,60; next; mes "[Guarnien]"; @@ -258,6 +253,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "you do that, I can go on to"; mes "my next lecture."; tu_merchant = 14; + changequest 8237, 8238; close; } case 12: @@ -275,8 +271,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "as I asked. Please,"; mes "take this little reward~"; tu_merchant = 13; - erasequest 8236; - setquest 8237; + changequest 8236, 8237; getexp 126,27; next; mes "[Guarnien]"; @@ -289,8 +284,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "mastered Over Charge?"; mes "Most impressive! You deserve a small reward for your work!"; tu_merchant = 13; - erasequest 8236; - setquest 8237; + changequest 8236, 8237; getexp 142,33; next; mes "[Guarnien]"; @@ -322,8 +316,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "[Guarnien]"; mes "Ah, you've already learned Level 4 Over Charge. Perfect! Let me give you a little reward~"; tu_merchant = 13; - erasequest 8235; - setquest 8236; + changequest 8235, 8237; getexp 126,27; next; mes "[Guarnien]"; @@ -334,8 +327,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "[Guarnien]"; mes "Amazing! You've already mastered the Over Charge skill! You must have wanted this reward badly~"; tu_merchant = 13; - erasequest 8235; - setquest 8236; + changequest 8235, 8237; getexp 142,33; next; mes "[Guarnien]"; @@ -346,8 +338,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "[Guarnien]"; mes "Personally, I think you should learn this skill for sure! For your next assignment, learn Over Charge up to Level 4. It shouldn't be too difficult to do."; tu_merchant = 12; - erasequest 8235; - setquest 8236; + changequest 8235, 8236; next; mes "[Guarnien]"; mes "Once you do that,"; @@ -418,6 +409,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "some reason --to send you there right now. Get ready...!"; next; tu_merchant = rand(6,8); + changequest 8233, 8234; warp "prontera",155,46; end; case 4: @@ -430,8 +422,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "how to use the Discount skill"; mes "well enough. Good, here's a little reward for your hard work~"; tu_merchant = 5; - erasequest 8232; - setquest 8233; + changequest 8232, 8233; getexp 83,11; next; mes "[Guarnien]"; @@ -441,8 +432,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "Incredible!"; mes "You've actually mastered the Discount skill! You're such a great student. You deserve a bit of a reward!"; tu_merchant = 5; - erasequest 8232; - setquest 8233; + changequest 8232, 8233; getexp 97,18; next; mes "[Guarnien]"; @@ -476,8 +466,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "Here, take this"; mes "small reward~"; tu_merchant = 5; - erasequest 8231; - setquest 8232; + changequest 8231, 8233; getexp 83,11; next; mes "[Guarnien]"; @@ -488,8 +477,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "Incredible!"; mes "You've actually mastered the Discount skill! You're such a great student. You deserve a bit of a reward!"; tu_merchant = 5; - erasequest 8231; - setquest 8232; + changequest 8231, 8233; getexp 97,18; next; mes "[Guarnien]"; @@ -506,8 +494,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "[Guarnien]"; mes "Still, you can't ignore the fact that bargaining is an essential skill for a Merchant! Come back to me when you're ready~"; tu_merchant = 4; - erasequest 8231; - setquest 8232; + changequest 8231, 8232; close; } case 2: @@ -530,8 +517,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "[Guarnien]"; mes "Well, since you're still green, I feel awfully sorry if you've wasted Zeny. Why don't you take this as compensation?"; tu_merchant = 3; - erasequest 8230; - setquest 8231; + changequest 8230, 8231; getexp 70,12; next; mes "[Guarnien]"; @@ -540,8 +526,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ } else { mes "Okay. Now I think we're ready for me to discuss the ^871F78Discount^000000 skill. Come back when you'd like me to tell you more about it, okay?"; tu_merchant = 3; - erasequest 8230; - setquest 8231; + changequest 8230,8231; close; } case 1: @@ -553,7 +538,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ next; mes "[Guarnien]"; .@chk_soji = getskilllv(MC_INCCARRY); - if(.@chk_soji > 3 && .@chk_soji < 10){ + if(.@chk_soji > 3 && .@chk_soji <= 10){ mes "Ah. I can tell that you have. Not bad! By now you should be able to learn the ^871F78Discount^000000 skill, but I'll teach you about that later."; next; mes "[Guarnien]"; @@ -569,8 +554,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "[Guarnien]"; mes "I see in your eyes that you've already learned to appraise items. Haha, although having that knowledge is reward in itself, let me give you something extra!"; tu_merchant = 2; - erasequest 8229; - setquest 8230; + changequest 8229, 8230; getexp 58,11; getitem 1351,1; //Battle_Axe next; @@ -588,8 +572,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "Alright, next time"; mes "I'll talk about the Mammonite skill. For now, let me take a little bit of a break from all of this arduous lecture. ^666666*Whew!*^000000"; tu_merchant = 2; - erasequest 8229; - setquest 8230; + changequest 8229, 8230; close; } @@ -638,7 +621,6 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ if(getskilllv(MC_IDENTIFY)){ mes "I see in your eyes that you've already learned to appraise items. Haha, although having that knowledge is reward in itself, let me give you something extra!"; tu_merchant = 2; - erasequest 8229; setquest 8230; getexp 58,11; getitem 1351,1; //Battle_Axe @@ -658,7 +640,6 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "skill later. I always manage"; mes "to forget about that!"; tu_merchant = 2; - erasequest 8229; setquest 8230; close; } diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt index dc2b4109c..b200e246f 100644 --- a/npc/quests/first_class/tu_sword.txt +++ b/npc/quests/first_class/tu_sword.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Fix up by Jukka //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Description: ========================================= //= [Official Conversion] //= Swordman training quest. @@ -15,6 +15,7 @@ //= 1.4 Misc. updates. [L0ne_W0lf] //= 1.5 Added Renewal Izlude coordinates. //= 1.6 Added Pre-Renewal support. [Euphy] +//= 1.7 Fixed quest log linking [KirieZ] //============================================================ // Shurank @@ -213,6 +214,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "Next time, I will tell you more about the Magnum Break skill."; mes "I'll be here when you're ready to learn more."; tu_swordman = 22; + changequest 8227,8228; close; case 13: mes "You should leave as soon as possible to meet Dequ'ee in Geffen. You do remember where to find him, don't you?"; @@ -227,8 +229,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "[Shurank]"; mes "From that gleen of toughness upon your skin, I see now that I was foolish to ask. Well done~"; tu_swordman = 13; - erasequest 8221; - setquest 8222; + changequest 8221, 8222; if (RENEWAL_EXP) getexp 126,0; else @@ -275,8 +276,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ next; mes "[Shurank]"; mes "Since you've learned the Endure skill already, I don't think I need to explain it any further. You've done well."; - erasequest 8221; - setquest 8222; + changequest 8221, 8222; tu_swordman = 13; next; mes "[Shurank]"; @@ -292,8 +292,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "[Shurank]"; mes "From that gleen of toughness upon your skin, I see now that I was foolish to ask. Well done~"; tu_swordman = 13; - erasequest 8221; - setquest 8222; + changequest 8221, 8222; if (RENEWAL_EXP) getexp 126,0; else @@ -357,8 +356,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "[Shurank]"; mes "Since you've learned the Endure skill already, I don't think I need to explain it any further. You've done well."; tu_swordman = 13; - erasequest 8221; - setquest 8222; + changequest 8220, 8222; next; mes "[Shurank]"; mes "Ah, once again, I have"; @@ -372,8 +370,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "[Shurank]"; mes "Hm. But judging from the gleen of toughness on your skin, I suppose teaching you about Endure would be a waste of your time. Well done!"; tu_swordman = 13; - erasequest 8221; - setquest 8222; + changequest 8220, 8222; if (RENEWAL_EXP) getexp 126,0; else @@ -398,6 +395,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "[Shurank]"; mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts."; tu_swordman = 10; + changequest 8219, 8220; if (RENEWAL_EXP) getexp 112,0; else @@ -415,6 +413,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "an outstanding Swordman."; mes "Here is a small reward..."; tu_swordman = 10; + changequest 8219, 8220; if (RENEWAL_EXP) getexp 126,0; else @@ -462,11 +461,13 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "[Shurank]"; mes "Alright, come back to me when you become sufficiently skilled in the use of Provoke. In the meantime, keep training."; tu_swordman = 9; + changequest 8218,8219; close; } else if((.@chk_provoke > 4) && (.@chk_provoke < 10)){ mes "[Shurank]"; mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts."; tu_swordman = 10; + changequest 8218,8220; if (RENEWAL_EXP) getexp 112,0; else @@ -484,6 +485,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "an outstanding Swordman."; mes "Here is a small reward..."; tu_swordman = 10; + changequest 8218,8220; if (RENEWAL_EXP) getexp 126,0; else @@ -562,13 +564,13 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "Now I ask that you train yourself in the use of Provoke. Come back"; mes "to me when you have a sufficient understanding of the use of the Provoke skill."; tu_swordman = 9; - changequest 8218,8219; + changequest 8217,8219; close; } else if((.@chk_provoke > 4) && (.@chk_provoke < 10)){ mes "[Shurank]"; mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts."; tu_swordman = 10; - changequest 8219,8220; + changequest 8217,8220; if (RENEWAL_EXP) getexp 112,0; else @@ -586,10 +588,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "an outstanding Swordman."; mes "Here is a small reward..."; tu_swordman = 10; - completequest 8218; - completequest 8219; - completequest 8220; - setquest 8221; + changequest 8217,8220; if (RENEWAL_EXP) getexp 126,0; else @@ -706,6 +705,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ } mes "[Shurank]"; mes "By now, I believe that you know enough about the Increase HP Recovery skill. Next time, I shall teach you what I know about the Provoke skill."; + changequest 8214, 8215; close; case 3: mes "If you want to be"; @@ -725,6 +725,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping"; mes "all of the basics."; tu_swordman = 4; + changequest 8213, 8214; if (RENEWAL_EXP) getexp 97,0; else @@ -763,6 +764,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "Here's a little reward for all of your hard work. I hope you realize the importance of using Bash as"; mes "you grow stronger."; tu_swordman = 3; + changequest 8212, 8213; if (RENEWAL_EXP) getexp 83,0; else @@ -777,6 +779,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping"; mes "all of the basics."; tu_swordman = 4; + changequest 8212, 8214; if (RENEWAL_EXP) getexp 97,0; else @@ -815,6 +818,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more"; mes "of the fundamentals to cover!"; tu_swordman = 2; + changequest 8211, 8212; if (RENEWAL_EXP) getexp 58,0; else @@ -847,7 +851,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "[Shurank]"; mes "For your efforts and patience, I offer you this small reward. Please take it and grow even stronger..."; tu_swordman = 3; - setquest 8211; + changequest 8211, 8213; if (RENEWAL_EXP) getexp 83,0; else @@ -865,6 +869,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping"; mes "all of the basics."; tu_swordman = 4; + changequest 8211, 8214; if (RENEWAL_EXP) getexp 97,0; else @@ -928,7 +933,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more"; mes "of the fundamentals to cover!"; tu_swordman = 2; - changequest 8211,8212; + setquest 8212; if (RENEWAL_EXP) getexp 58,0; else @@ -954,7 +959,7 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more"; mes "of the fundamentals to cover!"; tu_swordman = 3; - changequest 8212,8213; + setquest 8213; if (RENEWAL_EXP) getexp 83,0; else @@ -972,9 +977,6 @@ izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{ mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping"; mes "all of the basics."; tu_swordman = 4; - completequest 8211; - completequest 8212; - completequest 8213; setquest 8214; if (RENEWAL_EXP) getexp 97,0; |