From ff2362c56f938be3004ecbc6debffc37a46e4eed Mon Sep 17 00:00:00 2001 From: masao87 Date: Mon, 30 Jul 2012 00:22:47 +0000 Subject: - Reverted all changes done to the job change quest files. * Decided it'd be better to commit it all together when updating, fixing and optimization is done all at once. Sorry guys and girls for the trouble! Big shame on me :-/ :( git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16533 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/pre-re/jobs/1-1/merchant.txt | 171 ++++++++++----------------------------- 1 file changed, 41 insertions(+), 130 deletions(-) (limited to 'npc/pre-re/jobs/1-1/merchant.txt') diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 3f023de28..4b7e091f0 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -3,14 +3,13 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.0 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Job Change to Merchant Class //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] -//= 1.1 Added Baby job change support. [Masao] //============================================================ alberta_in,53,43,6 script Merchant#mer 86,{ if (Upper == 1) { @@ -37,7 +36,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "[Chief Mahnsoo]"; mes "I guess it's destiny that we meet like this once more. Alright. Once again, let me change you into a Merchant!"; next; - skill 143,0,1; + skill 143,0,0; jobchange Job_Merchant_High; skill 153,1,0; skill 154,1,0; @@ -45,22 +44,34 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "[Chief Mahnsoo]"; mes "Ah~ How nostalgic. Just like old times! Alright, do your best!"; close; + }else{ + mes "[Chief Mahnsoo]"; + mes "^333333*Sigh*^000000"; + mes "I'm so bored..."; + mes "When will I hear from my lovely Blossom?"; + close; } - mes "[Chief Mahnsoo]"; - mes "^333333*Sigh*^000000"; - mes "I'm so bored..."; - mes "When will I hear from my lovely Blossom?"; - close; } - mes "[Chief Mahnsoo]"; - mes "So, what brings you to"; - mes "the Merchant Association?"; - mes "Is there anything"; - mes "I can help you with?"; + mes "[Guildsman Mahnsoo]"; + mes "Hey, why are you here?"; next; - switch (select("I want to be a Merchant.:Tell me about Merchants.:Tell me the requirements.:Nope.")) { + switch(select("I want to be a merchant.:I want to know more about merchants.:Ask him the requirements to be a merchant.:Nothing.")) { case 1: - if (Class == Job_Baby || Class == Job_Novice) { + if(Class != Job_Novice) { + mes "[Guildsman Mahnsoo]"; + if(Class == Job_Merchant) { + mes ".....? Sorry? What are you saying?"; + mes "You are already a merchant. Oh my.."; + mes "Huh?! ...Do I need to laugh right now?!"; + }else{ + mes "Ahh? Are you trying to have both ways?"; + mes "How about just giving yourself over to your original job?"; + next; + mes "[Guildsman Mahnsoo]"; + mes "We have business ethics you know."; + } + close; + }else{ mes "[Guildsman Mahnsoo]"; mes "Want to be a merchant? Hmm..."; next; @@ -70,7 +81,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ next; mes "[Guildsman Mahnsoo]"; mes "Don't you think we need to learn some basic skills although we just deal with money?"; - close2; + close; } mes "[Guildsman Mahnsoo]"; mes "Good, I think you're fully ready for it seeing that your basic skill level is fulfilled."; @@ -78,137 +89,37 @@ alberta_in,53,43,6 script Merchant#mer 86,{ next; mes "[Guildsman Mahnsoo]"; mes "Congratulations on becoming a merchant!"; - next; - skill 143,0,1; - if(Class == Job_Baby){ - jobchange Job_Baby_Merchant; - } else { - jobchange Job_Merchant; - } - set MERCNT_Q,0; - set MERCNT_Q2,0; - getitem 1381,1; //N_Battle_Axe - mes "[Guildsman Mahnsoo]"; mes "Congratulations again for being a member of the merchant guild and one of our colleagues. I expect your active participation from now on!"; + callfunc "Job_Change",Job_Merchant; + getitem 1381,1; // N_Battle_Axe next; mes "[Guildsman Mahnsoo]"; - mes "Absolutely, we need young people who have passion to achieve our great goal for securing 20% of the worldwide currency volume. You get it? Huh? "; - mes "Well, I'm just saying... It means let's make lots of money in the end. You guys know that~"; + mes "Absolutely, we need young people who have passion to achieve our great goal for securing 20% of the worldwide currency volume. You get it? Huh?"; + mes "Well, I'm just saying... it means let's make lots of money in the end. You guys know that~"; close; } - if (Class == Job_Baby_Merchant || Class == Job_Merchant || Class == Job_Merchant_High) { - mes "[Chief Mahnsoo]"; - mes "Hello there!"; - mes "How do you like"; - mes "being a Merchant?"; - next; - mes "[Chief Mahnsoo]"; - mes "Having a way with"; - mes "money certainly"; - mes "has its perks,"; - mes "does it not?"; - close; - } - mes "[Chief Mahnsoo]"; - mes "We Merchants hate people who are two faced. It's bad for business."; - next; - mes "[Chief Mahnsoo]"; - mes "People who always try to take advantage of other people by selling things at a ridiculous price just so they can make money that they'll waste are the worst."; - next; - mes "[Chief Mahnsoo]"; - mes "Well, in any case, we only accept Novices for job changes to the Merchant class. But I appreciate your interest in what we do."; - close; case 2: - mes "[Chief Mahnsoo]"; - mes "Merchant?"; - mes "Well, we basically sell goods to make money. That is the way"; - mes "of the Merchant."; - next; - mes "[Chief Mahnsoo]"; - mes "I guess we may not be the best at fighting, and we don't have many special attacks. We've got no healing skills..."; - next; - mes "[Chief Mahnsoo]"; - mes "But we can buy goods at lower prices from NPC shops and sell them at a higher price to other people~"; - next; - mes "[Chief Mahnsoo]"; - mes "Our ultimate attack skill is 'Mammonite.' The strength of Mammonite comes from the anger"; - mes "when we're forced to throw away perfectly good zeny."; - next; - mes "[Chief Mahnsoo]"; - mes "Throwing away zeny like that"; - mes "causes a deadly rage to well up in the heart of any Merchant!"; - mes "Just thinking about it"; - mes "makes my blood boil!"; - next; - mes "[Chief Mahnsoo]"; - mes "Anyway, we can use most"; - mes "weapons except Bows, Rods, and Two-Handed Swords. But we can always sell those."; + mes "[Guildsman Mahnsoo]"; + mes "Merchant? To put it simply, the person who sells good and makes money is a merchant."; + mes "Not good at fighting and doesn't have special attack/recovery skills... but a merchant can buy things at a low price and then sell them and make money."; next; - mes "[Chief Mahnsoo]"; - mes "Yes..."; - mes "We Merchants generally"; - mes "have money on our minds..."; + mes "[Guildsman Mahnsoo]"; + mes "Well, a merchant has an ultimate skill called Mammonite which strikes an enemy with his/her money... We can equip everything except Bows, Rods, and Two-Handed Swords. But we can always sell and buy those."; + mes "Yes... we merchants always have money on our minds, got it?"; close; case 3: mes "[Guildsman Mahnsoo]"; - mes "To become a Merchant,"; - mes "although just selling and receiving money is our job,"; - mes "you will need to learn all Basic Skills."; + mes "To become a merchant, although just selling and receiving money is our job, you must reach at least basic skill level 9."; next; mes "[Guildsman Mahnsoo]"; - mes "Well, we used to receive a Membership Fee. But was it so hard to make that money?"; + mes "Well, we used to receive a start-up fee before. Wasn't it hard to make that money?"; mes "There were too many people who couldn't gather that money and kept crying."; next; mes "[Guildsman Mahnsoo]"; - mes "So recently, we decided to allow any Novice who wants to be a Merchant become one."; - mes "Because staying alive or not, it all rests on your own ability."; + mes "So recently, we decided to allow any Novice who wants to be a merchant become one."; + mes "Because to be alive or not later is all up to one's ability."; close; case 4: close; } } - -alberta_in,28,29,2 script Merchant Guildsman 83,{ - if (MERCNT_Q == 0 || MERCNT_Q == 1 || MERCNT_Q == 2) { - mes "[Union Staff Kay]"; - mes "I am sorry, but we don't make deliveries anymore."; - mes "Didn't Chief Mahnsoo tell you?"; - close; - } - mes "[Union Staff Kay]"; - mes "Ah, we don't make deliveries anymore."; - mes "Too many people cried and kept whining that it's too difficult."; - next; - mes "[Union Staff Kay]"; - mes "Well, maybe we will have a few deliveries later."; - mes "Anyway, I don't have any work now..."; - close; -} - -morocc_in,140,102,4 script Student#mer 86,{ - if (MERCNT_Q == 4 || MERCNT_Q == 3) { - mes "[Dyer's Student]"; - mes "I am sorry, but the Merchant Guild no longer makes deliveries to us anymore."; - close; - } - mes "[Dyer's Student]"; - mes "Mr. Java Dullihan is the one and only, the best dye maker on the Rune-Midgard continent."; - next; - mes "[Dyer's Student]"; - mes "Aaaand I'm proud to say that I'm his student! Someday, I'll be able to make really beautiful dyes too!"; - next; - mes "[Dyer's Student]"; - mes "Of course, I'm still learning the basics right now, but someday..."; - close; -} - -geffen_in,155,122,4 script Guild Staff 47,{ - if (MERCNT_Q == 4 || MERCNT_Q == 3) { - mes "[Guild Staff]"; - mes "I am sorry, but the Merchant Guild no longer makes deliveries to us anymore."; - close; - } - mes "[Guild Staff]"; - mes "My package should have arrived by now. Huh. I guess the Merchant Guild might be running a little late..."; - close; -} \ No newline at end of file -- cgit v1.2.3-60-g2f50