Okie ladies and gentleman if this commit breaks anything it's jman's and maki's fault, yes, blame them.

Fixing pre-re / re npc support, moving /config/ folder to src root so other servers may also make use of the #define renewal dir and other stuff.

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

6 files changed, 1053 insertions, 0 deletions

diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt
new file mode 100644
index 000000000..a200ec514
--- /dev/null
+++ b/npc/pre-re/jobs/1-1/acolyte.txt
@@ -0,0 +1,334 @@
+//===== rAthena Script ======================================= 
+//= Renewal Acolyte Job Change
+//===== By: ================================================== 
+//= Kisuka
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Job Change to Acolyte Class
+//===== Additional Comments: ================================= 
+//= 1.0 First Version. [Kisuka]
+//= 1.1 Added back the npcs used for the priest quest.
+//============================================================ 
+prt_church,184,41,4	script	Cleric#aco	60,{
+	if (Upper == 1) {
+		if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) {
+			if (Class == Job_Novice_High) {
+				mes "[Father Mareusis]";
+				mes "Ah, I sense you have endured";
+				mes "a past life experience. You must have learned many things before entering Valhalla.";
+				next;
+				if (getskilllv("NV_BASIC") < 9) {
+					mes "[Father Mareusis]";
+					mes "Unfortunately, I don't think you're ready to become an Acolyte yet. Please finish learning all of the Basic Skills first.";
+					next;
+					mes "[Father Mareusis]";
+					mes "In the meantime,";
+					mes "I will wait until";
+					mes "you are ready.";
+					mes "May God be";
+					mes "with you.";
+					close;
+				}
+				mes "[Father Mareusis]";
+				mes "Well, I welcome you";
+				mes "back from Valhalla and";
+				mes "wish you luck on your";
+				mes "new life's journey.";
+				next;
+				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 "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("Change your job to acolyte.:Ask the requirements to be an acolyte.:Quit it.")) {
+	case 1:
+		if(Class != Job_Novice) {
+			mes "[Father Mareusis]";
+			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;
+		}else{
+			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 "[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 "Hmm... your job level is enough...";
+			mes "Good. Now I will give you the qualification to become an Acolyte.";
+			next;
+			mes "[Father Mareusis]";
+			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;
+		}
+	case 2:
+		mes "[Father Mareusis]";
+		mes "Do you wish to become an Acolyte?";
+		mes "Then, you must fulfill the following requirements thinking those are the practices given by God.";
+		next;
+		mes "[Father Mareusis]";
+		mes "First, you have to reach at least Novice Job Level 9 and learn all of the Basic Skills.";
+		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, 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;
+	}
+}
+
+prt_fild03,365,255,2	script	Ascetic#aco	89,{
+	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 (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]";
+				mes "Now, your name was " + strcharinfo(0) + ", right? Excellent, thank you for visiting me.";
+				next;
+				mes "[Father Rubalkabara]";
+				mes "I believe you've been told much about Acolytes from Friar Mareusis. Plus, there's plenty of helpful people in the Prontera Sanctuary.";
+				next;
+				mes "[Father Rubalkabara]";
+				mes "I guess there's really no need for me to teach you much. Besides, I'm sure your someone from your generation may have trouble listening to an old man like me. Hahaha~";
+				next;
+				mes "[Father Rubalkabara]";
+				mes "Still, lessons may come from the places you'd least expect. God loves to teach his children in strange ways. You'll see.";
+				next;
+				mes "[Father Rubalkabara]";
+				mes "Well, I'll send the message telling them that you've come to visit me. So, you may now return to the Prontera Sanctuary.";
+				next;
+				mes "[Father Rubalkabara]";
+				mes "Farewell.";
+				close2;
+				savepoint "prt_fild03",361,255;
+				set job_acolyte_q,6;
+				end;
+			}
+			else {
+				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;
+			}
+		}
+		else {
+			mes "Huh? What brings you here? This is a very dangerous place for a Novice like yourself!";
+			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;
+		}
+	}
+}
+
+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 Mathilda]";
+			mes "I will pray to God, and hope that you become an Acolyte soon.";
+			close;
+		}
+		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 Mathilda]";
+				mes "What is your name? " + strcharinfo(0) + "? Let's see... Ah, you're on my list.";
+				next;
+				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 Mathilda]";
+				mes "Please return to the Prontera Sanctuary and speak to the Priest in charge.";
+				close2;
+				savepoint "moc_fild07",35,355;
+				set job_acolyte_q,7;
+				end;
+			}
+			else {
+				mes "Ah...!";
+				mes "You must be one";
+				mes "of the Acolyte applicants.";
+				mes "I sincerely welcome you.";
+				next;
+				mes "[Mother Mathilda]";
+				mes "Now, what is your name?";
+				mes "" + strcharinfo(0) + "? Let's see...";
+				next;
+				mes "[Mother Mathilda]";
+				mes "Hmm...";
+				mes "It seems your name";
+				mes "is not on my list...";
+				next;
+				mes "[Mother Mathilda]";
+				mes "Perhaps you should return to the Prontera Sanctuary and check the destination for your penance trial once again.";
+				close;
+			}
+		}
+		else {
+			mes "...";
+			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;
+		}
+	}
+}
+
+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 (job_acolyte_q != 0) {
+			if (job_acolyte_q == 4) {
+				mes "Hey.";
+				mes "Whatever you are,";
+				mes "you look like an";
+				mes "Acolyte applicant.";
+				mes "Right?";
+				next;
+				mes "[Father Yosuke]";
+				mes "Not bad, not bad. You withstood the penance trial pretty well.";
+				mes "So what's your name?";
+				next;
+				mes "[Father Yosuke]";
+				mes "" + strcharinfo(0) + ", huh?";
+				next;
+				mes "[Father Yosuke]";
+				mes "Okay. I'll send a message to the Sanctuary that you, " + strcharinfo(0) + ", came to visit me.";
+				next;
+				mes "[Father Yosuke]";
+				mes "Now go back to the Santuary and finish becoming an Acolyte, kid.";
+				close2;
+				savepoint "prt_fild00",206,230;
+				set job_acolyte_q,8;
+				end;
+			}
+			else {
+				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;
+			}
+		}
+		else {
+			mes "You...";
+			mes "Novice.";
+			mes "There something";
+			mes "you wanna tell me?";
+			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;
+		}
+	}
+}
+
diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt
new file mode 100644
index 000000000..46325309c
--- /dev/null
+++ b/npc/pre-re/jobs/1-1/archer.txt
@@ -0,0 +1,129 @@
+//===== rAthena Script ======================================= 
+//= Renewal Archer Job Change
+//===== By: ================================================== 
+//= Kisuka
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Job Change to Archer Class
+//===== Additional Comments: ================================= 
+//= 1.0 First Version. [Kisuka]
+//============================================================ 
+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)) {
+			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";
+			mes "to Valhalla and been reborn.";
+			mes "Wow, that's so impressive!";
+			next;
+			if (getskilllv("NV_BASIC") < 9) {
+				mes "[Archer Guildsman]";
+				mes "Err...";
+				mes "You'd better learn all the Basic Skills first before you can become an Archer.";
+				next;
+				mes "[Archer Guildsman]";
+				mes "Alright, see you later.";
+				close;
+			}
+			mes "[Archer Guildsman]";
+			mes "Well then. I don't";
+			mes "need to say anything else.";
+			mes "I know you'll make a great Archer...";
+			next;
+			skill 143,0,0;
+			jobchange Job_Archer_high;
+			skill 147,1,0;
+			skill 148,1,0;
+			mes "[Archer Guildsman]";
+			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 "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.")) {
+	case 1:
+		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?";
+			next;
+			if (getskilllv("NV_BASIC") < 9) {
+				mes "[Archer Guildsman]";
+				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 extremely high concentration, so we do not accept those who have little patience.";
+				close;
+			}
+			mes "[Archer Guildsman]";
+			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;
+			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!";
+			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 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;
+		}
+	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, 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, 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 "^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;
+	}
+}
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
new file mode 100644
index 000000000..99cca81c4
--- /dev/null
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -0,0 +1,131 @@
+//===== rAthena Script ======================================= 
+//= Renewal Mage Job Change
+//===== By: ================================================== 
+//= Kisuka
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Job Change to Mage Class
+//===== Additional Comments: ================================= 
+//= 1.0 First Version. [Kisuka]
+//============================================================ 
+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) {
+				mes "[Mage Guildsman]";
+				mes "Whoa, long time no see! But weren't you supposed to be dead?";
+				next;
+				mes "[Mage Guildsman]";
+				mes "Ah, you must have been reborn. Well, I'm glad to have you back.";
+				next;
+				if (getskilllv("NV_BASIC") < 9) {
+					mes "[Mage Guildsman]";
+					mes "I'm sorry, but I don't think you're ready to learn magic yet. Why don't you go finish learning the Basic Skills first?";
+					next;
+					mes "[Mage Guildsman]";
+					mes "Take your time. The more you learn, the more ready you'll be to learn magic again.";
+					close;
+				}
+				mes "[Mage Guildsman]";
+				mes "Well, since you have passed the Mage test once, I will not question your qualification. You want to have your magic skills back immediately, don't you?";
+				next;
+				skill 143,0,0;
+				jobchange Job_Mage_High;
+				skill 157,1,0;
+				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 "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_Novice) {
+		mes "[Mage Guildsman]";
+		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;
+	}else{
+		mes "[Mage Guildsman]";
+		mes "Hey?";
+		next;
+		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...";
+			next;
+			mes "[Mage Guildsman]";
+			if (Sex) {
+				mes "Hey, look at you! You're kinda cute~! Not my type though...";
+			}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;
+			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?";
+			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.";
+			next;
+			mes "[Mage Guildsman]";
+			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 "Don't hesitate. Just be a magician!";
+			close;
+		case 3:
+			mes "[Mage Guildsman]";
+			mes "Nothing...?";
+			close;
+		}
+	}
+}
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
new file mode 100644
index 000000000..4b7e091f0
--- /dev/null
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -0,0 +1,125 @@
+//===== rAthena Script ======================================= 
+//= Renewal Merchant Job Change
+//===== By: ================================================== 
+//= Kisuka
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Job Change to Merchant Class
+//===== Additional Comments: ================================= 
+//= 1.0 First Version. [Kisuka]
+//============================================================ 
+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 "Long time no see!";
+			mes "Hey, you didn't quit";
+			mes "your business, did you?";
+			mes "What happened?";
+			next;
+			mes "[Chief Mahnsoo]";
+			mes "Whoa...";
+			mes "You've actually been to Valhalla?! Wow, you've come a long way...";
+			next;
+			if (getskilllv("NV_BASIC") < 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 "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;
+		}else{
+			mes "[Chief Mahnsoo]";
+			mes "^333333*Sigh*^000000";
+			mes "I'm so bored...";
+			mes "When will I hear from my lovely Blossom?";
+			close;
+		}
+	}
+	mes "[Guildsman Mahnsoo]";
+	mes "Hey, why are you here?";
+	next;
+	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_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;
+			if (getskilllv("NV_BASIC") < 9) {
+				mes "[Guildsman Mahnsoo]";
+				mes "But if you want to be a merchant, your basic skill level must reach Level 9 or you must spend all of your skill points.";
+				next;
+				mes "[Guildsman Mahnsoo]";
+				mes "Don't you think we need to learn some basic skills although we just deal with money?";
+				close;
+			}
+			mes "[Guildsman Mahnsoo]";
+			mes "Good, I think you're fully ready for it seeing that your basic skill level is fulfilled.";
+			mes "Now I allow you to be a merchant.";
+			next;
+			mes "[Guildsman Mahnsoo]";
+			mes "Congratulations on becoming a merchant!";
+			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~";
+			close;
+		}
+	case 2:
+		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 "[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, 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 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 to be alive or not later is all up to one's ability.";
+		close;
+	case 4:
+		close;
+	}
+}
diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt
new file mode 100644
index 000000000..6942c170b
--- /dev/null
+++ b/npc/pre-re/jobs/1-1/swordman.txt
@@ -0,0 +1,127 @@
+//===== rAthena Script ======================================= 
+//= Renewal Swordman Job Change
+//===== By: ================================================== 
+//= Kisuka
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Job Change to Swordman Class
+//===== Additional Comments: ================================= 
+//= 1.0 First Version. [Kisuka]
+//============================================================ 
+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]";
+			mes "It...";
+			mes "Can't be...";
+			mes "You've been reborn, haven't you?";
+			next;
+			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]";
+				mes "Hmm? Ah, you must first master the Basic Skills before you are ready to become a Swordman.";
+				next;
+				mes "[Swordman]";
+				mes "Come back to me when you have finished learning the Basic Novice Skills.";
+				close;
+			}
+			mes "[Swordman]";
+			mes "Excellent! Let me promote you to a Swordman right away!";
+			next;
+			skill 143,0,0;
+			jobchange Job_Swordman_High;
+			skill 144,1,0;
+			skill 145,1,0;
+			skill 146,1,0;
+			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 "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.:Nothing.")) {
+	case 1:
+		mes "[Swordman Guildsman]";
+		mes "So you wish to know more about the mighty Swordman? Okay!";
+		next;
+		mes "[Swordman Guildsman]";
+		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 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 "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_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 ^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?";
+				mes "Do you think being a Swordman is that easy?";
+				close;
+			}
+			mes "[Swordman Guildsman]";
+			mes "Hmm, both your Job Level and Basic Skill Level check out.";
+			mes "Good. Do you want to be a Swordman right away?";
+			next;
+			if(select("Yes, I do.:I'll consider it again.") == 2) {
+				mes "[Swordman Guildsman]";
+				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;
+			}
+			mes "[Swordman Guildsman]";
+			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;
+		}
+	case 3:
+		close;
+	}
+}
diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt
new file mode 100644
index 000000000..8d7e452f3
--- /dev/null
+++ b/npc/pre-re/jobs/1-1/thief.txt
@@ -0,0 +1,207 @@
+//===== rAthena Script ======================================= 
+//= Renewal Thief Job Change
+//===== By: ================================================== 
+//= Kisuka
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Job Change to Thief Class
+//===== Additional Comments: ================================= 
+//= 1.0 First Version. [Kisuka]
+//============================================================ 
+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 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 Guide]";
+					mes "What, do you want to be a Thief? I'm sorry, but you look like you need more training.";
+					next;
+					mes "[Thief Guide]";
+					mes "Take your time and learn all the Basic Skills, will you? Well then, see you later~!";
+					close;
+				}
+				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;
+				jobchange Job_Thief_High;
+				skill 149,1,0;
+				skill 150,1,0;
+				skill 151,1,0;
+				skill 152,1,0;
+				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;
+			}
+		}else{
+			mes "[Thief Guide]";
+			if (sex)
+				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(q_job_thief == 1) {
+		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;
+		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_Novice) {
+		if(Class == Job_Thief) {
+			mes "[Thief Guildsman]";
+			mes "Hey~ if you have any trouble, get it out to me anytime, huh?";
+			close;
+		}else{
+			if(Sex) {
+				mes "[Thief Guildsman]";
+				mes "What the heck...?";
+				mes "Huh.. you are a "+jobname(Class)+" blockhead...!";
+				next;
+				mes "[Thief Guildsman]";
+				mes "Hey, brother.";
+				mes "Why are you here? Go back to your place~ go back~~";
+				close;
+			}else{
+				mes "[Thief Guildsman]";
+				mes "What the heck...?";
+				next;
+				mes "[Thief Guildsman]";
+				mes "Hey, lady.";
+				mes "Why are you here? Go back to your place~ go back~~";
+				close;
+			}
+		}
+	}
+	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;
+	}
+	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;
+		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;
+	}
+	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;
+	}
+	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 "[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 "[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 "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 quite a busy man.";
+		mes "See you again.";
+		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~";
+		}
+		close;
+	}
+	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;
+}