- 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

6 files changed, 483 insertions, 1038 deletions

diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt
index a21d4846c..a200ec514 100644
--- a/npc/pre-re/jobs/1-1/acolyte.txt
+++ b/npc/pre-re/jobs/1-1/acolyte.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.1
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,7 +11,6 @@
 //===== Additional Comments: ================================= 
 //= 1.0 First Version. [Kisuka]
 //= 1.1 Added back the npcs used for the priest quest.
-//= 1.2 Added Baby job change support. [Masao]
 //============================================================ 
 prt_church,184,41,4	script	Cleric#aco	60,{
 	if (Upper == 1) {
@@ -39,74 +38,62 @@ prt_church,184,41,4	script	Cleric#aco	60,{
 				mes "wish you luck on your";
 				mes "new life's journey.";
 				next;
-				skill 143,0,1;
+				skill 143,0,0;
 				jobchange Job_Acolyte_High;
 				skill 156,1,0;
 				mes "[Father Mareusis]";
 				mes "Now, venture forth and seek those who need your help. May God light your path.";
 				close;
+			}else{
+				mes "[Father Mareusis]";
+				mes "Now, venture forth to seek people who need your help. May God enlighten your way.";
+				close;
 			}
+		}else{
 			mes "[Father Mareusis]";
-			mes "Now, venture forth to seek people who need your help. May God enlighten your way.";
+			mes "I sense that you have endured a past life experience. You must have learned many things before entering Valhalla.";
+			next;
+			mes "[Father Mareusis]";
+			mes "However, I can tell that you are not suited to be an Acolyte. Please remember who you were in your past life and find your path.";
 			close;
 		}
-		mes "[Father Mareusis]";
-		mes "I sense that you have endured a past life experience. You must have learned many things before entering Valhalla.";
-		next;
-		mes "[Father Mareusis]";
-		mes "However, I can tell that you are not suited to be an Acolyte. Please remember who you were in your past life and find your path.";
-		close;
 	}
 	mes "[Father Mareusis]";
 	mes "What is it that you seek?";
 	next;
-	switch (select("Father, I want to be a Acolyte.:Acolyte Requirements.:Just looking around.")) {
+	switch(select("Change your job to acolyte.:Ask the requirements to be an acolyte.:Quit it.")) {
 	case 1:
-		if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
+		if(Class != Job_Novice) {
 			mes "[Father Mareusis]";
-			mes "Are you feeling okay today? I can tell by your attire that you are already an Acolyte. You're not joking around, are you?";
+			if(Class == Job_Acolyte) {
+				mes "Are you feeling okay today? I can tell by your attire that you are already an Acolyte. You're not joking around, are you?";
+			}else{
+				mes "I'm sorry but it seems you already have your own job, aren't you?";
+			}
 			close;
-		}
-		if ((Class != Job_Baby) && (Class != Job_Novice)) {
+		}else{
 			mes "[Father Mareusis]";
-			mes "I'm sorry, but we can only accept Novices as applicants for the job change to Acolyte.";
-			close;
-		}
-		mes "[Father Mareusis]";
-		mes "Do you truly wish to become a servant of God?";
-		mes "Let's see whether you are ready for it or not... Hmm...";
-		next;
-		if (getskilllv("NV_BASIC") < 9) {
+			mes "Do you truly wish to become a servant of God?";
+			mes "Let's see whether you are ready for it or not... Hmm...";
+			next;
+			if (getskilllv("NV_BASIC") < 9) {
+				mes "[Father Mareusis]";
+				mes "Oh my?! You haven't accomplished the basic practice yet?! You have a long way to go! Come again after increasing your job level!";
+				close;
+			}
 			mes "[Father Mareusis]";
-			mes "Good Lord! Haven't you accomplished the Basic Training yet?! It's important that you finish that!";
+			mes "Hmm... your job level is enough...";
+			mes "Good. Now I will give you the qualification to become an Acolyte.";
 			next;
 			mes "[Father Mareusis]";
-			mes "You should have trained more! Go back and make sure you reach Novice Job Level 9 and learn all of the Basic Skills!";
-			close;
-		}
-		mes "[Father Mareusis]";
-		mes "Hmm... your job level is high enough and you've proven your qualification.";
-		next;
-		mes "[Father Mareusis]";
-		mes "I am proud to say that you are now ready to become an Acolyte!";
-		next;
-		skill 143,0,1;
-		if(Class == Job_Baby){
-			jobchange Job_Baby_Acolyte;
-		} else {
+			mes "Always remember to be thankful to God, who takes care of us all the time. In chaos and times of difficulty, face your hardships with unwavering faith.";
 			jobchange Job_Acolyte;
+			getitem 1545,1;	// N_Mace
+			next;
+			mes "[Father Mareusis]";
+			mes "Lastly, I want to sincerely congratulate you on persevering through your trial of penance.";
+			close;
 		}
-		set ACO_Q,0;
-		getitem 1545,1; //N_Mace
-		mes "[Father Mareusis]";
-		mes "Always remember to be thankful to God, who is taking care of us all the time.";
-		next;
-		mes "[Father Mareusis]";
-		mes "Always use your gifts to serve Him by helping others. In chaos and times of difficulty, face your hardships with unwavering faith.";
-		next;
-		mes "[Father Mareusis]";
-		mes "Lastly, I want to sincerely congratulate you on persevering through your trial of penance.";
-		close;
 	case 2:
 		mes "[Father Mareusis]";
 		mes "Do you wish to become an Acolyte?";
@@ -117,7 +104,7 @@ prt_church,184,41,4	script	Cleric#aco	60,{
 		mes "This is the most basic thing to do, so you need to regard it as the way of training yourself.";
 		next;
 		mes "[Father Mareusis]";
-		mes "When you think you fulfilled this requirement I've asked of you. As long as your desire to serve God and others is sincere, you will be able to make it.";
+		mes "When you think you fulfilled this requirement, then come back to me again. Then you will have a holy job in which you can spread God's will.";
 		close;
 	case 3:
 		close;
@@ -125,18 +112,17 @@ prt_church,184,41,4	script	Cleric#aco	60,{
 }
 
 prt_fild03,365,255,2	script	Ascetic#aco	89,{
-	if (Class == Job_Novice) {
-		if (ACO_Q== 6) {
-			mes "[Father Rubalkabara]";
+	mes "[Father Rubalkabara]";
+	if (BaseJob == Job_Novice) {
+		if (job_acolyte_q == 6) {
 			mes "Please take care. They should know that you've met me by the time you arrive at the Prontera Sanctuary.";
 			next;
 			mes "[Father Rubalkabara]";
 			mes "I've sent a carrier pigeon with a message. I hope it will arrive there safely...";
 			close;
 		}
-		if (ACO_Q!= 0) {
-			if (ACO_Q== 2) {
-				mes "[Father Rubalkabara]";
+		if (job_acolyte_q != 0) {
+			if (job_acolyte_q == 2) {
 				mes "Oh...? You must be the one who aspires to become an Acolyte. I've already received news from the Sanctuary that you might be coming.";
 				next;
 				mes "[Father Rubalkabara]";
@@ -156,207 +142,133 @@ prt_fild03,365,255,2	script	Ascetic#aco	89,{
 				next;
 				mes "[Father Rubalkabara]";
 				mes "Farewell.";
+				close2;
 				savepoint "prt_fild03",361,255;
-				set ACO_Q,6;
-				close;
+				set job_acolyte_q,6;
+				end;
 			}
-			mes "[Father Rubalkabara]";
-			mes "Oh...";
-			mes "Are you one of the";
-			mes "Acolyte applicants...?";
-			mes "Let's see...";
-			next;
-			mes "[Father Rubalkabara]";
-			mes "Your name is " + strcharinfo(0) + "?";
-			mes "I don't think your name";
-			mes "is on my list. Hmmm...";
-			next;
-			mes "[Father Rubalkabara]";
-			mes "Why don't you go back to the Prontera Sanctuary and check again?";
-			close;
-		}
-		mes "[Father Rubalkabara]";
-		mes "Huh? What brings you here? This is a very dangerous place for a Novice like yourself!";
-		close;
-	}
-	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-		if (PRST_Q != 0) {
-			if (PRST_Q == 1) {
-				mes "[Father Rubalkabara]";
-				mes "Ah yes, so you're the young Acolyte who wishes to become a Priest.";
+			else {
+				mes "Oh...";
+				mes "Are you one of the";
+				mes "Acolyte applicants...?";
+				mes "Let's see...";
 				next;
 				mes "[Father Rubalkabara]";
-				mes "I've received the message from Bishop Paul. Since you made the pilgrimage, I hope you accomplish your goal of becoming a Priest.";
+				mes "Your name is " + strcharinfo(0) + "?";
+				mes "I don't think your name";
+				mes "is on my list. Hmmm...";
 				next;
 				mes "[Father Rubalkabara]";
-				mes "Also, if you have a chance, please visit this abbey again. It's a sacred place for our Church.";
-				next;
-				mes "[Father Rubalkabara]";
-				mes "Well then, please head to your next destination for your pilgrimage. Be safe in your travels.";
-				savepoint "prt_fild03",361,255;
-				set PRST_Q,2;
+				mes "Why don't you go back to the Prontera Sanctuary and check again?";
 				close;
 			}
-			if (PRST_Q == 2) {
-				mes "[Father Rubalkabara]";
-				mes "Please be hurry to the next destination for your pilgrimage. I hope you become a Priest soon.";
-				close;
-			}
-			mes "[Father Rubalkabara]";
-			mes "May I ask why you have returned? Please go back and continue your religious practice.";
+		}
+		else {
+			mes "Huh? What brings you here? This is a very dangerous place for a Novice like yourself!";
 			close;
 		}
-		mes "[Father Rubalkabara]";
-		mes "I have no idea what brought you here, but please excuse me.";
-		close;
 	}
-	if (Class == Job_Baby_Priest || Class == Job_Priest) {
-		mes "[Father Rubalkabara]";
-		mes "Greetings.";
-		next;
-		mes "[Father Rubalkabara]";
-		mes "Welcome to the Deep. Feel free to sit and contemplate God's message with me. This place is beautiful, even if danger accompanies its sense of serenity...";
-		close;
+	else if (BaseJob == Job_Acolyte) callfunc "F_FatherRub";
+	else {
+		if (BaseJob == Job_Priest) {
+			mes "Greetings.";
+			next;
+			mes "[Father Rubalkabara]";
+			mes "Welcome to the Deep. Feel free to sit and contemplate God's message with me. This place is beautiful, even if danger accompanies its sense of serenity...";
+			close;
+		}
+		else {
+			mes "Oh ho...";
+			mes "Have you come into the Deep here for training? Or are you just a Wanderer?";
+			next;
+			mes "[Father Rubalkabara]";
+			mes "Whoever you are, please take care of yourself. The monsters in here are shockingly strong, contrary to their cute appearance.";
+			close;
+		}
 	}
-	mes "[Father Rubalkabara]";
-	mes "Oh ho...";
-	mes "Have you come into the Deep here for training? Or are you just a Wanderer?";
-	next;
-	mes "[Father Rubalkabara]";
-	mes "Whoever you are, please take care of yourself. The monsters in here are shockingly strong, contrary to their cute appearance.";
-	close;
 }
 
-moc_fild07,41,355,4	script	Ascetic#2	95,{
-	if (Class == Job_Novice) {
-		if (ACO_Q== 6) {
-			mes "[Mother Marthilda]";
+moc_fild07,41,355,4	script	Ascetic#2aco	95,{
+	mes "[Mother Mathilda]";
+	if (BaseJob == Job_Novice) {
+		if (job_acolyte_q == 7) {
 			mes "I will send a carrier pigeon to the Prontera Sanctuary. When you return, the Priest there should already have received my message.";
 			next;
-			mes "[Mother Marthilda]";
+			mes "[Mother Mathilda]";
 			mes "I will pray to God, and hope that you become an Acolyte soon.";
 			close;
 		}
-		if (ACO_Q!= 0) {
-			if (ACO_Q== 3) {
-				mes "[Mother Marthilda]";
+		if (job_acolyte_q != 0) {
+			if (job_acolyte_q == 3) {
 				mes "Ah, you must be one of the Acolyte applicants. I sincerely welcome you.";
 				next;
-				mes "[Mother Marthilda]";
+				mes "[Mother Mathilda]";
 				mes "What is your name? " + strcharinfo(0) + "? Let's see... Ah, you're on my list.";
 				next;
-				mes "[Mother Marthilda]";
+				mes "[Mother Mathilda]";
 				mes "I will send a message to the Sanctuary confirming that you, " + strcharinfo(0) + " visited me and completed your penance.";
 				next;
-				mes "[Mother Marthilda]";
+				mes "[Mother Mathilda]";
 				mes "Please return to the Prontera Sanctuary and speak to the Priest in charge.";
+				close2;
 				savepoint "moc_fild07",35,355;
-				set ACO_Q,7;
-				close;
-			}
-			mes "[Mother Marthilda]";
-			mes "Ah...!";
-			mes "You must be one";
-			mes "of the Acolyte applicants.";
-			mes "I sincerely welcome you.";
-			next;
-			mes "[Mother Marthilda]";
-			mes "Now, what is your name?";
-			mes "" + strcharinfo(0) + "? Let's see...";
-			next;
-			mes "[Mother Marthilda]";
-			mes "Hmm...";
-			mes "It seems your name";
-			mes "is not on my list...";
-			next;
-			mes "[Mother Marthilda]";
-			mes "Perhaps you should return to the Prontera Sanctuary and check the destination for your penance trial once again.";
-			close;
-		}
-		mes "[Mother Marthilda]";
-		mes "...";
-		close;
-	}
-	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-		if (PRST_Q != 0) {
-			if (PRST_Q == 1) {
-				mes "[Mother Marthilda]";
-				mes "Hmm...";
-				mes "It seems you're";
-				mes "training to become";
-				mes "a Priest.";
-				next;
-				mes "[Mother Marthilda]";
-				mes "However, at this point in your pilgrimage, I am not the person that you should be visiting.";
-				next;
-				mes "[Mother Marthilda]";
-				mes "Perhaps you should ask Bishop Paul or Sister Cecilia once again. Well, may God be with you...";
-				close;
+				set job_acolyte_q,7;
+				end;
 			}
-			if (PRST_Q == 2) {
-				mes "[Mother Marthilda]";
-				mes "Ah, are you";
-				mes "a Priest trainee...?";
-				mes "Welcome!";
+			else {
+				mes "Ah...!";
+				mes "You must be one";
+				mes "of the Acolyte applicants.";
+				mes "I sincerely welcome you.";
 				next;
-				mes "[Mother Marthilda]";
-				mes "We Priests are obliged to spread the message of God to";
-				mes "the peoples of the Earth.";
+				mes "[Mother Mathilda]";
+				mes "Now, what is your name?";
+				mes "" + strcharinfo(0) + "? Let's see...";
 				next;
-				mes "[Mother Marthilda]";
-				mes "After you become a Priest, your travels may take you to the Morroc Pyramids. I hope that you may release the Undead there from the evil to which they are bound.";
+				mes "[Mother Mathilda]";
+				mes "Hmm...";
+				mes "It seems your name";
+				mes "is not on my list...";
 				next;
-				mes "[Mother Marthilda]";
-				mes "Well then...";
-				mes "I shall pray to";
-				mes "God for safety";
-				mes "on your journey.";
-				savepoint "moc_fild07",35,355;
-				set PRST_Q,3;
-				close;
-			}
-			if (PRST_Q == 3) {
-				mes "[Mother Marthilda]";
-				mes "Please leave soon, and";
-				mes "continue your training.";
+				mes "[Mother Mathilda]";
+				mes "Perhaps you should return to the Prontera Sanctuary and check the destination for your penance trial once again.";
 				close;
 			}
-			mes "[Mother Marthilda]";
-			mes "May I ask you the reason you came back? Please continue your training.";
+		}
+		else {
+			mes "...";
 			close;
 		}
-		mes "[Mother Marthilda]";
-		mes "May God";
-		mes "be with you...";
-		close;
 	}
-	if (Class == Job_Baby_Priest || Class == Job_Priest) {
-		mes "[Mother Marthilda]";
-		mes "Hello there~";
-		next;
-		mes "[Mother Marthilda]";
-		mes "How is your practice coming along? I certainly hope you're enjoying living in the grace of God.";
-		close;
+	else if (BaseJob == Job_Acolyte) callfunc "F_MotherMart";
+	else {
+		if (BaseJob == Job_Priest) {
+			mes "Hello there~";
+			next;
+			mes "[Mother Mathilda]";
+			mes "How is your practice coming along? I certainly hope you're enjoying living in the grace of God.";
+			close;
+		}
+		else {
+			mes "May God";
+			mes "be with you...";
+			close;
+		}
 	}
-	mes "[Mother Marthilda]";
-	mes "May God";
-	mes "be with you...";
-	close;
 }
 
-prt_fild00,208,218,6	script	Ascetic#3	98,{
-	if (Class == Job_Novice) {
-		if (ACO_Q== 8) {
-			mes "[Father Yosuke]";
+prt_fild00,208,218,6	script	Ascetic#3aco	98,{
+	mes "[Father Yosuke]";
+	if (BaseJob == Job_Novice) {
+		if (job_acolyte_q == 8) {
 			mes "What?";
 			next;
 			mes "[Father Yosuke]";
 			mes "Have you any more business with me?! You don't! Go back to the Sanctuary now!";
 			close;
 		}
-		if (ACO_Q!= 0) {
-			if (ACO_Q== 4) {
-				mes "[Father Yosuke]";
+		if (job_acolyte_q != 0) {
+			if (job_acolyte_q == 4) {
 				mes "Hey.";
 				mes "Whatever you are,";
 				mes "you look like an";
@@ -375,104 +287,48 @@ prt_fild00,208,218,6	script	Ascetic#3	98,{
 				next;
 				mes "[Father Yosuke]";
 				mes "Now go back to the Santuary and finish becoming an Acolyte, kid.";
+				close2;
 				savepoint "prt_fild00",206,230;
-				set ACO_Q,8;
-				close;
-			}
-			mes "[Father Yosuke]";
-			mes "Hey.";
-			mes "You look like an Acolyte Applicant. Am I right?";
-			next;
-			mes "[Father Yosuke]";
-			mes "Not bad at all, you've made it all the way here from Prontera. So what's your name, kid?";
-			next;
-			mes "[Father Yosuke]";
-			mes "" + strcharinfo(0) + ", huh? Why isn't your name on my list?";
-			next;
-			mes "[Father Yosuke]";
-			mes "You probably made a mistake. Go back to the Santuary, and check with the Bishop.";
-			close;
-		}
-		mes "[Father Yosuke]";
-		mes "You...";
-		mes "Novice.";
-		mes "There something";
-		mes "you wanna tell me?";
-		close;
-	}
-	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-		if (PRST_Q != 0) {
-			if (PRST_Q == 1) {
-				mes "[Father Yosuke]";
-				mes "Hmm...";
-				mes "A Priest trainee, eh?";
-				next;
-				mes "[Father Yosuke]";
-				mes "Well, you got the wrong person. If you're supposed to meet up with me at all, it'd be later.";
-				next;
-				mes "[Father Yosuke]";
-				mes "But that's your own fault.";
-				mes "Now, go back to Church, kid.";
-				close;
+				set job_acolyte_q,8;
+				end;
 			}
-			if (PRST_Q == 2) {
-				mes "[Father Yosuke]";
-				mes "Hmm...";
-				mes "A Priest trainee, eh?";
-				next;
-				mes "[Father Yosuke]";
-				mes "Well, you got the wrong person. If you're supposed to meet up with me at all, it'd be later.";
+			else {
+				mes "Hey.";
+				mes "You look like an Acolyte Applicant. Am I right?";
 				next;
 				mes "[Father Yosuke]";
-				mes "But that's your own fault. Go back to Church.";
-				close;
-			}
-			if (PRST_Q == 3) {
-				mes "[Father Yosuke]";
-				mes "Hmm.";
-				mes "A Priest";
-				mes "trainee, eh? ";
-				mes "Welcome.";
+				mes "Not bad at all, you've made it all the way here from Prontera. So what's your name, kid?";
 				next;
 				mes "[Father Yosuke]";
-				mes "I won't say";
-				mes "anything more.";
-				mes "Just devote your";
-				mes "life to God.";
+				mes "" + strcharinfo(0) + ", huh? Why isn't your name on my list?";
 				next;
 				mes "[Father Yosuke]";
-				mes "Now go back to church.";
-				mes "Hereby, the first of";
-				mes "your trials is now";
-				mes "completed.";
-				savepoint "prt_fild00",206,230;
-				set PRST_Q,4;
+				mes "You probably made a mistake. Go back to the Santuary, and check with the Bishop.";
 				close;
 			}
-			if (PRST_Q == 4) {
-				mes "[Father Yosuke]";
-				mes "I told you to go back to church.";
-				mes "Or do you want to live with me here for the rest of your life...?";
-				close;
-			}
-			mes "[Father Yosuke]";
-			mes "Just go be a Priest. This isn't a playground for kids.";
+		}
+		else {
+			mes "You...";
+			mes "Novice.";
+			mes "There something";
+			mes "you wanna tell me?";
 			close;
 		}
-		mes "[Father Yosuke]";
-		mes "...Acolyte, you don't have any business with me here.";
-		close;
 	}
-	if (Class == Job_Baby_Priest || Class == Job_Priest) {
-		mes "[Father Yosuke]";
-		mes "Hey...";
-		next;
-		mes "[Father Yosuke]";
-		mes "If you like, come sit here with me and meditate the great truths. God's majesty is truly inspiring...";
-		close;
+	else if (BaseJob == Job_Acolyte) callfunc "F_FatherYos";
+	else {
+		if (BaseJob == Job_Priest) {
+			mes "Hey...";
+			next;
+			mes "[Father Yosuke]";
+			mes "If you like, come sit here with me and meditate the great truths. God's majesty is truly inspiring...";
+			close;
+		}
+		else {
+			mes "Do you have anything to say? Because unfortunately for you,";
+			mes "I don't any replies.";
+			close;
+		}
 	}
-	mes "[Father Yosuke]";
-	mes "Do you have anything to say? Because unfortunately for you,";
-	mes "I don't any replies.";
-	close;
-}
\ No newline at end of file
+}
+
diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt
index 8204689bc..46325309c 100644
--- a/npc/pre-re/jobs/1-1/archer.txt
+++ b/npc/pre-re/jobs/1-1/archer.txt
@@ -3,20 +3,21 @@
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Job Change to Archer Class
 //===== Additional Comments: ================================= 
 //= 1.0 First Version. [Kisuka]
-//= 1.1 Added Baby job change support. [Masao]
 //============================================================ 
-payon_in02,64,71,4	script	Archer Guildsman	85,{
+payon_in02,64,71,4	script	Archer Guildsman#archer	85,{
 	if (Upper == 1) {
-		if ((Class == Job_Novice_High) && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) {
+		if (Class == Job_Novice_High && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) {
 			mes "[Archer Guildsman]";
 			mes "Hey, I know you.";
+			mes "You took this test";
+			mes "before, didn't you?";
 			next;
 			mes "[Archer Guildsman]";
 			mes "Ah, you must have been";
@@ -37,7 +38,7 @@ payon_in02,64,71,4	script	Archer Guildsman	85,{
 			mes "need to say anything else.";
 			mes "I know you'll make a great Archer...";
 			next;
-			skill 143,0,1;
+			skill 143,0,0;
 			jobchange Job_Archer_high;
 			skill 147,1,0;
 			skill 148,1,0;
@@ -45,97 +46,84 @@ payon_in02,64,71,4	script	Archer Guildsman	85,{
 			mes "Although there's no special";
 			mes "reward for you this time, I hope you understand. Take care of yourself.";
 			close;
+		}else{
+			mes "[Archer Guildsman]";
+			mes "Oh...?";
+			mes "Hey, what are";
+			mes "you doing here...?";
+			next;
+			mes "[Archer Guildsman]";
+			mes "I can tell that you're not cut out to be an Archer. It sort of feels like you're meant to do";
+			mes "something else...";
+			close;
 		}
-		mes "[Archer Guildsman]";
-		mes "Oh...?";
-		mes "Hey, what are";
-		mes "you doing here...?";
-		next;
-		mes "[Archer Guildsman]";
-		mes "I can tell that you're not cut out to be an Archer. It sort of feels like you're meant to do";
-		mes "something else...";
-		close;
 	}
 	mes "[Archer Guildsman]";
 	mes "Nice to meet you. How may I help you?";
 	next;
-	switch (select("I want to be an Archer.:I need the requirements, please.:Nothing, thanks.")) {
+	switch(select("I want to be an Archer.:I need the requirements, please.:Nothing, thanks.")) {
 	case 1:
-		if (Class == Job_Baby || Class == Job_Novice) {
+		if(Class != Job_Novice) {
+			mes "[Archer Guildsman]";
+			if(Class == Job_Archer) {
+				mes "Haha, you are kidding me..";
+			}else{
+				mes "I feel sorry but only Novices can change their job.";
+				mes "You already have your own decent job, don't you?";
+			}
+			close;
+		}else{
 			mes "[Archer Guildsman]";
-			mes "You are..." + strcharinfo(0) + " right?";
+			mes "You are... "+strcharinfo(0)+". right?";
 			next;
 			if (getskilllv("NV_BASIC") < 9) {
 				mes "[Archer Guildsman]";
-				mes "Well, you don't have the right skill level. ";
-				mes "Your job level must be at least ^4d4dff10^000000";
-				mes "and your Basic Skill level should reach ^4d4dfflevel 9^000000";
+				mes "Well, you're not at the right skill level.";
+				mes "Your job level must be at least ^4A4AFF10^000000 and your Basic Skill level should reach ^4A4AFFlevel 9";
 				next;
 				mes "[Archer Guildsman]";
-				mes "Because an Archer needs";
-				mes "extremely high concentration,";
-				mes "so we do not accept ";
-				mes "those who have little patience.";
-				close2;
+				mes "Because an Archer needs extremely high concentration, so we do not accept those who have little patience.";
+				close;
 			}
 			mes "[Archer Guildsman]";
-			mes "You seem to have learned the basic skills..";
-			mes "....Hm~~ you are now ready to become an Archer. I will take the step right away.";
+			mes "Your Basic Skill is now enough..";
+			mes "....Hm~~ so you are now ready to be an Archer. I will take the step right away.";
 			next;
-			skill 143,0,1;
-			if(Class == Job_Baby){
-				jobchange Job_Baby_Archer;
-			} else {
-				jobchange Job_Archer;
-			}
 			mes "[Archer Guildsman]";
 			mes "Congratulations! You are now an Archer! Also, we hope that you actively participate in many programs for the revival of the Archer Guild.";
 			mes "Ah, items have arrived from the Production Department. Here, take these! These are all yours!";
-			getitem 1742,1; //N_Composite_Bow
-			getitem 12004,1; //Arrow_Container
-			getitem 12009,1; //Silver_Arrow_Container
-			getitem 12008,1; //Fire_Arrow_Container
+			jobchange Job_Archer;
+			getitem 1742,1;	// N_Composite_Bow
+			getitem 12004,1;	// Arrow_Container
+			getitem 12009,1;	// Silver_Arrow_Container
+			getitem 12008,1;	// Fire_Arrow_Container
 			next;
 			mes "[Archer Guildsman]";
-			mes "Having a bow and arrows, now you've become a real Archer.";
-			mes "If you open the arrow quiver, there will be arrows in it that you can equip.";
-			mes "Well, I expect to hear good news from you. It's time to say goodbye. Bye.";
+			mes "Having a bow and arrows, now you became a real Archer.";
+			mes "If you open the arrow container, there are arrows in it and then you can equip them.";
+			mes "Well, I expect to hear better news from you. It's time to say goodbye.";
+			mes "Bye.";
 			close;
 		}
-		if (Class == Job_Baby_Archer || Class == Job_Archer || Class == Job_Archer_High) {
-			mes "[Archer Guildsman]";
-			mes "Haha, you are kidding me..";
-			close;
-		}
-		mes "[Archer Guildsman]";
-		mes "Wait a second. You've chosen a different job already. You don't need to know this~";
-		close;
 	case 2:
 		mes "[Archer Guildsman]";
 		mes "An Archer has skills using a bow and has various talents.";
 		mes "The greatest ability of an Archer is attacking enemies from a long distance.";
 		next;
 		mes "[Archer Guildsman]";
-		mes "Although an Archer has weaker HP,";
-		mes "he or she can shoot enemies";
-		mes "at a long range,";
+		mes "Although an Archer has weaker HP, he or she can shoot enemies at a long range,";
 		mes "so an Archer is safer in a real battle.";
 		next;
 		mes "[Archer Guildsman]";
-		mes "Although an Archer in Ragnarok has lower HP,";
-		mes "he or she has high accuracy and attack rate";
-		mes "so that the archer can kill monsters";
-		mes "before they get close to an Archer.";
+		mes "Although an Archer in Ragnarok has lower HP, he or she has high accuracy and attack rate so that the archer can kill monsters before they get close to an Archer.";
 		next;
 		mes "[Archer Guildsman]";
-		mes "^8E2323An Archer can change";
-		mes "^8E2323jobs to a Hunter.";
-		mes "^8E2323Other than Hunter, if you are a man, you can change your job to Bard";
-		mes "^8E2323and if you are a woman, you can change your job to Dancer.^000000";
+		mes "^8C2121An Archer can change jobs to a Hunter.^000000";
+		mes "^8C2121Other than Hunter, if you are a man, you can change your job to Bard and if you are a woman, you can change your job to Dancer.^000000";
 		close;
 	case 3:
 		mes "[Archer Guildsman]";
 		mes "If you have any questions, feel free to come and ask me.";
 		close;
 	}
-}
\ No newline at end of file
+}
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index c44d0148e..99cca81c4 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -3,16 +3,15 @@
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Job Change to Mage Class
 //===== Additional Comments: ================================= 
 //= 1.0 First Version. [Kisuka]
-//= 1.1 Added Baby job change support. [Masao]
 //============================================================ 
-geffen_in,164,124,4	script	Mage Guildsman	123,{
+geffen_in,164,124,4	script	Mage Guildsman#mage	123,{
 	if (Upper == 1) {
 		if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor) {
 			if (Class == Job_Novice_High) {
@@ -39,112 +38,89 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 				mes "[Mage Guildsman]";
 				mes "Wow, for some reason, you look way better than you did before. Anyway, I believe you will do a better job being a Mage as well.";
 				close;
+			}else{
+				mes "[Mage Guildsman]";
+				mes "Is there anything more I can help you with? If not, why don't you go test your skills? The world is waiting for you~!";
+				close;
 			}
+		}else{
 			mes "[Mage Guildsman]";
-			mes "Is there anything more I can help you with? If not, why don't you go test your skills? The world is waiting for you~!";
+			mes "What, are you interested in the Mage guild? I didn't want to tell you this, but you don't belong here.";
+			next;
+			mes "[Mage Guildsman]";
+			mes "I am not sure why you're still standing in front of me, but I can tell that you're not meant to be a Mage.";
 			close;
 		}
-		mes "[Mage Guildsman]";
-		mes "What, are you interested in the Mage guild? I didn't want to tell you this, but you don't belong here.";
-		next;
-		mes "[Mage Guildsman]";
-		mes "I am not sure why you're still standing in front of me, but I can tell that you're not meant to be a Mage.";
-		close;
-	}
-	if (Class == Job_Baby_Mage || Class == Job_Mage) {
-		mes "[Mage Guildsman]";
-		mes "Hey, haven't you realized? You're aleady a Mage, silly!";
-		next;
-		mes "[Mage Guildsman]";
-		mes "One of these days you'll realize the power inside of you when you can make Fire with your mind!";
-		close;
 	}
-	if ((Class != Job_Baby_Mage) && (Class != Job_Mage) && (Class != Job_Novice)) {
+	if(Class != Job_Novice) {
 		mes "[Mage Guildsman]";
-		mes "Hey~ C'mon. Quit playing games. You can't be a Mage because you already have another Job.";
+		if(Class == Job_Mage) {
+			mes "Hey, haven't you realized? You're already a Mage, silly!";
+			mes "One of these days you'll realize the power inside of you when you can make Fire with your mind!";
+		}else{
+			mes "Hey~ C'mon. Quit playing games. You can't be a Mage because you already have another Job.";
+		}
 		close;
-	}
-	if (Class == Job_Baby || Class == Job_Novice) {
+	}else{
 		mes "[Mage Guildsman]";
 		mes "Hey?";
 		next;
-		switch (select("I want to be a Mage.:Tell me the Requirements.:Pretty much nothing.")) {
+		switch(select("I want to be a Mage:What are the requirements to be a Mage?:Nothing, thanks.")) {
 		case 1:
 			mes "[Mage Guildsman]";
-			mes "Wanna be a Mage, eh?";
+			mes "Wanna be a Mage? Eh...";
 			next;
 			mes "[Mage Guildsman]";
-			if (Sex == 1) {
+			if (Sex) {
 				mes "Hey, look at you! You're kinda cute~! Not my type though...";
-			}
-			else {
+			}else{
 				mes "Oooh, you're such a hot babe~!";
 				mes "I like girls like you~";
 			}
 			mes "Right, you said that you wanna be a Mage?";
 			next;
-			switch (select("I want to be a Mage.:Pretty much nothing.")) {
-			case 1:
-				if (getskilllv("NV_BASIC") < 9) {
-					mes "[Mage Guildman]";
-					mes "Oh, what a bummer. You haven't met the requirements yet.";
-					next;
-					mes "[Mage Guildman]";
-					mes "Go back and reach Novice Job level 9 first. Don't forget that you also have to learn all of the Basic Skills before you come back.";
-					close;
-				}
-				mes "[Mage Guildsman]";
-				mes "Okay. Sign right there. Oh, you're very good at spelling.";
-				mes "So your name is... " + strcharinfo(0) + ".";
-				next;
-				mes "[Mage Guildsman]";
-				mes "Hmm I can see that you've worked very hard on your own.";
-				mes "Good! Always sticking to the basics is the best! I will transform you right away.";
-				next;
-				mes "[Mage Guildsman]";
-				mes "*Ahem*";
-				mes "Congratulations!";
-				mes "You are now a Mage!";
-				next;
-				skill 143,0,1;
-				if(Class == Job_Baby){
-					jobchange Job_Baby_Mage;
-				} else {
-					jobchange Job_Mage;
-				}
-				getitem 1639,1; //N_Rod
-				set Zeny, Zeny + 50;
-				mes "[Mage Guildsman]";
-				mes "'Welcome to My World~'";
-				mes "Heh heh, I just wanted to say that. You know, it's a quote from a well-known movie~";
-				next;
-				mes "[Mage Guildsman]";
-				mes "Now that you're a Mage just like us, let's be friends, okay?";
-				close;
-			case 2:
+			if(select("I want to be a Mage.:Nothing, thanks.") == 2) {
 				mes "[Mage Guildsman]";
 				mes "Whaaaaat~?! Right after you tell me that you wanna become a Mage, you change your mind?! Be a bit more decisive!";
 				close;
 			}
+			mes "[Mage Guildsman]";
+			if (getskilllv("NV_BASIC") < 9) {
+				mes "Oh, man your Basic Skill Level doesn't reach enough to be a Mage.";
+				mes "Go back and level up your Basic Skill.";
+				close;
+			}
+			mes "Alright.. sign the application form.... Wow~ you have good handwriting! Ahh, okay. That's enough.";
+			mes "You are... "+strcharinfo(0)+".";
+			next;
+			mes "[Mage Guildsman]";
+			mes "Hmm I can see that you've tried hard in your own way. Though it seems to be a little clumsy, but well I think it's okay!";
+			mes "Good! Always sticking to the basics is the best! I will transform you right away.";
+			next;
+			mes "[Mage Guildsman]";
+			mes "Hahh..! You are now a Mage, one of our colleagues!";
+			mes "We welcome you to the Mage Guild, our new friend!";
+			next;
+			mes "[Mage Guildsman]";
+			mes "'Welcome to the Mage Guild~'";
+			mes "Congratulations on becoming a member of the Mage Guild! Go for it!";
+			callfunc "Job_Change",Job_Mage;
+			getitem	1639,1; // N_Rod
+			close;
 		case 2:
 			mes "[Mage Guildsman]";
 			mes "Wanna be a Mage, eh?";
-			if (Sex == 1) {
-				mes "For a cutie like you, I'd be happy to explain the requirements!";
-			}
-			else {
-				mes "I'd be happy to explain the requirements for a pretty girl like you!";
-			}
+			mes "I'd be happy to explain the requirements for a pretty girl like you!";
 			next;
 			mes "[Mage Guildsman]";
-			mes "First of all, you have to reach Novice Job Level 10 and learn all of the Basic Skills. ";
+			mes "First of all, you have to reach Novice Job Level 10 and learn all of the Basic Skills.";
 			next;
 			mes "[Mage Guildsman]";
-			mes "In the past, there was a complicated potion mixing test. Because of that hard test, we slowly started to lose aplicants.";
-			mes "So, we decided to accept all aplicants who have the basic requirements.";
+			mes "In the past, there was a complicated potion making test. Because of that, we'd lost an aplicant slowly.";
+			mes "So, we decided to accept all aplicants who meet the basic requirements.";
 			next;
 			mes "[Mage Guildsman]";
-			mes "Let me know when you are ready to become a Mage, alright?";
+			mes "Don't hesitate. Just be a magician!";
 			close;
 		case 3:
 			mes "[Mage Guildsman]";
@@ -153,152 +129,3 @@ geffen_in,164,124,4	script	Mage Guildsman	123,{
 		}
 	}
 }
-
-geffen_in,164,112,4	script	Mixing machine	111,{
-	mes "- Out of Order !! -";
-	close;
-}
-
-pay_arche,122,100,0	script	Dollshoi	88,{
-	mes "[Mage Guildsman]";
-	mes "You want a Solution? Hmm, give me 50 Zeny and at least 1 Empty Test Tube.";
-	next;
-	switch (select("Alright, Deal.:Nah, forget it.")) {
-	case 1:
-		mes "[Mage Guildsman]";
-		if (Zeny < 50) {
-			mes "Hey! You don't have enough money to cover my 50 Zeny charge.";
-			close;
-		}
-		if (countitem(1092) == 0) {
-			mes "You can't carry solutions without a bottle! Bring me an Empty Test Tube.";
-			close;
-		}
-		delitem 1092,1; //Empty_Cylinder
-		set Zeny, Zeny - 50;
-		getitem 1089,1; //Payon_Potion
-		close;
-	case 2:
-		close;
-	}
-}
-
-moc_ruins,91,150,0	script	Ponka-Hontas	93,{
-	mes "[Mage Guildsman]";
-	mes "Would you like a Solution? Then please give me 50 Zeny and at least 1 Empty Testtube.";
-	next;
-	switch (select("Alright, Deal.:Nah, forget it.")) {
-	case 1:
-		mes "[Mage Guildsman]";
-		if (Zeny < 50) {
-			mes "I'm sorry, but you don't have enough money to cover the 50 Zeny fee.";
-			close;
-		}
-		if (countitem(1092) == 0) {
-			mes "You can't carry liquids without using a bottle. Bring an Empty Test Tube the next time you see me.";
-			close;
-		}
-		delitem 1092,1; //Empty_Cylinder
-		set Zeny, Zeny - 50;
-		getitem 1088,1; //Morocc_Potion
-		close;
-	case 2:
-		close;
-	}
-}
-
-geffen_in,177,112,4	script	Bookshelf	111,{
-	mes "[Guide Book]";
-	mes "This Guide Book is the property of the Geffen Mage Association. Please handle with care.";
-	next;
-	switch (select("Solution No. 1.:Solution No. 2.:Solution No. 3.:Solution No. 4.:Close.")) {
-	case 1:
-		mes "[Mage Test Solution No. 1]";
-		mes "* Ingredients List *";
-		mes "2 Jellopy";
-		mes "3 Fluff";
-		mes "1 Milk";
-		next;
-		mes "[Mage Test Solution No. 1]";
-		mes "* Solvent Agent *";
-		mes "Payon Solution";
-		mes "Where to Find:";
-		mes "A small spring in Payon, the Archer Village.";
-		next;
-		mes "[Mage Test Solution No. 1]";
-		mes "* Magic Power Serial Code *";
-		mes "8472";
-		next;
-		mes "[Mage Test Solution No. 1]";
-		mes "* Catalyst *";
-		mes "Yellow Gemstone";
-		mes "(Provided by";
-		mes "Mixing Machine)";
-		close;
-	case 2:
-		mes "[Mage Test Solution No. 2]";
-		mes "* Ingredients List *";
-		mes "3 Jellopy";
-		mes "1 Fluff";
-		mes "1 Milk";
-		next;
-		mes "[Mage Test Solution No. 2]";
-		mes "* Solvent Agent *";
-		mes "None";
-		next;
-		mes "[Mage Test Solution No. 2]";
-		mes "* Magic Power Serial Code *";
-		mes "3735";
-		next;
-		mes "[Mage Test Solution No. 2]";
-		mes "* Catalyst *";
-		mes "Red Gemstone";
-		mes "(Provided by";
-		mes "Mixing Machine)";
-		close;
-	case 3:
-		mes "[Mage Test Solution No. 3]";
-		mes "* Ingredients List *";
-		mes "6 Jellopy";
-		mes "1 Fluff";
-		next;
-		mes "[Mage Test Solution No. 3]";
-		mes "* Solvent Agent *";
-		mes "Payon Solution";
-		mes "Where to Find:";
-		mes "A small spring in Payon, the Archer Village.";
-		next;
-		mes "[Mage Test Solution No. 3]";
-		mes "* Magic Power Serial Code *";
-		mes "2750";
-		next;
-		mes "[Mage Test Solution No. 3]";
-		mes "* Catalyst *";
-		mes "Blue Gemstone";
-		mes "(Provided by";
-		mes "Mixing Machine)";
-		close;
-	case 4:
-		mes "[Mage Test Solution No. 4]";
-		mes "* Ingredients List *";
-		mes "2 Jellopy";
-		mes "3 Fluff";
-		next;
-		mes "[Mage Test Solution No. 4]";
-		mes "* Solvent Agent *";
-		mes "Morroc Solution";
-		mes "Where to Find:";
-		mes "A small spring near entrance of pyramid in Morroc.";
-		next;
-		mes "[Mage Test Solution No. 4]";
-		mes "* Magic Power Serial Code *";
-		mes "5429";
-		next;
-		mes "[Mage Test Solution No. 4]";
-		mes "* Catalyst *";
-		mes "1 carat Diamond";
-		mes "(Provided by";
-		mes "Mixing Machine)";
-		close;
-	}
-}
\ No newline at end of file
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
diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt
index ff87a1a05..6942c170b 100644
--- a/npc/pre-re/jobs/1-1/swordman.txt
+++ b/npc/pre-re/jobs/1-1/swordman.txt
@@ -3,90 +3,98 @@
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Job Change to Swordman Class
 //===== Additional Comments: ================================= 
 //= 1.0 First Version. [Kisuka]
-//= 1.1 Added Baby job change support. [Masao]
 //============================================================ 
-izlude_in,74,172,4	script	Swordman	119,{
+izlude_in,74,172,4	script	Swordman#swd	119,{
 	if (Upper == 1) {
-		if ((Class == Job_Novice_High) && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) {
-			mes "[Swordman Guildsman]";
+		if (Class == Job_Novice_High && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) {
+			mes "[Swordman]";
 			mes "It...";
 			mes "Can't be...";
 			mes "You've been reborn, haven't you?";
 			next;
-			mes "[Swordman Guildsman]";
+			mes "[Swordman]";
 			mes "I see you're retreading the path of the Swordman! Once you've gotten used to brandishing a sword, you can never go back!!";
 			next;
 			if (getskilllv("NV_BASIC") < 9) {
-				mes "[Swordman Guildsman]";
+				mes "[Swordman]";
 				mes "Hmm? Ah, you must first master the Basic Skills before you are ready to become a Swordman.";
 				next;
-				mes "[Swordman Guildsman]";
+				mes "[Swordman]";
 				mes "Come back to me when you have finished learning the Basic Novice Skills.";
 				close;
 			}
-			mes "[Swordman Guildsman]";
+			mes "[Swordman]";
 			mes "Excellent! Let me promote you to a Swordman right away!";
 			next;
-			skill 143,0,1;
+			skill 143,0,0;
 			jobchange Job_Swordman_High;
 			skill 144,1,0;
 			skill 145,1,0;
 			skill 146,1,0;
-			mes "[Swordman Guildsman]";
+			mes "[Swordman]";
 			mes "Hmm... You look like a well-experienced Swordman. Still, I'm sure that you must train to improve your skills and gain strength!";
 			close;
+		}else{
+			mes "[Swordman]";
+			mes "Hm...?";
+			mes "You're a reborn";
+			mes "warrior, aren't you?";
+			next;
+			mes "[Swordman]";
+			mes "Hmmm...";
+			mes "It seems that being";
+			mes "a Swordman is not part";
+			mes "of your destiny. I'm sorry,";
+			mes "but it seems there is nothing";
+			mes "I can do for you.";
+			close;
 		}
-		mes "[Swordman Guildsman]";
-		mes "Hm...?";
-		mes "You're a reborn";
-		mes "warrior, aren't you?";
-		next;
-		mes "[Swordman Guildsman]";
-		mes "Hmmm...";
-		mes "It seems that being";
-		mes "a Swordman is not part";
-		mes "of your destiny. I'm sorry,";
-		mes "but it seems there is nothing";
-		mes "I can do for you.";
-		close;
 	}
 	mes "[Swordman Guildsman]";
-	mes "Welcome to the";
-	mes "Swordman Association!";
-	next;
-	mes "[Swordman Guildsman]";
-	mes "So...";
-	mes "What business";
-	mes "brings you to us?";
+	mes "This is the Swordman Guild.";
+	mes "Why are you here?";
 	next;
-	switch (select("Tell me about being a Swordman.:I want to be a Swordman.:Cancel.")) {
+	switch(select("Tell me about being a Swordman.:I want to be a Swordman.:Nothing.")) {
 	case 1:
 		mes "[Swordman Guildsman]";
-		mes "So you wish to know more about the mighty Swordman job? Well, then...";
+		mes "So you wish to know more about the mighty Swordman? Okay!";
 		next;
 		mes "[Swordman Guildsman]";
-		mes "Amongst the First Class jobs, the Swordman is the best melee fighter for three reasons.";
-		mes "There are 3 reasons why Swordy is the best to approch a fight!";
+		mes "The most distinctive feature of the Swordman is that the Swordman can show us his/her real abilities in close combat.";
+		mes "There are three reasons!";
 		next;
 		mes "[Swordman Guildsman]";
-		mes "First, Swordman has the benefit of additional HP. Second, Swordman generally have access to a wider selection fo weapons than the other First Class jobs.";
+		mes "First, Swordman has higher HP than other jobs.";
+		mes "Second, except for Bows and Rods, Swordman can use all other weapons so they can fight at their optimal ability.";
+		mes "And third, most of the skills of the Swordman give powerful physical attacks.";
 		next;
 		mes "[Swordman Guildsman]";
-		mes "And third, most of the Swordman skills are crushing physical attacks! In my opinion, being a Swordman is the best job ever!";
+		mes "Though I gave you a simple explanation, I believe you understand the core meaning of what it is to be a Swordman.";
+		mes "In my opinion, Swordman is the best job ever!";
 		close;
 	case 2:
-		if (Class == Job_Baby || Class == Job_Novice) {
+		if(Class != Job_Novice) {
+			mes "[Swordman Guildsman]";
+			if(Class == Job_Swordman) {
+				mes "You are already an excellent Swordman, aren't you?";
+				mes "Just devote yourself to be a great Swordman.";
+			}else{
+				mes "You already have one of the other jobs, don't you?";
+				mes "You've gone too far with that joke.";
+			}
+			close;
+		}else{
 			if (getskilllv("NV_BASIC") < 9) {
 				mes "[Swordman Guildsman]";
-				mes "I'm sorry to tell you this but to be a Swordman, you must reach at least ^4d4dffJob Level 10^000000.";
-				mes "and ^4d4dffBasic Skill Level 9^000000.";
+				mes "I'm sorry to tell you this but to be a Swordman, you must reach at least ^4A4AFFJob Level 10^000000.";
+				mes "and ^4A4AFFBasic Skill Level 9^000000.";
 				next;
 				mes "[Swordman Guildsman]";
 				mes "Want to be a Swordman without having the minimum requirement?";
@@ -97,43 +105,23 @@ izlude_in,74,172,4	script	Swordman	119,{
 			mes "Hmm, both your Job Level and Basic Skill Level check out.";
 			mes "Good. Do you want to be a Swordman right away?";
 			next;
-			switch (select("Yes, I do.:I'll consider it again.")) {
-			case 1:
-				mes "[Swordman Guildsman]";
-				mes "Congratulations! From now on, you are going to live a Swordman's life!";
-				mes "I will transform you right away!";
-				next;
-				skill 143,0,1;
-				if(Class == Job_Baby){
-					jobchange Job_Baby_Swordman;
-				} else {
-					jobchange Job_Swordman;
-				}
-				set job_sword_q,0;
-				getitem 13415,1; //N_Falchion
-				mes "[Swordman Guildsman]";
-				mes "Congratulations again for becomming a Swordman and I hope that you participate in many activities for the revival of our guild.";
-				close;
-			case 2:
+			if(select("Yes, I do.:I'll consider it again.") == 2) {
 				mes "[Swordman Guildsman]";
-				mes "Yeah. Careful consideration is needed for choosing a job.";
-				mes "But I feel sorry... that you'll have to consider it again after all the trials....";
+				mes "Yeah. Prudent decision is needed for choosing a job.";
+				mes "But I feel sorry... that you consider it again after overcoming all the hardships....";
 				close;
 			}
-		}
-		if (Class == Job_Baby_Swordman || Class == Job_Swordman || Class == Job_Swordman) {
 			mes "[Swordman Guildsman]";
-			mes "You are already an excellent Swordman, aren't you?";
-			mes "Just devote yourself to be a great Swordman.";
+			mes "Congratulations! From now on, you are going to live a Swordman's life!";
+			mes "Let's do it right now!";
+			next;
+			mes "[Swordman Guildsman]";
+			mes "Congratulations again for being a Swordman and I hope that you participate in many activities for the revival of our guild.";
+			callfunc "Job_Change",Job_Swordman;
+			getitem 13415,1; // N_Falchion
 			close;
 		}
-		mes "[Swordman Guildsman]";
-		mes "Haha! Oh boy. I'm flattered, but you already have another job! Still, I can't blame you...";
-		close;
 	case 3:
-		mes "[Swordman Guildsman]";
-		mes "Ha ha ha!";
-		mes "Ah, youth!";
 		close;
 	}
-}
\ No newline at end of file
+}
diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt
index 14f9cae71..8d7e452f3 100644
--- a/npc/pre-re/jobs/1-1/thief.txt
+++ b/npc/pre-re/jobs/1-1/thief.txt
@@ -3,31 +3,30 @@
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= Job Change to Thief Class
 //===== Additional Comments: ================================= 
 //= 1.0 First Version. [Kisuka]
-//= 1.1 Added Baby job change support. [Masao]
 //============================================================ 
-moc_prydb1,39,129,2	script	Thief Guildsman	69,{
+moc_prydb1,39,129,2	script	Thief Guide#thief	69,{
 	if (Upper == 1) {
 		if (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker) {
 			if (Class == Job_Novice_High) {
-				mes "[Thief Guildsman]";
+				mes "[Thief Guide]";
 				mes "Huh? Do I know you? It's creepy that you seem so familiar. You don't have a twin, do you?";
 				next;
 				if (getskilllv("NV_BASIC") < 9) {
-					mes "[Thief Guildsman]";
+					mes "[Thief Guide]";
 					mes "What, do you want to be a Thief? I'm sorry, but you look like you need more training.";
 					next;
-					mes "[Thief Guildsman]";
+					mes "[Thief Guide]";
 					mes "Take your time and learn all the Basic Skills, will you? Well then, see you later~!";
 					close;
 				}
-				mes "[Thief Guildsman]";
+				mes "[Thief Guide]";
 				mes "Well, I got this feeling like you've been through a lifetime of fighting, so I'm promoting you to a Thief right this minute. I better give you tough guys what you want...";
 				next;
 				skill 143,0,0;
@@ -36,297 +35,173 @@ moc_prydb1,39,129,2	script	Thief Guildsman	69,{
 				skill 150,1,0;
 				skill 151,1,0;
 				skill 152,1,0;
-				mes "[Thief Guildsman]";
+				mes "[Thief Guide]";
 				mes "Since you've become a Thief, live as a Thief. Now, go for it! Next~";
 				close;
+			}else{
+				mes "[Thief Guide]";
+				if (sex)
+					mes "Hey, dude.";
+				else
+					mes "Hey, baby~";
+				close;
 			}
-			mes "[Thief Guildsman]";
-			if (Sex == 1) {
+		}else{
+			mes "[Thief Guide]";
+			if (sex)
 				mes "Hey, dude.";
-			} else {
-				mes "Hey, baby~";
-			}
+			else
+				mes "Hey, baby.";
+			mes "...Hey! You look too goody-goody to want to be a Thief!! Now scram, I'm busy. Next!";
 			close;
 		}
-		mes "[Thief Guildsman]";
-		if (Sex == 1) {
-			mes "Hey, dude.";
-		} else {
-			mes "Hey, baby~";
-		}
-		mes "...Hey! You look too goody-goody to want to be a Thief!! Now scram, I'm busy. Next!";
-		close;
 	}
-	if (Class == Job_Baby_Thief || Class == Job_Thief || Class == Job_Thief_High) {
+	if(q_job_thief == 1) {
 		mes "[Thief Guildsman]";
-		mes "Hey~ if you have any trouble, get it out to me anytime, huh?";
+		mes "Ehh... Seems like a beloved "+(Sex?"son":"daughter")+" of a rich family, but why are you here in this dirty place?";
+		next;
+		mes "[Thief Guildsman]";
+		mes "Well, I'm not in charge of making you a Thief. I just accept applications, get it?";
+		mes "If you want to become a Thief, ask the sharp-eyed guy next to me.";
 		close;
 	}
-	if ((Class != Job_Baby) && (Class != Job_Novice) && (Class != Job_Baby_Thief) && (Class != Job_Thief)) {
-		mes "[Thief Guildsman]";
-		mes "What the heck...?";
-		switch (Class) {
-		case Job_Swordman:
-			mes "Huh.";
-			mes "Now, that's";
-			mes "a big sword.";
-			next;
+	if(Class != Job_Novice) {
+		if(Class == Job_Thief) {
 			mes "[Thief Guildsman]";
-			mes "So...";
-			mes "Trying to make";
-			mes "up for something";
-			mes "...Buddy?";
+			mes "Hey~ if you have any trouble, get it out to me anytime, huh?";
 			close;
-		case Job_Mage:
-			mes "What's a Mage doin' here? Shouldn't you be doing card tricks elsewhere? Oh well, it's a free country...";
-			next;
-			mes "[Thief Guildsman]";
-			mes "Oh wait,";
-			mes "it's not...";
-			mes "Get outta here!";
-			close;
-		case Job_Archer:
-			mes "Man, shouldn't you";
-			mes "Archers be playing";
-			mes "in the forest";
-			mes "or something?";
-			close;
-		case Job_Merchant:
-			mes "You're a Merchant,";
-			mes "right? Why are you";
-			mes "walking into a den";
-			mes "of Thieves?!";
-			next;
-			mes "[Thief Guildsman]";
-			mes "It's like you're begging";
-			mes "us to steal from you!";
-			mes "Come on, hurry and";
-			mes "get outta here~";
-			close;
-		case Job_Acolyte:
-			mes "You know we all steal for a living, right? What are you doing in this kinda place, Acolyte?";
-			close;
-		case Job_Assassin:
-			mes "Didn't you use to be one of us?! Man, you changed. You seem real dangerous now...";
-			close;
-			close;
-		case Job_Rogue:
-			mes "Man, you got real cool all of a sudden! You must have some skills I can only dream of!";
-			close;
-			close;
-		case Job_Priest:
-			mes "Oh my God...";
-			mes "Am I dying?";
-			next;
-			mes "[Thief Guildsman]";
-			mes "Why else would a Priest come here? I guess I better start confessing all of my misdeeds.";
-			close;
-		}
-		next;
-		if (Sex == 1) {
-			mes "Hey, dude.";
-		}
-		else {
-			mes "Hey, baby~";
-		}
-		mes "...Hey! You look too goody-goody to want to be a Thief!! Now scram, I'm busy. Next!";
-		close;
-	}
-	if (Class == Job_Baby || Class == Job_Novice) {
-		mes "[Thief Guildsman]";
-		if (Sex == 1) {
-			mes "Ehh... Seems like a beloved son of a rich family, but why are you here in this dirty place?";
-		}
-		else {
-			mes "Ehh... Seems like a beloved daughter of a rich family, but why are you here in this dirty place?";
-		}
-		next;
-		switch (select("I want to be a Thief.:Nothing.")) {
-		case 1:
-			if (THF_Q == 0) {
+		}else{
+			if(Sex) {
 				mes "[Thief Guildsman]";
-				mes "Well, are you that proud of it? You're telling me so proudly that you want to be a Thief! Why don't you go to all the villages and advertise yourself for being a thief?";
-				mes "'Ha ha ha! Go put up a banner that says 'I will be a proud thief who steals other people's stuff.'";
+				mes "What the heck...?";
+				mes "Huh.. you are a "+jobname(Class)+" blockhead...!";
 				next;
 				mes "[Thief Guildsman]";
-				mes "Do you want to be a thief so badly?";
-				next;
-				switch (select("Yes.:No.:How about you?")) {
-				case 1:
-					mes "[Thief Guildsman]";
-					mes "Well, are you that proud of it? You're telling me so proudly that you want to be a Thief! Why don't you go to all the villages and advertise yourself for being a thief?";
-					mes "'Ha ha ha! Go put up a banner that says 'I will be a proud thief who steals other people's stuff.'";
-					next;
-					break;
-				case 2:
-					mes "[Thief Guildsman]";
-					mes "Then why are you here? Do you think you can become a thief so easily?";
-					next;
-					break;
-				case 3:
-					mes "[Thief Guildsman]";
-					mes "Eh..? me? me?";
-					mes "Well... I just fit well to being a thief... characteristically... I don't mind this silly matter.";
-					next;
-					break;
-				}
+				mes "Hey, brother.";
+				mes "Why are you here? Go back to your place~ go back~~";
+				close;
+			}else{
 				mes "[Thief Guildsman]";
-				mes "Anyway, in the outside world, never say that you want to be a Thief!!";
+				mes "What the heck...?";
 				next;
 				mes "[Thief Guildsman]";
-				mes "So, do you want to apply for being a Thief?";
-				next;
-				switch (select("Yes, I do.:No.")) {
-				case 1:
-					mes "[Thief Guildsman]";
-					mes "Alright, tell me your name. Huh? What?";
-					mes "" + strcharinfo(0) + ". " + strcharinfo(0) + ", right...?";
-					next;
-					if (getskilllv("NV_BASIC") < 9) {
-						mes "[Thief Guildsman]";
-						mes "I can see your strong will to become a Thief......";
-						mes "But only with your will, you cannot make it in a real fight, can you? So go and reach at least Basic Skill Level 9.";
-						close;
-					}
-					mes "[Thief Guildsman]";
-					mes "Alright. I looked at your Felony Record, and you seem to have a very interesting history. You might have what it takes to be a Thief.";
-					mes "" + strcharinfo(0) + ". I now decree that you have passed this interview. Good work!";
-					set THF_Q,1;
-					next;
-					mes "[Thief Guildsman]";
-					mes "Well, I'm not in charge of making you a Thief. I just accept applications, get it?";
-					mes "If you want to become a Thief, ask the guy next to me.";
-					close;
-				case 2:
-					mes "[Thief Guildsman]";
-					mes "Well... do what you want to do~ Go your way~";
-					close;
-				}
-			}
-			if (THF_Q == 1) {
-				mes "[Thief Guildsman]";
-				mes "Well, I'm not in charge of making you a Thief. I just accept applications, get it?";
-				mes " If you want to become a Thief, ask the sharp-eyed guy next to me.";
+				mes "Hey, lady.";
+				mes "Why are you here? Go back to your place~ go back~~";
 				close;
 			}
-			mes "[Thief Guildsman]";
-			mes "Oh, before I let you go... ...did you take any mushrooms?";
-			mes "... ...It was a joke.";
-			mes "You don't need to do a test, and if you want to jobchange, you can do it directly.";
-			next;
-			mes "[Thief Guildsman]";
-			mes "In short it was just a joke.";
-			mes "Ha ha ha ha ha!!";
-			close;
-		case 2:
-			mes "[Thief Guildsman]";
-			mes "You know you cannot be a thief without an application.....";
-			mes "What's on your mind..?";
-			close;
 		}
 	}
-}
-
-moc_prydb1,42,133,2	script	Comrade	118,{
-	if (Class == Job_Baby_Thief || Class == Job_Thief || Class == Job_Thief_High) {
-		mes "[Brad]";
-		mes "I don't have any special events now. So go on your way and come back later.";
+	mes "[Thief Guildsman]";
+	mes "Ehh... Seems like a beloved "+(Sex?"son":"daughter")+" of a rich family, but why are you here in this dirty place?";
+	next;
+	if(select("I want to be a Thief.:Nothing.") == 2) {
+		mes "[Thief Guildsman]";
+		mes "You know you cannot be a thief without an application.....";
+		mes "What's on your mind..?";
 		close;
 	}
-	if ((Class != Job_Baby) && (Class != Job_Novice) && (Class != Job_Baby_Thief) && (Class != Job_Thief)) {
-		mes "[Comrade]";
-		mes "Um...";
-		mes "You don't look";
-		mes "like a Thief.";
+	mes "[Thief Guildsman]";
+	mes "Well, are you that proud of it?";
+	mes "You're telling me so proudly that you want to be a Thief! Why don't you go to all the villages and advertise yourself for being a thief?";
+	mes "'Ha ha ha! Go put up a banner that says 'I will be a proud thief who steals other people's stuff.'";
+	next;
+	mes "[Thief Guildsman]";
+	mes "Do you want to be a thief so badly?";
+	next;
+	switch(select("Yes.:No.:How about you?")) {
+	case 1:
+		mes "[Thief Guildsman]";
+		mes "Oh, do you...? Huh.. well... I do live and learn to see strange people like you.";
 		next;
-		mes "[Comrade]";
-		mes "What the heck are";
-		mes "you doing here anyway?";
+		break;
+	case 2:
+		mes "[Thief Guildsman]";
+		mes "Then why are you here? Do you think you can become a thief so easily?";
+		next;
+		break;
+	case 3:
+		mes "[Thief Guildsman]";
+		mes "Eh..? me? me?";
+		mes "Well... I just fit well to being a thief... characteristically... I don't mind this silly matter.";
+		next;
+		break;
+	}
+	mes "[Thief Guildsman]";
+	mes "Anyway, in the outside world, never say that you want to be a Thief!!";
+	next;
+	mes "[Thief Guildsman]";
+	mes "So, do you want to apply for being a Thief?";
+	next;
+	if(select("Yes, I do.:No.") == 2) {
+		mes "[Thief Guildsman]";
+		mes "Well... do what you want to do~ Go your way~";
 		close;
 	}
-	if (THF_Q == 0) {
-		mes "[Comrade]";
-		mes "What's the matter? If you want to be a Thief, speak to the woman beside me.";
+	mes "[Thief Guildsman]";
+	mes "Alright, tell me your name. Huh? What?";
+	mes ""+strcharinfo(0)+". So "+strcharinfo(0)+", right...?";
+	next;
+	if (getskilllv("NV_BASIC") < 9) {
+		mes "[Thief Guildsman]";
+		mes "I can see your strong will to become a Thief......";
+		mes "But only with your will, you cannot make it in a real fight, can you?";
+		mes "So go and reach at least Basic Skill Level 9.";
 		close;
 	}
-	if (THF_Q == 1) {
+	mes "[Thief Guildsman]";
+	mes "Hmm.... I found your interesting criminal records from the data of the detective agency. Well you seem to have what it takes to be a good thief.";
+	mes ""+strcharinfo(0)+". I now declare that you have passed the job interview!";
+	next;
+	mes "[Thief Guildsman]";
+	mes "Well, I'm not in charge of making you a Thief. I just accept applications, get it?";
+	mes "If you want to become a Thief, ask the guy next to me.";
+	set q_job_thief,1;
+	close;
+}
+
+moc_prydb1,42,133,2	script	Thief Guildsman#thief	118,{
+	if(q_job_thief == 1) {
 		mes "[Thief Guildsman]";
 		mes "Alright. You must have passed the job interview, huh?";
 		mes "Good. I'll accept you.";
 		mes "Let's begin the job-changing ceremony of our guild!";
 		next;
-		mes "[Leader of Thief Guild 'E']";
-		mes "" + strcharinfo(0) + "...";
-		mes "'For those who are ready, the moonlight shall open the way. You are now one of us.'";
-		skill 143,0,1;
-		if(Class == Job_Baby){
-			jobchange Job_Baby_Thief;
-		} else {
-			jobchange Job_Thief;
-		}
-		getitem 13041,1; //N_Main_Gauche
-		erasequest 1013;
+		mes "[Commander of Thief Guild]";
+		mes "'"+strcharinfo(0)+".'";
+		mes "'For those who are ready, the moonlight shall open the way. Now you are fully ready, I now officially allow you to become a member of the Thief Guild.'";
+		jobchange Job_Thief;
+		set q_job_thief,0;
+		getitem 13041,1; // N_Main_Gauche
 		next;
-		mes "[Leader of Thief Guild 'E']";
-		mes "'Congratulations on becoming a Thief!'";
-		mes "'From now, be an honorable representative of the Thief's Guild.'";
-		mes "'If you bring disgrace to our guild, you will be killed.'";
-		mes "'Anyway, I expect you to be a great Thief.'";
+		mes "[Commander of Thief Guild]";
+		mes "'Congratulations on becoming a Thief.'";
+		mes "'From now on, keep the rules of our guild and be an honorable member.'";
+		mes "'If you bring us any disgrace by breaking our rules, you better watch your back.'";
+		mes "'Anyway, I expect you to be a great thief.'";
 		next;
 		mes "[Brad]";
-		mes "*Ahem* Welcome to the Guild, comrade!";
-		mes "I'm Brad, and I'm in charge of human resources here.";
+		mes "Heee~Yaaaa~! Congratulations! My friend.";
+		mes "My name is 'Brad'. I'm in charge of human resources here.";
 		mes "I'm not sure for now but you'll have more chances to see me later on.";
 		next;
 		mes "[Brad]";
-		mes "Okay, I've done what I can do to you, so go on your way. I'm a quite busy man.";
-		mes "Alright then, I'll see you around~";
-		close;
-	}
-}
-
-moc_ruins,141,125,3	script	Mr. Irrelevant	83,{
-	if (Class == Job_Baby_Thief || Class == Job_Thief) {
-		mes "[Mr. Irrelevant]";
-		mes "Ah, I see that you are now a Thief. I always knew you'd join us.";
-		next;
-		mes "[Mr. Irrelevant]";
-		mes "Why don't you leave this place?";
+		mes "Okay, I've done what I can do to you, so go on your way. I'm quite a busy man.";
+		mes "See you again.";
 		close;
 	}
-	if ((Class != Job_Baby) && (Class != Job_Novice) && (Class != Job_Baby_Thief) && (Class != Job_Thief)) {
-		set .@rand,rand(1,5);
-		switch(.@rand){
-			mes "[Mr. Irrelevant]";
-		case 1:
-			mes "Today looks like a good day to go to the pyramids and hunt with some of my friends.";
-			close;
-		case 2:
-			mes "I could use a good, hard drink.";
-			close;
-		case 3:
-			mes "Gimme your money.";
-			next;
-			mes "[Mr. Irrelevant]";
-			mes "Kidding, I'm off the clock.";
-			close;
-		case 4:
-			mes "WHO YOU CALLING A PSYCHO?!?!";
-			close;
-		case 5:
-			mes "I've got nothing to say to you. Would you mind leaving me alone?";
-			close;
+	if(Class != Job_Novice) {
+		if(Class == Job_Thief) {
+			mes "[Brad]";
+			mes "I don't have any special events now. So go on your way and come back later.";
+		}else{
+			mes "[Thief Guildsman]";
+			mes "Hey~ Hey~ You're not a novice or a thief!";
+			mes "What are you doing here? You're not welcome to make this place your home~ Hweeeee~ Get outta here~";
 		}
-	}
-	if (THF_Q == 1) {
-		mes "[Mr. Irrelevant]";
-		mes "There is this strange smell coming from... You. Now why would that be?";
 		close;
 	}
-	mes "[Mr. Irrelevant]";
-	mes "Hey Novice! Why don't you join the ranks of the Thief Guild? You newbies are always welcome to join us and our selfish cause.";
-	next;
-	mes "[Mr. Irrelevant]";
-	mes "You can get more information in the Underground Room in the Pyramid 1 BF.";
+	mes "[Thief Guildsman]";
+	mes "Ho? Why is a novice like you visiting here?";
+	mes "If you are here to be a Thief, ask the nasty-tempered lady right next to me.";
 	close;
 }