* Updated Job quests for 1-1 classes and Rebirthed classes.

- Moved valkyrie.txt from ../cities/ to ../jobs/. It's not a city. Doofus. 

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10926 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 1036 insertions, 861 deletions

diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt
index b17ffddb1..2020f1313 100644
--- a/npc/jobs/1-1/merchant.txt
+++ b/npc/jobs/1-1/merchant.txt
@@ -1,13 +1,14 @@
 //===== eAthena Script ======================================= 
 //= Merchant Job Quest
 //===== By: ================================================== 
-//= kobra_k88
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
-//= eAthena 1.0 +
+//= eAthena SVN
 //===== Description: ========================================= 
-//= <Description> 
+//= [Aegis Conversion]
+//= Job quest for Merchant classes
 //===== Additional Comments: ================================= 
 //= Fully working
 //= v1.1 Added instant job change for High Novice [Lupus]
@@ -18,949 +19,1123 @@
 //= 1.5.2 Now saves/restores all quest skills [Lupus]
 //= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus]
 //= 1.7 Updated to use Free Ticket for Kafra [Lupus]
+//= 1.8 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
+//=	No longer uses function "F_ToHigh"
 //============================================================ 
 
-
-// == Guild NPCs == 
-// -- Mahnsoo --
-alberta_in,53,43,6	script	Chief Mahnsoo	86,{
-	callfunc "F_ToHigh",Job_Merchant_High,"Merchant High",Job_Whitesmith,"Chief Mahnsoo";
-	mes "[Chief Mahnsoo]";
-	if(BaseJob == Job_Novice && job_merchant_q3 == 4) goto L_MakeMerc;
-	if(BaseJob == Job_Novice && job_merchant_q3 == 3) goto L_GiveRecpt;
-	if(BaseJob == Job_Novice && job_merchant_q3 == 5) goto L_Failed;
-	if(BaseJob == Job_Novice && job_merchant_q2 > 0) goto L_Back;
-
-	mes "What brings you here? Something on your mind?";
-M_Menu:
-	next;
-	menu "I want to be a Merchant.",M_0,"What exactly is a Merchant?",M_1,"Give me the Requirements.",M_2,"End.",M_End;
-
-     	M_0:
-
-     		if(BaseJob == Job_Merchant) {
+alberta_in,53,43,6	script	Merchant#mer	86,{
+	if (Upper == 1) {
+		if (Class == Job_Novice_High && ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator) {
 			mes "[Chief Mahnsoo]";
-			mes "Huh? What did you say? You noodle head! Take a good look at yourself.  Your ALREADY A MERCHANT!  Good lord!";
-			emotion e_what;
-			emotion e_gasp;
-			close;
-		}
-		if(BaseJob != Job_Novice) {
+			mes "Long time no see!";
+			mes "Hey, you didn't quit";
+			mes "your business, did you?";
+			mes "What happened?";
+			next;
 			mes "[Chief Mahnsoo]";
-			mes "We Merchants really don't like people who work during the day, and then go out to crazy bars at night.  When it comes to money, for them it's 'easy come easy go.";
+			mes "Whoa...";
+			mes "You've actually been to Valhalla?! Wow, you've come a long way...";
 			next;
+			if (getskilllv(1) < 9) {
+				mes "[Chief Mahnsoo]";
+				mes "Hmmm...";
+				mes "It seems that you're not ready to become a Merchant again. Go finish learning the Basic Novice Skills first.";
+				next;
+				mes "[Chief Mahnsoo]";
+				mes "Don't worry, we'll always have a Merchant position open for you. Just come back when you're ready, okay?";
+				close;
+			}
 			mes "[Chief Mahnsoo]";
-			mes "Well.. I talked a little too long, I guess... but since you already have an occupation, we don't need you.";
+			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,0;
+			jobchange Job_Merchant_High;
+			skill 153,1,0;
+			skill 154,1,0;
+			skill 155,1,0;
+			mes "[Chief Mahnsoo]";
+			mes "Ah~ How nostalgic. Just like old times! Alright, do your best!";
 			close;
 		}
-		if(JobLevel < 10) {
+		else {
 			mes "[Chief Mahnsoo]";
-			mes "I'm sorry but you have to have a Novice Job level of 9 with all 9 of the basic Skills.";
+			mes "^333333*Sigh*^000000";
+			mes "I'm so bored...";
+			mes "When will I hear from my lovely Blossom?";
 			close;
 		}
+	}
+	if (BaseJob == Job_Merchant) {
 		mes "[Chief Mahnsoo]";
-		mes "A Merchant you say? Well...";
+		mes "Hello there!";
+		mes "How do you like";
+		mes "being a Merchant?";
 		next;
 		mes "[Chief Mahnsoo]";
-		mes "Alright.  First fill out an application form and submit 1000 Zeny for the Memebership Fee.";
-		mes "If you don't have enough money right now, you can pay 500 Zeny first and then pay the rest later after you've passed the Merchant License Test.";
+		mes "Having a way with";
+		mes "money certainly";
+		mes "has its perks,";
+		mes "does it not?";
+		close;
+	}
+	else if (BaseJob != Job_Merchant && BaseJob != Job_Novice) {
+		mes "[Chief Mahnsoo]";
+		mes "We Merchants hate people who are two faced. It's bad for business.";
 		next;
 		mes "[Chief Mahnsoo]";
-		mes "How does that sound? Are you still interested?";
-
+		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;
-		menu "Sure why not.  Who needs college anyways.",sM_0a,"Maybe, later...",sM_0b;
-
-		sM_0a:
+		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;
+	}
+	else if (job_merchant_q == 9) {
+		mes "[Chief Mahnsoo]";
+		mes "Hello there,";
+		mes ""+ strcharinfo(0) +".";
+		set job_merchant_q,0;
+		set job_merchant_q2,0;
+		set quest_alb_01,0;
+		mes "Unfortunately, you failed to earn your Merchant License this time.";
+		next;
+		mes "[Chief Mahnsoo]";
+		mes "I'll erase your records, so come back anytime when you want to reapply.";
+		close;
+	}
+	else if (job_merchant_q == 8 || job_merchant_q == 7) {
+		mes "[Chief Mahnsoo]";
+		mes "Hello there,";
+		mes ""+ strcharinfo(0) +".";
+		mes "I'm pleased to tell you";
+		mes "that I have good news!";
+		next;
+		mes "[Chief Mahnsoo]";
+		mes "The Merchant Guild accepted your application. You've proven that you are fully qualified to become a Merchant.";
+		if (job_merchant_q == 7) {
+			next;
 			mes "[Chief Mahnsoo]";
-			mes "I'm glad to hear that.  So how do you wish to pay the Membership Fee?";
-		sM_Menu:
+			mes "The only thing to take care of is your Membership Fee.";
+			mes "Are you ready?";
 			next;
-			menu "Pay 1000 Zeny Now.",m_0a,"2 payments of 500 Zeny.",m_0b,"Nevermind.",m_0End;
-
-			m_0a:
+			switch(select("Pay the rest of the 500 Zeny:Quit")) {
+			case 1:
 				mes "[Chief Mahnsoo]";
-				if(Zeny < 1000) goto sl_Short1k;
-				set Zeny,Zeny-1000;
-				set job_merchant_q,1;
-				mes "Let's see... 1000 Zeny.... Good.";
-				goto L_Cont0;
-
-				sl_Short1k:	
-					mes "Looks like your a little short on zeny.  Why not make a minimal payment of 500 Zeny first?";
-					mes "You can worry about the rest later.";
-					emotion e_swt;
-					goto sM_Menu;
+				if (Zeny < 500) {
+					mes "Hmmm...";
+					mes "I suppose you currently don't have enough zeny to pay the rest of your Membership fee right now.";
+					next;
+					mes "[Chief Mahnsoo]";
+					mes "Please return when you have earned the 500 zeny that you need to become a Merchant.";
 					close;
-
-			m_0b:
-				mes "[Chief Mahnsoo]";
-				if(Zeny < 500) goto sl_Short500z;
-				set Zeny,Zeny-500;
-				set job_merchant_q,2;
-				mes "Let's See... 500 Zeny.... Good enough to start off... though I don't really think splitting paymenst is a good habbit for any Merchant.";
-				goto L_Cont0;
-				
-				sl_Short500z:
-					mes "Looks like your a little short on zeny.  Come back when you have enough.";
-					emotion e_swt;
-					close;
-
-			m_0End:
+				}
+				set zeny,zeny-500;
+				mes "Ah yes...!";
+				mes "Now your";
+				mes "membership";
+				mes "is paid in full.";
+				break;
+			case 2:
 				mes "[Chief Mahnsoo]";
-				mes "You have no money now? Ok, No Problem.  Take your time, Ok?";
+				mes "I suppose you need some time to gather some zeny to pay your membership fee. Please come";
+				mes "back as soon as you're ready.";
 				close;
-
-		sM_0b:
-			mes "[Chief Mahnsoo]";
-			mes "Feel free to return anytime when you are ready, Alright?.";
-			close;
-
-
-		L_Cont0:
+			}
+		}
 		next;
 		mes "[Chief Mahnsoo]";
-		mes "Now that that's settled, let me talk to you about the Merchant License Test.  You will be given a task to fullfill.";
-		mes "How well you perform the task will determine whether or not you will become a merchant.";
+		mes "Congratulations!";
+		callfunc "Job_Change",Job_Merchant;
+		callfunc "F_ClearJobVar";
+		mes "I'm very pleased that you are joining the Merchant Guild and hope that you will play an active part in Rune-Midgarts' economy.";
 		next;
-		mes "[Chief Mahnsoo]";
-		mes "Oh, but before we get started I must say one thing.....";
+		if (quest_alb_01 == 1) {
+			mes "[Chief Mahnsoo]";
+			mes "*Ahem* Aaaaand let me give you a little bit of money for delivering that message to Blossom for me.";
+			mes "I hope you'll help me again next time~";
+			set zeny,zeny+200;
+			set quest_alb_01,2;
+		}
+		else {
+			mes "[Chief Mahnsoo]";
+			mes "The message you were supposed to deliver as per my request? You've forgotten about that? Oh well. Good work!";
+		}
 		next;
 		mes "[Chief Mahnsoo]";
-		mes "There are some dumb and greedy people out there who do not know what  it means to be a Merchant.";
-		mes "I sincerely hope you will not turn out to be like them.  You won't... will you??..... (stares at you intently)";
+		mes "Our goal is to control 20 % of the world's income! We're going to need young, eager people like you!";
 		next;
 		mes "[Chief Mahnsoo]";
-		mes "Anywho, here is your task.  You will need to....";
-		next;
+		mes "But overall, we'll also be happy just to make loads of money.";
+		mes "But we all know that~";
+		close;
+	}
+	else if (job_merchant_q <= 6 && job_merchant_q != 0) {
 		mes "[Chief Mahnsoo]";
-
-		set @TEMP,rand(4);
-		if(@TEMP ==1) goto R_1;
-		if(@TEMP ==2) goto R_2;
-		if(@TEMP ==3) goto R_3;
-
-		R_0:	
-			mes "retrieve a ^ff0000product^000000 from the ^0000ffWharehouse^000000 and deliver it to the ^00aa00Kafra Worker in the Former Swordman Association in Prontera^000000.";
-			if(job_merchant_q2 == 1) goto sR_0a;
-			if(job_merchant_q2 == 2) goto sR_0b;
-			set @TEMP,rand(2);
-			if(@TEMP !=0) goto sR_0b;
-
-			sR_0a:
-				mes "The ^0000ff'Serial Number'^000000 of the product is ^ff00002485741^000000.";
-				set job_merchant_q2, 1;
-				next;
-				goto L_Cont1;
-			sR_0b:
-				mes "The ^0000ff'Serial Number'^000000 of the product is ^ff00002328137^000000.";
-				set job_merchant_q2, 2;
-				next;
-				goto L_Cont1;
-
-		R_1:
-			mes "retrieve a ^ff0000product^000000 from the ^0000ffWharehouse^000000 and deliver it to a member of the ^00aa00Mage Guild in Geffen^000000.";
+		if (job_merchant_q2 == 1 || job_merchant_q2 == 2) {
+			mes "First, get the delivery package from the storehouse, and then take it to the former Swordman's Association in Prontera.";
 			next;
 			mes "[Chief Mahnsoo]";
-			if(job_merchant_q2 == 3) goto sR_1a;
-			if(job_merchant_q2 == 4) goto sR_1b;
-			set @TEMP,rand(2);
-			if(@TEMP !=0) goto sR_1b;
-
-			sR_1a:
-				mes "The ^0000ff'Serial Number'^000000 of the product is ^ff00002989396^000000.";
-				set job_merchant_q2, 3;
-				next;
-				goto L_Cont1;
-			sR_1b:
-				mes "The ^0000ff'Serial Number'^000000 of the product is ^ff00002191737^000000.";
-				set job_merchant_q2, 4;
-				next;
-				goto L_Cont1;
-
-		R_2:
-			mes "retrieve a ^ff0000product^000000 from the ^0000ffWharehouse^000000 and deliver it to ^00aa00Java Dullihan, the Dyermaker in Morroc^000000.";
+			mes "When you get there, give the package to the Kafra Employee stationed near there. Her name is Blossom. Did you get all that?";
 			next;
-			mes "[Chief Mahnsoo]";
-			if(job_merchant_q2 == 5) goto sR_2a;
-			if(job_merchant_q2 == 6) goto sR_2b;
-			set @TEMP,rand(2);
-			if(@TEMP !=0) goto sR_2b;
-
-			sR_2a:
-				mes "The ^0000ff'Serial Number'^000000 of the product is ^ff00003012685^000000.";
-				set job_merchant_q2,5;
-				next;
-				goto L_Cont1;
-			sR_2b:
-				mes "The ^0000ff'Serial Number'^000000 of the product is ^ff00003487372^000000.";
-				set job_merchant_q2,6;
-				next;
-				goto L_Cont1;
-
-		R_3:
-			mes "retrieve a ^ff0000product^000000 from the ^0000ffWharehouse^000000 and deliver it to the ^00aa00Kafra worker in Byalan island^000000.";
+			if (job_merchant_q2 == 1) {
+				mes "[Chief Mahnsoo]";
+				mes "Remember, the Serial Number of the package is ^3355FF2485741^000000.";
+			}
+			else {
+				mes "[Chief Mahnsoo]";
+				mes "Remember, the Serial Number of the package is ^3355FF2328137^000000.";
+			}
+		}
+		else if (job_merchant_q2 == 3 || job_merchant_q2 == 4) {
+			mes "First, get the delivery package from the storehouse, and then take it to the Mage Guild in Geffen.";
+			next;
+			if (job_merchant_q2 == 3) {
+				mes "[Chief Mahnsoo]";
+				mes "When you get there, give the package to the Mage Guildsman in charge. Remember, the packages Serial Number is ^3355FF2989396^000000.";
+			}
+			else {
+				mes "[Chief Mahnsoo]";
+				mes "When you get there, give the package to the Mage Guildsman in charge. Remember, the packages Serial Number is ^3355FF2191737^000000.";
+			}
+		}
+		else if (job_merchant_q2 == 5 || job_merchant_q2 == 6) {
+			mes "First, get the delivery package from the storehouse, and then take it to Morroc.";
 			next;
 			mes "[Chief Mahnsoo]";
-			if(job_merchant_q2 == 7) goto sR_3a;
-			if(job_merchant_q2 == 8) goto sR_3b;
-			set @TEMP,rand(2);
-			if(@TEMP !=0) goto sR_3b;
-
-			sR_3a:
-
-				mes "The ^0000ff'Serial Number'^000000 of the product is ^ff00003318702^000000.";
-				set job_merchant_q2,7;
-				goto M00R3;
-			sR_3b:
-				mes "The ^0000ff'Serial Number'^000000 of the product is ^ff00003543625^000000.";
-				set job_merchant_q2,8;
-				goto M00R3;
-
-			M00R3:
-				next;
+			mes "You'll have to find Java Dullihan, the Dyemaker, so that you can deliver the product he ordered.";
+			if (job_merchant_q2 == 5) {
 				mes "[Chief Mahnsoo]";
-				mes "Umm and... this is my personal request.  Include this message in your delivery please~";
-				if(countitem(1072)==0) getitem 1072,1;//Items: Delivery_Message,
-				next;
-				goto L_Cont1;
-
-
-		L_Cont1:
-		mes "[Chief Mahnsoo]";
-		mes "Keep track of the ^ff0000'Serial Number'^000000 and the ^ff0000'Destination'^000000 of the product.";
-		mes "The Wharehouse Manager will need them to assist you in getting the right product.";
-		next;
-		mes "[Chief Mahnsoo]";
-		mes "The Wharehouse itself is located to my right.";
+				mes "But he's a little forgetful, so give it to one of his students. Remember, the package's Serial Number is ^3355FF3012685^000000.";
+			}
+			else {
+				mes "[Chief Mahnsoo]";
+				mes "But he's a little forgetful, give it to one of his students. Remember, the package's Serial Number is ^3355FF3487372^000000.";
+			}
+		}
+		else if (job_merchant_q2 == 7 || job_merchant_q2 == 8) {
+			mes "First, get the package from the storehouse, and then give it to the Kafra Employee stationed on Byalan Island. Her name is Blossom.";
+			if (job_merchant_q2 == 7) {
+				mes "[Chief Mahnsoo]";
+				mes "Remember, the package's Serial Number is ^3355FF3318702^000000.";
+			}
+			else {
+				mes "[Chief Mahnsoo]";
+				mes "Remember, the package's Serial Number is ^3355FF3543625^000000.";
+			}
+		}
+		if (job_merchant_q2 == 7 || job_merchant_q2 == 8) {
+			next;
+			mes "[Chief Mahnsoo]";
+			mes "Aaaannnnd...";
+			mes "Don't forget to deliver that message for me~";
+		}
 		next;
 		mes "[Chief Mahnsoo]";
-		mes "After you've finished making the delivery come back here and give the Receipt to the Wharehouse Manager.  Then come see me.  Is that clear?";
+		mes "Don't forget your destination and the package's Serial Number.";
+		mes "You'll need to tell them";
+		mes "to the storekeeper.";
 		next;
 		mes "[Chief Mahnsoo]";
-		mes "Alright, good luck!";
-      		close;
-
-	M_1:
-		mes "[Chief Mahnsoo]";
-		mes "Merchants are people who are in the business of buying and selling goods.  We focus on finding rare items and selling them to those who desire or need them.";
-		mes "We are not particularly good at fighting nor do we have any usefull support skills.  What we Merchants can do is buy Goods at lower prices as well as sell them at Highter prices.";
+		mes "The storehouse is in the room";
+		mes "to my right. There, you can talk";
+		mes "to the storekeeper, and he'll";
+		mes "help you out.";
 		next;
 		mes "[Chief Mahnsoo]";
-		mes "As far as what weapons go, we can use most of them.  Bows, Rods, and Two-Handed Swords are the only types of weapons we can't use.";
-		mes "The skill Mannomite even lets us use zeny as a weapon.";  
+		mes "After you make the delivery, return to the storehouse and give the receipt to the storekeeper.";
+		mes "Then, come back";
+		mes "and see me.";
 		next;
 		mes "[Chief Mahnsoo]";
-		mes "Whatever people may say about us, making money is important to a merchants lively hood.";
-		goto M_Menu;
+		mes "Is that clear?";
+		mes "Alright, that's";
+		mes "the spirit.";
+		mes "Take care!";
 		close;
-
-	M_2:
-		mes "[Chief Mahnsoo]";
-		mes "There are three conditions to be qualified if you want to be a Merchant.";
-		next;
-		mes "[Chief Mahnsoo]";
-		mes "First of all, You have to be at Novice job level 9 with fulfilled Basic Skills.";
-		next;
+	}
+	else if (job_merchant_q == 0) {
 		mes "[Chief Mahnsoo]";
-		mes "Secondly, You have to pay 1000 Zeny for acquire a Memebrship. I believe a Merchant Candidate will be able to earn 1000 Zeny at ease. Oh yeah~";
+		mes "So, what brings you to";
+		mes "the Merchant Association?";
+		mes "Is there anything";
+		mes "I can help you with?";
 		next;
-		mes "[Chief Mahnsoo]";
-		mes "Third, There is a License Test to examine your basic Physical Strength and a Sense of Direction. You must Deliever the Goods to the Specific person in the Specific Town.";
-		goto M_Menu;
-		close;
-
-	M_End:
-		close;
-
-L_GiveRecpt:
-	mes "Ah, " + strcharinfo(0) + ".  You're back! I take it things went well? Tell you what, go give the Receipt to the Storekeeper and then hurry back here ok.";
-	close;
-
-L_Back:
-	mes "What are you doing back here?";
-	emotion e_what;
-	next;
-	mes "[Chief Mahnsoo]";
-	mes "You didn't leave yet?";
-	next;
-	mes "[Chief Mahnsoo]";
-	mes "You are supposed to be on your way by now.  Don't tell me you already forgot the product number and destination?";
-	next;
-	mes "[Chief Mahnsoo]";
-	mes "Alright numskull, do you want me to repeat it to you one more time?";
-	next;
-	menu "Yes please", M_Yes,"Never mind.",M_No;
-
-	M_Yes:
-		mes "[Chief Mahnsoo]";
-		if((job_merchant_q2==1) || (job_merchant_q2==2)) goto R_0;
-		if((job_merchant_q2==3) || (job_merchant_q2==4)) goto R_1;
-		if((job_merchant_q2==5) || (job_merchant_q2==6)) goto R_2;
-		if((job_merchant_q2==7) || (job_merchant_q2==8)) goto R_3;
-		close;
-
-	M_No:
-		close;
-
-L_MakeMerc:
-	if(Sex == 1) mes "Mr. ^0000cc" + strcharinfo(0) + "^000000.....";
-	if(Sex == 0) mes "Ms. ^0000cc" + strcharinfo(0) + "^000000.......";
-	next;
-	mes "[Chief Mahnsoo]";
-	if(SkillPoint > 0) mes "You need to use up all of your skill points before I can make you a Merchant.";
-	if(SkillPoint > 0) close;
-
-	mes "WELL DONE! Well done indeed!! I just read Wharehouse Manager Kays' evaluation of your performance, and I was very impressed.  I have great news for you!";
-	next;
-	if(job_merchant_q == 2) goto L_MemFee;
-
-	mes "[Chief Mahnsoo]";
-	mes "Because of your HARD work, The Merchant Guild as decided to ACCEPT YOU as one of its members!";
-	next;
-	callfunc "Job_Change",Job_Merchant;
-	callfunc "F_ClearJobVar";		// clears all job variables for the current player
-
-	mes "[Chief Mahnsoo]";
-	mes "Congratulations! You are now one of us, A PROUD MERCHANT!!";
-	emotion e_no1;
-	next;
-	mes "[Chief Mahnsoo]";
-	mes "I am very pleased that you decided to join the Merchant Guild and I hope you will play an active role in Rune Midgards' economy!  The best of luck to you!!";
-	if((job_merchant_q2==7) || (job_merchant_q2==8)) goto L_Favor;
-	close;
-
-	L_Favor:
-		next;
-		mes "[Chief Mahnsoo]";
-		mes "(Oh, here is a little something for Delivering the Message for me.  Thanks very much)";
-		set Zeny,Zeny+100;
-		close;
-
-	L_MemFee:
-		mes "[Chief Mahnsoo]";
-		mes "Um... before I go on... there was the little issue of the Membership Fee if you recall.  I will need the rest of it before I can proceed with your initiation.";
-		emotion e_hmm;
-		next;		           			
-		menu "Pay the remaining 500 Zeny",sM_1a,"...(run away!)...",sM_1b;
-
-		sM_1a:
-			if(Zeny < 500) goto sL_NotEnough;
-			set Zeny,Zeny-500;
-			set job_merchant_q,1;
-
+		switch(select("I want to be a Merchant.:Tell me about Merchants.:Tell me the requirements.:Nope.")) {
+		case 1:
 			mes "[Chief Mahnsoo]";
-			mes "Very good! Now I can go on.  Now where was I?..... oh yes, I remember.....";
-			goto L_MakeMerc;
-
-			sL_NotEnough:
+			mes "Do you want to";
+			mes "be a Merchant?";
+			mes "Well...";
+			next;
+			if (getskilllv(1) < 9) {
+				mes "[Chief Mahnsoo]";
+				mes "First, you have to be a Novice with Job Level 10. Once you do that, make sure you learn all of the Basic Skills.";
+				next;
 				mes "[Chief Mahnsoo]";
-				mes "Eh em.... you seem to be a little short.  Now that you've come this far, don't let a little fee impede your progress.  Go forth and do something about it!";
-				emotion e_swt;
+				mes "We're not just";
+				mes "simple money makers!";
+				mes "We pride ourselves on having standards and only accepting qualified applicants!";
 				close;
-
-		sM_1b:
+			}
+			mes "[Chief Mahnsoo]";
+			mes "Alright, you'll need to fill out this application and prepare 1,000 Zeny for your Membership Fee.";
+			next;
+			mes "[Chief Mahnsoo]";
+			mes "Oh...!";
+			mes "If you don't have all the money,";
+			mes "I can just take 500 Zeny now.";
+			mes "You can pay the rest after you";
+			mes "pass the test and earn your";
+			mes "Merchant Guild License.";
+			next;
+			mes "[Chief Mahnsoo]";
+			mes "So what do you think?";
+			mes "Are you ready to join now?";
+			next;
+			if (select("Yes, I will.:Ummm, maybe later...") ==1 ) {
+				mes "[Chief Mahnsoo]";
+				mes "Let me check if you";
+				mes "filled out everything";
+				mes "on your application form...";
+				next;
+				mes "[Chief Mahnsoo]";
+				mes "Hmm... ";
+				mes "" + strcharinfo(0) + "...";
+				mes "That's a nice name.";
+				next;
+				mes "[Chief Mahnsoo]";
+				mes "This application will";
+				mes "only be registered once";
+				mes "the Membership Fee is paid.";
+				mes "How do you wish to";
+				mes "handle the fee?";
+				next;
+				switch(select("Pay all 1,000 Zeny now!:Two payments of 500 Zeny.:Quit")) {
+				case 1:
+					mes "[Chief Mahnsoo]";
+					if (Zeny >= 1000) {
+						set job_merchant_q,2;
+						set zeny,zeny-1000;
+						mes "Alright~";
+						mes "That's 1,000 zeny.";
+						mes "Excellent, excellent.";
+					}
+					else {
+						mes "It seems don't have enough zeny to pay all of the fee right now. Why don't you just pay 500 zeny now? Think about it.";
+						close;
+					}
+					break;
+				case 2:
+					mes "[Chief Mahnsoo]";
+					if (Zeny >= 500) {
+						set job_merchant_q,1;
+						set zeny,zeny-500;
+						mes "Let's see...";
+						mes "That's 500 Zeny. Although I don't think splitting payment is a good idea for any Merchant, it's alright since you're still learning.";
+					}
+					else {
+						mes "Hmm...";
+						mes "It seems you don't have the funds to pay half of the membership fee. Please come back once you collect the zeny that you need.";
+						close;
+					}
+					break;
+				case 3:
+					mes "[Chief Mahnsoo]";
+					mes "Feel free to return anytime";
+					mes "when you are ready, alright?";
+					close;
+				}
+			}
+			else {
+				mes "[Chief Mahnsoo]";
+				mes "You don't have enough zeny now? That's no problem. Take your time and come back when you're";
+				mes "ready, okay?";
+				close;
+			}
+			next;
+			mes "[Chief Mahnsoo]";
+			mes "Alright, you're now on the list of applicants. Ah, before I get started let me say just one thing.";
+			next;
+			mes "[Chief Mahnsoo]";
+			mes "There are some dumb and greedy people out there who do not know what it means to be a Merchant.";
+			mes "I hope you won't turn out to be like them, will you?";
+			next;
+			mes "[Chief Mahnsoo]";
+			mes "Now, let me";
+			mes "explain what you";
+			mes "need to do for the";
+			mes "Merchant License Test.";
+			next;
+			mes "[Chief Mahnsoo]";
+			switch(rand(1,4)) {
+			case 1:
+				mes "First, get the delivery package from the storehouse, then go to the former Swordman's Association in Prontera.";
+				next;
+				mes "[Chief Mahnsoo]";
+				mes "When you get there, visit the Kafra Employee stationed there. Her name is Blossom. Did you get";
+				mes "all of that?";
+				callsub S_GiveSerial,2485741,1,2328137,2;
+				break;
+			case 2:
+				mes "First, get the delivery package from the storehouse, and then go to the Mage Guild in Geffen. When you get there, visit the Mage Guildsman in charge.";
+				callsub S_GiveSerial,2989396,3,2191737,4;
+				break;
+			case 3:
+				mes "First, get the delivery package from the storehouse, and then go to Morroc. There you must find Java Dullihan, the dyemaker.";
+				next;
+				mes "[Chief Mahnsoo]";
+				mes "He's a bit forgetful, so you should probably give the package to one of his students.";
+				callsub S_GiveSerial,3012685,5,3487372,6;
+				break;
+			case 4:
+				mes "First, get the delivery package from the storehouse, and then give it to the Kafra Employee stationed on Byalan Island.";
+				callsub S_GiveSerial,3318702,7,3543625,8;
+				next;
+				mes "[Chief Mahnsoo]";
+				mes "Ummmm...";
+				mes "And I also have";
+				mes "a bit of a personal";
+				mes "request for you.";
+				next;
+				mes "[Chief Mahnsoo]";
+				mes "Would you please give her this message when you deliver the package? Please~";
+				getitem 1072,1; //Delivery_Message
+				break;
+			}
+			next;
 			mes "[Chief Mahnsoo]";
-			mes "WHAT THE??? Hey come back here! YOU STILL HAVE TO PAY THE FEE!!!!!";
-			emotion e_swt2;
+			mes "Don't forget your destination and the package's Serial Number. You will need to tell those to the storekeeper in the storehouse to the right of me.";
+			next;
+			mes "[Chief Mahnsoo]";
+			mes "After the delivery, give the receipt to the storekeeper, and then come back and see me.";
+			next;
+			mes "[Chief Mahnsoo]";
+			mes "Is that clear?";
+			mes "Alright, that's";
+			mes "the spirit.";
+			mes "Take care!";
 			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.";
+			next;
+			mes "[Chief Mahnsoo]";
+			mes "Yes...";
+			mes "We Merchants generally";
+			mes "have money on our minds...";
+			close;
+		case 3:
+			mes "[Chief Mahnsoo]";
+			mes "There are three conditions that must be fulfilled before you can become a Merchant.";
+			next;
+			mes "[Chief Mahnsoo]";
+			mes "First, You have to be a Novice with Job Level 10, and have learned all of the Basic Skills.";
+			next;
+			mes "[Chief Mahnsoo]";
+			mes "Second, You have to pay a 1,000 Zeny Membership Fee. I believe any Merchant candidate should be able to earn 1,000 Zeny with ease.";
+			next;
+			mes "[Chief Mahnsoo]";
+			mes "Third, there is a License Test to test your physical strength and sense of direction. You will deliver a package to a specific person in a specific location.";
+			close;
+		case 4:
+			close;
+		}
+	}
 
-L_Failed:
-	set job_merchant_q2,0;
-	set job_merchant_q3,0;
-
-	mes "I just finished reading Wharehouse Manager Kays' evalutation of your work......";
+S_GiveSerial:
 	next;
 	mes "[Chief Mahnsoo]";
-	mes "What a shame, what a shame! HOW could you be so CARLESS??!!  I'm sure Wharehouse Manager Kay has already given you an earfull so I will not go on with anymore critizism.";
-	emotion e_pif;
-	next;
-	mes "[Chief Mahnsoo]";
-	mes "^ff0000"+strcharinfo(0) + "^000000, you have failed in the Merchant License Test!  However...... if you are TRUELY interested in becoming a Merchant, and will work EXTREMELY HARD to do so....";
-	next;
-	mes "[Chief Mahnsoo]";
-	mes "... I will allow you to retake the test.  What do you say?";
-	next;
-	menu "Thank you very much for this opportunity!",M_Thanks,"Maybe some other time",M_NoThanks;
-	
-	M_Thanks:
-		set job_merchant_q2,0;
-		set job_merchant_q3,0;
-		goto L_Cont0;
-
-	M_NoThanks:
-		mes "[Chief Mahnsoo]";
-		mes "Remeber these words: In life, failure is NOT an option!!!";
-		emotion e_gasp;
-		set job_merchant_q,0;
-		set job_merchant_q2,0;
-		set job_merchant_q3,0;
-		close;
-
+	mes "Remember...";
+	if (rand(1)) {
+		mes "The package's";
+		mes "Serial Number is";
+		mes "^3355FF"+getarg(0)+"^000000.";
+		set job_merchant_q2,getarg(1);
+	}
+	else {
+		mes "The package's";
+		mes "Serial Number is";
+		mes "^3355FF"+getarg(2)+"^000000.";
+		set job_merchant_q2,getarg(3);
+	}
+	return;
 }
 
-
-// -- Wharehouse Manager Kay --
-alberta_in,28,29,2	script	Merchant Guildsman	83,{
-	if(BaseJob == Job_Novice && job_merchant_q3 > 0) goto L_Check;
-
-	mes "[Wharehouse Manager Kay]";
-	mes "Hey~ What brings you here?";
-	next;
-	menu "I came here for the Merchant Test.",M_0,"I came here for a Part Time job.",M_1,"Nope,Nothing.",M_End;
-
-	M_0:
-		mes "[Wharehouse Manager Kay]";
-		if(BaseJob != Job_Novice) goto L_NotNov;
-		if(job_merchant_q==0) goto L_NotRdy;
-		mes "You're ^0000cc"+ strcharinfo(0) +"^000000, right?  Ok I'll give you a product to deliver.  First I'll need the destination";
+alberta_in,28,29,2	script	Merchant Guildsman#mer	83,{
+	if (BaseJob == Job_Merchant) {
+		mes "[Union Staff Kay]";
+		mes "Heya pal.";
+		mes "How ya doin'?";
+		close;
+	}
+	else if (BaseJob != Job_Merchant && BaseJob != Job_Novice) {
+		mes "[Union Staff Kay]";
+		mes "Hey you. We don't have any open positions for part time work. If you wanna earn some zeny, you'll hafta look elsewhere.";
+		close;
+	}
+	else if (job_merchant_q == 9) {
+		mes "[Union Staff Kay]";
+		mes "Hey you. Yeah, you.";
+		mes "If you wanna restart the test, go visit Mahnsoo in the other room. Then we can talk.";
+		close;
+	}
+	else if (job_merchant_q == 8 || job_merchant_q == 7) {
+		mes "[Union Staff Kay]";
+		mes "Alright! Everything looks perfect! I'll report your success to the guildmaster. Now go talk to Chief Mahnsoo, yeah?";
+	}
+	else if (job_merchant_q == 6 || job_merchant_q == 5) {
+		mes " [Union Staff Kay] ";
+		mes "Oh, yeah? Okay, lemme check. Your name is " + strcharinfo(0) + "? Alright, your destination was...";
 		next;
-		menu "Prontera.",sM_0,"Geffen.",sM_1,"Morroc.",sM_2,"Byalan Island(Izlude).",sM_3;
-
-		sM_0:
-			set @s_flag,1;
-			goto L_Cont0;
-		sM_1:
-			set @s_flag,2;
-			goto L_Cont0;
-		sM_2:
-			set @s_flag,3;
-			goto L_Cont0;
-		sM_3:
-			set @s_flag,4;
-
-		L_Cont0:
-		mes "[Wharehouse Manager Kay]";
-		mes "Now, I'll need the Serial Number of the product.  Just type it in the box.  If you want to Cancel, just type '0' in the box, alright?";
+		mes "[Union Staff Kay]";
+		if (job_merchant_q2 == 1 || job_merchant_q2 == 2)
+			mes "Wow! You met the Kafra babe in Prontera?! Lucky you~ ...Receipt?";
+		else if (job_merchant_q2 == 3 || job_merchant_q2 == 4)
+			mes "Geffen Magic Academy. Okay, receipt?";
+		else if (job_merchant_q2 == 5 || job_merchant_q2 == 6)
+			mes "The dyemaker in Morroc. Not bad. Receipt?";
+		else if (job_merchant_q2 == 7 || job_merchant_q2 == 8)
+			mes "Oh hohohoho~! The Kafra Babe on Byalan Island?! Awesome! Anyway, did you bring the receipt?";
+
+		if (job_merchant_q2 == 1 && countitem(1073) != 0)
+			delitem 1073,1; //Merchant_Voucher_1
+		else if (job_merchant_q2 == 2 && countitem(1074) != 0)
+			delitem 1074,1; //Merchant_Voucher_2
+		else if (job_merchant_q2 == 3 && countitem(1075) != 0)
+			delitem 1075,1; //Merchant_Voucher_3
+		else if (job_merchant_q2 == 4 && countitem(1076) != 0)
+			delitem 1076,1; //Merchant_Voucher_4
+		else if (job_merchant_q2 == 5 && countitem(1077) != 0)
+			delitem 1077,1; //Merchant_Voucher_5
+		else if (job_merchant_q2 == 6 && countitem(1078) != 0)
+			delitem 1078,1; //Merchant_Voucher_6
+		else if (job_merchant_q2 == 7 && countitem(1079) != 0)
+			delitem 1079,1; //Merchant_Voucher_7
+		else if (job_merchant_q2 == 8 && countitem(1080) != 0)
+			delitem 1080,1; //Merchant_Voucher_8
+		else {
+			next;
+			set job_merchant_q,9;
+			mes " [Union Staff Kay] ";
+			mes "Wait a sec.";
+			mes "Where's the receipt?";
+			mes "What happened?";
+			next;
+			mes " [Union Staff Kay] ";
+			mes "If you don't have the receipt, you fail the test! You better talk to Mahnsoo if you wanna retake it, alright? Pay attention next time!";
+			close;
+		}
 		next;
-		input @input;
-		if(@input ==0 ) goto sL_Cancel; 
-		if((@input < 1000000) || (@input > 5000000)) goto sL_Error;
-
-		mes "[Wharehouse Manager Kay]";
-		if(@s_flag==1) mes "Destination is Prontera. The Serial Number is  "+@input+"  .  ^ff0000Is this correct^000000?";
-		if(@s_flag==2) mes "Destination is Geffen.  Phew~ Really far from here~ A little unlucky there huh? The Serial Number is "+@input+" . ^ff0000Is this correct^000000?";
-		if(@s_flag==3) mes "Destination is Morroc.  Phew~ Really far from here~ A little unlucky there huh? The Serial Number is "+@input+" . ^ff0000Is this correct^000000?";
-		if(@s_flag==4) mes "Destination is Byalan.  The Serial Number is "+@input+" .  ^ff0000Is this correct^000000?";
+		mes " [Union Staff Kay] ";
+		mes "...Great! Everything's perfect! I'll report your success to the Guildmaster. You should talk to Chief Mahnsoo now, alright?";
+		close2;
+		if (job_merchant_q == 6)
+			set job_merchant_q,8;
+		else if (job_merchant_q == 5)
+			set job_merchant_q,7;
+		end;
+	}
+	else if (job_merchant_q == 4 || job_merchant_q == 3 && countitem(1081) == 0 && countitem(1082) == 0 && countitem(1091) == 0) {
+		mes " [Union Staff Kay] ";
+		mes "Huh?";
+		mes "You're back?";
+		mes "So how did";
+		mes "the delivery go?";
 		next;
-		menu "Positive.",sM_Pos,"Negative.",sM_Neg;
-
-		sM_Pos:
-			if(@s_flag==1 && @input==2485741 && job_merchant_q2 == 1) goto ssL_Prod1;
-			if(@s_flag==2 && @input==2989396 && job_merchant_q2 == 3) goto ssL_Prod1;
-			if(@s_flag==3 && @input==3012685 && job_merchant_q2 == 5) goto ssL_Prod1;
-			if(@s_flag==4 && @input==3318702 && job_merchant_q2 == 7) goto ssL_Prod1;
-			if(@s_flag==1 && @input==2328137 && job_merchant_q2 == 2) goto ssL_Prod2;
-			if(@s_flag==2 && @input==2191737 && job_merchant_q2 == 4) goto ssL_Prod2;
-			if(@s_flag==3 && @input==3487372 && job_merchant_q2 == 6) goto ssL_Prod2;
-			if(@s_flag==4 && @input==3543625 && job_merchant_q2 == 8) goto ssL_Prod2;
-			getitem 1083,1;//Items: Delivery_Box__,
-			goto L_Cont1;
-
-			ssL_Prod1:
-				getitem 1081,1;//Items: Delivery_Box,
-				goto L_Cont1;
-
-			ssL_Prod2:
-				getitem 1082,1;//Items: Delivery_Box_,
-				goto L_Cont1;
-
-		sM_Neg:
-			close;
-
-		sL_Cancel:
-			mes "[Wharehouse Manager Kay]";
-			mes "Are you sure that you wanna cancel?";
+		if (select("*Sob* I lost the package.:Fine.") == 1) {
+			set job_merchant_q,9;
+			mes "[Union Staff Kay]";
+			mes "Are you kidding me? You'll fail the test if you lose the package!";
 			next;
-			menu "Oh yes.",m_yes,"No way.",m_no;
-
-			m_yes:
-				mes "[Wharehouse Manager Kay]";
-				mes "Do as you wish~I cancel~";
+			mes "[Union Staff Kay]";
+			mes "Awwww man. Well, if you wanna restart the test, talk to Mahnsoo, okay? You're lucky you're getting another chance!";
+			close;
+		}
+		mes "[Union Staff Kay]";
+		mes "Huh...";
+		mes "Okay...";
+		close;
+	}
+	else if (job_merchant_q == 4 || job_merchant_q == 3 && countitem(1081) != 0 || countitem(1082) != 0 || countitem(1091) != 0) {
+		mes "[Union Staff Kay]";
+		mes "Hey, what are you still doing here? Shouldn't you be on your way already?";
+		next;
+		if (select("I need a new package.:Oh, yeah. You're right!") == 1) {
+			if (countitem(1081) == 0 && countitem(1082) == 0 && countitem(1083) == 0 && countitem(1091) == 0) {
+				mes "[Union Staff Kay]";
+				mes "Wha--?";
+				mes "So where did";
+				mes "the package go?";
+				mes "Where is it?!";
+				next;
+				if (select("*Sob* I lost it!:I have it right here.") == 1) {
+					set job_merchant_q,9;
+					mes "[Union Staff Kay]";
+					mes "You...";
+					mes "Lost it?!";
+					mes "You failed the test!";
+					next;
+					mes "[Union Staff Kay]";
+					mes "*Sigh* If you want to restart the test, go visit Mahnsoo in the other room, alright?";
+					close;
+				}
+				mes "[Union Staff Kay]";
+				mes "Huh.";
+				mes "I thought";
+				mes "you lost it.";
+				mes "You don't";
+				mes "need a new one.";
 				close;
-			m_no:
-				next;    						
-				goto L_Cont0;
-
-		sL_Error:
-			mes "[Wharehouse Manager Kay]";
-			mes "Hey~ Hey~ That number is out of the valid Serial number range.  A valid Serial number should be betwwen 1000000 and 5000000.";
+			}
+			mes "[Union Staff Kay]";
+			mes "*Sigh* Man, you're starting to become a pain in the ass. Hold on, lemme cancel your record...";
+			if (countitem(1081) != 0)
+				delitem 1081,1; //Merchant_Box_1
+			else if (countitem(1082) != 0)
+				delitem 1082,1; //Merchant_Box_2
+			else if (countitem(1091) != 0)
+				delitem 1091,1; //Merchant_Box_Etc
+			if (job_merchant_q == 4)
+				set job_merchant_q,2;
+			else if (job_merchant_q == 3)
+				set job_merchant_q,1;
 			next;
-			goto L_Cont0;
-
-
-		L_Cont1:
-		mes "[Wharehouse Manager Kay]";
-		mes "Be very carefull with this product and make sure you do not loose it.  It cannot be replaced.   If you do loose it you will not be able to become a Merchant.";
-		next;
-		mes "[Wharehouse Manager Kay]";
-		mes "After you've made the delivery be sure to get a Receipt.  Good luck!";
-		set job_merchant_q3, 1;
+			mes "[Union Staff Kay]";
+			mes "I need some time to get everything in order, so come back later.";
+			close;
+		}
+		mes "[Union Staff Kay]";
+		mes "What a bummer...";
 		close;
-
-		L_NotRdy:
-			mes "Speak with the chief about that";
+	}
+	else if ((job_merchant_q == 0 || job_merchant_q == 1 || job_merchant_q == 2)) {
+		set where_village,0;
+		mes "[Union Staff Kay]";
+		mes "Hey there.";
+		mes "what brings";
+		mes "you here?";
+		next;
+		switch(select("My Merchant License test.:I'm looking for part time work.:Nothing.")) {
+		case 1:
+			mes "[Union Staff Kay]";
+			mes "I see.";
+			mes "Alright.";
+			mes "So what's";
+			mes "your name?";
+			mes "" + strcharinfo(0) + "...?";
+			next;
+			if (job_merchant_q == 0) {
+				mes "[Union Staff Kay]";
+				mes "Huh. Your name's not on my list. Did you apply for the job change quest or what?";
+				next;
+				mes "[Union Staff Kay]";
+				mes "You gotta apply first by talking to Chief Mahnsoo in the center";
+				mes "of this building, okay?";
+				close;
+			}
+			mes "[Union Staff Kay]";
+			mes "Alright, there you go. Lemme give you the package. Now, choose the destination of the delivery.";
+			next;
+			switch(select("Prontera.:Geffen.:Morocc.:Byalan Island.")) {
+			case 1: set .@where_village,1; break;
+			case 2: set .@where_village,2; break;
+			case 3: set .@where_village,3; break;
+			case 4: set .@where_village,4; break;
+			}
+			mes "[Union Staff Kay]";
+			mes "Okay, now you need to give me the package's Serial Number. If you wanna cancel, just enter '0', alright?";
+			next;
+			while(1) {
+				while(1) {
+					input .@input;
+					if (.@input == 0) {
+						mes "[Union Staff Kay]";
+						mes "Are you sure that you wanna cancel?";
+						if (select("Yes.:Let me try again.") == 1) {
+							mes "Alright, we'll cancel for now.";
+							close;
+						}
+						next;
+					}
+					else if (.@input < 1000000 || .@input > 5000000) {
+						mes "[Union Staff Kay]";
+						mes "Hey hey. That number's not valid! Enter a value from 1000000 to 5000000. got it?";
+						next;
+					}
+					else 
+						break;
+				}
+				mes "[Union Staff Kay]";
+				if (.@where_village == 1)
+					mes "Destination is Prontera. The Serial Number is " + .@input + ". Are you positive?";
+				else if (.@where_village == 2)
+					mes "Destination is Geffen. Phew! That's really far! The Serial Number is " + .@input + ". Are you positive?";
+				else if (.@where_village == 3)
+					mes "Destination is Morocc. That's pretty far away! The Serial Number is " + .@input + ". Are you positive?";
+				else
+					mes "Lucky you! Your destination is Byalan Island. The Serial Number is " + .@input + ". Are you positive?";
+				next;
+				if (select("Positive.:Whoops! Wrong number!") == 1) {
+					break;
+				}
+			}
+			if (.@where_village == 1) {
+				if (job_merchant_q2 == 1 && .@input == 2485741)
+					getitem 1081,1; //Merchant_Box_1
+				else if (job_merchant_q2 == 2 && .@input == 2328137)
+					getitem 1082,1; //Merchant_Box_2
+				else
+					getitem 1091,1; //Merchant_Box_Etc
+			}
+			else if (.@where_village == 2) {
+				if (job_merchant_q2 == 3 && .@input == 2989396)
+					getitem 1081,1; //Merchant_Box_1
+				else if (job_merchant_q2 == 4 && .@input == 2191737)
+					getitem 1082,1; //Merchant_Box_2
+				else
+					getitem 1091,1; //Merchant_Box_Etc
+			}
+			else if (.@where_village == 3) {
+				if (job_merchant_q2 == 5 && .@input == 3012685)
+					getitem 1081,1; //Merchant_Box_1
+				else if (job_merchant_q2 == 6 && .@input == 3487372)
+					getitem 1082,1; //Merchant_Box_2
+				else
+					getitem 1091,1; //Merchant_Box_Etc
+			}
+			else {
+				if (job_merchant_q2 == 7 && .@input == 3318702)
+					getitem 1081,1; //Merchant_Box_1
+				else if (job_merchant_q2 == 8 && .@input == 3543625)
+					getitem 1082,1; //Merchant_Box_2
+				else
+					getitem 1091,1; //Merchant_Box_Etc
+			}
+			if (job_merchant_q == 2)
+				set job_merchant_q,4;
+			else if (job_merchant_q == 1)
+				set job_merchant_q,3;
+			mes "[Union Staff Kay]";
+			mes "Alright. Take this package and guard it with your life until it's safely delivered to the customer. Don't lose this thing, got it?";
+			next;
+			mes "[Union Staff Kay]";
+			mes "Well then, I wish you luck. Remember, you gotta bring me";
+			mes "a receipt once you finish the delivery, okay?";
 			close;
-
-		L_NotNov:
-			mes "I'm sorry but only novices are allowed to take the Merchant License Test.";
+		case 2:
+			mes "[Union Staff Kay]";
+			mes "Part time job? Sorry pal, no jobs yet. The Paymaster's department can never balance our budget...";
 			close;
+		case 3:
+			mes "[Union Staff Kay]";
+			mes "Nothing, eh?";
+			mes "I guess you enjoy";
+			mes "bothering people for";
+			mes "no reason then, yeah?";
+			close;
+		}
+	}
+}
 
-	M_1:
-		mes "[Wharehouse Manager Kay]";
-		mes "Part Time job? Nothing is available right now.  We're currently in a budget crisis and can't afford to hire any new employees.";
-		close;
-	M_End:
-		mes "[Wharehouse Manager Kay]";
-		mes "...? Huh..? Huh..? What..?";
-		close;
-
-L_Check:
-	if( job_merchant_q3 == 4) goto L_Done;
-	mes "[Wharehouse Manager Kay]";
-	if(job_merchant_q3 == 1) goto L_Back;
-	if(job_merchant_q3 == 5) goto L_Failed;
-	if((job_merchant_q3 == 2) && (countitem(1083) ==1)) goto L_WrongProd;//Items: Delivery_Box__,
-
-	mes "I see your back ^0000cc"+ strcharinfo(0) +"^000000.  I hope things went well.  Lets see.... you were supposed to deliver a product to a....";
-	next;
-	mes "[Wharehouse Manager Kay]";
-	if((countitem(1073) == 1) || (countitem(1074) == 1)) goto L_0;//Items: Voucher, Voucher_,
-	if((countitem(1075) == 1) || (countitem(1076) == 1)) goto L_1;//Items: Voucher__, Voucher___,
-	if((countitem(1077) == 1) || (countitem(1078) == 1)) goto L_2;//Items: Voucher____, Voucher_____,
-	if((countitem(1079) == 1) || (countitem(1080) == 1)) goto L_3;//Items: Voucher______, Voucher_______,
-	goto L_LostRecpt;
-
-	L_0:
-		mes "...Kafra employee in Prontera.  And indeed the receipt veryifies that the delivery was successfully  made.";
-		if(countitem(1073) == 1) delitem 1073,1;//Items: Voucher,
-		if(countitem(1074) == 1) delitem 1074,1;//Items: Voucher_,
+morocc_in,140,102,4	script	Student#mer	86,{
+	if ((job_merchant_q == 4) || (job_merchant_q == 3)) {
+		mes "[Dyer's Student]";
+		mes "You're from";
+		mes "the Merchant Guild?";
+		mes "Yes! You've come to";
+		mes "the right place.";
 		next;
-		goto L_Done;
-
-	L_1:
-		mes "...member of the Geffen Magic Academy.  And indeed the receipt veryifies that the delivery was successfully  made";
-		if(countitem(1075) == 1) delitem 1075,1;//Items: Voucher__,
-		if(countitem(1076) == 1) delitem 1076,1;//Items: Voucher___,
+		mes "[Dyer's Student]";
+		if (countitem(1081) == 1 || countitem(1082) == 1 || countitem(1091) == 1) {
+			mes "Okay~";
+			mes "Please set the";
+			mes "package down";
+			mes "over there.";
+		}
+		else {
+			mes "But...";
+			mes "Where's the";
+			mes "package I ordered?";
+			mes "That's strange...";
+			close;
+		}
 		next;
-		goto L_Done;
-
-	L_2:
-		mes "...Dyermaker in Morroc.  And indeed the receipt veryifies that the delivery was successfully  made.";
-		if(countitem(1077) == 1) delitem 1077,1;//Items: Voucher____,
-		if(countitem(1078) == 1) delitem 1078,1;//Items: Voucher_____,
+		mes "[Dyer's Student]";
+		mes "Let me check the Serial Number of the package so I can give you the receipt, okay?";
 		next;
-		goto L_Done;
-
-    	L_3:
-		mes "...Kafra employee in Byalan.   And indeed the receipt veryifies that the delivery was successfully  made.";
-		if(countitem(1079) == 1) delitem 1079,1;//Items: Voucher______,
-		if(countitem(1080) == 1) delitem 1080,1;//Items: Voucher_______,
+		mes "[Dyer's Student]";
+		if (job_merchant_q2 == 5 && countitem(1081) != 0) {
+			mes "3012685...";
+			mes "That's right.";
+			mes "Here's your";
+			mes "receipt.";
+			delitem 1081,1; //Merchant_Box_1
+			getitem 1077,1; //Merchant_Voucher_5
+		}
+		else if (job_merchant_q2 == 6 && countitem(1082) != 0) {
+			mes "3487372...";
+			mes "That's right.";
+			mes "Here's your";
+			mes "receipt.";
+			delitem 1082,1; //Merchant_Box_2
+			getitem 1078,1; //Merchant_Voucher_6
+		}
+		else {
+			mes "Excuse me, but...";
+			if (job_merchant_q2 == 5)
+				mes "I don't think this is the package we ordered. The Serial Number should be 3012685. See?";
+			else if (job_merchant_q2 == 6)
+				mes "I don't think this is the package we ordered. The Serial Number should be 3487372. See?";
+			else
+				mes "I don't think this is the package we ordered. The Serial Number should be 3012685 or 3487372. Well, one of those two...";
+			close;
+		}
+		if (job_merchant_q == 4)
+			set job_merchant_q,6;
+		else if (job_merchant_q == 3)
+			set job_merchant_q,5;
 		next;
-
-	L_Done:
-		mes "[Wharehouse Manager Kay]";
-		mes "Great! Everything went perfectly! I will send my evaluation of your performance to 'Chief Mahnsoo' imiediately.";
-		mes "Go ahead and speak with Chief Mahnsoo so that he can finalize the process to make you a Merchant.";
-		emotion e_no1;
-		set job_merchant_q3,4;
-		close;
-	L_LostRecpt:
-		mes "Lets see here...... you say you delivered the correct Product to the correct person...... but you have no reciept.....";
-		next;
-		mes  "[Wharehouse Manager Kay]";
-		mes "YOU HAVE NO RECIEPT?????";
-		emotion e_omg;
-		next;
-		mes "[Wharehouse Manager Kay]";
-		mes "HOW the HECK am I gonna know that you delievered it then?  This was an ABSOLUTE FAILURE!!";
-		mes "Your evaluation is not going to look good.  I suggest you find some good excuses by the time you speak with Chief Mahnsoo.";
-		emotion e_pif;
-		set job_merchant_q3,5;
-		close;
-	L_WrongProd:
-		mes "You delivered the WRONG PRODUCT??? DO YOU know how much TIME you've WASTED???? UCK! This was a total failure!";
-		emotion e_an;
-		next;
-		mes "[Wharehouse Manager Kay]";
-		mes "Your evaluation is not going to look good.  I suggest you find some good excuses when you go to speak with Chief Mahnsoo.";
-		delitem 1083, 1;//Items: Delivery_Box__,
-		set job_merchant_q3,5;
-		close;
-	L_Failed:
-		mes "Go speak to the Chief about your failure........";
+		mes "[Dyer's Student]";
+		mes "Thanks a lot!";
+		mes "See you again";
+		mes "sometime!";
 		close;
-
-L_Back:
-	if((countitem(1081) != 1) && (countitem(1082) != 1) && (countitem(1083) != 1)) goto L_LostProd;//Items: Delivery_Box, Delivery_Box_, Delivery_Box__,
-	mes "Huh? Back so soon? Don't tell me you ran into problems already....";
-	emotion e_hmm;
-	next;
-	menu "Please Exchange the Product.",M_Exch,"Nope, never mind.",M_Nvmnd;
-
-	M_Exch:
-		mes "[Wharehouse Manager Kay]";
-		mes "Sigh... this is not a good way to start your test you know.  Make sure you get the RIGHT Product this time!  ";
-		emotion e_pif;
-		if(countitem(1081) ==1) delitem 1081,1;//Items: Delivery_Box,
-		if(countitem(1082) ==1) delitem 1082,1;//Items: Delivery_Box_,
-		if(countitem(1083) ==1) delitem 1083,1;//Items: Delivery_Box__,
-		set job_merchant_q3,0;
-		next;
-		goto M_0;
-
-	M_Nvmnd:
+	}
+	else if (job_merchant_q == 6 || job_merchant_q == 5 && job_merchant_q2 == 6 || job_merchant_q2 == 5) {
+		mes "[Dyer's Student]";
+		mes "Oh...";
+		mes "You're gonna";
+		mes "go back? Okay";
+		mes "then, take care!";
 		close;
-
-	L_LostProd:
-		mes "Huh? Oh~ How was the Trip?";
-		next;
-		mes "[Wharehouse Manager Kay]";
-		mes "WHAT???";
-		emotion e_what;
+	}
+	else {
+		mes "[Dyer's Student]";
+		mes "Mr. Java Dullihan is the one and only, the best dye maker on the Rune-Midgard continent.";
 		next;
-		mes "[Wharehouse Manager Kay]";
-		mes "Holy crap!! YOU LOST the product??!! What have you done, you moron!!!";
-		emotion e_omg;
+		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 "[Wharehouse Manager Kay]";
-		mes "Your evaluation is not going to look good.  I suggest you find some good excuses when you go to speak with Chief Mahnsoo.";
-		emotion e_ag;
-		set job_merchant_q3,5;
+		mes "[Dyer's Student]";
+		mes "Of course, I'm still learning the basics right now, but someday...";
 		close;
-
+	}
 }
 
-
-
-// == Customers ==
-// -- Kafra(Byalan) --
-function	script	F_MercKafra	{
-
-	if (job_merchant_q3 == 3) goto L_3;
-
-	mes "[Kafra]";
-	if(job_merchant_q3 ==2) goto L_WrongProd;
-	mes "A delivery from the Merchant Guild?? Oh, Right! Yes! I almost forgot.";
-       	next;
-       	mes "[Kafra]";
-       	mes "Let's see, the serial number for the product should be.......";
-	next;
-	mes "[Kafra]";
-	if((countitem(1081) ==0) && (countitem(1082) ==0) && (countitem(1083) ==0)) goto L_NoProd;//Items: Delivery_Box, Delivery_Box_, Delivery_Box__,
-	if((job_merchant_q2 !=7) && (job_merchant_q2 !=8)) goto L_WrongDest;
-	if(countitem(1083) == 1) goto L_WrongProd;//Items: Delivery_Box__,
-
-	mes "Oh, here it is. Yes! This is the one we ordered.  Thank you very much.  Here is your receipt.";
-	next;
-
-	set job_merchant_q3, 3;
-	if(countitem(1081) == 1) goto L_0;//Items: Delivery_Box,
-	if(countitem(1082) == 1) goto L_1;//Items: Delivery_Box_,
-
-	L_0:
-		getitem 1079,1;//Items: Voucher______,
-		delitem 1081,1;//Items: Delivery_Box,
-		goto L_3;
-
-	L_1:
-		getitem 1080,1;//Items: Voucher_______,
-		delitem 1082,1;//Items: Delivery_Box_,
-		goto L_3;
-	
-	L_3:
-		if(countitem(1072) == 1) goto L_Msg;//Items: Delivery_Message,
-		mes "[Kafra]";
-		mes "Thanks so much for comming all this way to deliver the product to me.  Take care now.  By bye.";
-		emotion e_thx;
-		cutin "kafra_03",255;
-		close;
-
-		L_Msg:
-			mes "[Kafra]";
-     			mes "Oh,My good Lord! Mr. Mansoo wrote me a Letter? Thank you, Thank you~";
-     			mes "I though he would send one, one of these days, but I've never expected it would be at a time like this.....";
-			emotion e_what;
-			next;
-			mes "[Kafra]";
-			mes "I really appreciate what you've done for me.  Here is a small gift to show you my thanks.";
-			emotion e_thx;
-			delitem 1072,1;//Items: Delivery_Message,
-			set @TEMP,rand(2);
-			if(@TEMP !=0) goto R1;
-
-			R0:
-
-				getitem 513,3;//Items: Banana,
-				cutin "kafra_03",255;
-				close;
-			R1:
-				getitem 512,3;//Items: Apple,
-				cutin "kafra_03",255;
-				close;
-
-L_NoProd:
-	mes ".... I thought we what we ordered was OVERSIZED and HEAVY.... but.... you seem to carry it on without any difficulty.........";
-	emotion e_what;
-	cutin "kafra_03",255;
-	close;
-
-L_WrongProd:
-	mes "......? Excuse me! I think you gave me the wrong item.  Our order should have the serial number 3318702 or 3543625...";
-	emotion e_swt;
-	set job_merchant_q3,2;
-	cutin "kafra_03",255;
-	close;
-
-L_WrongDest:
-	mes "......? Excuse me.... I think you have the wrong person.... our order should have the serial number 3318702 or 3543625...";
-	emotion e_swt;
-	cutin "kafra_03",255;
-	close;
-}
-
-// -- Kafra(Prontera) --
-prontera,248,42,8	script	Kafra#01	115,{
-	cutin "kafra_03",2;
-	if(BaseJob == Job_Novice && job_merchant_q3>0) goto L_Start;
-L_Other:
-	mes "[Kafra]";
-	mes "Hello.  I am a Kafra Service Agent.  As you can see, the ^3355FFSwordsman Association^000000 has moved to Izlude.";
-	mes "I can warp you there for a small fee of 600 zeny however.";
-	next;
-	menu "Warp.",M_Warp, "Cancel.",M_End;
-
-	M_Warp:
-		// we'll use Free Ticket for Kafra Transportation if available
-		if(countitem(7060)){
-			delitem 7060,1;
-		} else {
-			if(Zeny < 600) goto sL_NdZeny;
-			set Zeny, Zeny - 600;
-			set RESRVPTS, RESRVPTS + 37;
+geffen_in,155,122,4	script	Guild Staff#mer	47,{
+	if (job_merchant_q == 4 || job_merchant_q == 3) {
+		mes "[Guild Staff]";
+		mes "Ah, you must be with the Merchant Guild. Finally, my package has arrived! Alright...!";
+		next;
+		mes "[Guild Staff]";
+		if (countitem(1081) == 1 || countitem(1082) == 1 || countitem(1091) == 1) {
+			mes "You must be very tired";
+			mes "from having to travel";
+			mes "in this kind";
+			mes "of weather...";
 		}
-		warp "izlude",91,105;
-		cutin "kafra_03",255;
-		end;
-
-		sL_NdZeny:
-			mes "[Kafra]";
-			mes "I'm sorry but you do not have enough zeny.";
-			cutin "kafra_03",255;
+		else {
+			mes "Wait...";
+			mes "Where's the";
+			mes "package?";
 			close;
-
-	M_End:
-		mes "[Kafra]";
-		mes "Thank you for using Kafra Corp. Services.  We will be with you wherever you go.";
-		emotion e_thx;
-		cutin "kafra_03",255;
+		}
+		next;
+		mes "[Guild Staff]";
+		mes "Alright, let me";
+		mes "check the Serial Number...";
+		if (job_merchant_q2 == 3 && countitem(1081) != 0) {
+			mes "2989396. Yes, this is what we ordered. Here is your receipt.";
+			delitem 1081,1; //Merchant_Box_1
+			getitem 1075,1; //Merchant_Voucher_3
+		}
+		else if (job_merchant_q2 == 4 && countitem(1082) != 0) {
+			mes "2191737. Yes, this is what we ordered. Here is your receipt.";
+			delitem 1082,1; //Merchant_Box_2
+			getitem 1076,1; //Merchant_Voucher_4
+		}
+		else {
+			mes "Uh oh, this is the wrong number. This isn't what we ordered...";
+			next;
+			mes "[Guild Staff]";
+			if (job_merchant_q2 == 3) {
+				mes "The Serial Number";
+				mes "should be 2989396.";
+			}
+			else if (job_merchant_q2 == 4) {
+				mes "The Serial Number";
+				mes "should be 2191737.";
+			}
+			else {
+				mes "The Serial Number";
+				mes "should be 2989396";
+				mes "or 2191737, one of";
+				mes "those two.";
+			}
+			mes "Look here!";
+			mes "Don't you see";
+			mes "something";
+			mes "is wrong?";
+			close;
+		}
+		if (job_merchant_q == 4)
+			set job_merchant_q,6;
+		else if (job_merchant_q == 3)
+			set job_merchant_q,5;
+		next;
+		mes "[Guild Staff]";
+		mes "Heh heh~";
+		mes "Thank you!";
+		mes "Bye bye!";
 		close;
-
-
-L_Start:
-	if(job_merchant_q3 ==3) goto L_3;
-	mes "[Kafra]";
-	if(job_merchant_q3 ==2) goto L_WrongProd;
-
-	mes "Oh, you're from the Merchant Guild and you have a delivery for me?";
-	mes "I really appreciate you comming all this way..........";
-	next;
-	mes "[Kafra]";
-
-	if((countitem(1081) ==0) && (countitem(1082) ==0) && (countitem(1083) ==0)) goto L_NoProd;//Items: Delivery_Box, Delivery_Box_, Delivery_Box__,
-	if((job_merchant_q2 !=1) && (job_merchant_q2 !=2)) goto L_WrongDest;
-	if(countitem(1083) == 1) goto L_WrongProd;//Items: Delivery_Box__,
-
-	mes "Yes! This is the Product we ordered.  Thank you.  Here, let me give you a Receipt.";
-	next;
-
-	set job_merchant_q3,3;
-	if(countitem(1081) == 1) goto L_0;//Items: Delivery_Box,
-	if(countitem(1082) == 1) goto L_1;//Items: Delivery_Box_,
-
-	L_0:
-		getitem 1073,1;//Items: Voucher,
-		delitem 1081,1;//Items: Delivery_Box,
-		goto L_3;
-
-	L_1:
-		getitem 1074,1;//Items: Voucher_,
-		delitem 1082,1;//Items: Delivery_Box_,
-		goto L_3;
-
-	L_3:
-		mes "[Kafra]";
-		mes "Thank you again for the delivery.";
-		emotion e_thx;
-		cutin "kafra_03",255;
+	}
+	else if (job_merchant_q == 6 || job_merchant_q == 5 && job_merchant_q2 == 4 || job_merchant_q2 == 3) {
+		mes "[Guild Staff]";
+		mes "Hello,";
+		mes "Merchant Guildsman~";
+		mes "I give you my thanks.";
 		close;
-
-L_NoProd:
-	mes "Umm......... excuse me... but where is the Product  your supposed to give me....?";
-	emotion e_hmm;
-	cutin "kafra_03",255;
-	close;
-
-L_WrongProd:
-	mes "Oh, Dear... this isn't what I ordered.  It should have a serial number of either ^ff00002485741 or 2328137^000000.";
-	mes "It looks like there was a mix up at the wharehouse and you got the wrong product.  I'd appreciate it if you could sort this out.";
-	emotion e_swt;
-	set job_merchant_q3,2;
-	cutin "kafra_03",255;
-	close;
-
-L_WrongDest:
-	mes "Oh, Dear... this isn't what I ordered.  You see here, it's addressed to someone else.  It looks like this Product is supposed to go to someone else.";
-	emotion e_swt;
-	cutin "kafra_03",255;
-	close;
-}
-
-
-// == Other Npcs ==
-// -- Guild Staff --
-geffen_in,155,122,4	script	Guild Staff	47,{
-
-	if(BaseJob == Job_Novice && job_merchant_q3>0) goto L_Start;
-L_Other:
-	mes "[Guild Staff]";
-	mes "It should be arriving any time now...... it seems to be late.... Hmm...";
-	close;
-
-L_Start:
-	if(job_merchant_q3 ==3) goto L_3;
-	mes "[Guild Staff]";
-	if(job_merchant_q3 ==2) goto L_WrongProd;
-
-	mes "Oh hi there.  You're from the Merchant Guild you say? That means.........";
-	next;
-	mes "[Guild Staff]";
-	mes "WOW! IT'S HERE! It's here!! They FINALLY sent the Box!...... ";
-	next;
-	mes "[Guild Staff]";
-	mes "Oh excuse me, I'm so sorry.  You must be very tired from having to travel in such hot weather.  My thanks for your effort.";
-	next;
-	mes "[Guild Staff]";
-	mes "Alright, let me just ckeck the Serial Number to make sure.........";
-	next;
-	mes "[Guild Staff]";
-	if((countitem(1081) !=1) && (countitem(1082) !=1) && (countitem(1083) !=1)) goto L_NoProd;//Items: Delivery_Box, Delivery_Box_, Delivery_Box__,
-	if((job_merchant_q2 !=3) && (job_merchant_q2 !=4)) goto L_WrongDest;
-	if(countitem(1083) == 1) goto L_WrongProd;//Items: Delivery_Box__,
-
-	mes "YES! This is it! Here, let me give you a Receipt.";
-	next;
-	set job_merchant_q3,3;
-	if(countitem(1081) == 1) goto L_0;//Items: Delivery_Box,
-	if(countitem(1082) == 1) goto L_1;//Items: Delivery_Box_,
-	
-	L_0:
-		getitem 1075,1;//Items: Voucher__,
-		delitem 1081,1;//Items: Delivery_Box,
-		goto L_3;
-
-	L_1:
-		getitem 1076,1;//Items: Voucher___,
-		delitem 1082,1;//Items: Delivery_Box_,
-		goto L_3;
-	
-	L_3:
+	}
+	else {
 		mes "[Guild Staff]";
-		mes "Heheh~ Thank you, Bye Bye.";
-		emotion e_thx;
+		mes "My package should have arrived by now. Huh. I guess the Merchant Guild might be running a little late...";
 		close;
-L_NoProd:
-	mes "Huh? Where? Where is the Box?";
-	emotion e_what;
-	close;
-
-L_WrongDest:
-	mes "Hey wait a Minute! This is not what we ordered! The Serial Number should either be 2989396 or 2191737.";
-	mes "It looks like this is addressed to someone else.  I think you got the wrong delivery destination.";
-	emotion e_swt2;
-	close;
-
-L_WrongProd:
-	mes "Hey wait a Minute! This is not what we ordered! The Serial Number should either be 2989396 or 2191737.";
-	mes "I don't know how you could make this mistake but please correct it.  I really need that Product.";
-	emotion e_swt2;
-	set job_merchant_q3,2;
-	close;
+	}
 }
 
+prontera,248,42,0	script	Kafra Employee#mer	116,{
+	cutin "kafra_02",2;
+	if (job_merchant_q == 6 || job_merchant_q == 5) && (job_merchant_q2 == 2 || job_merchant_q2 == 1) {
+		mes "[Kafra Employee]";
+		mes "Oh! Thank you for";
+		mes "traveling such a long";
+		mes "way to come over here~";
+		close2;
+		cutin "",255;
+		end;
+	}
+	else if (job_merchant_q == 4 || job_merchant_q == 3) {
+		mes "[Kafra Employee]";
+		mes "A delivery from";
+		mes "the Merchant Guild?";
+		mes "Oh, yes, please set";
+		mes "it down right over there...";
+		if (countitem(1081) == 1 || countitem(1082) == 1 || countitem(1091) == 1) {
+			mes "You must be really tired";
+			mes "after carrying it for so long!";
+		}
+		else {
+			mes "W-wait. Didn't you bring it?";
+			mes "Where's the package?";
+			close2;
+			cutin "",255;
+			end;
+		}
+		next;
+		mes "[Kafra Employee]";
+		mes "Now, let me check";
+		mes "the serial number...";
+		if (job_merchant_q2 == 1 && countitem(1081) != 0) {
+			mes "2485741. Right, this is";
+			mes "the one we ordered. Oh,";
+			mes "and don't forget this receipt!";
+			next;
+			delitem 1081,1; //Merchant_Box_1
+			getitem 1073,1; //Merchant_Voucher_1
+		}
+		else if (job_merchant_q2 == 2 && countitem(1082) != 0) {
+			mes "2328137. Right, this is";
+			mes "the one we ordered. Oh,";
+			mes "and don't forget this receipt!";
+			next;
+			delitem 1082,1; //Merchant_Box_2
+			getitem 1074,1; //Merchant_Voucher_2
+		}
+		else {
+			mes "Mmmm? Hold on. This is";
+			mes "the wrong package. What we";
+			if (job_merchant_q2 == 1)
+				mes "ordered had the serial number 2485741. I'm sure it's not this.";
+			else if (job_merchant_q2 == 2)
+				mes "ordered had the serial number 2328137. I'm sure it's not this.";
+			else
+				mes "ordered had the serial number 2328137 or 2328137.";
+			next;
+			mes "[Kafra Employee]";
+			mes "I'm afraid there";
+			mes "must be some kind";
+			mes "of mistake. Perhaps";
+			mes "you should go back to";
+			mes "the Merchant Guild to";
+			mes "clear up this situation?";
+			close2;
+			cutin "",255;
+			end;
+		}
+		if (job_merchant_q == 4)
+			set job_merchant_q,6;
+		else if (job_merchant_q == 3)
+			set job_merchant_q,5;
+		mes "[Kafra Employee]";
+		mes "Thanks again";
+		mes "for going through";
+		mes "all of that trouble~";
+		close2;
+		cutin "",255;
+		end;
+	}
+	else {
+		mes "[Kafra Employee]";
+		mes "Welcome to the";
+		mes "Kafra Corportation,";
+		mes "where the service is";
+		mes "always on your side~";
+		next;
+		mes "[Kafra Employee]";
+		mes "As you can see, the";
+		mes "Swordman Assocation";
+		mes "has moved to Izlude, a";
+		mes "satellite city of Prontera.";
+		mes "Currently, we offer a Teleport";
+		mes "Service to Izlude for 600 zeny.";
+		next;
+		if (select("Use:Cancel") == 1) {
+			if (Zeny < 600) {
+				mes "[Kafra Employee]";
+				mes "I'm sorry, but you";
+				mes "don't have enough zeny";
+				mes "for this Teleport Service.";
+				close2;
+				cutin "",255;
+				end;
+			}
+			set zeny,zeny-600;
+			set RESRVPTS, RESRVPTS + 37;
+			cutin "",255;
+			warp "izlude",94,103;
+			end;
+		}
+		close2;
+		cutin "",255;
+		end;
+	}
+}
 
-// -- Dyer's Student --
-morocc_in,140,102,4	script	Dyer's Student	86,{
-	if(BaseJob == Job_Novice && job_merchant_q3>0) goto L_Start;
-
-L_Other:
-	mes "[Dyer's Student]";
-	mes "Mr. JavaDullihan is one and Only the Best in Midgard continent.";
-	mes "Aaaand I am his Student!! How proude of I am!!!!";
-	next;
-	mes "[Dyer's Student]";
-	mes ".....That's what I am saying..";
-	close;
-
-L_Start:
-	if(job_merchant_q3 ==3) goto L_3;
-	mes "[Dyer's Student]";
-	if(job_merchant_q3 ==2) goto L_WrongProd;
-
-	mes "You're from the Merchant Guild...? Ah, Yes! I've been expecting you.";
-	next;
-	mes "[Dyer's Student]";
-	mes "Let me check the Serial Number of the Product just to make sure.......";
-	next;
-	mes "[Dyer's Student]";
-	if((countitem(1081) !=1) && (countitem(1082) !=1) && (countitem(1083) !=1)) goto L_NoProd;//Items: Delivery_Box, Delivery_Box_, Delivery_Box__,
-	if((job_merchant_q2 !=5) && (job_merchant_q2 !=6)) goto L_WrongDest;
-	if(countitem(1083) == 1) goto L_WrongProd;//Items: Delivery_Box__,
-
-	mes "Great! This is what we ordered.  Here, let me give you a Receipt.";	
-	set job_merchant_q3,3;
-	if(countitem(1081) == 1) goto L_0;//Items: Delivery_Box,
-	if(countitem(1082) == 1) goto L_1;//Items: Delivery_Box_,
-	
-	L_0:
-		getitem 1077,1;//Items: Voucher____,
-		delitem 1081,1;//Items: Delivery_Box,
-		goto L_3;
-
-	L_1:
-		getitem 1078,1;//Items: Voucher_____,
-		delitem 1082,1;//Items: Delivery_Box_,
-		goto L_3;
-	
-	L_3:
-		mes "[Dyer's Student]";
-		mes "Thank you, See you next time~";
-		emotion e_thx;
-		close;
-
-L_NoProd:
-	mes "But where's the Product?";
-	emotion e_hmm;
-	close;
-
-L_WrongProd:
-	mes "Um..... excuse me? I don't think this is what we ordered? The Serial Number should be either 3012685 or 3487372.";
-	emotion e_hmm;
-	next;
-	mes "[Dyer's Student]";
-	mes "I see.  There was a mix up at the wharehouse and you got the wrong product.";
-	next;
-	mes "[Dyer's Student]";
-	mes "Well this sucks.  Please come back with the correct Product.";
-	emotion e_pif;
-	set job_merchant_q3,2;
-	close;	
-
-L_WrongDest:
-	mes "Um.... excuse me? I don't think this is what we ordered? The Serial Number should be either 3012685 or 3487372.";
-	mes "I think you have the wrong delivery destination.  Maybe you should try someone else.";
-	emotion e_hmm;
-	close;
-
-
+//izlu2dun,106,58,4	script	Kafra Employee#mer	116,{
+function	script	F_MercKafra	{
+	if (job_merchant_q == 6 || job_merchant_q == 5 && job_merchant_q2 == 8 || job_merchant_q2 == 7) {
+		mes "[Kafra Employee]";
+		mes "Oh hello~";
+		mes "Um, is there";
+		mes "some special reason";
+		mes "as to why you're here?";
+		close2;
+		cutin "",255;
+		end;
+	}
+	else if (job_merchant_q == 4 || job_merchant_q == 3) {
+		mes "[Kafra Employee]";
+		mes "A delivery from";
+		mes "the Merchant Guild?";
+		mes "Oh, yes, please set";
+		mes "it down right over there...";
+		if (countitem(1081) == 1 || v[Merchant_Box_2] == 1 || countitem(1091) == 1) {
+			mes "You must be really tired";
+			mes "after carrying it for so long!";
+		}
+		else {
+			mes "W-wait. Didn't you bring it?";
+			mes "Where's the package?";
+			close2;
+			cutin "",255;
+			end;
+		}
+		next;
+		mes "[Kafra Employee]";
+		mes "Now, let me check";
+		mes "the serial number...";
+		if (job_merchant_q2 == 7 && countitem(1081) != 0) {
+			mes "3318702. Right, this is";
+			mes "the one we ordered. Oh,";
+			mes "and don't forget this receipt!";
+			delitem 1081,1; //Merchant_Box_1
+			getitem 1079,1; //Merchant_Voucher_7
+		}
+		else if (job_merchant_q2 == 8 && countitem(1082) != 0) {
+			mes "3543625. Right, this is";
+			mes "the one we ordered. Oh,";
+			mes "and don't forget this receipt!";
+			delitem 1082,1; //Merchant_Box_2
+			getitem 1080,1; //Merchant_Voucher_8
+		}
+		else {
+			mes "Mmmm? Hold on. This is";
+			mes "the wrong package. What we";
+			if (job_merchant_q2 == 7)
+				mes "ordered had the serial number 3318702. I'm sure it's not this.";
+			else if (job_merchant_q2 == 8)
+				mes "ordered had the serial number 3543625. I'm sure it's not this.";
+			else
+				mes "ordered had the serial number 3318702 or 3543625.";
+			close2;
+			cutin "",255;
+			end;
+		}
+		if (job_merchant_q == 4)
+			set job_merchant_q,6;
+		else if (job_merchant_q == 3)
+			set job_merchant_q,5;
+		next;
+		if (countitem(1072) != 0 && quest_alb_01 == 0) {
+			select("This is from Chief Mahnsoo of the Merchant Guild...");
+			delitem 1072,1; //Delivery_Message
+			set quest_alb_01,1;
+			mes "[Kafra Employee]";
+			mes "Oh~! A letter from";
+			mes "Mahnsoo! Thank you";
+			mes "so much, I've been dying";
+			mes "to hear from him. How is";
+			mes "he doing, is he alright?";
+			mes "I can't wait to read it...";
+			next;
+			mes "[Kafra Employee]";
+			mes "Oh, thank you for";
+			mes "going through all the";
+			mes "trouble of delivering all";
+			mes "of this. This isn't anything";
+			mes "special, but please take it.";
+			mes "Well, see you again~";
+			getitem 513,3; //Banana
+		}
+		else {
+			mes "[Kafra Employee]";
+			mes "Thanks again";
+			mes "for going through";
+			mes "all of that trouble~";
+		}
+		close2;
+		cutin "",255;
+		end;
+	}
 }