* Raw revert of all job files back to r16578, prior to the rewrite in r16579. The updates will be re-applied after more testing is done.

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

6 files changed, 4009 insertions, 7775 deletions

diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index c18d1d819..7f8febe58 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -1,20 +1,56 @@
 //===== rAthena Script ======================================= 
-// Assassin Job change Quest
+//= Assassin Job Quest
 //===== By: ================================================== 
-//= Masao
-//= Credits: Muad_Dib
+//= kobra_k88
 //===== Current Version: ===================================== 
-//= 1.0
+//= 3.5
 //===== Compatible With: ===================================== 
-//= Any rAthena SVN
+//= rAthena SVN
 //===== Description: ========================================= 
-//= [Translated from the Official]
-//= Job change Quest from Thief -> Assassin.
+//= [Aegis Conversion]
+//= Job Change quest for Assassin class.
 //===== Additional Comments: ================================= 
-//= 1.0 Updated to latest available official file. [Masao]
+//= v1.0 Used some dialogue from the aegis Assassin script translated By: Pgro Team (OwNaGe)
+//= Also converted the booby traps from the aegis script.[kobra_k88]
+//= v1.1 Made adjustments to ontouch npcs to work with the new "ontouch" functionality.
+//= Fixed some duplicate npc names.  Added missing waitingroom triggers.
+//= Fixed warp in "TimerSin", was supposed to be an areawarp.
+//= For some reason sometimes the "Nameless One" would have message windows
+//= without controls.  Changed the doevent that triggers him to an
+//= addtimer and that seemed make the prob. go away[kobra_k88]
+//= 1.2 Fixed WRONG skillpoint check! [Lupus]
+//= 1.2b Fixed missing commands and typos [Lupus]
+//= 1.3 Baby class Support added [Lupus]
+//= 1.5 Fixed possible EXP abuse [Lupus]
+//= 1.6 Added a func which prevent advanced classes passing
+//= 2nd Job Quests again. It also guides adv classes where
+//= to go. [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
+//= 2.1 Removed Duplicates [Silent]
+//= 2.2 Merged back JFunc. Fixed missing dialogue [Lupus]
+//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I 
+//= was still able to bypass it) [Toms]
+//= 2.4 Fixed skipping of Nameless NPC [Lupus]
+//= 2.5 Fixed a Rogue exploit [Lupus]
+//= 2.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 2.7 Several bugfixes with the help of Samuray22 and Barron-Monster. [L0ne_W0lf]
+//= 2.8 Removed duplicate warps. [L0ne_W0lf]
+//= 2.8a Deleted unused variables. [Samuray22]
+//= 2.8b Fixed error caused in last updated, removed useless variable 'joblvl'. [L0ne_W0lf]
+//= 2.9 Fixed an indent and added a 'break;' in hopes of 'fixing' an error [L0ne_W0lf]
+//= 2.9a Corrected a Typo error ";;". [Samuray22]
+//= 2.9b Moved a wrong 'break'. [Zephyrus_cr]
+//= 3.0 Now uses enable and disable waitingroomevent. [L0ne_W0lf]
+//= 3.1 Fixed problem with waiting room. (bugreport:1099) [L0ne_W0lf]
+//= 3.1a Follow up fix. Forgot to replace a label. [L0ne_W0lf]
+//= 3.1b Fixed waiting room not enabled in some situations [Zephyrus]
+//= 3.2 Fixed a question having all correct answers. [brianluau]
+//= 3.3 Added Quest Log commands. [Kisuka]
+//= 3.4 Removed the need for use of 'goto.' [L0ne_W0lf]
+//= 3.5 Fixed the waitingroom where player can enter the Test Area without passing the written exam. Now player will not be warp inside the Test Area when did not passed the written exam instead the player will be warp back to the written exam entrance [JayPee]
 //============================================================ 
 
-in_moc_16,19,33,1	script	Guildsman	55,{
+in_moc_16,19,33,1	script	Guildsman#asn	55,{
 	if (Upper == 1) {
 		mes "[Ferocious-looking guy]";
 		mes "Hm? You....?";
@@ -24,7 +60,7 @@ in_moc_16,19,33,1	script	Guildsman	55,{
 		mes "I've never met anyone as intimidating as you! For some reason, I don't like you. I think you should leave!";
 		close;
 	}
-	if (SkillPoint != 0) {
+	if (SkillPoint) {
 		mes "[Ferocious-looking guy]";
 		mes "You can't change your job if you have any unused skill points from the 1st job. You better go and use those up first.";
 		close;
@@ -60,22 +96,11 @@ in_moc_16,19,33,1	script	Guildsman	55,{
 		set ASSIN_Q,0;
 		set ASSIN_Q2,0;
 		set ASSIN_Q3,0;
-		if(checkquest(8000)){
-			erasequest 8000;
-		} else if(checkquest(8001)){
-			erasequest 8001;
-		} else if(checkquest(8002)){
-			erasequest 8002;
-		} else if(checkquest(8003)){
-			erasequest 8003;
-		} else if(checkquest(8004)){
-			erasequest 8004;
-		}
 		savepoint "in_moc_16",18,14;
 		warp "in_moc_16",18,14;
 		end;
 	}
-	if ((Class == Job_Baby_Thief || Class == Job_Thief) && (countitem(1008) == 0) && (ASSIN_Q > 7)) {
+	if (BaseJob == Job_Thief && countitem(1008) == 0 && ASSIN_Q > 7) {
 		mes "[Assassin Expert 'Huey']";
 		mes "Hey, what happened...? How come you didn't bring the ^006699Necklace of Oblivion^000000? You're supposed to carry that with you, so where is it?";
 		next;
@@ -86,7 +111,7 @@ in_moc_16,19,33,1	script	Guildsman	55,{
 		mes "When you finally succeed in getting it, bring it to me! ^666666*Sigh...*^000000";
 		close;
 	}
-	if ((Class == Job_Baby_Thief || Class == Job_Thief) && (countitem(1008) > 0) && (ASSIN_Q > 7)) {
+	if (BaseJob == Job_Thief && countitem(1008) > 0 && ASSIN_Q > 7) {
 		mes "[Assassin Expert 'Huey']";
 		mes "Well well well, you got it. Congratulations! But since it's been clearly scratched, I can't accept it. You'll never become an Assassin!";
 		next;
@@ -101,22 +126,19 @@ in_moc_16,19,33,1	script	Guildsman	55,{
 		mes "......";
 		next;
 		delitem 1008,1; //Frozen_Heart
+		changequest 8007,8008;
 		mes "[Assassin Expert 'Huey']";
 		mes "Alright!";
 		mes "You've been approved!";
 		next;
-		if(Class == Job_Baby_Thief){
-			jobchange Job_Baby_Assassin;
-		} else {
-			jobchange Job_Assassin;
-		}
-		changequest 8007,8008;
 		completequest 8008;
+		callfunc "Job_Change",Job_Assassin;
+		callfunc "F_ClearJobVar";		// clears all job variables for the current player
 		mes "[Assassin Expert 'Huey']";
 		mes "Now! Do your best to be a great Assassin! Travel with faith and kill with dignity. Come by anytime and pay us a visit. Once again, congratulations.";
 		close;
 	}
-	if ((countitem(1008) > 0) && (Class == Job_Baby_Thief || Class == Job_Thief) && (ASSIN_Q < 7)) {
+	else if (countitem(1008) > 0 && BaseJob == Job_Thief && ASSIN_Q < 7) {
 		mes "[Ferocious-looking guy]";
 		mes "Eh?";
 		mes "What do you want?";
@@ -141,128 +163,138 @@ in_moc_16,19,33,1	script	Guildsman	55,{
 		warp "moc_fild16",206,229;
 		end;
 	}
-	mes "[Ferocious-looking guy]";
-	mes "What brings you here?";
-	mes "I don't think I like the way you're looking at me... Punk.";
-	next;
-	if (Class == Job_Baby || Class == Job_Novice) {
-		mes "[Ferocious-looking guy]";
-		mes "Hey Newbie. You should really get out of here as soon as you can. I can't guarantee your safety.";
-		close;
-	}
-	if (Class == Job_Swordman || Class == Job_Knight || Class == Job_Crusader) {
-		mes "[Ferocious-looking guy]";
-		mes "What brings a man of the sword to this place? Why don't you try smashing stuff somewhere else, ya lunkhead.";
-		close;
-	}
-	if (Class == Job_Mage || Class == Job_Wizard || Class == Job_Sage) {
-		mes "[Ferocious-looking guy]";
-		mes "Now what would a magic user be doing here?";
-		next;
-		mes "[Ferocious-looking guy]";
-		mes "There's a library in Prontera and Juno where you're welcome, so why don't you make like a magic trick and disappear?";
-		close;
-	}
-	if (Class == Job_Archer || Class == Job_Hunter || Class == Job_Bard || Class == Job_Dancer) {
-		mes "[Ferocious-looking guy]";
-		mes "Well well well.";
-		mes "Look at that purdy bow.";
-		next;
-		mes "[Ferocious-looking guy]";
-		mes "There aren't many Bowmen with the gall to even come close to this place. Well, what do you think you're doin' here?!";
-		close;
-	}
-	if (Class == Job_Acolyte || Class == Job_Priest || Class == Job_Monk) {
-		mes "[Ferocious-looking guy]";
-		mes "I thought something smelled funny. What's a servant of God doing in this place? You don't belong here.";
-		close;
-	}
-	if (Class == Job_Merchant || Class == Job_Blacksmith || Class == Job_Alchemist) {
-		mes "[Ferocious-looking guy]";
-		mes "We don't like greedy people around these parts. You better sell your stuff somewhere else, Moneybags.";
-		close;
-	}
-	if (Class == Job_Rogue) {
-		mes "[Ferocious-looking guy]";
-		mes "You look like you don't have a care in the world. Well, I hope you enjoy your rest while you stay here. It's okay, since the Rogue and Assassin Guilds have always gotten along pretty well.";
-		next;
+	else {
 		mes "[Ferocious-looking guy]";
-		mes "By the way...";
-		mes "Have you ever seen";
-		mes "a girl named Markie?";
+		mes "What brings you here?";
+		mes "I don't think I like the way you're looking at me... Punk.";
 		next;
-		mes "[Ferocious-looking guy]";
-		mes "Markie...";
-		mes "We promised that we'd be together forever. ^666666*Sigh...*^000000 I don't even think she remembers that promise anymore. Then again, we were pretty young back then...";
-		close;
-	}
-	if (Class == Job_Baby_Assassin || Class == Job_Assassin) {
-		mes "[Assassin Expert 'Huey']";
-		mes "Hey, I remember you~";
-		mes "Wasn't your name, umm, I remember 'cause it sounded funny to me...";
-		next;
-		mes "[Assassin Expert 'Huey']";
-		mes ":+:" + strcharinfo(0) + ":+:, right? No wait, just " + strcharinfo(0) + ". Yeah, how's it goin'?";
-		next;
-		mes "[Assassin Expert 'Huey']";
-		mes "Unfortunately, I don't have any requests for you at this time from the guild. Just keep focusing on your training. Till then, see ya.";
-		close;
-	}
-	if ((Classe == Job_Baby_Thief || Class == Job_Thief) && (JobLevel > 39)) {
-		if (SkillPoint != 0) {
+		if (BaseClass == Job_Novice) {
 			mes "[Ferocious-looking guy]";
-			mes "You can't change your job if you still have unused skill points from First Job. You better use up those skill points first.";
+			mes "Hey Newbie. You should really get out of here as soon as you can. I can't guarantee your safety.";
 			close;
 		}
-		mes "[Ferocious-looking guy]";
-		mes "Hmm...";
-		mes "A Thief...?";
-		next;
-		mes "[Ferocious-looking guy]";
-		mes "And a well-experienced Thief since I can't seem to find my wallet. We do need people like you, you know.";
-		next;
-		mes "[Ferocious-looking guy]";
-		mes "So how about taking the next step and becoming an Assassin?";
-		next;
-		switch (select("Yes. I've picked my last pocket.:What's the requirements?:Maybe later, I need to steal some things first.")) {
-		case 1:
+		else if (BaseClass == Job_Swordman) {
 			mes "[Ferocious-looking guy]";
-			mes "It's been a while since I've received a guest. I'm sending";
-			mes "you to the office.";
-			close2;
-			set ASSIN_Q,0;
-			warp "in_moc_16",19,76;
-			end;
-		case 2:
+			mes "What brings a man of the sword to this place? Why don't you try smashing stuff somewhere else, ya lunkhead.";
+			close;
+		}
+		else if (BaseClass == Job_Mage) {
 			mes "[Ferocious-looking guy]";
-			mes "Requirements? Well, first you need to be a Thief. Second, you need to be at least Thief job level 40.";
+			mes "Now what would a magic user be doing here?";
 			next;
 			mes "[Ferocious-looking guy]";
-			mes "And third, you need to pass a test to become an Assassin. You got";
-			mes "all that? If you're sure of your ability as a Thief, you won't have to worry.";
+			mes "There's a library in Prontera and Juno where you're welcome, so why don't you make like a magic trick and disappear?";
 			close;
-		case 3:
+		}
+		else if (BaseClass == Job_Archer) {
+			mes "[Ferocious-looking guy]";
+			mes "Well well well.";
+			mes "Look at that purdy bow.";
+			next;
+			mes "[Ferocious-looking guy]";
+			mes "There aren't many Bowmen with the gall to even come close to this place. Well, what do you think you're doin' here?!";
+			close;
+		}
+		else if (BaseClass == Job_Acolyte) {
+			mes "[Ferocious-looking guy]";
+			mes "I thought something smelled funny. What's a servant of God doing in this place? You don't belong here.";
+			close;
+		}
+		else if (BaseClass == Job_Merchant) {
+			mes "[Ferocious-looking guy]";
+			mes "We don't like greedy people around these parts. You better sell your stuff somewhere else, Moneybags.";
+			close;
+		}
+		else if (BaseJob == Job_Rogue) {
+			mes "[Ferocious-looking guy]";
+			mes "You look like you don't have a care in the world. Well, I hope you enjoy your rest while you stay here. It's okay, since the Rogue and Assassin Guilds have always gotten along pretty well.";
+			next;
+			mes "[Ferocious-looking guy]";
+			mes "By the way...";
+			mes "Have you ever seen";
+			mes "a girl named Markie?";
+			next;
+			mes "[Ferocious-looking guy]";
+			mes "Markie...";
+			mes "We promised that we'd be together forever. ^666666*Sigh...*^000000 I don't even think she remembers that promise anymore. Then again, we were pretty young back then...";
+			close;
+		}
+		else if (BaseJob == Job_Assassin) {
+			mes "[Assassin Expert 'Huey']";
+			mes "Hey, I remember you~";
+			mes "Wasn't your name, umm, I remember 'cause it sounded funny to me...";
+			next;
+			mes "[Assassin Expert 'Huey']";
+			mes ":+:" + strcharinfo(0) + ":+:, right? No wait, just "+ strcharinfo(0) +". Yeah, how's it goin'?";
+			next;
+			mes "[Assassin Expert 'Huey']";
+			mes "Unfortunately, I don't have any requests for you at this time from the guild. Just keep focusing on your training. Till then, see ya.";
+			close;
+		}
+		else if (BaseJob == Job_Thief && JobLevel > 39) {
+			if (SkillPoint) {
+				mes "[Ferocious-looking guy]";
+				mes "You can't change your job if you still have unused skill points from First Job. You better use up those skill points first.";
+				close;
+			}
+			else {
+				mes "[Ferocious-looking guy]";
+				mes "Hmm...";
+				mes "A Thief...?";
+				next;
+				mes "[Ferocious-looking guy]";
+				mes "And a well-experienced Thief since I can't seem to find my wallet. We do need people like you, you know.";
+				next;
+				mes "[Ferocious-looking guy]";
+				mes "So how about taking the next step and becoming an Assassin?";
+				next;
+				switch(select("Yes. I've picked my last pocket.:What's the requirements?:Maybe later, I need to steal some things first.")) {
+				case 1:
+					mes "[Ferocious-looking guy]";
+					mes "It's been a while since I've received a guest. I'm sending";
+					mes "you to the office.";
+					close2;
+					set ASSIN_Q,0;
+					if(checkquest(8000) != -1) {
+						changequest 8000,8001;
+					}else{
+						setquest 8001;
+					}
+					warp "in_moc_16",19,76;
+					end;
+				case 2:
+					mes "[Ferocious-looking guy]";
+					mes "Requirements? Well, first you need to be a Thief. Second, you need to be at least Thief job level 40.";
+					next;
+					mes "[Ferocious-looking guy]";
+					mes "And third, you need to pass a test to become an Assassin. You got";
+					mes "all that? If you're sure of your ability as a Thief, you won't have to worry.";
+					close;
+				case 3:
+					mes "[Ferocious-looking guy]";
+					mes "Hmm...";
+					mes "Alright then.";
+					mes "But come back when";
+					mes "you think you're ready.";
+					close;
+				}
+			}
+		}
+		else {
 			mes "[Ferocious-looking guy]";
-			mes "Hmm...";
-			mes "Alright then.";
-			mes "But come back when";
-			mes "you think you're ready.";
+			mes "Huh. You're not qualified to become an Assassin yet. There are requirements you need to meet first, you know.";
+			next;
+			mes "[Ferocious-looking guy]";
+			mes "Well, keep training. You need to be at least job level 40, got it? But if you're above job level 40, that will probably be even better.";
 			close;
 		}
 	}
-	mes "[Ferocious-looking guy]";
-	mes "Huh. You're not qualified to become an Assassin yet. There are requirements you need to meet first, you know.";
-	next;
-	mes "[Ferocious-looking guy]";
-	mes "Well, keep training. You need to be at least job level 40, got it? But if you're above job level 40, that will probably be even better.";
-	close;
 }
 
 in_moc_16,25,90,1	script	Guildsman#ASN2	730,2,2,{
-
 	mes "[Assassin 'Khai']";
 	mes "Umm?!";
-	emotion e_gasp;
+	Emotion e_gasp;
 	next;
 	mes "[Assassin 'Khai']";
 	mes "Come closer. I prefer to talk to people face to face. It really irritates me if I have to raise my voice, just so you can hear me.";
@@ -270,7 +302,7 @@ in_moc_16,25,90,1	script	Guildsman#ASN2	730,2,2,{
 	close;
 
 OnTouch:
-	if (ASSIN_Q3 == 4) {
+	if (ASSIN_Q2 == 4) {
 		mes "[Assassin 'Khai']";
 		mes "Ehhh?";
 		mes "Didn't you just";
@@ -296,7 +328,7 @@ OnTouch:
 		mes "[Assassin 'Khai']";
 		mes "Sorry for laughing, but this is hilarious! Hahaha~ So do you want me to give you some hints?";
 		next;
-		switch (select("I beg you, give me hints.:Don't laugh at me! Now, give me hints!:...Shut up, I don't need your help!")) {
+		switch(select("I beg you, give me hints.:Don't laugh at me! Now, give me hints!:...Shut up, I don't need your help!")) {
 		case 1:
 			mes "[Assassin 'Khai']";
 			mes "Haaahahahaha!!!";
@@ -350,15 +382,14 @@ OnTouch:
 			close;
 		case 2:
 			mes "[Assassin 'Khai']";
-			if (Sex == 1) {
+			if (sex) {
 				mes "Huh. You must have a lot of self confidence to be a Thief nowadays.";
 				next;
 				mes "[Assassin 'Khai']";
 				mes "Yeah yeah, I understand. Everyone messes up from time to time. Sorry for laughing at your mistakes.";
 			}
-			else {
+			else
 				mes "Hmm. I like your attitude. You should keep your pride as a Thief. Sorry for laughing at your mistakes. I think you'll do better next time.";
-			}
 			next;
 			mes "[Assassin 'Khai']";
 			mes "I'm not allowed to give you hints, I can tell you more about being an Assassin...";
@@ -380,7 +411,6 @@ OnTouch:
 			mes "seem depressing to you?";
 			close;
 		case 3:
-			set .@assassin_quiz,rand(1,3);
 			mes "[Assassin 'Khai']";
 			mes "...Hm.";
 			next;
@@ -395,12 +425,12 @@ OnTouch:
 			mes "Along with keeping your pride,";
 			mes "I want that you respect the blood that may stain your Katar or Dagger.";
 			next;
-			switch (select("...Got you.:...I'm confused.")) {
-			case 1:
+			if (select("...Got you.:...I'm confused.") == 1) {
 				mes "[Assassin 'Khai']";
 				mes "Yeah, I can trust you now. Let me give you some important tips.";
 				next;
-				if (.@assassin_quiz == 1) {
+				switch(rand(1,3)) {
+				case 1:
 					mes "[Assassin 'Khai']";
 					mes "First of all, Grimtooth is ...A skill specifically for the Katar. Therefore, it doesn't require any skills related to Dagger weapons.";
 					next;
@@ -416,8 +446,8 @@ OnTouch:
 					mes "[Assassin 'Khai']";
 					mes "As long as you stick close to the shadows, by walls and things like that, Cloaking will hide you from sight perfectly! Unless some bastard uses a certain detecting skill, you know.";
 					next;
-				}
-				if (.@assassin_quiz == 2) {
+					break;
+				case 2:
 					mes "[Assassin 'Khai']";
 					mes "'Sharpened Legbone of Ghoul' possesses the Undead property.";
 					next;
@@ -440,8 +470,8 @@ OnTouch:
 					mes "[Assassin 'Khai']";
 					mes "You know elemental weapons? The names of Blacksmiths are engraved on them usually...";
 					next;
-				}
-				else {
+					break;
+				case 3:
 					mes "[Assassin 'Khai']";
 					mes "Sell an Elder Willow Card to a Mage as soon as you can. They are mad about the card for some reason. Doesn't it increase the INT of a character? Hmmm...";
 					next;
@@ -478,113 +508,104 @@ OnTouch:
 				close2;
 				warp "in_moc_16",19,144;
 				end;
-			case 2:
-				mes "[Assassin 'Khai']";
-				mes "^666666*Sigh...*^000000";
-				mes "How can you not understand the concept of dignity? You just showed some to me just now!";
-				next;
-				mes "[Assassin 'Khai']";
-				mes "Oh, I get it. It wasn't pride you were showing, you were just being a jerk!";
-				next;
-				mes "[Assassin 'Khai']";
-				mes "Grrrrr...";
-				mes "WARP PORTAL!";
-				close2;
-				warp "c_tower4",64,76;
-				end;
 			}
-		}
-	}
-	mes "[Assassin 'Khai']";
-	mes "Oh, you must be an Assassin trainee. You are here to become";
-	mes "an Assassin, aren't you?";
-	next;
-	switch (select("Yes, I am. :...No, I'm not.")) {
-	case 1:
-		mes "[Assassin 'Khai']";
-		mes "Okay, good. Let's fill out the application form. Please sign your name and include your job level.";
-		next;
-		mes "[Assassin 'Khai']";
-		mes "Let's see.";
-		mes "Your name is";
-		mes "" + strcharinfo(0) + "...";
-		mes "Job level " + JobLevel + "...";
-		next;
-		if (JobLevel > 48) {
 			mes "[Assassin 'Khai']";
-			mes "Wait, Job level " + JobLevel + "?! I can see you've been training pretty hard! My bosses will like this~";
+			mes "^666666*Sigh...*^000000";
+			mes "How can you not understand the concept of dignity? You just showed some to me just now!";
 			next;
 			mes "[Assassin 'Khai']";
-			mes "Did you finish the form? Alright, go ahead and give it to me. Give me a second and I'll transport you to the Test Hall.";
+			mes "Oh, I get it. It wasn't pride you were showing, you were just being a jerk!";
 			next;
 			mes "[Assassin 'Khai']";
-			mes "Alright then,";
-			mes "best of luck to you!";
+			mes "Grrrrr...";
+			mes "WARP PORTAL!";
 			close2;
-			set ASSIN_Q2,1;
-			set ASSIN_Q,1;
-			setquest 8001;
-			warp "in_moc_16",19,144;
+			warp "c_tower4",64,76;
 			end;
 		}
-		if (JobLevel < 49) {
+	}
+	else {
+		mes "[Assassin 'Khai']";
+		mes "Oh, you must be an Assassin trainee. You are here to become";
+		mes "an Assassin, aren't you?";
+		next;
+		if (select("Yes, I am. :...No, I'm not.") == 1) {
 			mes "[Assassin 'Khai']";
-			mes "Well, you passed";
-			mes "the requirements.";
-			mes "Not bad at all.";
+			mes "Okay, good. Let's fill out the application form. Please sign your name and include your job level.";
 			next;
 			mes "[Assassin 'Khai']";
-			mes "Go ahead and give";
-			mes "me the form when you're";
-			mes "done filling it out.";
-			mes "Alright, thanks.";
+			mes "Let's see.";
+			mes "Your name is";
+			mes "" + strcharinfo(0) + "...";
+			mes "Job level " + JobLevel + "...";
 			next;
-			mes "[Assassin 'Khai']";
-			mes "I'll transport you";
-			mes "to the Test Hall.";
-			mes "Best of luck~";
-			close2;
-			set ASSIN_Q2,2;
-			set ASSIN_Q,1;
-			setquest 8001;
-			warp "in_moc_16",19,144;
-			end;
+			if (JobLevel > 48) {
+				mes "[Assassin 'Khai']";
+				mes "Wait, Job level " + JobLevel + "?! I can see you've been training pretty hard! My bosses will like this~";
+				next;
+				mes "[Assassin 'Khai']";
+				mes "Did you finish the form? Alright, go ahead and give it to me. Give me a second and I'll transport you to the Test Hall.";
+				next;
+				mes "[Assassin 'Khai']";
+				mes "Alright then,";
+				mes "best of luck to you!";
+				close2;
+				set ASSIN_Q3,1;
+				set ASSIN_Q,1;
+				changequest 8001,8002;
+				warp "in_moc_16",19,144;
+				end;
+			}
+			else if (JobLevel < 49) {
+				mes "[Assassin 'Khai']";
+				mes "Well, you passed";
+				mes "the requirements.";
+				mes "Not bad at all.";
+				next;
+				mes "[Assassin 'Khai']";
+				mes "Go ahead and give";
+				mes "me the form when you're";
+				mes "done filling it out.";
+				mes "Alright, thanks.";
+				next;
+				mes "[Assassin 'Khai']";
+				mes "I'll transport you";
+				mes "to the Test Hall.";
+				mes "Best of luck~";
+				close2;
+				set ASSIN_Q3,2;
+				set ASSIN_Q,1;
+				changequest 8001,8002;
+				warp "in_moc_16",19,144;
+				end;
+			}
+			else {
+				mes "[Assassin 'Khai']";
+				mes "Who the";
+				mes "hell are you?";
+				mes "...Guards!";
+				close2;
+				warp "moc_fild16",206,229;
+				end;
+			}
 		}
-		mes "[Assassin 'Khai']";
-		mes "Who the";
-		mes "hell are you?";
-		mes "...Guards!";
-		close2;
-		warp "moc_fild16",206,229;
-		end;
-	case 2:
-		mes "[Assassin 'Khai']";
-		mes "Huh...?";
-		mes "What, are you trying to trick me or something? Don't you wanna be an Assassin?";
-		next;
-		switch (select("No.:Yes, I want to be an Assassin.")) {
-		case 1:
+		else {
 			mes "[Assassin 'Khai']";
-			mes "Eh, get outta here.";
-			mes "Stop wastin' my time...";
-			close2;
-			set ASSIN_Q,0;
-			set ASSIN_Q2,0;
-			set ASSIN_Q3,0;
-			if(checkquest(8000)){
-				erasequest 8000;
-			} else if(checkquest(8001)){
+			mes "Huh...?";
+			mes "What, are you trying to trick me or something? Don't you wanna be an Assassin?";
+			next;
+			if (select("No.:Yes, I want to be an Assassin.") == 1) {
+				mes "[Assassin 'Khai']";
+				mes "Eh, get outta here.";
+				mes "Stop wastin' my time...";
+				close2;
+				set ASSIN_Q,0;
+				set ASSIN_Q3,0;
+				set ASSIN_Q2,0;
 				erasequest 8001;
-			} else if(checkquest(8002)){
-				erasequest 8002;
-			} else if(checkquest(8003)){
-				erasequest 8003;
-			} else if(checkquest(8004)){
-				erasequest 8004;
+				warp "moc_fild16",206,229;
+				end;
 			}
-			warp "moc_fild16",206,229;
-			end;
-		case 2:
 			mes "[Assassin 'Khai']";
 			mes "...";
 			mes "What the hell?";
@@ -606,13 +627,13 @@ OnTouch:
 				mes "[Assassin 'Khai']";
 				mes "Are you done filling out the form? Alright, give it to me so I can send you to the Test Hall. Good luck~";
 				next;
-				set ASSIN_Q2,1;
+				set ASSIN_Q3,1;
 				set ASSIN_Q,1;
-				setquest 8001;
+				changequest 8001,8002;
 				warp "in_moc_16",19,144;
 				end;
 			}
-			if (JobLevel < 49) {
+			else if (JobLevel < 49) {
 				mes "[Assassin 'Khai']";
 				mes "Not bad. You fulfilled our requirements. Not bad at all. Now are you done filling out the form?";
 				next;
@@ -620,724 +641,501 @@ OnTouch:
 				mes "Then give me the form so that I can send you to the Test Hall, alright?";
 				mes "Good luck...";
 				next;
-				set ASSIN_Q2,2;
+				set ASSIN_Q3,2;
 				set ASSIN_Q,1;
-				setquest 8001;
+				changequest 8001,8002;
 				warp "in_moc_16",19,144;
 				end;
 			}
-			mes "[Assassin 'Khai']";
-			mes "How the hell did";
-			mes "you get in here?";
-			mes "Get out!";
-			close2;
-			warp "moc_fild16",206,229;
-			end;
+			else {
+				mes "[Assassin 'Khai']";
+				mes "How the hell did";
+				mes "you get in here?";
+				mes "Get out!";
+				close2;
+				warp "moc_fild16",206,229;
+				end;
+			}
 		}
 	}
 }
 
-in_moc_16,19,154,0	script	nameless_one	139,8,2,{
-
+in_moc_16,19,154,0	script	nameless_one	-1,8,2,{
 OnTouch:
-	if (ASSIN_Q3 < 1) {
-		mes "[The Anonymous One]";
-		mes "Welcome, guest.";
-		mes "Mwahaha, it's useless";
-		mes "to try to find or see me...";
-		next;
-		mes "[The Anonymous One]";
-		mes "I am perfectly hidden!";
-		mes "To become undetectable can only be done by the greatest Assassins!";
-		next;
-		mes "[The Anonymous One]";
-		mes "Aren't you scared that you can't see me? I could kill you at any time and it would be so easy...";
-		next;
-		if (select("I think I crapped my pants!:You're all talk. I challenge you!") == 1) {
+	if (ASSIN_Q2 < 5) {
+		if (ASSIN_Q2 < 3) {
 			mes "[The Anonymous One]";
-			mes "Now I see that";
-			mes "you're nothing";
-			mes "but a wimp.";
+			mes "Welcome, guest.";
+			mes "Mwahaha, it's useless";
+			mes "to try to find or see me...";
 			next;
 			mes "[The Anonymous One]";
-			mes "Bwahahahahahah!";
-			mes "Stop cowering in fear!";
-			mes "It's making me laugh!";
-			close;
-		}
-		mes "[The Anonymous One]";
-		mes "So...";
-		mes "You wish for";
-		mes "a challenge?";
-		mes "From me?!";
-		next;
-		mes "[The Anonymous One]";
-		mes "A river of blood follows my every footstep. I am nameless, for the sting of my blades is all anyone needs to know.";
-		next;
-		mes "[The Anonymous One]";
-		mes "I am here to test your knowledge, as well as your capacity for heartlessness. Those are both necessary to become an Assassin.";
-		next;
-		mes "[The Anonymous One]";
-		mes "For your challenge, you must";
-		mes "answer my questions correctly. Very difficult questions that only an Assassin can answer.";
-		next;
-		mes "[The Anonymous One]";
-		mes "Although I am heartless,";
-		mes "I am not necessarily cruel. Before we proceed, is there anything you wish to know?";
-		next;
-	}
-	while(ASSIN_Q3 < 3) {
-		switch (select("...Skills?:...Stats?:Hmpf, I know it all.")) {
-		case 1:
-			mes "[The Anonymous One]";
-			mes "Skills...?";
-			mes "Although skills can have circumstantial applications, I will tell you about the basic concepts.";
-			next;
-			mes "[The Anonymous One]";
-			mes "First, ^3355FFKatar Mastery^000000. This skill increases the damage of Katar class weapons. The higher the skill level, the more damage is increased.";
-			next;
-			mes "[The Anonymous One]";
-			mes "^3355FFLeft Hand Mastery^000000 and ^3355FFRight Hand Mastery^000000. Assassins can equip different weapons in each hand when using Dagger class weapons.";
-			next;
-			mes "[The Anonymous One]";
-			mes "But it is obviously more difficult to handle 2 weapons at a time than using just one. The Left and Right Hand Mastery skills increase the damage when using two Daggers.";
-			next;
-			mes "[The Anonymous One]";
-			mes "However, if you don't want to use two Daggers, you won't need this skill. You will see how 'Left Hand Mastery' works as soon as you reach 'Right Hand Mastery' Level 2.";
-			next;
-			mes "[The Anonymous One]";
-			mes "^3355FFSonic Blow^000000 allows you to strike an enemy 8 times at once. This skill only works with Katar weapons because of the speed it requires.";
-			next;
-			mes "[The Anonymous One]";
-			mes "Of course, the damage is affected by STR and weapon damage. You'll understand how this skill works when you reach Level 4 Katar Mastery.";
+			mes "I am perfectly hidden!";
+			mes "To become undetectable can only be done by the greatest Assassins!";
 			next;
 			mes "[The Anonymous One]";
-			mes "^3355FFGrimtooth^000000 allows you to attack enemies while hiding under the ground. As you master it, you'll be able to attack foes from a distance.";
-			next;
-			mes "[The Anonymous One]";
-			mes "Since it's a ranged attack, it can be very useful when you're surrounded by enemies.";
+			mes "Aren't you scared that you can't see me? I could kill you at any time and it would be so easy...";
 			next;
+			if (select("I think I crapped my pants!:You're all talk. I challenge you!") == 1) {
+				mes "[The Anonymous One]";
+				mes "Now I see that";
+				mes "you're nothing";
+				mes "but a wimp.";
+				next;
+				mes "[The Anonymous One]";
+				mes "Bwahahahahahah!";
+				mes "Stop cowering in fear!";
+				mes "It's making me laugh!";
+				close;
+			}
 			mes "[The Anonymous One]";
-			mes "Because you're required to perfectly hide yourself to use this skill, you must first learn Level 2 Cloaking before you can learn Grimtooth.";
+			mes "So...";
+			mes "You wish for";
+			mes "a challenge?";
+			mes "From me?!";
 			next;
 			mes "[The Anonymous One]";
-			mes "To learn ^3355FFCloaking^000000, you must learn Level 2 Hiding. Then you will be able to move while hiding if you are close to a wall.";
+			mes "A river of blood follows my every footstep. I am nameless, for the sting of my blades is all anyone needs to know.";
 			next;
 			mes "[The Anonymous One]";
-			mes "The ^3355FFEnchant Poison^000000 skill allows you to enchant poison on the weapon you're using. This will temporarily give the weapon the Poison property.";
+			mes "I am here to test your knowledge, as well as your capacity for heartlessness. Those are both necessary to become an Assassin.";
 			next;
 			mes "[The Anonymous One]";
-			mes "This will also make your attacks poison the enemy by chance. You can also use this skill to enchant the weapons of your party members...";
+			mes "For your challenge, you must";
+			mes "answer my questions correctly. Very difficult questions that only an Assassin can answer.";
 			next;
 			mes "[The Anonymous One]";
-			mes "^3355FFPoison React^000000 shields the user from attacks with the Poison property, and can be used on other people as well. However, you must learn Level 3 Enchant Poison first.";
+			mes "Although I am heartless,";
+			mes "I am not necessarily cruel. Before we proceed, is there anything you wish to know?";
 			next;
+			set ASSIN_Q2,0;
+			while(ASSIN_Q2 < 3) {
+				switch(select("...Skills?:...Stats?:Hmpf, I know it all.")) {
+				case 1:
+					mes "[The Anonymous One]";
+					mes "Skills...?";
+					mes "Although skills can have circumstantial applications, I will tell you about the basic concepts.";
+					next;
+					mes "[The Anonymous One]";
+					mes "First, ^3355FFKatar Mastery^000000. This skill increases the damage of Katar class weapons. The higher the skill level, the more damage is increased.";
+					next;
+					mes "[The Anonymous One]";
+					mes "^3355FFLeft Hand Mastery^000000 and ^3355FFRight Hand Mastery^000000. Assassins can equip different weapons in each hand when using Dagger class weapons.";
+					next;
+					mes "[The Anonymous One]";
+					mes "But it is obviously more difficult to handle 2 weapons at a time than using just one. The Left and Right Hand Mastery skills increase the damage when using two Daggers.";
+					next;
+					mes "[The Anonymous One]";
+					mes "However, if you don't want to use two Daggers, you won't need this skill. You will see how 'Left Hand Mastery' works as soon as you reach 'Right Hand Mastery' Level 2.";
+					next;
+					mes "[The Anonymous One]";
+					mes "^3355FFSonic Blow^000000 allows you to strike an enemy 8 times at once. This skill only works with Katar weapons because of the speed it requires.";
+					next;
+					mes "[The Anonymous One]";
+					mes "Of course, the damage is affected by STR and weapon damage. You'll understand how this skill works when you reach Level 4 Katar Mastery.";
+					next;
+					mes "[The Anonymous One]";
+					mes "^3355FFGrimtooth^000000 allows you to attack enemies while hiding under the ground. As you master it, you'll be able to attack foes from a distance.";
+					next;
+					mes "[The Anonymous One]";
+					mes "Since it's a ranged attack, it can be very useful when you're surrounded by enemies.";
+					next;
+					mes "[The Anonymous One]";
+					mes "Because you're required to perfectly hide yourself to use this skill, you must first learn Level 2 Cloaking before you can learn Grimtooth.";
+					next;
+					mes "[The Anonymous One]";
+					mes "To learn ^3355FFCloaking^000000, you must learn Level 2 Hiding. Then you will be able to move while hiding if you are close to a wall.";
+					next;
+					mes "[The Anonymous One]";
+					mes "The ^3355FFEnchant Poison^000000 skill allows you to enchant poison on the weapon you're using. This will temporarily give the weapon the Poison property.";
+					next;
+					mes "[The Anonymous One]";
+					mes "This will also make your attacks poison the enemy by chance. You can also use this skill to enchant the weapons of your party members...";
+					next;
+					mes "[The Anonymous One]";
+					mes "^3355FFPoison React^000000 shields the user from attacks with the Poison property, and can be used on other people as well. However, you must learn Level 3 Enchant Poison first.";
+					next;
+					mes "[The Anonymous One]";
+					mes "^3355FFVenom Dust^000000 consumes a Red Gemstone to contaminate an area with poison. The duration of contamination increases with the level of this skill.";
+					next;
+					mes "[The Anonymous One]";
+					mes "You can learn the Venom Dust skill after you learn Level 5 Enchant Poison.";
+					next;
+					mes "[The Anonymous One]";
+					mes "^3355FFVenom Splasher^000000 is a skill that, after it is used on a target, will cause it to explode when its HP is less than a certain amount after three seconds.";
+					next;
+					mes "[The Anonymous One]";
+					mes "When the target explodes, the enemies in the vicinity are also damaged. This is an essential skill for Assassins. It requires Level 5 Poison React and Level 5 Venom Dust.";
+					next;
+					mes "[The Anonymous One]";
+					mes "Now...";
+					mes "That's all I have to tell you";
+					mes "about Assassin skills.";
+					set ASSIN_Q2,1;
+					next;
+					break;
+				case 2:
+					mes "[The Anonymous One]";
+					mes "Hmm, Stats...";
+					mes "For Assassins, Agility, or AGI, is the most important stat.";
+					next;
+					mes "[The Anonymous One]";
+					mes "For the sake of assassination, STR is probably the second most important stat. But that is only my recommendation.";
+					next;
+					mes "[The Anonymous One]";
+					mes "I cannot give you better advice than that in regards to Stats. You should research and see which stats suit you, and decide what kind of Assassin you want to be.";
+					set ASSIN_Q2,2;
+					next;
+					break;
+				case 3:
+					if (ASSIN_Q2 == 0) {
+						mes "[The Anonymous One]";
+						mes "Know everything do you?!";
+						mes "I'll be the judge of that!";
+						next;
+					}
+					set ASSIN_Q2,3;
+					break;
+				}
+			}
 			mes "[The Anonymous One]";
-			mes "^3355FFVenom Dust^000000 consumes a Red Gemstone to contaminate an area with poison. The duration of contamination increases with the level of this skill.";
+			mes "Hmpf. It is now time to test your knowledge. You are not allowed to miss more than one question.";
 			next;
 			mes "[The Anonymous One]";
-			mes "You can learn the Venom Dust skill after you learn Level 5 Enchant Poison.";
+			mes "In other words, if you want to pass this test, you must give me 9 correct answers out of 10 questions. I won't let you know which answer you got wrong...";
 			next;
 			mes "[The Anonymous One]";
-			mes "^3355FFVenom Splasher^000000 is a skill that, after it is used on a target, will cause it to explode when its HP is less than a certain amount after three seconds.";
-			next;
+			mes "Are you ready?";
+			mes "Prepare yourself!";
+		}
+		else if (ASSIN_Q2 < 5) {
 			mes "[The Anonymous One]";
-			mes "When the target explodes, the enemies in the vicinity are also damaged. This is an essential skill for Assassins. It requires Level 5 Poison React and Level 5 Venom Dust.";
+			mes "Having problems";
+			mes "passing a simple test?";
+			mes "You should have";
+			mes "known better.";
 			next;
+			if (select("Help me, how do I pass?:I challenge you again!") == 1) {
+				mes "[The Anonymous One]";
+				mes "Well, that's a damn good question. But you're banished from the Assassin Guild, so it's no concern of mine...";
+				close2;
+				warp "moc_fild16",206,151;
+				end;
+			}
 			mes "[The Anonymous One]";
-			mes "Now...";
-			mes "That's all I have to tell you";
-			mes "about Assassin skills.";
-			set ASSIN_Q3,1;
+			mes "So I see...";
+			mes "Now go, but do not fear. I will be by your side as you learn the outcome of your choice...";
 			next;
-			break;
-		case 2:
 			mes "[The Anonymous One]";
-			mes "Hmm, Stats...";
-			mes "For Assassins, Agility, or AGI, is the most important stat.";
+			mes "Now, we shall test you once more! Keep in mind, you must answer 9 questions out of 10 correctly. Remember I am doing you a favor...";
 			next;
 			mes "[The Anonymous One]";
-			mes "For the sake of assassination, STR is probably the second most important stat. But that is only my recommendation.";
+			mes "You must answer 9 questions out of 10 correctly. If you miss more then one question, you can never become an Assassin.";
 			next;
 			mes "[The Anonymous One]";
-			mes "I cannot give you better advice than that in regards to Stats. You should research and see which stats suit you, and decide what kind of Assassin you want to be.";
-			set ASSIN_Q3,2;
-			next;
-			break;
-		case 3:
-			if (ASSIN_Q3 == 0) {
-				mes "[The Anonymous One]";
-				mes "Know everything do you?!";
-				mes "I'll be the judge of that!";
-				set ASSIN_Q3,3;
-				changequest 8001,8002;
-				next;
-			} else {
-				set ASSIN_Q3,3;
-				changequest 8001,8002;
-				next;
-			}
-			break;
+			mes "Okay,";
+			mes "are you ready?";
+			mes "Good luck.";
 		}
-	}
-	if(ASSIN_Q == 3){
-		mes "[The Anonymous One]";
-		mes "Hmpf. It is now time to test your knowledge. You are not allowed to miss more than one question.";
-		next;
-		mes "[The Anonymous One]";
-		mes "In other words, if you want to pass this test, you must give me 9 correct answers out of 10 questions. I won't let you know which answer you got wrong...";
-		next;
-		set .@assassin_quiz,rand(1,3);
-		set @assassin_t, 0;
-		mes "[The Anonymous One]";
-		mes "Are you ready?";
-		mes "Prepare yourself!";
 		next;
-		if (.@assassin_quiz == 1) {
+		switch(rand(1,3)) {
+		case 1:
 			mes "[The Anonymous One]";
 			mes "1. Choose skill that is not required to learn Grimtooth.";
 			next;
-			if (select("Cloaking level 2:Sonic Blow level 5:Katar Mastery level 4:Right hand Mastery level 2") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Cloaking level 2:Sonic Blow level 5:Katar Mastery level 4:Right hand Mastery level 2") == 4)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "2. What property does Enchant Poison possess?";
 			next;
-			if (select("Poison:Earth:Fire:Wind") == 1) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Poison:Earth:Fire:Wind") == 1)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "3. How does Level 4 Right Hand Mastery work?";
 			next;
-			if (select("Recover 80% of damage decrease:Recover 90% of damage decrease:Increase 90% of damage:Increase 108% of damage") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Recover 80% of damage decrease:Recover 90% of damage decrease:Increase 90% of damage:Increase 108% of damage") == 2)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "4. What is the item required for using Venom Dust?";
 			next;
-			if (select("Red Blood:Blue Gemstone:Yellow Gemstone:Red Gemstone") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Red Blood:Blue Gemstone:Yellow Gemstone:Red Gemstone") == 4)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "5. Which skill can you learn when you reach Level 5 Enchant Poison?";
 			next;
-			if (select("Envenom:Sonic Blow:Venom Splasher:Venom Dust") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Envenom:Sonic Blow:Venom Splasher:Venom Dust") == 4)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "6. Among the following skills, which allows you to walk while invisible?";
 			next;
-			if (select("Hiding:Back Slide:Cloaking:Sand Attack") == 3) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Hiding:Back Slide:Cloaking:Sand Attack") == 3)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "7. Choose the condition that is unrelated to Venom Splasher.";
 			next;
-			if (select("Poisoned target.:Red Gemstone.:Remaing HP of Target.") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Poisoned target.:Red Gemstone.:Remaing HP of Target.") == 2)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "8. Which monster is weak to a weapon with Vadon card (adds 20% damage on Fire property monster)?";
 			next;
-			if (select("Steel Chonchon:Deviruchi:Elder Willow:Baphomet") == 3) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Steel Chonchon:Deviruchi:Elder Willow:Baphomet") == 3)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "9. How much SP does";
 			mes "Double Attack need?";
 			next;
-			if (select("15:It's a passive skill, so SP use is 0.:It's passive skill, so SP use is 10.:54") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("15:It's a passive skill, so SP use is 0.:It's passive skill, so SP use is 10.:54") == 2)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "10. What is the best elemental Main Gauche weapon for hunting in Izlude dungeon?";
 			next;
-			if (select("Wind Main Gauche:Ice Main Gauche:Earth Main Gauche:Fire Main Gauche") == 1) {
-				set @assassin_t,@assassin_t + 10;
-				next;
-			}
-		}
-		if (.@assassin_quiz == 2) {
+			if (select("Wind Main Gauche:Ice Main Gauche:Earth Main Gauche:Fire Main Gauche") == 1)
+				set .@assassin_t,.@assassin_t+10;
+			break;
+		case 2:
 			mes "[The Anonymous One]";
 			mes "1. Which monster";
 			mes "drops a slotted Katar?";
 			next;
-			if (select("Thief Bug:Peco Peco:Desert Wolf:Hammer Cobolt") == 3) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Thief Bug:Peco Peco:Desert Wolf:Hammer Cobolt") == 3)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "2. Which monster";
 			mes "drops a slotted Jur?";
 			next;
-			if (select("Martin:Desert Wolf:Marionette:Myst") == 1) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Martin:Desert Wolf:Marionette:Myst") == 1)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "3. Which class is allowed to craft elemental weapons?";
 			next;
-			if (select("Merchant:Blacksmith:Thief:Priest") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Merchant:Blacksmith:Thief:Priest") == 2)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "4. Choose the weapon which is not in the Katar class.";
 			next;
-			if (select("Jamadhar:Jur:Katar:Gladius") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Jamadhar:Jur:Katar:Gladius") == 4)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "5. What property do Izlude dungeon monsters posses?";
 			next;
-			if (select("Water:Fire:Wind:Earth") == 1) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Water:Fire:Wind:Earth") == 1)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "6. Which monster";
 			mes "cannot be a Cute Pet?";
 			next;
-			if (select("Poporing:Roda Frog:Smokie:Poison Spore") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Poporing:Roda Frog:Smokie:Poison Spore") == 2)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "7. Choose a monster that Fire property Daggers work the best on.";
 			next;
-			if (select("Dagger Goblin:Mace Goblin:Morning Star Goblin:Hammer Goblin") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Dagger Goblin:Mace Goblin:Morning Star Goblin:Hammer Goblin") == 4)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "8. Choose the non-elemental Katar from the following:";
 			next;
-			if (select("Katar of Raging Blaze:Katar of Dusty Thornbush:Sharpened Legbone of Ghoul:Infiltrator") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Katar of Raging Blaze:Katar of Dusty Thornbush:Sharpened Legbone of Ghoul:Infiltrator") == 4)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "9. Which is the uncommon monster?";
 			next;
-			if (select("Poring:Mastering:Ghostring:Spore") == 3) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Poring:Mastering:Ghostring:Spore") == 3)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "10. Choose the monster";
 			mes "that is not Undead.";
 			next;
-			if (select("Drake:Megalodon:Spore:Khalitzburg") == 3) {
-				set @assassin_t,@assassin_t + 10;
-				next;
-			}
-		} else {
+			if (select("Drake:Megalodon:Spore:Khalitzburg") == 3)
+				set .@assassin_t,.@assassin_t+10;
+			break;
+		case 3:
 			mes "[The Anonymous One]";
 			mes "1. Choose the correct amount of the maximum dodge rate increase from the 'Increase Dodge' skill when at level 10.";
 			next;
-			if (select("30:40:160:20") == 1) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("30:40:160:20") == 1)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "2. Choose a monster which detects hiding/cloaking Thieves and Assassins.";
 			next;
-			if (select("Worm Tail:Andre:Mummy:Soldier Skeleton") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Worm Tail:Andre:Mummy:Soldier Skeleton") == 2)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "3. Choose a group of weapons that cannot be used by an Assassin at once.";
 			next;
-			if (select("Main Gaughe + Gladius:Stiletto + Main Gauche:Katar + Maingauche:Hammer + Stiletto") == 3) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Main Gaughe + Gladius:Stiletto + Main Gauche:Katar + Maingauche:Hammer + Stiletto") == 3)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "4. Choose the town where Thieves can change their jobs.";
 			next;
-			if (select("Prontera:Lutie:Alberta:Morroc") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Prontera:Lutie:Alberta:Morocc") == 4)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "5. Choose a card that does not affect the AGI stat.";
 			next;
-			if (select("Baphomet Jr. card:Whisper Card:Female Thiefbug card:Male Thiefbug card") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Baphomet Jr. card:Whisper Card:Female Thiefbug card:Male Thiefbug card") == 2)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "6. Choose the correct specialty of the Assassin class.";
 			next;
-			if(select("Excellent singing talent:Excellent reading talent:Excellent dancing talent:Excellent dodge ability") == 4);
-			set @assassin_t,@assassin_t + 10;
+			if (select("Excellent singing talent:Excellent reading talent:Excellent dancing talent:Excellent dodge ability") == 4)
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "7. Choose the maximum AGI bonus an Assassin can get at job level 50.";
 			next;
-			if (select("7:8:9:10") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("7:8:9:10") == 4) 
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "8. Choose the item that an Assassin cannot equip.";
 			next;
-			if (select("Dagger:Helm:Boots:Brooch") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
+			if (select("Dagger:Helm:Boots:Brooch") == 2) 
+				set .@assassin_t,.@assassin_t+10;
 			mes "[The Anonymous One]";
 			mes "9. Choose the job change item for Thief.";
 			next;
-			switch (select("Orange Gooey Mushroom:Red Gooey Mushroom:Orange Net Mushroom:Orange Hair Mushroom")) {
+			switch(select("Orange Gooey Mushroom:Red Gooey Mushroom:Orange Net Mushroom:Orange Hair Mushroom")) {
 			case 1:
-				set @assassin_t,@assassin_t + 10;
-			case 2:
-				break;
 			case 3:
-				set @assassin_t,@assassin_t + 10;
-			case 4:
+				set .@assassin_t,.@assassin_t+10;
+				break;
+			default:
+				break;
 			}
 			mes "[The Anonymous One]";
 			mes "10. Choose a card that would typically benefit an Assassin the least.";
 			next;
-			if (select("Whisper Card:Elder Willow Card:Soldier Skeleton Card:Cobold Card") == 2) {
-				set @assassin_t,@assassin_t + 10;
-				next;
-			}
-		}
-		mes "[The Anonymous One]";
-		mes "Hmpf.";
-		mes "Somehow, you";
-		mes "have shown me";
-		mes "great effort.";
-		next;
-		mes "[The Anonymous One]";
-		mes "Let's see...";
-		mes "You scored";
-		mes "" + @assassin_t + " percent...";
-		if (@assassin_t > 80) {
-			set ASSIN_Q3,5;
-			mes "Well done.";
-			mes "You pass.";
-			next;
-			mes "[The Anonymous One]";
-			mes "However, another test awaits you. When you go inside the next area, you will receive your instructions...";
-			close;
-		}
-		set ASSIN_Q3,4;
-		mes "That means you fail!";
-		next;
-		mes "[The Anonymous One]";
-		mes "How could you expect to be an Assassin with this score? Keep training and come back when you're ready.";
-		next;
-		mes "[The Anonymous One]";
-		mes "I would ask 'Khai,' the one who processed your application, for advice.";
-		next;
-		mes "[The Anonymous One]";
-		mes "You may also use this code: ^880000iro.ragnarokonline.com^000000. Somehow, those words are linked to a vast body of otherworldly knowledge...";
-		close2;
-		warp "in_moc_16",19,76;
-		end;
-	}
-	if (ASSIN_Q3 < 5) {
-		mes "[The Anonymous One]";
-		mes "Having problems";
-		mes "passing a simple test?";
-		mes "You should have";
-		mes "known better.";
-		next;
-		if (select("Help me, how do I pass?:I challenge you again!") == 1) {
-			mes "[The Anonymous One]";
-			mes "Well, that's a damn good question. But you're banished from the Assassin Guild, so it's no concern of mine...";
-			close2;
-			warp "moc_fild16",206,241;
-			end;
+			if (select("Whisper card:Elder Willow card:Soldier Skeleton card:Cobold card") == 2)
+				set .@assassin_t,.@assassin_t+10;
+			break;
 		}
-		mes "[The Anonymous One]";
-		mes "So I see...";
-		mes "Now go, but do not fear. I will be by your side as you learn the outcome of your choice...";
-		next;
-		mes "[The Anonymous One]";
-		mes "Now, we shall test you once more! Keep in mind, you must answer 9 questions out of 10 correctly. Remember I am doing you a favor...";
-		next;
-		mes "[The Anonymous One]";
-		mes "You must answer 9 questions out of 10 correctly. If you miss more then one question, you can never become an Assassin.";
-		next;
-		set @assassin_quiz,rand(1,3);
-		set @assassin_t,0;
-		mes "[The Anonymous One]";
-		mes "Okay,";
-		mes "are you ready?";
-		mes "Good luck.";
-		next;
-		if (.@assassin_quiz == 1) {
-			mes "[The Anonymous One]";
-			mes "1. Choose the skill that is not required to learn Grimtooth.";
-			next;
-			if (select("Level 2 Cloaking:Level 5 Sonic Blow:Level 4 Katar Mastery:Level 2 Right hand Mastery") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "2. What property does Enchant Poison possess?";
-			next;
-			if (select("Poison:Earth:Fire:Wind") == 1) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "3. How does Level 4 'Right hand Mastery' work?";
+		if (ASSIN_Q2 == 3) {
 			next;
-			if (select("Recover 80% of damage decrement:Recover 90% of damage decrement:Increase 90% of damage:Increase 108% of damage!!") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
 			mes "[The Anonymous One]";
-			mes "4. What is the item required for using Venom Dust?";
+			mes "Hmpf.";
+			mes "Somehow, you";
+			mes "have shown me";
+			mes "great effort.";
 			next;
-			if (select("Red Blood:Blue Gemstone:Yellow Gemstone:Red Gemstone") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
 			mes "[The Anonymous One]";
-			mes "5. Which skill can you learn when you reach Level 5 Enchant Poison?";
-			next;
-			if (select("Envenom:Sonic Blow:Venom Splasher:Venom Dust") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "6. Among the following skills, which allows you to become invisible while moving?";
-			next;
-			if (select("Hiding:Back Slide:Cloaking:Sand Attack") == 3) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "7. From the following, choose the thing unrelated to using Venom Splasher.";
-			next;
-			if (select("Poisoned target.:Red Gemstone.:Remaining HP of Target.") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "8. Which monster is weak to a weapon with Vadon card (adds 20% damage on Fire monster)?";
-			next;
-			if (select("Steel Chonchon:Deviruchi:Elder Willow:Baphomet") == 3) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "9. How much SP does";
-			mes "Double Attack use?";
-			next;
-			if (select("15:It's a passive skill and doesn't use SP.:It's a passive skill, so it uses 10 SP.:54") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "10. What is the best elemental Main Gauche to use when hunting in Izlude dungeon?";
-			next;
-			if (select("Wind Main Gauche:Ice Main Gauche:Earth Main Gauche:Fire Main Gauche") == 1) {
-				set @assassin_t,@assassin_t + 10;
+			mes "Let's see...";
+			mes "You scored";
+			mes "" + .@assassin_t + " percent...";
+			if (.@assassin_t > 80) {
+				set ASSIN_Q2,5;
+				changequest 8002,8003;
+				mes "Well done.";
+				mes "You pass.";
 				next;
+				mes "[The Anonymous One]";
+				mes "However, another test awaits you. When you go inside the next area, you will receive your instructions...";
+				close;
 			}
-		}
-		if (.@assassin_quiz == 2) {
-			mes "[The Anonymous One]";
-			mes "1. Which monster drops";
-			mes "a slotted Katar?";
-			next;
-			if (select("Thief Bug:Peco Peco:Desert Wolf:Hammer Cobold") == 3) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "2. Which monster";
-			mes "a slotted Jur?";
-			next;
-			if (select("Martin:Desert Wolf:Marionette:Myst") == 1) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "3. Which class is allowed to craft elemental weapons?";
-			next;
-			if (select("Merchant:Blacksmith:Thief:Priest") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "4. Choose a weapon which is not Katar class.";
-			next;
-			if (select("Jamadhar:Jur:Katar:Gladius") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "5. What property do Izlude dungeon monsters possess?";
-			next;
-			if (select("Water:Fire:Wind:Earth") == 1) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "6. Which monster";
-			mes "cannot be a Cute Pet?";
-			next;
-			if (select("Poporing:Roda Frog:Smokie:Poison Spore") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "7. Choose a monster that Fire property daggers work the best on.";
-			next;
-			if (select("Dagger Goblin:Mace Goblin:Morning Star Goblin:Hammer Goblin") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "8. Choose the non-elemental Katar.";
-			next;
-			if (select("Katar of Raging Blaze:Katar of Dusty Thornbush:Sharpened Legbone of Ghoul:Infiltrator") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "9. Which is the uncommon monster?";
-			next;
-			if (select("Poring:Mastering:Ghostring:Spore") == 3) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "10. Choose the monster";
-			mes "that is not Undead.";
-			next;
-			if (select("Drake:Megalodon:Spore:Khalitzburg") == 3) {
-				set @assassin_t,@assassin_t + 10;
+			else {
+				set ASSIN_Q2,4;
+				mes "That means you fail!";
+				next;
+				mes "[The Anonymous One]";
+				mes "How could you expect to be an Assassin with this score? Keep training and come back when you're ready.";
 				next;
+				mes "[The Anonymous One]";
+				mes "I would ask 'Khai,' the one who processed your application, for advice.";
+				next;
+				mes "[The Anonymous One]";
+				mes "You may also use this code: ^880000iro.ragnarokonline.com^000000. Somehow, those words are linked to a vast body of otherworldly knowledge...";
+				close2;
+				warp "in_moc_16",19,76;
+				end;
 			}
 		}
-		else {
-			mes "[The Anonymous One]";
-			mes "1. When the 'Increase Dodge' skill is at Level 10, by how much is the maximum dodge rate increased?";
-			next;
-			if (select("30:40:160:20") == 1) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "2. Choose the monster which detects hiding/cloaking Thief/Assassin.";
-			next;
-			if (select("Worm Tail:Andre:Mummy:Soldier Skeleton") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "3. Choose the group of weapons that cannot be used by an Assassin at the same time.";
+		else if (ASSIN_Q2 == 4) {
 			next;
-			if (select("Main Gaughe + Gladius:Stiletto + Main Gauche:Katar + Maingauche:Hammer + Stiletto") == 3) {
-				set @assassin_t,@assassin_t + 10;
-			}
 			mes "[The Anonymous One]";
-			mes "4. Choose the town where the Thief job change resides.";
+			mes "You showed";
+			mes "great effort...";
 			next;
-			if (select("Prontera:Lutie:Alberta:Morroc") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
 			mes "[The Anonymous One]";
-			mes "5. Choose the card that does not affect the AGI stat.";
-			next;
-			if (select("Baphomet Jr. card:Whisper Card:Female Thiefbug card:Male Thiefbug card") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "6. Choose the specialty that applies to Assassins.";
-			next;
-			select("Excellent singing talent:Excellent acting talent:Excellent dancing talent:Excellent dodge ability");
-			set @assassin_t,@assassin_t + 10;
-			mes "[The Anonymous One]";
-			mes "7. Choose the maximum AGI bonus that an Assassin can get at job level 50.";
-			next;
-			if (select("7:8:9:10") == 4) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "8. Choose the item that an Assassin cannot equip.";
-			next;
-			if (select("Dagger:Helm:Boots:Brooch") == 2) {
-				set @assassin_t,@assassin_t + 10;
-			}
-			mes "[The Anonymous One]";
-			mes "9. Choose the";
-			mes "job change item";
-			mes "for a Thief.";
-			next;
-			switch (select("Orange Gooey Mushroom:Red Gooey Mushroom:Orange Net Mushroom:Orange Hair Mushroom")) {
-			case 1:
-				set @assassin_t,@assassin_t + 10;
-			case 2:
-				break;
-			case 3:
-				set @assassin_t,@assassin_t + 10;
-			case 4:
+			mes "Let's see...";
+			mes "You scored";
+			mes "" + .@assassin_t + " points...";
+			if (.@assassin_t > 80) {
+				set ASSIN_Q2,5;
+				changequest 8002,8003;
+				next;
+				mes "[The Anonymous One]";
+				mes "You didn't fail this time! But you're not done just yet. You have another test ahead of you. Once you proceed, you will be informed about your next trial.";
+				close;
 			}
-			mes "[The Anonymous One]";
-			mes "10. Choose a card that would benefit Assassins the least.";
-			next;
-			if (select("Whisper card:Elder Willow card:Soldier Skeleton card:Cobold card") == 2) {
-				set @assassin_t,@assassin_t + 10;
+			else {
+				set ASSIN_Q2,4;
+				mes "You failed!";
+				next;
+				mes "[The Anonymous One]";
+				mes "You're too underqualified. How can you even think about becoming an Assassin?!";
+				next;
+				mes "[The Anonymous One]";
+				mes "I'm surprised that you were even able to become a Thief. Go away, and come back only when you know what the hell you're doing.";
+				next;
+				mes "[The Anonymous One]";
+				mes "Hmpf, if you really don't have a clue, I will give you a little advice.";
 				next;
+				mes "[The Anonymous One]";
+				mes "Go ask 'Khai,' the guy who takes care of your test application, maybe he will help you.";
+				next;
+				mes "[The Anonymous One]";
+				mes "You may also wish to take advantage of the ancient code, ^3355FFiro.ragnarokonline.com^000000. Supposedly, those words are linked to a vast body of otherworldly knowledge...";
+				close2;
+				warp "in_moc_16",19,76;
+				end;
 			}
 		}
+	}
+	else {
 		mes "[The Anonymous One]";
-		mes "You showed";
-		mes "great effort...";
-		next;
-		mes "[The Anonymous One]";
-		mes "Let's see...";
-		mes "You scored";
-		mes "" + @assassin_t + " points...";
-		if (@assassin_t > 80) {
-			set ASSIN_Q3,5;
-			next;
-			mes "[The Anonymous One]";
-			mes "You didn't fail this time! But you're not done just yet. You have another test ahead of you. Once you proceed, you will be informed about your next trial.";
-			close;
-		}
-		set ASSIN_Q3,4;
-		mes "You failed!";
-		next;
-		mes "[The Anonymous One]";
-		mes "You're too underqualified. How can you even think about becoming an Assassin?!";
-		next;
-		mes "[The Anonymous One]";
-		mes "I'm surprised that you were even able to become a Thief. Go away, and come back only when you know what the hell you're doing.";
-		next;
-		mes "[The Anonymous One]";
-		mes "Hmpf, if you really don't have a clue, I will give you a little advice.";
-		next;
-		mes "[The Anonymous One]";
-		mes "Go ask 'Khai,' the guy who takes care of your test application, maybe he will help you.";
-		next;
-		mes "[The Anonymous One]";
-		mes "You may also wish to take advantage of the ancient code, ^3355FFiro.ragnarokonline.com^000000. Supposedly, those words are linked to a vast body of otherworldly knowledge...";
-		close2;
-		warp "in_moc_16",19,76;
-		end;
+		mes "...I will keep watching you.";
+		close;
 	}
-	mes "[The Anonymous One]";
-	mes "...I will keep watching you.";
-	close;
 }
 
 in_moc_16,21,165,2	script	Standby Room#ASNTEST	725,{
 	end;
 
 OnInit:
-	hideonnpc "Standby Room#ASNTEST";
+	disablenpc "Standby Room#ASNTEST";
 	waitingroom "Standby Room",10,"Standby Room#ASNTEST::OnStartArena",1;
 	enablewaitingroomevent;
 	end;
 
 OnStartArena:
-	warpwaitingpc "in_moc_16",66,151;
+	warpwaitingpc "in_moc_16", 66, 151;
 	attachrid($@warpwaitingpc[0]);
-	if(ASSIN_Q3 < 5) {
+	if(ASSIN_Q2<5)
+	{
 		warpchar "in_moc_16",20,145,getcharid(0);
 		end;
 	}
+	
 	donpcevent "Beholder#ASNTEST::OnEnable";
-	donpcevent "Beholder#ASNTEST2::OnEnable";
 	donpcevent "Keeper of the Door#ASN::OnDisable";
-	donpcevent "backers#ASN::OnDisable";
-	donpcevent "traps#ASN::OnEnable";
-	disablewaitingroomevent
+	set getvariableofnpc(.DisableTraps,"Beholder#ASNTEST"),0;
+	disablewaitingroomevent;
 	end;
 
-OnReset:
+OnStart:
 	enablewaitingroomevent;
 	end;
 }
 
 in_moc_16,21,165,2	script	Test Guide#ASN	725,4,4,{
+	end;
 
 OnTouch:
-	if (ASSIN_Q3 < 5) {
+	if (ASSIN_Q2 < 5) {
 		mes "[Barcardi]";
 		mes "You can't take the next trial without passing the written test first. You better speak to the Anonymous One...";
 		close2;
 		warp "in_moc_16",19,76;
 		end;
 	}
-	if ((ASSIN_Q == 1) && (ASSIN_Q3 == 5)) {
+	if (ASSIN_Q == 1 && ASSIN_Q2 == 5) {
 		mes "[Barcardi]";
 		mes "" + strcharinfo(0) + "...";
 		mes "You passed the test..?";
@@ -1370,90 +1168,124 @@ OnTouch:
 		next;
 		mes "[Barcardi]";
 		mes "Only one person is allowed to take the test at a time, so if anyone is taking the test, you'll have to wait until that person finishes.";
-		changequest 8002,8003;
 		close;
 	}
-	mes "[Barcardi]";
-	mes "Hey, don't be too hard";
-	mes "on yourself. Cheer up!";
-	next;
-	mes "[Barcardi]";
-	mes "Hmm, if you're exhausted, I'm willing to bring you back. Of course, if you leave, you'll have to take the job test over again. So what do you want to do?";
-	next;
-	if (select("Continue!:Quit the job change test for now.") == 1) {
+	else {
 		mes "[Barcardi]";
-		mes "Good choice!";
-		mes "Remember, you";
-		mes "must find and kill";
-		mes "6 ^008800Job change target^000000 monsters!";
-		mes "Good luck!";
-		close;
+		mes "Hey, don't be too hard";
+		mes "on yourself. Cheer up!";
+		next;
+		mes "[Barcardi]";
+		mes "Hmm, if you're exhausted, I'm willing to bring you back. Of course, if you leave, you'll have to take the job test over again. So what do you want to do?";
+		next;
+		if (select("Continue!:Quit the job change test for now.") == 1) {
+			mes "[Barcardi]";
+			mes "Good choice!";
+			mes "Remember, you";
+			mes "must find and kill";
+			mes "6 ^008800Job change target^000000 monsters!";
+			mes "Good luck!";
+			close;
+		}
+		mes "[Barcardi]";
+		mes "Alright...";
+		mes "I guess you";
+		mes "could use a break...";
+		close2;
+		set ASSIN_Q,0;
+		set ASSIN_Q3,0;
+		set ASSIN_Q2,0;
+		changequest 8003,8000;
+		warp "in_moc_16",19,13;
+		end;
 	}
-	mes "[Barcardi]";
-	mes "Alright...";
-	mes "I guess you";
-	mes "could use a break...";
-	set ASSIN_Q,0;
-	set ASSIN_Q2,0;
-	set ASSIN_Q3,0;
-	erasequest 8000;
-	erasequest 8001;
-	erasequest 8002;
-	erasequest 8003;
-	erasequest 8004;
-	close2;
-	warp "in_moc_16",19,13;
-	end;
 }
 
-in_moc_16,1,1,0	script	Beholder#ASNTEST	139,{
-	end;
-
-OnInit:
-	disablenpc "Beholder#ASNTEST";
+in_moc_16,1,1,0	script	Beholder#ASNTEST	-1,{
 	end;
 
 OnEnable:
-	enablenpc "Beholder#ASNTEST";
+	set .MyMobs,6;
+	// Target mobs
 	monster "in_moc_16",62,161,"Job change target",1002,1,"Beholder#ASNTEST::OnMyMobDead";
 	monster "in_moc_16",85,169,"Job change target",1063,1,"Beholder#ASNTEST::OnMyMobDead";
 	monster "in_moc_16",88,152,"Job change target",1002,1,"Beholder#ASNTEST::OnMyMobDead";
 	monster "in_moc_16",90,143,"Job change target",1113,1,"Beholder#ASNTEST::OnMyMobDead";
 	monster "in_moc_16",74,167,"Job change target",1031,1,"Beholder#ASNTEST::OnMyMobDead";
 	monster "in_moc_16",77,173,"Job change target",1002,1,"Beholder#ASNTEST::OnMyMobDead";
+	// Decoy mobs
+	monster "in_moc_16",62,161,"Job change creature",1063,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",85,169,"Job change creature",1031,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",79,174,"Job change creature",1113,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",85,156,"Job change creature",1063,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",74,171,"Job change monster",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",68,173,"Job change dummy",1113,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",65,158,"Battle test target",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",60,158,"Warrior test target",1113,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",64,169,"Job change targets",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",71,173,"Jobs change target",1063,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",77,172,"Please don't hit me",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",76,172,"Job change sample",1063,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",75,172,"Not me",1113,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",67,167,"I got yours right here",1063,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",86,170,"Job changes target",1031,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",86,171,"Job quest target",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",85,170,"Job target change",1113,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",89,171,"Hit me",1063,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",85,170,"Battle Monster",1031,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",89,156,"Bouncer",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",89,156,"Mungamorp",1113,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",89,156,"Battle test target",1063,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",89,156,"Dew of the Battle field",1113,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",89,156,"Tear of test",1031,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",83,169,"Evil Druid",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",63,158,"Doppelganger",1063,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",63,157,"Job change dummy",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",64,159,"Job ready dummy",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",63,159,"Job change ready",1063,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",63,159,"Archer test target",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",63,159,"Swordman test target",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",83,148,"Thief test target",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",82,148,"Acolyte test target",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
+	monster "in_moc_16",84,148,"Merchant test target",1002,1,"Beholder#ASNTEST::OnMyMobDead2";
 	initnpctimer;
 	end;
 
 OnReset:
 	killmonster "in_moc_16","Beholder#ASNTEST::OnMyMobDead";
-	donpcevent "Standby Room#ASNTEST::OnReset";
+	killmonster "in_moc_16","Beholder#ASNTEST::OnMyMobDead2";
 	stopnpctimer;
+	donpcevent "Standby Room#ASNTEST::OnStart";
 	end;
 
 OnResetmob:
 	killmonster "in_moc_16","Beholder#ASNTEST::OnMyMobDead";
+	killmonster "in_moc_16","Beholder#ASNTEST::OnMyMobDead2";
 	stopnpctimer;
 	end;
 
 OnMyMobDead:
-	if (mobcount ("in_moc_16","Beholder#ASNTEST::OnMyMobDead") < 1) {
+	set .MyMobs,.MyMobs-1;
+	if (.MyMobs < 1) {
 		mapannounce "in_moc_16","You seem to be doing quite well. Keep it up!",bc_map;
 		set ASSIN_Q,3;
+		changequest 8003,8004;
 		donpcevent "timestopper#1::OnEnable";
 		donpcevent "Keeper of the Door#ASN::OnEnable";
 		donpcevent "Beholder#ASNTEST::OnResetmob";
-		donpcevent "Beholder#ASNTEST2::OnReset";
+		set .DisableTraps,1;
 		stopnpctimer;
-		donpcevent "Beholder#ASNTEST::OnDisable";
-		donpcevent "Beholder#ASNTEST2::OnDisable";
 	}
 	else {
 		mapannounce "in_moc_16","Okay, you're doing good! Hang in there, you're almost there!",bc_map;
 	}
 	end;
 
-OnDisable:
-	disablenpc "Beholder#ASNTEST";
+OnMyMobDead2:
+	mapannounce "in_moc_16",strcharinfo(0) + "! You made a mistake! I'm bringing you back!",bc_map;
+	set ASSIN_Q,2;
+	warp "in_moc_16",19,161;
+	donpcevent "Beholder#ASNTEST::OnReset";
 	end;
 
 OnTimer1000:
@@ -1506,405 +1338,128 @@ OnTimer184000:
 
 OnTimer185000:
 	mapannounce "in_moc_16","Time's up!",bc_map;
-	end;
-
-OnTimer185500:
 	mapannounce "in_moc_16","Well, good job... If you wanted to waste your time. You'll have to try again!",bc_map;
-	set ASSIN_Q,2;
+	//set ASSIN_Q,2;
 	end;
 
 OnTimer186000:
-	donpcevent "backers#ASN::OnEnable";
-	end;
-
-OnTimer186500:
-	donpcevent "backers#ASN::OnDisable";
+	areawarp "in_moc_16",60,136,93,177,"in_moc_16",19,161;
 	end;
 
 OnTimer187000:
 	donpcevent "Beholder#ASNTEST::OnReset";
-	donpcevent "Beholder#ASNTEST2::OnReset";
-	donpcevent "Beholder#ASNTEST::OnDisable";
-	donpcevent "Beholder#ASNTEST2::OnDisable";
 	end;
 }
 
-in_moc_16,76,158,0	script	backers#ASN	139,20,20,{
-
+in_moc_16,68,158,0	script	01_1::SinTrap	-1,0,0,{
 OnTouch:
-	warp "in_moc_16",19,161;
-	end;
-
-OnInit:
-	disablenpc "backers#ASN";
-	end;
-
-OnEnable:
-	donpcevent "job_asn_test::OnDisable";
-	enablenpc "backers#ASN";
-	end;
-
-OnDisable:
-	disablenpc "backers#ASN";
-	end;
-}
-
-in_moc_16,1,1,0	script	traps#ASN	139,{
-	end;
-	
-OnEnable:
-	donpcevent "job_asn_test::OnEnable";
+	if (getvariableofnpc(.DisableTraps,"Beholder#ASNTEST")  < 1) {
+		mapannounce "in_moc_16",strcharinfo(0) + ", you're trapped. You will be sent back.",bc_map;
+		set ASSIN_Q,2;
+		warp "in_moc_16",19,161;
+		donpcevent "Beholder#ASNTEST::OnResetmob";
+		donpcevent "Standby Room#ASNTEST::OnStart";
+	}
 	end;
 }
 
-in_moc_16,2,1,0	script	Beholder#ASNTEST2	139,{
-	end;
+in_moc_16,69,158,0	duplicate(SinTrap)	01_2	-1,0,0
+in_moc_16,68,159,0	duplicate(SinTrap)	01_3	-1,0,0
+in_moc_16,69,159,0	duplicate(SinTrap)	01_4	-1,0,0
+in_moc_16,64,162,0	duplicate(SinTrap)	02_1	-1,0,0
+in_moc_16,65,162,0	duplicate(SinTrap)	02_2	-1,0,0
+in_moc_16,64,163,0	duplicate(SinTrap)	02_3	-1,0,0
+in_moc_16,65,163,0	duplicate(SinTrap)	02_4	-1,0,0
+in_moc_16,62,168,0	duplicate(SinTrap)	03_1	-1,0,0
+in_moc_16,63,168,0	duplicate(SinTrap)	03_2	-1,0,0
+in_moc_16,62,169,0	duplicate(SinTrap)	03_3	-1,0,0
+in_moc_16,63,169,0	duplicate(SinTrap)	03_4	-1,0,0
+in_moc_16,66,170,0	duplicate(SinTrap)	04_1	-1,0,0
+in_moc_16,67,170,0	duplicate(SinTrap)	04_2	-1,0,0
+in_moc_16,66,171,0	duplicate(SinTrap)	04_3	-1,0,0
+in_moc_16,67,171,0	duplicate(SinTrap)	04_4	-1,0,0
+in_moc_16,64,174,0	duplicate(SinTrap)	05_1	-1,0,0
+in_moc_16,64,175,0	duplicate(SinTrap)	05_2	-1,0,0
+in_moc_16,65,174,0	duplicate(SinTrap)	05_3	-1,0,0
+in_moc_16,65,175,0	duplicate(SinTrap)	05_4	-1,0,0
+in_moc_16,72,174,0	duplicate(SinTrap)	06_1	-1,0,0
+in_moc_16,72,175,0	duplicate(SinTrap)	06_2	-1,0,0
+in_moc_16,73,174,0	duplicate(SinTrap)	06_3	-1,0,0
+in_moc_16,73,175,0	duplicate(SinTrap)	06_4	-1,0,0
+in_moc_16,72,166,0	duplicate(SinTrap)	07_1	-1,0,0
+in_moc_16,72,167,0	duplicate(SinTrap)	07_2	-1,0,0
+in_moc_16,73,166,0	duplicate(SinTrap)	07_3	-1,0,0
+in_moc_16,73,167,0	duplicate(SinTrap)	07_4	-1,0,0
+in_moc_16,72,168,0	duplicate(SinTrap)	08_1	-1,0,0
+in_moc_16,72,169,0	duplicate(SinTrap)	08_2	-1,0,0
+in_moc_16,73,168,0	duplicate(SinTrap)	08_3	-1,0,0
+in_moc_16,73,169,0	duplicate(SinTrap)	08_4	-1,0,0
+in_moc_16,78,168,0	duplicate(SinTrap)	09_1	-1,0,0
+in_moc_16,78,169,0	duplicate(SinTrap)	09_2	-1,0,0
+in_moc_16,79,168,0	duplicate(SinTrap)	09_3	-1,0,0
+in_moc_16,79,169,0	duplicate(SinTrap)	09_4	-1,0,0
+in_moc_16,80,172,0	duplicate(SinTrap)	10_1	-1,0,0
+in_moc_16,81,172,0	duplicate(SinTrap)	10_2	-1,0,0
+in_moc_16,82,172,0	duplicate(SinTrap)	10_3	-1,0,0
+in_moc_16,83,172,0	duplicate(SinTrap)	10_4	-1,0,0
+in_moc_16,80,173,0	duplicate(SinTrap)	10_5	-1,0,0
+in_moc_16,81,173,0	duplicate(SinTrap)	10_6	-1,0,0
+in_moc_16,82,173,0	duplicate(SinTrap)	10_7	-1,0,0
+in_moc_16,83,173,0	duplicate(SinTrap)	10_8	-1,0,0
+in_moc_16,88,174,0	duplicate(SinTrap)	11_1	-1,0,0
+in_moc_16,88,175,0	duplicate(SinTrap)	11_2	-1,0,0
+in_moc_16,89,174,0	duplicate(SinTrap)	11_3	-1,0,0
+in_moc_16,89,175,0	duplicate(SinTrap)	11_4	-1,0,0
+in_moc_16,86,166,0	duplicate(SinTrap)	12_1	-1,0,0
+in_moc_16,86,167,0	duplicate(SinTrap)	12_2	-1,0,0
+in_moc_16,87,166,0	duplicate(SinTrap)	12_3	-1,0,0
+in_moc_16,87,167,0	duplicate(SinTrap)	12_4	-1,0,0
+in_moc_16,90,164,0	duplicate(SinTrap)	13_1	-1,0,0
+in_moc_16,90,165,0	duplicate(SinTrap)	13_2	-1,0,0
+in_moc_16,91,164,0	duplicate(SinTrap)	13_3	-1,0,0
+in_moc_16,91,165,0	duplicate(SinTrap)	13_4	-1,0,0
+in_moc_16,84,160,0	duplicate(SinTrap)	14_1	-1,0,0
+in_moc_16,85,160,0	duplicate(SinTrap)	14_2	-1,0,0
+in_moc_16,86,160,0	duplicate(SinTrap)	14_3	-1,0,0
+in_moc_16,87,160,0	duplicate(SinTrap)	14_4	-1,0,0
+in_moc_16,88,160,0	duplicate(SinTrap)	14_5	-1,0,0
+in_moc_16,89,160,0	duplicate(SinTrap)	14_6	-1,0,0
+in_moc_16,84,161,0	duplicate(SinTrap)	14_7	-1,0,0
+in_moc_16,85,161,0	duplicate(SinTrap)	14_8	-1,0,0
+in_moc_16,86,161,0	duplicate(SinTrap)	14_9	-1,0,0
+in_moc_16,87,161,0	duplicate(SinTrap)	14_10	-1,0,0
+in_moc_16,88,161,0	duplicate(SinTrap)	14_11	-1,0,0
+in_moc_16,89,161,0	duplicate(SinTrap)	14_12	-1,0,0
+in_moc_16,86,154,0	duplicate(SinTrap)	15_1	-1,0,0
+in_moc_16,86,155,0	duplicate(SinTrap)	15_2	-1,0,0
+in_moc_16,87,154,0	duplicate(SinTrap)	15_3	-1,0,0
+in_moc_16,87,155,0	duplicate(SinTrap)	15_4	-1,0,0
+in_moc_16,84,150,0	duplicate(SinTrap)	16_1	-1,0,0
+in_moc_16,84,151,0	duplicate(SinTrap)	16_2	-1,0,0
+in_moc_16,85,150,0	duplicate(SinTrap)	16_3	-1,0,0
+in_moc_16,85,151,0	duplicate(SinTrap)	16_4	-1,0,0
+in_moc_16,90,150,0	duplicate(SinTrap)	17_1	-1,0,0
+in_moc_16,90,151,0	duplicate(SinTrap)	17_2	-1,0,0
+in_moc_16,91,150,0	duplicate(SinTrap)	17_3	-1,0,0
+in_moc_16,91,151,0	duplicate(SinTrap)	17_4	-1,0,0
+in_moc_16,86,146,0	duplicate(SinTrap)	18_1	-1,0,0
+in_moc_16,86,147,0	duplicate(SinTrap)	18_2	-1,0,0
+in_moc_16,87,146,0	duplicate(SinTrap)	18_3	-1,0,0
+in_moc_16,87,147,0	duplicate(SinTrap)	18_4	-1,0,0
 
+in_moc_16,87,137,0	script	Keeper of the Door#ASN	45,2,1,{
 OnInit:
-	disablenpc "Beholder#ASNTEST2";
-	end;
-
-OnReset:
-	killmonster "in_moc_16","Beholder#ASNTEST2::OnMyMobDead";
-	end;
-
-OnDisable:
-	disablenpc "Beholder#ASNTEST2";
-	end;
-
-OnEnable:
-	enablenpc "Beholder#ASNTEST2";
-	monster "in_moc_16",62,161,"Job change creature",1063,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",85,169,"Job change creature",1031,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",79,174,"Job change creature",1113,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",85,156,"Job change creature",1063,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",74,171,"Job change monster",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",68,173,"Job change dummy",1113,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",65,158,"Battle test target",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",60,158,"Warrior test target",1113,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",64,169,"Job change targets",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",71,173,"Jobs change target",1063,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",77,172,"Please don't hit me",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",76,172,"Job change sample",1063,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",75,172,"Not me",1113,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",67,167,"I got yours right here",1063,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",86,170,"Job changes target",1031,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",86,171,"Job quest target",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",86,170,"Job target change",1113,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",86,173,"Hit me",1063,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",85,170,"Battle Monster",1031,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",89,156,"Bouncer",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",89,156,"Mungamorp",1113,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",89,156,"Battle test target",1063,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",89,156,"Dew of the Battle field",1113,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",89,156,"Tear of test",1031,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",83,169,"Evil Druid",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",63,158,"Doppelganger",1063,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",63,157,"Job change dummy",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",64,159,"Job ready dummy",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",63,159,"Job change ready",1063,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",63,159,"Archer test target",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",63,159,"Swordman test target",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",83,148,"Thief test target",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",82,148,"Acolyte test target",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	monster "in_moc_16",84,148,"Merchant test target",1002,1,"Beholder#ASNTEST2::OnMyMobDead";
-	end;
-
-OnMyMobDead:
-	mapannounce "in_moc_16"," " + strcharinfo(0) + "! You made a mistake! I'm bringing you back!",bc_map;
-	set ASSIN_Q,2;
-	warp "in_moc_16",19,161;
-	donpcevent "Beholder#ASNTEST::OnReset";
-	donpcevent "Beholder#ASNTEST2::OnReset";
-	donpcevent "Beholder#ASNTEST::OnDisable";
-	donpcevent "Beholder#ASNTEST2::OnDisable";
-	end;
-}
-
--	script	job_asn_test::jasntdups	-1,{
-
-OnTouch:
-	mapannounce "in_moc_16"," " + strcharinfo(0) + ", you're trapped. You will be sent back.",bc_map;
-	set ASSIN_Q,2;
-	warp "in_moc_16",19,161;
-	donpcevent "Beholder#ASNTEST::OnReset";
-	donpcevent "Beholder#ASNTEST2::OnReset";
-	donpcevent "Beholder#ASNTEST::OnDisable";
-	donpcevent "Beholder#ASNTEST2::OnDisable";
-	end;
-
-OnEnable:
-	enablenpc "01_1";
-	enablenpc "01_2";
-	enablenpc "01_3";
-	enablenpc "01_4";
-	enablenpc "02_1";
-	enablenpc "02_2";
-	enablenpc "02_3";
-	enablenpc "02_4";
-	enablenpc "03_1";
-	enablenpc "03_2";
-	enablenpc "03_3";
-	enablenpc "03_4";
-	enablenpc "04_1";
-	enablenpc "04_2";
-	enablenpc "04_3";
-	enablenpc "04_4";
-	enablenpc "05_1";
-	enablenpc "05_2";
-	enablenpc "05_3";
-	enablenpc "05_4";
-	enablenpc "06_1";
-	enablenpc "06_2";
-	enablenpc "06_3";
-	enablenpc "06_4";
-	enablenpc "07_1";
-	enablenpc "07_2";
-	enablenpc "07_3";
-	enablenpc "07_4";
-	enablenpc "08_1";
-	enablenpc "08_2";
-	enablenpc "08_3";
-	enablenpc "08_4";
-	enablenpc "09_1";
-	enablenpc "09_2";
-	enablenpc "09_3";
-	enablenpc "09_4";
-	enablenpc "10_1";
-	enablenpc "10_2";
-	enablenpc "10_3";
-	enablenpc "10_4";
-	enablenpc "10_5";
-	enablenpc "10_6";
-	enablenpc "10_7";
-	enablenpc "10_8";
-	enablenpc "11_1";
-	enablenpc "11_2";
-	enablenpc "11_3";
-	enablenpc "11_4";
-	enablenpc "12_1";
-	enablenpc "12_2";
-	enablenpc "12_3";
-	enablenpc "12_4";
-	enablenpc "13_1";
-	enablenpc "13_2";
-	enablenpc "13_3";
-	enablenpc "13_4";
-	enablenpc "14_1";
-	enablenpc "14_2";
-	enablenpc "14_3";
-	enablenpc "14_4";
-	enablenpc "14_5";
-	enablenpc "14_6";
-	enablenpc "14_7";
-	enablenpc "14_8";
-	enablenpc "14_9";
-	enablenpc "14_10";
-	enablenpc "14_11";
-	enablenpc "14_12";
-	enablenpc "15_1";
-	enablenpc "15_2";
-	enablenpc "15_3";
-	enablenpc "15_4";
-	enablenpc "16_1";
-	enablenpc "16_2";
-	enablenpc "16_3";
-	enablenpc "16_4";
-	enablenpc "17_1";
-	enablenpc "17_2";
-	enablenpc "17_3";
-	enablenpc "17_4";
-	enablenpc "18_1";
-	enablenpc "18_2";
-	enablenpc "18_3";
-	enablenpc "18_4";
-	end;
-
-OnDisable:
-	disablenpc "01_1";
-	disablenpc "01_2";
-	disablenpc "01_3";
-	disablenpc "01_4";
-	disablenpc "02_1";
-	disablenpc "02_2";
-	disablenpc "02_3";
-	disablenpc "02_4";
-	disablenpc "03_1";
-	disablenpc "03_2";
-	disablenpc "03_3";
-	disablenpc "03_4";
-	disablenpc "04_1";
-	disablenpc "04_2";
-	disablenpc "04_3";
-	disablenpc "04_4";
-	disablenpc "05_1";
-	disablenpc "05_2";
-	disablenpc "05_3";
-	disablenpc "05_4";
-	disablenpc "06_1";
-	disablenpc "06_2";
-	disablenpc "06_3";
-	disablenpc "06_4";
-	disablenpc "07_1";
-	disablenpc "07_2";
-	disablenpc "07_3";
-	disablenpc "07_4";
-	disablenpc "08_1";
-	disablenpc "08_2";
-	disablenpc "08_3";
-	disablenpc "08_4";
-	disablenpc "09_1";
-	disablenpc "09_2";
-	disablenpc "09_3";
-	disablenpc "09_4";
-	disablenpc "10_1";
-	disablenpc "10_2";
-	disablenpc "10_3";
-	disablenpc "10_4";
-	disablenpc "10_5";
-	disablenpc "10_6";
-	disablenpc "10_7";
-	disablenpc "10_8";
-	disablenpc "11_1";
-	disablenpc "11_2";
-	disablenpc "11_3";
-	disablenpc "11_4";
-	disablenpc "12_1";
-	disablenpc "12_2";
-	disablenpc "12_3";
-	disablenpc "12_4";
-	disablenpc "13_1";
-	disablenpc "13_2";
-	disablenpc "13_3";
-	disablenpc "13_4";
-	disablenpc "14_1";
-	disablenpc "14_2";
-	disablenpc "14_3";
-	disablenpc "14_4";
-	disablenpc "14_5";
-	disablenpc "14_6";
-	disablenpc "14_7";
-	disablenpc "14_8";
-	disablenpc "14_9";
-	disablenpc "14_10";
-	disablenpc "14_11";
-	disablenpc "14_12";
-	disablenpc "15_1";
-	disablenpc "15_2";
-	disablenpc "15_3";
-	disablenpc "15_4";
-	disablenpc "16_1";
-	disablenpc "16_2";
-	disablenpc "16_3";
-	disablenpc "16_4";
-	disablenpc "17_1";
-	disablenpc "17_2";
-	disablenpc "17_3";
-	disablenpc "17_4";
-	disablenpc "18_1";
-	disablenpc "18_2";
-	disablenpc "18_3";
-	disablenpc "18_4";
+	disablenpc "Keeper of the Door#ASN";
 	end;
-}
-
-in_moc_16,68,158,0	duplicate(jasntdups)	01_1	139
-in_moc_16,69,158,0	duplicate(jasntdups)	01_2	139
-in_moc_16,68,159,0	duplicate(jasntdups)	01_3	139
-in_moc_16,69,159,0	duplicate(jasntdups)	01_4	139
-in_moc_16,64,162,0	duplicate(jasntdups)	02_1	139
-in_moc_16,65,162,0	duplicate(jasntdups)	02_2	139
-in_moc_16,64,163,0	duplicate(jasntdups)	02_3	139
-in_moc_16,65,163,0	duplicate(jasntdups)	02_4	139
-in_moc_16,62,168,0	duplicate(jasntdups)	03_1	139
-in_moc_16,63,168,0	duplicate(jasntdups)	03_2	139
-in_moc_16,62,169,0	duplicate(jasntdups)	03_3	139
-in_moc_16,63,169,0	duplicate(jasntdups)	03_4	139
-in_moc_16,66,170,0	duplicate(jasntdups)	04_1	139
-in_moc_16,67,170,0	duplicate(jasntdups)	04_2	139
-in_moc_16,66,171,0	duplicate(jasntdups)	04_3	139
-in_moc_16,67,171,0	duplicate(jasntdups)	04_4	139
-in_moc_16,64,174,0	duplicate(jasntdups)	05_1	139
-in_moc_16,64,175,0	duplicate(jasntdups)	05_2	139
-in_moc_16,65,174,0	duplicate(jasntdups)	05_3	139
-in_moc_16,65,175,0	duplicate(jasntdups)	05_4	139
-in_moc_16,72,174,0	duplicate(jasntdups)	06_1	139
-in_moc_16,72,175,0	duplicate(jasntdups)	06_2	139
-in_moc_16,73,174,0	duplicate(jasntdups)	06_3	139
-in_moc_16,73,175,0	duplicate(jasntdups)	06_4	139
-in_moc_16,72,166,0	duplicate(jasntdups)	07_1	139
-in_moc_16,72,167,0	duplicate(jasntdups)	07_2	139
-in_moc_16,73,166,0	duplicate(jasntdups)	07_3	139
-in_moc_16,73,167,0	duplicate(jasntdups)	07_4	139
-in_moc_16,72,168,0	duplicate(jasntdups)	08_1	139
-in_moc_16,72,169,0	duplicate(jasntdups)	08_2	139
-in_moc_16,73,168,0	duplicate(jasntdups)	08_3	139
-in_moc_16,73,169,0	duplicate(jasntdups)	08_4	139
-in_moc_16,78,168,0	duplicate(jasntdups)	09_1	139
-in_moc_16,78,169,0	duplicate(jasntdups)	09_2	139
-in_moc_16,79,168,0	duplicate(jasntdups)	09_3	139
-in_moc_16,79,169,0	duplicate(jasntdups)	09_4	139
-in_moc_16,80,172,0	duplicate(jasntdups)	10_1	139
-in_moc_16,81,172,0	duplicate(jasntdups)	10_2	139
-in_moc_16,82,172,0	duplicate(jasntdups)	10_3	139
-in_moc_16,83,172,0	duplicate(jasntdups)	10_4	139
-in_moc_16,80,173,0	duplicate(jasntdups)	10_5	139
-in_moc_16,81,173,0	duplicate(jasntdups)	10_6	139
-in_moc_16,82,173,0	duplicate(jasntdups)	10_7	139
-in_moc_16,83,173,0	duplicate(jasntdups)	10_8	139
-in_moc_16,88,174,0	duplicate(jasntdups)	11_1	139
-in_moc_16,88,175,0	duplicate(jasntdups)	11_2	139
-in_moc_16,89,174,0	duplicate(jasntdups)	11_3	139
-in_moc_16,89,175,0	duplicate(jasntdups)	11_4	139
-in_moc_16,86,166,0	duplicate(jasntdups)	12_1	139
-in_moc_16,86,167,0	duplicate(jasntdups)	12_2	139
-in_moc_16,87,166,0	duplicate(jasntdups)	12_3	139
-in_moc_16,87,167,0	duplicate(jasntdups)	12_4	139
-in_moc_16,90,164,0	duplicate(jasntdups)	13_1	139
-in_moc_16,90,165,0	duplicate(jasntdups)	13_2	139
-in_moc_16,91,164,0	duplicate(jasntdups)	13_3	139
-in_moc_16,91,165,0	duplicate(jasntdups)	13_4	139
-in_moc_16,84,160,0	duplicate(jasntdups)	14_1	139
-in_moc_16,85,160,0	duplicate(jasntdups)	14_2	139
-in_moc_16,86,160,0	duplicate(jasntdups)	14_3	139
-in_moc_16,87,160,0	duplicate(jasntdups)	14_4	139
-in_moc_16,88,160,0	duplicate(jasntdups)	14_5	139
-in_moc_16,89,160,0	duplicate(jasntdups)	14_6	139
-in_moc_16,84,161,0	duplicate(jasntdups)	14_7	139
-in_moc_16,85,161,0	duplicate(jasntdups)	14_8	139
-in_moc_16,86,161,0	duplicate(jasntdups)	14_9	139
-in_moc_16,87,161,0	duplicate(jasntdups)	14_10	139
-in_moc_16,88,161,0	duplicate(jasntdups)	14_11	139
-in_moc_16,89,161,0	duplicate(jasntdups)	14_12	139
-in_moc_16,86,154,0	duplicate(jasntdups)	15_1	139
-in_moc_16,86,155,0	duplicate(jasntdups)	15_2	139
-in_moc_16,87,154,0	duplicate(jasntdups)	15_3	139
-in_moc_16,87,155,0	duplicate(jasntdups)	15_4	139
-in_moc_16,84,150,0	duplicate(jasntdups)	16_1	139
-in_moc_16,84,151,0	duplicate(jasntdups)	16_2	139
-in_moc_16,85,150,0	duplicate(jasntdups)	16_3	139
-in_moc_16,85,151,0	duplicate(jasntdups)	16_4	139
-in_moc_16,90,150,0	duplicate(jasntdups)	17_1	139
-in_moc_16,90,151,0	duplicate(jasntdups)	17_2	139
-in_moc_16,91,150,0	duplicate(jasntdups)	17_3	139
-in_moc_16,91,151,0	duplicate(jasntdups)	17_4	139
-in_moc_16,86,146,0	duplicate(jasntdups)	18_1	139
-in_moc_16,86,147,0	duplicate(jasntdups)	18_2	139
-in_moc_16,87,146,0	duplicate(jasntdups)	18_3	139
-in_moc_16,87,147,0	duplicate(jasntdups)	18_4	139
-
-in_moc_16,87,137,0	script	Keeper of the Door#ASN	45,2,1,{
 
 OnTouch:
-	donpcevent "Thomas#ASNTEST::OnReset";
-	if (ASSIN_Q == 3) {
+	donpcevent "Thomas#ASNTEST::OnDisable";
+	if (ASSIN_Q == 3)
 		set ASSIN_Q,3;
-	}
-	else {
+	else
 		set ASSIN_Q,4;
-	}
-	savepoint "in_moc_16",16,13;
 	warp "in_moc_16",87,102;
+	savepoint "in_moc_16",16,13;
 	end;
 
 OnEnable:
@@ -1915,31 +1470,33 @@ OnEnable:
 OnDisable:
 	disablenpc "Keeper of the Door#ASN";
 	end;
-
-OnInit:
-	disablenpc "Keeper of the Door#ASN";
-	end;
 }
 
-in_moc_16,3,3,0	script	timestopper#1	139,{
-	end;
-
+in_moc_16,3,3,0	script	timestopper#1	-1,{
 OnEnable:
 	initnpctimer;
 	end;
 
 OnTimer187000:
-	donpcevent "Standby Room#ASNTEST::OnReset";
-	donpcevent "Thomas#ASNTEST::OnReset";
+	donpcevent "Thomas#ASNTEST::OnDisable";
 	stopnpctimer;
 	end;
 
 OnDisable:
 	stopnpctimer;
 	end;
+	
+OnMyMobDead:
+	mapannounce "in_moc_16","Hey, what the hell was that?! I told you: No killing monsters!",bc_map;
+	mapannounce "in_moc_16","I'm bringing you back... *Sigh...*",bc_map;
+	set ASSIN_Q,3;
+	warp "in_moc_16",87,102;
+	killmonsterall "in_moc_16";
+	end;
 }
 
 in_moc_16,89,98,1	script	Thomas#ASNTEST	118,5,1,{
+	end;
 
 OnTouch:
 	if (ASSIN_Q == 4) {
@@ -1951,132 +1508,114 @@ OnTouch:
 		mes "It looks like you're having a tough time. You're either trying too hard, or not trying hard";
 		mes "enough, kid.";
 		next;
-		if (select("I'm gonna try it again!:I... I quit!") == 1) {
+		switch(select("I'm gonna try it again!:I... I quit!")) {
+		case 1:
 			mes "[Thomas]";
 			mes "Hmm. Well, okay.";
 			mes "Good luck out there.";
 			close;
+		case 2:
+			mes "[Thomas]";
+			mes "Huh...";
+			mes "Quit the test, eh? Well, I guess you don't wanna waste any more of our time.";
+			next;
+			mes "[Thomas]";
+			mes "Oh hey, don't forget to save your respawn point in town.";
+			close2;
+			mapannounce "in_moc_16",strcharinfo(0) + " got scared and quit the test...Who's Next?!",bc_map;
+			set ASSIN_Q,0;
+			set ASSIN_Q2,0;
+			set ASSIN_Q3,0;
+			changequest 8004,8000;
+			savepoint "in_moc_16",18,14;
+			warp "in_moc_16",18,14;
+			donpcevent "Standby Room#ASNTEST::OnStart";
+			end;
 		}
-		mes "[Thomas]";
-		mes "Huh...";
-		mes "Quit the test, eh? Well, I guess you don't wanna waste any more of our time.";
-		next;
-		mes "[Thomas]";
-		mes "Oh hey, don't forget to save your respawn point in town.";
-		close2;
-		mapannounce "in_moc_16"," " + strcharinfo(0) + " got scared and quit the test...Who's Next?!",bc_map;
-		donpcevent "Standby Room#ASNTEST::OnReset";
-		set ASSIN_Q,0;
-		set ASSIN_Q2,0;
-		set ASSIN_Q3,0;
-		erasequest 8000;
-		erasequest 8001;
-		erasequest 8002;
-		erasequest 8003;
-		erasequest 8004;
-		savepoint "in_moc_16",18,14;
-		warp "in_moc_16",18,14;
-	} else {
-		mes "[Thomas]";
-		mes "Hey, I'm Thomas. I'm in charge of testing your use of the hiding skill. Think you're up to it?";
-		next;
-		mes "[Thomas]";
-		mes "Listen. In this test, you can't kill any monsters. Your goal is to reach 'Barcardi' at the opposite side of this room.";
-		next;
-		mes "[Thomas]";
-		mes "So basically, get to the other side of this room and meet 'Barcardi' without killing a single monster. Understand?";
-		next;
-		mes "[Thomas]";
-		mes "If you run away, get a nose bleed and pass out or something like that, I'll fail ya'. Enough talk. Let's see what you got.";
-		close2;
-		set ASSIN_Q,4;
-		changequest 8003,8004;
 	}
-	donpcevent "Thomas#ASNTEST::OnTestmode";
-	end;
-
-OnTestmode:
-	monster "in_moc_16",81,77,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",82,77,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",83,77,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",84,77,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",85,77,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",86,77,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",88,77,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",89,77,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",90,77,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",77,56,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",78,56,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",79,56,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",80,56,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",81,55,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",91,56,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",92,56,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",93,56,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",94,56,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",95,56,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",96,56,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",97,56,"Mummy",1041,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",76,62,"Hydra",1068,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",79,62,"Hydra",1068,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",79,65,"Hydra",1068,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",76,65,"Hydra",1068,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",96,62,"Hydra",1068,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",96,65,"Hydra",1068,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",99,62,"Hydra",1068,1,"Thomas#ASNTEST::OnMyMobDead";
-	monster "in_moc_16",99,65,"Hydra",1068,1,"Thomas#ASNTEST::OnMyMobDead";
-	end;
 
-OnMyMobDead:
-	mapannounce "in_moc_16","Hey, what the hell was that?! I told you: No killing monsters!",bc_map;
-	mapannounce "in_moc_16","I'm bringing you back... *Sigh...*",bc_map;
-	set ASSIN_Q,3;
-	warp "in_moc_16",87,102;
-	killmonster "in_moc_16","Thomas#ASNTEST::OnMyMobDead";
+	mes "[Thomas]";
+	mes "Hey, I'm Thomas. I'm in charge of testing your use of the hiding skill. Think you're up to it?";
+	next;
+	mes "[Thomas]";
+	mes "Listen. In this test, you can't kill any monsters. Your goal is to reach 'Barcardi' at the opposite side of this room.";
+	next;
+	mes "[Thomas]";
+	mes "So basically, get to the other side of this room and meet 'Barcardi' without killing a single monster. Understand?";
+	next;
+	mes "[Thomas]";
+	mes "If you run away, get a nose bleed and pass out or something like that, I'll fail ya'. Enough talk. Let's see what you got.";
+	close2;
+	set ASSIN_Q,4;
+
+	monster "in_moc_16",81,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",82,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",83,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",84,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",85,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",86,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",88,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",89,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",90,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",77,77,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",78,56,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",79,56,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",80,56,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",81,56,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",91,55,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",92,56,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",93,56,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",94,56,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",95,56,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",96,56,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",97,56,"Mummy",1041,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",76,62,"Hydra",1068,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",79,62,"Hydra",1068,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",79,65,"Hydra",1068,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",76,65,"Hydra",1068,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",96,62,"Hydra",1068,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",96,65,"Hydra",1068,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",99,62,"Hydra",1068,1,"timestopper#1::OnMyMobDead";
+	monster "in_moc_16",99,65,"Hydra",1068,1,"timestopper#1::OnMyMobDead";
 	end;
 
-OnReset:
-	killmonster "in_moc_16","Thomas#ASNTEST::OnMyMobDead";
+OnDisable:
+	donpcevent "Standby Room#ASNTEST::OnStart";
+	killmonsterall "in_moc_16";
 	end;
 }
 
 in_moc_16,87,48,2	script	Barcardi#ASN	725,2,2,{
-
 OnTouch:
 	donpcevent "timestopper#1::OnDisable";
-	donpcevent "Thomas#ASNTEST::OnReset";
+	donpcevent "Thomas#ASNTEST::OnDisable";
 	mes "[Barcardi]";
 	mes "Oh! Congratulations!";
 	mes "You may now proceed to our Guildmaster's room. Good luck!!";
 	close2;
 	set ASSIN_Q,5;
 	changequest 8004,8005;
-	donpcevent "Standby Room#ASNTEST::OnReset";
 	warp "in_moc_16",181,183;
 	end;
 }
 
 in_moc_16,182,169,0	script	Maze Assistant	45,1,1,{
-
 OnTouch:
-	if (ASSIN_Q == 5) {
-		warp "in_moc_16",181,183;
-		set ASSIN_Q,6;
-	}
-	if (ASSIN_Q == 6) {
+	if (ASSIN_Q == 5 || ASSIN_Q == 6) {
 		warp "in_moc_16",181,183;
-		set ASSIN_Q,7;
+		set ASSIN_Q,ASSIN_Q+1;
+		changequest 8005,8006;
 	}
 	else {
-		mapannounce "in_moc_16","" + strcharinfo(0) + " has entered 'Guildmaster's room.'",bc_map;
+		mapannounce "in_moc_16",strcharinfo(0)+" has entered 'Guildmaster's room.'",bc_map;
 		savepoint "in_moc_16",181,183;
+		donpcevent "Guildmaster#ASN2::OnDisable";
 		warp "in_moc_16",167,113;
+		end;
 	}
-	end;
 }
 
-in_moc_16,167,110,0	script	Guildmaster#ASN1	139,3,1,{
-
+in_moc_16,167,110,0	script	Guildmaster#ASN1	-1,3,1,{
 OnTouch:
 	savepoint "in_moc_16",167,110;
 	mes "[Guildmaster]";
@@ -2090,27 +1629,17 @@ OnTouch:
 	mes "I look forward";
 	mes "to meeting you";
 	mes "at the end of maze.";
-	changequest 8005,8006;
 	close;
 
-OnCast:
+OnDisable:
 	mapannounce "in_moc_16","...Next volunteer, please come in.",bc_map;
 	end;
 }
 
 in_moc_16,149,80,4	script	Guildmaster#ASN2	106,1,1,{
-
 OnTouch:
-	if (checkweight(1201,1) == 0) {
-		mes "- Wait a minute !! -";
-		mes "- Currently you're carrying -";
-		mes "- too many items with you. -";
-		mes "- Please try again -";
-		mes "- after you loose some weight. -";
-		close;
-	}
-	savepoint "moc_ruins",79,99;
-	if ((ASSIN_Q == 7) && (Class == Job_Baby_Thief || Class == Job_Thief)) {
+	savepoint "morocc",100,100;
+	if (ASSIN_Q == 7 && BaseJob == Job_Thief) {
 		set ASSIN_Q,8;
 		mes "[Guildmaster]";
 		mes "Welcome.";
@@ -2127,7 +1656,7 @@ OnTouch:
 		mes "[Guildmaster]";
 		mes "First off, what do you think is the priority of an Assassin?";
 		next;
-		switch (select("More power.:An Assassin's pride.:Endless practice.")) {
+		switch(select("More power.:An Assassin's pride.:Endless practice.")) {
 		case 1:
 			mes "[Guildmaster]";
 			mes "More power...";
@@ -2143,7 +1672,7 @@ OnTouch:
 			mes "to be stronger";
 			mes "than you are now?";
 			next;
-			switch (select("Revenge...!:Money~:I want to travel.")) {
+			switch(select("Revenge...!:Money~:I want to travel.")) {
 			case 1:
 				set ASSIN_Q,8;
 				mes "[Guildmaster]";
@@ -2156,6 +1685,7 @@ OnTouch:
 				mes "[Guildmaster]";
 				mes "Being an Assassin means";
 				mes "to abandon the ego.";
+				next;
 				break;
 			case 2:
 				set ASSIN_Q,9;
@@ -2166,6 +1696,7 @@ OnTouch:
 				mes "Being an Assassin means";
 				mes "to abandon such worldly";
 				mes "attachments...";
+				next;
 				break;
 			case 3:
 				set ASSIN_Q,10;
@@ -2177,8 +1708,10 @@ OnTouch:
 				next;
 				mes "[Guildmaster]";
 				mes "In a way, being an Assassin is to live life in loneliness...";
+				next;
 				break;
 			}
+			break;
 		case 2:
 			mes "[Guildmaster]";
 			mes "An Assassin's pride...";
@@ -2193,7 +1726,7 @@ OnTouch:
 			mes "[Guildmaster]";
 			mes "I can understand why their pride and dignity would be so important to them. Now, for what reason do you wish to become an Assassin?";
 			next;
-			switch (select("I like the solitude.:Making money being an Assassin.:They just look interesting.")) {
+			switch(select("I like the solitude.:Making money being an Assassin.:They just look interesting.")) {
 			case 1:
 				set ASSIN_Q,11;
 				mes "[Guildmaster]";
@@ -2207,11 +1740,13 @@ OnTouch:
 				next;
 				mes "[Guildmaster]";
 				mes "But, as I told you before, we have comrades. I recommend having at least one comrade to back up you when you're on a mission.";
+				next;
 				break;
 			case 2:
 				set ASSIN_Q,12;
 				mes "[Guildmaster]";
 				mes "Well, I can't deny it, we do need money to make a living. But don't you think we should pursue something even more important than money?";
+				next;
 				break;
 			case 3:
 				set ASSIN_Q,13;
@@ -2224,8 +1759,10 @@ OnTouch:
 				mes "[Guildmaster]";
 				mes "Don't forget...";
 				mes "Assassins don't toy around. We are not into a style or trend, and we never will be.";
+				next;
 				break;
 			}
+			break;
 		case 3:
 			mes "[Guildmaster]";
 			mes "Endless Practice...";
@@ -2235,7 +1772,7 @@ OnTouch:
 			mes "Unlike the Thief class, the Assassin job doesn't allow self-indulgence. Tell me the";
 			mes "reason you train endlessly.";
 			next;
-			switch (select("To broaden my skills.:It's a goal of mine.:For spiritual improvement.")) {
+			switch(select("To broaden my skills.:It's a goal of mine.:For spiritual improvement.")) {
 			case 1:
 				set ASSIN_Q,14;
 				mes "[Guildmaster]";
@@ -2243,6 +1780,7 @@ OnTouch:
 				next;
 				mes "[Guildmaster]";
 				mes "You won't be satisfied in becoming an Assassin if you think this...";
+				next;
 				break;
 			case 2:
 				set ASSIN_Q,15;
@@ -2256,6 +1794,7 @@ OnTouch:
 				mes "It's to bad I had to kill him before he was level 52... ^666666*Sigh*^000000 Oh well.";
 				next;
 				mes "I'm a bit worried about you. I hope you realize that once you become an Assassin, there's no turning back...";
+				next;
 				break;
 			case 3:
 				set ASSIN_Q,16;
@@ -2265,10 +1804,11 @@ OnTouch:
 				next;
 				mes "[Guildmaster]";
 				mes "I hope you're not a hypocrite. Spiritual discipline is the best way for you to survive.";
+				next;
 				break;
 			}
+			break;
 		}
-		set @assassin_sangdam,0;
 		mes "[Guildmaster]";
 		mes "Sadly, there are some nit-wits who are eager to be Assassins even though they don't know anything...";
 		next;
@@ -2281,29 +1821,30 @@ OnTouch:
 		mes "[Guildmaster]";
 		mes "So if you could become an Assassin right now, what is the first thing you would do?";
 		next;
-		switch (select("I would go hunt right away.:There are people waiting for me.:Check how I can help as an Assassin.")) {
+		switch(select("I would go hunt right away.:There are people waiting for me.:Check how I can help as an Assassin.")) {
 		case 1:
 			mes "[Guildmaster]";
 			mes "Hunt...";
 			mes "Is that all...?";
 			next;
-			switch (select("I would level up fast.:I want to explore my Assassin skills.:I will go where I couldn't go as a Thief.")) {
+			switch(select("I would level up fast.:I want to explore my Assassin skills.:I will go where I couldn't go as a Thief.")) {
 			case 1:
-				set @assassin_sangdam,@assassin_sangdam + 10;
+				set .@assassin_sangdam,.@assassin_sangdam+10;
 				mes "[Guildmaster]";
 				mes "Don't act recklessly...";
 				mes "Being an Assassin never makes you a different person. And don't rely on chance.";
+				next;
 				break;
 			case 2:
-				set @assassin_sangdam,@assassin_sangdam + 5;
+				set .@assassin_sangdam,.@assassin_sangdam+5;
 				mes "[Guildmaster]";
 				mes "It is good for one to examine oneself. I can understand that you will be excited by the great change in your ability.";
 				next;
 				mes "[Guildmaster]";
 				mes "In the meantime, I hope you won't forget the Assassin mentality.";
+				next;
 				break;
 			case 3:
-				set @assassin_sangdam,@assassin_sangdam + 0;
 				mes "[Guildmaster]";
 				mes "Very well...";
 				mes "Exploring places you've never seen before. But know that being an Assassin never makes you a different person.";
@@ -2311,78 +1852,84 @@ OnTouch:
 				mes "[Guildmaster]";
 				mes "Don't force yourself too much.";
 				mes "Take your time and travel wisely.";
+				next;
 				break;
 			}
+			break;
 		case 2:
 			mes "[Guildmaster]";
 			mes "Who is waiting";
 			mes "for you, might I ask?";
 			next;
-			switch (select("My friends.:My Guildsmen.:My lover.")) {
+			switch(select("My friends.:My Guildsmen.:My lover.")) {
 			case 1:
-				set @assassin_sangdam,@assassin_sangdam + 5;
+				set .@assassin_sangdam,.@assassin_sangdam+5;
 				mes "[Guildmaster]";
 				mes "I see...";
 				mes "Appreciate them for caring about you, even when you're alone.";
+				next;
 				break;
 			case 2:
-				set @assassin_sangdam,@assassin_sangdam + 5;
+				set .@assassin_sangdam,.@assassin_sangdam+5;
 				mes "[Guildmaster]";
 				mes "Great...";
 				mes "Comrades for whom you would die for...";
 				next;
 				mes "[Guildmaster]";
 				mes "As an Assassin, find a job that you can do for them without them knowing..";
+				next;
 				break;
 			case 3:
-				set @assassin_sangdam,@assassin_sangdam + 0;
 				mes "[Guildmaster]";
 				mes "Haha, the needs of the body are sometimes hard to ignore. It's best to accept that part of human nature.";
 				next;
 				mes "[Guildmaster]";
-				if (Sex == 1) {
+				if (sex )
 					mes "But you must never reveal to her the Assassin side of your life. No matter what it takes.";
-				}
-				else {
+				else
 					mes "But you must never reveal to him the Assassin side of your life, no matter what it takes.";
-				}
 				next;
 				mes "[Guildmaster]";
 				mes "Love your beloved forever, even if you can't openly express it. Sometimes, life doesn't allow you to find true love more than once.";
+				next;
 				break;
 			}
+			break;
 		case 3:
 			mes "[Guildmaster]";
 			mes "That's most admirable. Is there anything that you would like to ask me about?";
 			next;
-			switch (select("Places where Assassins can level up...:Main goals as an Assassin.:Financial consulting.")) {
+			switch(select("Places where Assassins can level up...:Main goals as an Assassin.:Financial consulting.")) {
 			case 1:
-				set @assassin_sangdam,@assassin_sangdam + 5;
+				set .@assassin_sangdam,.@assassin_sangdam+5;
 				mes "[Guildmaster]";
 				mes "It all depends on your mind. Any place could be the best to level up according to your mind state.";
 				next;
 				mes "[Guildmaster]";
 				mes "You must know how to";
 				mes "survive in any situation.";
+				next;
 				break;
 			case 2:
-				set @assassin_sangdam,@assassin_sangdam + 0;
 				mes "[Guildmaster]";
 				mes "There are many Assassins out there. Look to them as your trainers, and ask for their opinions.";
 				next;
 				mes "[Guildmaster]";
 				mes "I hope you will become an excellent Assassin. And when you reach a certain level, you must guide newbies as your trainers have.";
+				next;
 				break;
 			case 3:
-				set @assassin_sangdam,@assassin_sangdam + 10;
+				set .@assassin_sangdam,.@assassin_sangdam+10;
 				mes "[Guildmaster]";
 				mes "Oh my lord...";
 				mes "Are you planning to become an Assassin in order to make money?";
 				next;
 				mes "[Guildmaster]";
 				mes "People of that nature are unwelcome. If such is your goal, you may wish to reconsider your job...";
+				next;
 				break;
 			}
+			break;
 		}
 		mes "[Guildmaster]";
 		mes "It was nice to meet you. You reminded me of the good ol' days.";
@@ -2399,13 +1946,13 @@ OnTouch:
 		mes "They will";
 		mes "be here soon.";
 		next;
-		donpcevent "[Huey]::OnEnable";
-		donpcevent "[Khai]::OnEnable";
-		donpcevent "[The Anonymous One]::OnEnable";
-		donpcevent "[Barcardi]::OnEnable";
-		donpcevent "[Beholder]::OnEnable";
-		donpcevent "[Thomas]::OnEnable";
-		donpcevent "[Gayle Maroubitz]::OnEnable";
+		enablenpc "[Huey]";
+		enablenpc "[Khai]";
+		enablenpc "[The Anonymous One]";
+		enablenpc "[Barcardi]";
+		enablenpc "[Beholder]";
+		enablenpc "[Thomas]";
+		enablenpc "[Gayle Maroubitz]";
 		mes "[The Anonymous One]";
 		mes "I am here.";
 		next;
@@ -2415,7 +1962,7 @@ OnTouch:
 		mes "[The Anonymous One]";
 		mes "Ah yeah...";
 		mes "I think";
-		mes "" + strcharinfo(0) + "";
+		mes ""+ strcharinfo(0) +"";
 		mes "is decent.";
 		next;
 		mes "[Guildmaster]";
@@ -2424,7 +1971,7 @@ OnTouch:
 		mes "supports you. How";
 		mes "about you, Huey?";
 		next;
-		if (ASSIN_Q2 == 1) {
+		if (ASSIN_Q3 == 1) {
 			mes "[Huey]";
 			mes "A rarity.";
 			mes "You can tell";
@@ -2433,9 +1980,10 @@ OnTouch:
 			mes "[Huey]";
 			mes "I agree with";
 			mes "the Anonymous One.";
-		} else {
+		}
+		else {
 			mes "[Huey]";
-			mes "Although " + strcharinfo(0) + " looks too mellow and gentle, kind of like a pussycat, " + strcharinfo(0) + " has the stuff.";
+			mes "Although "+ strcharinfo(0) +" looks too mellow and gentle, kind of like a pussycat, "+ strcharinfo(0) +" has the stuff.";
 			next;
 			mes "[Huey]";
 			mes "If it's alright with you, I'd like to get back to my job.";
@@ -2456,66 +2004,68 @@ OnTouch:
 		next;
 		mes "[Guildmaster]";
 		mes "Hmm...";
-		mes "It seems we are all in agreement. Good. I don't have any problem with " + strcharinfo(0) + " as well...";
+		mes "It seems we are all in agreement. Good. I don't have any problem with "+ strcharinfo(0) +" as well...";
 		next;
-		if (ASSIN_Q == 8) {
+		switch(ASSIN_Q) {
+		case 8:
 			mes "[Guildmaster]";
 			mes "Even though you're driven by personal revenge, I hope it will go away as you train...";
 			next;
-		}
-		if (ASSIN_Q == 9) {
+			break;
+		case 9:
 			mes "[Guildmaster]";
 			mes "Even though your main concern for now is being a rich, I'm sure you'll pursue something even greater...";
 			next;
-		}
-		if (ASSIN_Q == 10) {
+			break;
+		case 10:
 			mes "[Guildmaster]";
 			mes "Eager to travel all around the world, I hope your real identity is found in your journeys...";
 			next;
-		}
-		if (ASSIN_Q == 11) {
+			break;
+		case 11:
 			mes "[Guildmaster]";
 			mes "You seem to know a lot about Assassins. I don't think frustration from being alone will be difficult for you...";
 			next;
-		}
-		if (ASSIN_Q == 12) {
+			break;
+		case 12:
 			mes "[Guildmaster]";
 			mes "You have an idiocy about money, but I believe that you should be able to overcome it.";
 			next;
 			mes "[Guildmaster]";
 			mes "Although I do not trust you for now, I will give you a chance...";
 			next;
-		}
-		if (ASSIN_Q == 13) {
+			break;
+		case 13:
 			mes "[Guildmaster]";
 			mes "Even though you're enamored with Assassins superficially, I believe you will realize the real value of the Assassin job sooner or later.";
 			next;
-		}
-		if (ASSIN_Q == 14) {
+			break;
+		case 14:
 			mes "[Guildmaster]";
 			mes "One of the rare people who seeks better skills, I hope you will realize the importance of spiritual discipline sooner or later.";
 			next;
-		}
-		if (ASSIN_Q == 15) {
+			break;
+		case 15:
 			mes "[Guildmaster]";
 			mes "Sooner or later, you will find a new goal to which you can devote yourself...";
 			next;
-		}
-		if (ASSIN_Q == 16) {
+			break;
+		case 16:
 			mes "[Guildmaster]";
 			mes "I know some people care only about their physical training, but";
 			mes "I believe you stand out amongst them...";
 			next;
 		}
-		if ((ASSIN_Q2 == 1) && (Class == Job_Baby_Thief || Class == Job_Thief) && (ASSIN_Q > 6) && (ASSIN_Q < 17)) {
-			set ASSIN_Q2,2;
+		if (ASSIN_Q3 == 1 && BaseJob == Job_Thief && ASSIN_Q > 6 && ASSIN_Q < 17) {
+			set ASSIN_Q,17;
+			set ASSIN_Q3,2;
 			mes "[Guildmaster]";
 			mes "Well, I've said too much. Please choose a weapon as a present.";
 			next;
 			mes "[Guildmaster]";
 			mes "You can choose a Jur, Katar, Main Gauche, or a Gladius. As a master, I love them all.";
 			next;
-			switch (select("Jur:Katar:Main Gauche:Gladius")) {
+			switch(select("Jur:Katar:Main Gauche:Gladius")) {
 			case 1:
 				mes "[Guildmaster]";
 				mes "A Jur...";
@@ -2541,57 +2091,32 @@ OnTouch:
 				mes "A Gladius...";
 				mes "It used to rule over the Assassin weapon market. Please take care of my gladius.";
 				getitem 1220,1; //Gladius_
-				break;
 			}
 			next;
-		} else {
+		}
+		else {
+			set ASSIN_Q,17;
 			mes "[Guildmaster]";
 			mes "Well, I talked too much.";
 			mes "Please take this first.";
 			next;
-			set .@asn_item,rand(1,5);
-			if (.@asn_item == 1) {
+			switch(rand(1,5)) {
+			case 1:
 				getitem 1207,1; //Main_Gauche
-			}
-			if (.@asn_item == 2) {
+				break;
+			case 2:
 				getitem 1250,1; //Jur
-			}
-			if (.@asn_item == 3) {
+				break;
+			case 3:
 				getitem 1216,1; //Stiletto
-			}
-			if (.@asn_item == 4) {
+				break;
+			case 4:
 				getitem 1201,1; //Knife
-			}
-			else {
+				break;
+			case 5:
 				getitem 1252,1; //Katar
 			}
 		}
-		set ASSIN_Q,17;
-		mes "[Guildmaster]";
-		mes "Well, I am giving you a token. Please return to the Assassin expert, the Ferocious-Looking Huey, at the entrance.";
-		next;
-		mes "[Guildmaster]";
-		mes "Upon receiving this token, Huey will promote you to an Assassin.";
-		next;
-		mes "[Guildmaster]";
-		mes "You, " + strcharinfo(0) + ", have chosen to live as an Assassin. May you learn our ways and be an honorable example to others.";
-		savepoint "moc_ruins",79,99;
-		getitem 1008,1; //Frozen_Heart
-		next;
-		mes "[Guildmaster]";
-		mes "Okay, all of you may go back to your positions. I will send you to the entrance as well. Let's move...";
-		donpcevent "[Huey]::OnDisable";
-		donpcevent "[Khai]::OnDisable";
-		donpcevent "[The Anonymous One]::OnDisable";
-		donpcevent "[Barcardi]::OnDisable";
-		donpcevent "[Beholder]::OnDisable";
-		donpcevent "[Thomas]::OnDisable";
-		donpcevent "[Gayle Maroubitz]::OnDisable";
-		close2;
-		warp "in_moc_16",17,19;
-		end;
-	}
-	if ((ASSIN_Q == 17) && (countitem(1008) == 0)) {
 		mes "[Guildmaster]";
 		mes "Well, I am giving you a token. Please return to the Assassin expert, the Ferocious-Looking Huey, at the entrance.";
 		next;
@@ -2600,24 +2125,24 @@ OnTouch:
 		next;
 		mes "[Guildmaster]";
 		mes "You, " + strcharinfo(0) + ", have chosen to live as an Assassin. May you learn our ways and be an honorable example to others.";
-		savepoint "moc_ruins",79,99;
+		savepoint "morocc",100,100;
 		getitem 1008,1; //Frozen_Heart
+		changequest 8006,8007;
 		next;
 		mes "[Guildmaster]";
 		mes "Okay, all of you may go back to your positions. I will send you to the entrance as well. Let's move...";
-		donpcevent "[Huey]::OnDisable";
-		donpcevent "[Khai]::OnDisable";
-		donpcevent "[The Anonymous One]::OnDisable";
-		donpcevent "[Barcardi]::OnDisable";
-		donpcevent "[Beholder]::OnDisable";
-		donpcevent "[Thomas]::OnDisable";
-		donpcevent "[Gayle Maroubitz]::OnDisable";
-		changequest 8006,8007;
+		disablenpc "[Huey]";
+		disablenpc "[Khai]";
+		disablenpc "[The Anonymous One]";
+		disablenpc "[Barcardi]";
+		disablenpc "[Beholder]";
+		disablenpc "[Thomas]";
+		disablenpc "[Gayle Maroubitz]";
 		close2;
 		warp "in_moc_16",17,19;
 		end;
 	}
-	if (ASSIN_Q == 17) {
+	else if (ASSIN_Q == 17) {
 		mes "[Guildmaster]";
 		mes "Umm...?";
 		mes "How come you're in here...?";
@@ -2628,7 +2153,7 @@ OnTouch:
 		warp "in_moc_16",17,19;
 		end;
 	}
-	if ((ASSIN_Q > 7) && (ASSIN_Q < 17)) {
+	else if (ASSIN_Q > 7 && ASSIN_Q < 17) {
 		set ASSIN_Q,7;
 		mes "[Guildmaster]";
 		mes "What the hell? You pressed 'Cancel' during the process. Do you want to change your job or what?";
@@ -2638,14 +2163,16 @@ OnTouch:
 		mes "Ok, let's start again. If you don't listen this time, you won't leave this room alive. You got me?";
 		close;
 	}
-	mes "[Guildmaster]";
-	mes "Umm? How come your in here?";
-	next;
-	mes "[Guildmaster]";
-	mes "You already finished your test, go give your ^006699Necklace of Oblivion^000000 to the Ferocious-looking guy so you can change your job!";
-	close2;
-	warp "in_moc_16",17,19;
-	end;
+	else {
+		mes "[Guildmaster]";
+		mes "Umm? How come your in here?";
+		next;
+		mes "[Guildmaster]";
+		mes "You already finished your test, go give your ^006699Necklace of Oblivion^000000 to the Ferocious-looking guy so you can change your job!";
+		close2;
+		warp "in_moc_16",17,19;
+		end;
+	}
 }
 
 in_moc_16,186,81,1	script	Master Assist	55,1,1,{
@@ -2654,8 +2181,7 @@ in_moc_16,186,81,1	script	Master Assist	55,1,1,{
 	close;
 }
 
-in_moc_16,170,90,0	script	info 1	139,{
-
+in_moc_16,170,90,0	script	info 1	-1,{
 OnTouch:
 	mes "[Guildmaster]";
 	mes "Huh.";
@@ -2663,16 +2189,14 @@ OnTouch:
 	close;
 }
 
-in_moc_16,153,85,0	script	info 2	139,1,1,{
-
+in_moc_16,153,85,0	script	info 2	-1,1,1,{
 OnTouch:
 	mes "[Guildmaster]";
 	mes "You're getting warmer. You're almost there. Just, turn around a little bit.";
 	close;
 }
 
-in_moc_16,160,85,0	script	info 3	139,1,1,{
-
+in_moc_16,160,85,0	script	info 3	-1,1,1,{
 OnTouch:
 	mes "[Guildmaster]";
 	mes "Hmm.";
@@ -2681,8 +2205,7 @@ OnTouch:
 	close;
 }
 
-in_moc_16,175,89,0	script	info 4	139,1,1,{
-
+in_moc_16,175,89,0	script	info 4	-1,1,1,{
 OnTouch:
 	mes "[Guildmaster]";
 	mes "Umm...";
@@ -2690,8 +2213,7 @@ OnTouch:
 	close;
 }
 
-in_moc_16,164,88,0	script	info 5	139,{
-
+in_moc_16,164,88,0	script	info 5	-1,{
 OnTouch:
 	mes "[Guildmaster]";
 	mes "Well done...";
@@ -2699,138 +2221,79 @@ OnTouch:
 	close;
 }
 
-in_moc_16,149,95,0	script	info 6	139,1,1,{
-
+in_moc_16,149,95,0	script	info 6	-1,1,1,{
 OnTouch:
 	mes "[Guildmaster]";
 	mes "Hm? Not bad. You're almost here.";
 	close;
 }
 
-in_moc_16,180,101,0	script	info 7	139,1,1,{
-
+in_moc_16,180,101,0	script	info 7	-1,1,1,{
 OnTouch:
 	mes "[Guildmaster]";
 	mes "I don't think you're going the right way.";
 	close;
 }
 
-in_moc_16,186,107,0	script	info 8	139,1,1,{
-
+in_moc_16,186,107,0	script	info 8	-1,1,1,{
 OnTouch:
 	mes "[Guildmaster]";
 	mes "No sense of direction, eh?";
 	close;
 }
 
-in_moc_16,156,87,1	script	[Huey]	55,1,1,{
+in_moc_16,156,87,1	script	[Huey]	55,{
 	end;
 
 OnInit:
 	disablenpc "[Huey]";
 	end;
-
-OnDisable:
-	disablenpc "[Huey]";
-	end;
-
-OnEnable:
-	enablenpc "[Huey]";
-	end;
 }
 
-in_moc_16,156,85,1	script	[Khai]	730,1,1,{
+in_moc_16,156,85,1	script	[Khai]	730,{
 	end;
 
 OnInit:
 	disablenpc "[Khai]";
 	end;
-
-OnDisable:
-	disablenpc "[Khai]";
-	end;
-
-OnEnable:
-	enablenpc "[Khai]";
-	end;
 }
 
-in_moc_16,156,83,1	script	[The Anonymous One]	106,1,1,{
+in_moc_16,156,83,1	script	[The Anonymous One]	106,{
 	end;
 
 OnInit:
 	disablenpc "[The Anonymous One]";
 	end;
-
-OnDisable:
-	disablenpc "[The Anonymous One]";
-	end;
-
-OnEnable:
-	enablenpc "[The Anonymous One]";
-	end;
 }
 
-in_moc_16,156,81,2	script	[Barcardi]	725,1,1,{
+in_moc_16,156,81,2	script	[Barcardi]	725,{
 	end;
 
 OnInit:
 	disablenpc "[Barcardi]";
 	end;
-
-OnDisable:
-	disablenpc "[Barcardi]";
-	end;
-
-OnEnable:
-	enablenpc "[Barcardi]";
-	end;
 }
 
-in_moc_16,156,79,1	script	[Beholder]	118,1,1,{
+in_moc_16,156,79,1	script	[Beholder]	118,{
 	end;
 
 OnInit:
 	disablenpc "[Beholder]";
 	end;
-
-OnDisable:
-	disablenpc "[Beholder]";
-	end;
-
-OnEnable:
-	enablenpc "[Beholder]";
-	end;
 }
 
-in_moc_16,156,77,1	script	[Thomas]	118,1,1,{
+in_moc_16,156,77,1	script	[Thomas]	118,{
 	end;
 
 OnInit:
 	disablenpc "[Thomas]";
 	end;
-
-OnDisable:
-	disablenpc "[Thomas]";
-	end;
-
-OnEnable:
-	enablenpc "[Thomas]";
-	end;
 }
 
-in_moc_16,156,75,1	script	[Gayle Maroubitz]	55,1,1,{
+in_moc_16,156,75,1	script	[Gayle Maroubitz]	55,{
 	end;
 
 OnInit:
 	disablenpc "[Gayle Maroubitz]";
 	end;
-
-OnDisable:
-	disablenpc "[Gayle Maroubitz]";
-	end;
-
-OnEnable:
-	enablenpc "[Gayle Maroubitz]";
-	end;
 }
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index f96a41a25..413fe69fd 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -1,18 +1,46 @@
-//===== rAthena Script ======================================= 
-// Blacksmith Job change Quest
-//===== By: ================================================== 
-//= Masao
-//= Credits: Muad_Dib
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= Any rAthena SVN
-//===== Description: ========================================= 
-//= [Translated from the Official]
-//= Job change Quest from Merchant -> Blacksmith.
-//===== Additional Comments: ================================= 
-//= 1.0 Updated to latest available official file. [Masao]
-//============================================================ 
+//===== rAthena Script =======================================
+//= Blacksmith Quest
+//===== By: ==================================================
+//= EREMES THE CANIVALIZER(Aegis)
+//= Translated by: yoshiki.
+//= Converted by: Komurka.
+//= Optimized and further edited by kobra_k88.
+//= Further bugfixed and tested by Lupus
+//===== Current Version: =====================================
+//= 2.8
+//===== Compatible With: =====================================
+//= rAthena  SVN
+//===== Description: =========================================
+//= [Aegis Conversion]
+//= Job Change quest for Blacksmith class.
+//===== Additional Comments: =================================
+//= Changed some npc names to the iRO names. Changed some variable
+//= names and labels. Edited some text.[kobra_k88]
+//= Removed "if(JobLevel > 48) goto higher". It was a left over line.
+//= Thx to "Decker".[kobra_k88]
+//= Fixed some typos, thanks to Riotblade [celest]
+//= 1.3-1.5 Added Baby Class support [Lupus]
+//= 1.6 Added a func which prevent advanced classes passing
+//= 2nd Job Quests again. It also guides adv classes where
+//= to go. [Lupus]
+//= 1.7 item quantity/ids typos fix
+//= 1.8 Moved the Quest to Einbroch [Poki#3]
+//= 2.0 Changed numbers to constants. [Vicious]
+//= 2.1 Removed Duplicates [Silent]
+//= 2.2 Merged Jfunc, changed job numbers to constants [Lupus]
+//= 2.3 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 2.4 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf]
+//= 2.4a Changed a BaseJob to baseclass. [L0ne_W0lf]
+//= 2.4b Further bug fixes with teh hel of Barron-Monster. [L0ne_W0lf]
+//= 2.4c More fixes courtosy of Micktu. [L0ne_W0lf]
+//= 2.4d Fixed an incorrect answer in the quiz. (Trojal) [L0ne_W0lf]
+//= 2.4e Touched up a few issues as pointed out by Ultramage. [L0ne_W0lf]
+//= 2.5 Krongast is in Lighthalzen. (DarkValmir) [L0ne_W0lf]
+//= 2.6 Fixed 4 bugs [Lupus]
+//= 2.6a Typo fix [Yommy]
+//= 2.7 Added Quest Log commands. [Kisuka]
+//= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
+//==============================================================
 
 ein_in01,18,28,4	script	Guildsman#BLS	731,{
 	if (Upper == 1) {
@@ -45,52 +73,62 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 	mes "our craft. Our skills of melting metal into new weapons";
 	mes "and tools is truly a form of art!";
 	next;
-	if (Class == Job_Baby || Class == Job_Novice) {
-		mes "[Altiregen]";
-		mes "First, you must become a Merchant before you can become a Blacksmith. Go to the city of Alberta to learn the Merchant trade.";
+	if (BaseClass == Job_Novice) {
+		if (sex == 0) {
+			mes "[Altiregen]";
+			mes "Oh~";
+			mes "what a very";
+			mes "pretty lady!";
+			mes "Are you interested in";
+			mes "becoming a Blacksmith?";
+			next;
+			mes "[Altiregen]";
+			mes "First, you must become a Merchant before you can become a Blacksmith. Go to the city of Alberta to learn the Merchant trade.";
+			close;
+		}
 		close;
 	}
-	if (Class == Job_Swordman || Class == Job_Knight || Class == Job_Crusader) {
+	else if (BaseClass == Job_Swordman) {
 		mes "[Altiregen]";
 		mes "Oh, are you interested in having a weapon forged? I'm sorry to disappoint you, but I actually have a lot of business to attend to.";
 		close;
 	}
-	if (Class == Job_Archer || Class == Job_Hunter || Class == Job_Dancer || Class == Job_Bard) {
+	else if (BaseClass == Job_Archer) {
 		mes "[Altiregen]";
 		mes "Oh...";
 		mes "There's not much we can offer you here. And you can't really help out around here unless you know how to make stuff...";
 		close;
 	}
-	if (Class == Job_Mage || Class == Job_Wizard || Class == Job_Sage) {
+	else if (BaseClass == Job_Mage) {
 		mes "[Altiregen]";
 		mes "Oh? What's a magic user doing here? I'm surprised. Usually this kind of rough work is beneath you intellectual types.";
 		close;
 	}
-	if (Class == Job_Acolyte || Class == Job_Priest || Class == Job_Monk) {
+	else if (BaseClass == Job_Acolyte) {
 		mes "[Altiregen]";
 		mes "Oh! Am I correct in assuming you're a member of the Clergy? Would you please bless me before you leave!";
 		close;
 	}
-	if (Class == Job_Thief || Class == Job_Assassin || Class == Job_Rogue) {
+	else if (BaseClass == Job_Thief) {
 		mes "[Altiregen]";
 		mes "I'm sorry...";
 		mes "But there really isn't anything for you to steal here. Well, there are the Daggers we keep in the back, but...";
 		close;
 	}
-	if (Class == Job_Alchemist) {
+	else if (BaseJob == Job_Alchemist) {
 		mes "[Altiregen]";
 		mes "So how's the pharmacy business going on recently?";
 		mes "Well, my forging business does not seem to grow any longer.";
 		close;
 	}
-	if (Class == Job_Baby_Blacksmith || Class == Job_Blacksmith) {
+	else if (BaseJob == Job_Blacksmith) {
 		mes "[Altiregen]";
 		mes "Oh! Long time no see.";
 		mes "Have you come to purchase supplies from Christopher? These days I'm stuck behind this desk. My body's itching to strike the ol' anvil.";
 		close;
 	}
-	if (Class == Job_Baby_Merchant || Class == Job_Merchant) {
-		if (SkillPoint != 0) {
+	else if (BaseJob == Job_Merchant) {
+		if (SkillPoint) {
 			mes "[Altiregen]";
 			mes "You can't change to the Blacksmith Job Class without first using all your skill points. Please come back after wisely using your skill points.";
 			close;
@@ -103,14 +141,14 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 			mes "If you're interested, fill out this application with your name";
 			mes "and Job Level.";
 			next;
-			switch (select("Fill out Application.:What are the requirements?:Um, I need to think about it.")) {
+			switch(select("Fill out Application.:What are the requirements?:Um, I need to think about it.")) {
 			case 1:
-				if (SkillPoint != 0) {
+				if (SkillPoint) {
 					mes "[Altiregen]";
 					mes "You can't change to the Blacksmith Job Class without first using all your skill points. Please come back after wisely using your skill points.";
 					close;
 				}
-				if ((JobLevel > 39) && (BSMITH_Q == 0)) {
+				else if (JobLevel > 39 && BSMITH_Q == 0) {
 					mes "[Altiregen]";
 					mes "Hmmm...";
 					mes "Looks like you";
@@ -133,7 +171,7 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 					mes "and good luck!";
 					close;
 				}
-				if (JobLevel < 40) {
+				else if (JobLevel < 40) {
 					mes "[Altiregen]";
 					mes "Hmmm, it seems that you lack experience as a Merchant. We require that you are at least Job Level 40, you see.";
 					next;
@@ -157,18 +195,18 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 				close;
 			}
 		}
-		if ((BSMITH_Q > 0) && (BSMITH_Q < 8)) {
+		else if (BSMITH_Q > 0  && BSMITH_Q < 8) {
 			mes "[Altiregen]";
 			mes "You haven't left yet?";
 			mes "Go to Einbech and find ^8E6B23Geschupenschte^000000. Finish helping him out, and when you're done, come back to me.";
 			close;
 		}
-		if ((BSMITH_Q > 8) && (BSMITH_Q < 15)) {
+		else if (BSMITH_Q > 8 && BSMITH_Q < 15) {
 			mes "[Altiregen]";
 			mes "Was the work you did for ^8E6B23Geschupenschte^000000 to your liking? He's known for being pretty exacting...";
 			close;
 		}
-		if (BSMITH_Q == 15) {
+		else if (BSMITH_Q == 15) {
 			mes "[Altiregen]";
 			mes "Great job!!";
 			mes "You have passed";
@@ -203,53 +241,51 @@ ein_in01,18,28,4	script	Guildsman#BLS	731,{
 			mes "If you can't endure this, you'll never be a Blacksmith!";
 			close;
 		}
-		if (BSMITH_Q == 16) {
+		else if (BSMITH_Q == 16) {
 			mes "[Altiregen]";
 			mes "Um? Haven't you talk to the guildsman yet?";
 			mes "If you haven't, I suggest you to do so as soon as possible.";
 			close;
 		}
-		if ((BSMITH_Q == 17) && (countitem(1005) > 0) && (JobLevel > 39)) {
+		else if (BSMITH_Q == 17 && countitem(1005) > 0 && JobLevel > 39) {
 			mes "[Altiregen]";
-			mes "Excellent, I can tell by the twinkle in your eye that you were successful. I can now bestow upon you the gift of smithing, the art";
-			mes "of the Blacksmith.";
-			next;
-			if(Class == Job_Baby_Merchant){
-				jobchange Job_Baby_Blacksmith;
-			} else {
-				jobchange Job_Blacksmith;
+			mes "Excellent, I can tell by the twinkle in your eye that you were successful. I can now bestow upon you the gift of the smithing, the art of the Blacksmith.";
+			if(checkquest(2015) != -1) {
+				changequest 2015,2016;
 			}
+			next;
+			set .@joblvl,JobLevel;
+			callfunc "Job_Change",Job_Blacksmith;
+			callfunc "F_ClearJobVar";		// clears all job variables for the current player
 			mes "[Altiregen]";
 			mes "Always remember that we are creators, and artists over metals. Be wary that you do not fall into the pitfalls of selfishness";
 			mes "and greed.";
 			next;
 			delitem 1005,1; //Hammer_Of_Blacksmith
+			completequest 2016;
 			mes "[Altiregen]";
 			mes "Here is a little";
 			mes "gift to mark the";
 			mes "beginning of your";
 			mes "life as a Blacksmith.";
 			mes "Congratulations!!!";
-			if (JobLevel > 48) {
+			if (.@joblvl > 48)
 				getitem 999,30; //Steel
-			} else {
+			else 
 				getitem 999,5; //Steel
-			}
-			changequest 2015,2016;
-			completequest 2016;
 			close;
 		}
 	}
 }
 
-ein_in01,201,27,3	script	Guildsman#einbech	63,{
+ein_in01,201,27,3	script	Guildsman#alberta	63,{
 	mes "[Geschupenschte]";
 	mes "Hello there!";
 	mes "I'm ^8E6B23Geschupenschte^000000,";
 	mes "a Blacksmith by trade.";
 	mes "Nice to meet you!";
 	next;
-	if (Class == Job_Baby_Merchant || Class == Job_Merchant) {
+	if (BaseJob == Job_Merchant) {
 		mes "[Geschupenschte]";
 		mes "Oh ho ho!";
 		mes "You're a Merchant!";
@@ -270,193 +306,190 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 			mes "to be busy~";
 			close;
 		}
-		if (BSMITH_Q == 1) {
-			mes "[Geschupenschte]";
-			mes "Oh ho ho!";
-			mes "You're a Merchant!";
-			mes "Excellent! I was";
-			mes "in need of some help!";
-			next;
-			mes "[Geschupenschte]";
-			mes "Am I correct in assuming you are the help sent by the Blacksmith Guild? There aren't many trustyworthy people I can hire to help me, so I'm always";
-			mes "short on help.";
-			next;
-			mes "[Geschupenschte]";
-			mes "Hmm, in any case,";
-			mes "you are the help that was sent, right? Okay, I have some work for you that must be handled";
-			mes "right away!";
-			next;
-			mes "[Geschupenschte]";
-			mes "Some time ago, I had a boy working for me who had no experience and bought the wrong supplies! It was terrible...";
-			next;
-			mes "[Geschupenschte]";
-			mes "Anyone would hate to lose money through a foolish mistake like that. However, I have a slightly more difficult job for you.";
-			next;
-			mes "[Geschupenschte]";
-			mes "However, I want to make sure that you have some basic knowledge as a Merchant. I'd like to ask you some questions, if that's okay.";
-			next;
-			if (select("Yes.:Um, can I have some time to prepare?") == 1) {
-				set @black_q,0;
-				set .@rand_b,rand(1,3);
-				if (.@rand_b == 1) {
+		else if ((BSMITH_Q == 1) || (BSMITH_Q == 2)) {
+			if (BSMITH_Q == 1) {
+				mes "[Geschupenschte]";
+				mes "Am I correct in assuming you are the help sent by the Blacksmith Guild? There aren't many trustyworthy people I can hire to help me, so I'm always";
+				mes "short on help.";
+				next;
+				mes "[Geschupenschte]";
+				mes "Hmm, in any case,";
+				mes "you are the help that was sent, right? Okay, I have some work for you that must be handled";
+				mes "right away!";
+				next;
+				mes "[Geschupenschte]";
+				mes "Some time ago, I had a boy working for me who had no experience and bought the wrong supplies! It was terrible...";
+				next;
+				mes "[Geschupenschte]";
+				mes "Anyone would hate to lose money through a foolish mistake like that. However, I have a slightly more difficult job for you.";
+				next;
+				mes "[Geschupenschte]";
+				mes "However, I want to make sure that you have some basic knowledge as a Merchant. I'd like to ask you some questions, if that's okay.";
+				next;
+				set .@selection,select("Yes.:Um, can I have some time to prepare?");
+			}
+			else if (BSMITH_Q == 2) {
+				mes "[Geschupenschte]";
+				mes "So, have you";
+				mes "studied a little";
+				mes "more this time?";
+				next;
+				mes "[Geschupenschte]";
+				mes "I admit that it's pretty unreasonable to expect anyone to get a perfect score the first time around, so I'll give you";
+				mes "a little break...";
+				next;
+				mes "[Geschupenschte]";
+				mes "You can miss";
+				mes "one problem!";
+				mes "Alright, let's start";
+				mes "with the questions~";
+				next;
+			}
+			if (.@selection != 2) {
+				if (rand(2)) {
 					mes "[Geschupenschte]";
 					mes "1. Which one of the following regions is matched incorrectly";
 					mes "with its specialty item?";
 					next;
-					if (select("Morroc - Thief Clothes:Alberta - Two Hand Axe:Comodo - Berserk Potion:Alberta - Swordmace") == 4) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("Morroc - Thief Clothes:Alberta - Two Hand Axe:Comodo - Berserk Potion:Alberta - Swordmace") == 4)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "2. What status can";
 					mes "be inflicted with the";
 					mes "^8E6B23Hammer Fall^000000 skill?";
 					next;
-					if (select("Stun:Blind:Silence:Sleep") == 1) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("Stun:Blind:Silence:Sleep") == 1)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "3. Which one of the following skills cannot be performed";
 					mes "by a Merchant?";
 					next;
-					if (select("Vending:Discount:Overcharge:Increase AGI") == 4) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("Vending:Discount:Overcharge:Increase AGI") == 4)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "4. Where can you find a store";
 					mes "that sells Blue Gemstones?";
 					next;
-					if (select("Alberta:Morroc:Geffen:Prontera") == 3) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("Alberta:Morroc:Geffen:Prontera") == 3)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "5. Where is the";
 					mes "Tool Dealer";
 					mes "located in Geffen?";
 					next;
-					if (select("8 o'clock direction from the town square:11 o'clock direction from the town square:6 o'clock direction from the town square:5 o'clock direction from the town square") == 1) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("8 o'clock direction from the town square:11 o'clock direction from the town square:6 o'clock direction from the town square:5 o'clock direction from the town square") == 1)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "6. Which weapon";
 					mes "cannot be used";
 					mes "by a Merchant?";
 					next;
-					if (select("Stiletto:Ring Pommel Saber:Chain:Bible") == 4) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("Stiletto:Ring Pommel Saber:Chain:Bible") == 4)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "7. Which one of the following";
 					mes "has the highest defense rate?";
 					next;
-					if (select("Panties:Mink Coat:Wooden Mail:Silk Robe") == 2) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("Panties:Mink Coat:Wooden Mail:Silk Robe") == 2)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "8. For Level 3 weapons,";
 					mes "what is the ^8E6B23Safe^000000 limit";
 					mes "for upgrading?";
 					next;
-					if (select("up to + 3:up to + 4:up to + 5:up to + 6") == 3) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("up to + 3:up to + 4:up to + 5:up to + 6") == 3)
+						set .@black_q,.@black_q+10;
 					mes "9. What item";
 					mes "can be made using";
 					mes "the ^8E6B23Trunks^000000 item?";
 					next;
-					if (select("Sakkat:Ghost Bandana:Majestic Goat:Antler") == 1) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("Sakkat:Ghost Bandana:Majestic Goat:Antler") == 1)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "10. The most important";
 					mes "part of being a Merchant is...?";
 					next;
 					select("Credit:Integrity:Money:Rhetoric");
-						set @black_q,@black_q + 10;
-						next;
-				} else {
+					set .@black_q,.@black_q+10;
+				}
+				else {
 					mes "[Geschupenschte]";
 					mes "1. Among the following cities, which one is not correctly matched with its specialty?";
 					next;
-					if (select("Al De Baran - Yggdrasil Leaf:Alberta - Hammer:Comodo - Berserk Potion:Al De Baran - Hammer") == 4) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("Al De Baran - Yggdrasil Leaf:Alberta - Hammer:Comodo - Berserk Potion:Al De Baran - Hammer") == 4)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "2. How much Zeny";
 					mes "is one Jellopy worth?";
 					next;
-					if (select("1 Zeny:2 Zeny:3 Zeny:4 Zeny") == 3) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("1 Zeny:2 Zeny:3 Zeny:4 Zeny") == 3)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "3. What is required";
 					mes "for a Merchant to use";
 					mes "the ^8E6B23Vending^000000 Skill?";
 					next;
-					if (select("Must have a Cart.:Must have items to sell.:Must be wielding a weapon.:Must be wearing armor.") == 1) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("Must have a Cart.:Must have items to sell.:Must be wielding a weapon.:Must be wearing armor.") == 1)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "4. Where can you";
 					mes "change your Job to";
 					mes "become a Merchant?";
 					next;
-					if (select("Alberta:Morroc:Geffen:Prontera") == 1) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("Alberta:Morroc:Geffen:Prontera") == 1)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "5. Where is the";
 					mes "Weapons Dealer";
 					mes "located in Morroc?";
 					next;
-					if (select("7 o'clock from the town's center:11 o'clock from the town's center:6 o'clock from the town's center:5 o'clock from the town's center") == 4) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("7 o'clock from the town's center:11 o'clock from the town's center:6 o'clock from the town's center:5 o'clock from the town's center") == 4)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "6. What weapon";
 					mes "can a Merchant";
 					mes "not use?";
 					next;
-					if (select("Main Gauche:Claymore:Chain:Two handed Axe") == 2) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("Main Gauche:Claymore:Chain:Two handed Axe") == 2)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "7. Which one of the following";
 					mes "has the highest defense rate?";
 					next;
-					if (select("Panties:Mink Coat:Wooden Mail:Silk Robe") == 2) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("Panties:Mink Coat:Wooden Mail:Silk Robe") == 2)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "8. For Level 3 weapons,";
 					mes "what is the ^8E6B23Safe^000000 limit";
 					mes "for upgrading?";
 					next;
-					if (select("up to + 3:up to + 4:up to + 5:up to + 6") == 2) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("up to + 3:up to + 4:up to + 5:up to + 6") == 3)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "9. What monster does";
 					mes "NOT drop Iron Ore?";
 					next;
-					if (select("Chon Chon:Steel Chon Chon:Zerom:Anolian") == 4) {
-						set @black_q,@black_q + 10;
-					}
+					if (select("Chon Chon:Steel Chon Chon:Zerom:Anolian") == 4)
+						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "10. What is most";
 					mes "important to a Merchant?";
 					next;
 					select("Rhetoric:Credit:Money:Experience");
-						set @black_q,@black_q + 10;
-						next;
+					set .@black_q,.@black_q+10;
 				}
 				mes "[Geschupenschte]";
 				mes "Umm. You did a good job!";
 				next;
 				mes "[Geschupenschte]";
-				mes "Let's see...your score is..." + @black_q + " points.";
-				if (@black_q == 100) {
-					set BSMITH_Q, 3;
-					changequest 2000,2002;
+				mes "Let's see...your score is..." + .@black_q + " points.";
+				if (.@black_q == 100) {
+					set BSMITH_Q,3;
+					if(checkquest(2001) != -1) {
+						changequest 2001,2002;
+					}else{
+						changequest 2000,2002;
+					}
 					mes "Oh ho ho~";
 					mes "You'll have";
 					mes "no problem";
@@ -468,11 +501,19 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 					mes "When you get back, I'll be ready!";
 					close;
 				}
-				set BSMITH_Q, 2;
-				changequest 2000,2001;
+				set BSMITH_Q,2;
+				if(checkquest(2001) == -1) {
+					changequest 2000,2001;
+				}
 				mes ".............";
 				next;
 				mes "[Geschupenschte]";
+				if (BSMITH_Q == 2) {
+					mes "How do I say this?";
+					mes "How did you fail again?!";
+					mes "If you plan to perform your duties in this manner, I can't trust you with any kind of job...";
+					close;
+				}
 				mes "Hmm...";
 				mes "It pains me to say this, but it seems you need to study a little more. You can never be";
 				mes "a Blacksmith with";
@@ -485,7 +526,8 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 			mes "being careful~";
 			close;
 		}
-		if (BSMITH_Q == 2) {
+		/*
+		else if (BSMITH_Q == 2) {
 			mes "[Geschupenschte]";
 			mes "So, have you";
 			mes "studied a little";
@@ -501,191 +543,10 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 			mes "Alright, let's start";
 			mes "with the questions~";
 			next;
-			set @black_q,0;
-			set .@rand_b,rand(1,3);
-			if (.@rand_b == 1) {
-				mes "[Geschupenschte]";
-				mes "1. Which one of the following regions is matched incorrectly";
-				mes "with its specialty item?";
-				next;
-				if (select("Morroc - Thief Clothes:Alberta - Two Hand Axe:Comodo - Beserk Potion:Alberta - Swordmace") == 4) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "2. What status can";
-				mes "be inflicted with the";
-				mes "^8E6B23Hammer Fall^000000 skill?";
-				next;
-				if (select("Stun:Blind:Silence:Sleep") == 1) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "3. Which one of the following skills cannot be performed";
-				mes "by a Merchant?";
-				next;
-				if (select("Vending:Discount:Overcharge:Increase AGI") == 4) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "4. Where can you find a store";
-				mes "that sells Blue Gemstones?";
-				next;
-				if (select("Alberta:Morroc:Geffen:Prontera") == 3) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "5. Where is the";
-				mes "Tool Dealer";
-				mes "located in Geffen?";
-				next;
-				if (select("8 o'clock direction from the town square:11 o'clock direction from the town square:6 o'clock direction from the town square:5 o'clock direction from the town square") == 1) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "6. Which weapon";
-				mes "cannot be used";
-				mes "by a Merchant?";
-				next;
-				if (select("Stiletto:Ring Pommel Saber:Chain:Bible") == 4) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "7. Which one of the following";
-				mes "has the highest defense rate?";
-				next;
-				if (select("Panties:Mink Coat:Wooden Mail:Silk Robe") == 2) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "8. For Level 3 weapons,";
-				mes "what is the ^8E6B23Safe^000000 limit";
-				mes "for upgrading?";
-				next;
-				if (select("up to + 3:up to + 4:up to + 5:up to + 6") == 3) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "9. What item";
-				mes "can be made using";
-				mes "the ^8E6B23Trunks^000000 item?";
-				next;
-				if (select("Sakkat:Ghost Bandana:Majestic Goat:Antler") == 1) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "10. The most important";
-				mes "part of being a Merchant is...?";
-				next;
-				select("Credit:Integrity:Money:Rhetoric");
-					set @black_q,@black_q + 10;
-					next;
-			} else {
-				mes "[Geschupenschte]";
-				mes "1. Among the following cities, which one is not correctly matched with its specialty?";
-				next;
-				if (select("Al De Beran - Yggdrasil Leaf:Alberta - Hammer:Comodo - Beserk Potion:Al De Baran - Hammer") == 4) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "2. How much Zeny";
-				mes "is one Jellopy worth?";
-				next;
-				if (select("1 Zeny:2 Zeny:3 Zeny:4 Zeny") == 3) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "3. What is required";
-				mes "for a Merchant to use";
-				mes "the ^8E6B23Vending^000000 Skill?";
-				next;
-				if (select("Must have a Cart.:Must have items to sell.:Must be wielding a weapon.:Must be wearing armor.") == 1) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "4. Where can you";
-				mes "change your Job to";
-				mes "become a Merchant?";
-				next;
-				if (select("Alberta:Morroc:Geffen:Prontera") == 1) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "5. Where is the";
-				mes "Weapons Dealer";
-				mes "located in Morroc?";
-				next;
-				if (select("7 o'clock from the town's center:11 o'clock from the town's center:6 o'clock from the town's center:5 o'clock from the town's center") == 4) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "6. What weapon";
-				mes "can a Merchant";
-				mes "not use?";
-				next;
-				if (select("Main Gauche:Claymore:Chain:Two handed Axe") == 2) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "7. Which one of the following";
-				mes "has the highest defense rate?";
-				next;
-				if (select("Panties:Mink Coat:Wooden Mail:Silk Robe") == 2) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "8. For Level 3 weapons,";
-				mes "what is the ^8E6B23Safe^000000 limit";
-				mes "for upgrading?";
-				next;
-				if (select("up to + 3:up to + 4:up to + 5:up to + 6") == 2) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "9. What monster does";
-				mes "NOT drop Iron Ore?";
-				next;
-				if (select("Chon Chon:Steel Chon Chon:Zerom:Anolian") == 4) {
-					set @black_q,@black_q + 10;
-				}
-				mes "[Geschupenschte]";
-				mes "10. What is most";
-				mes "important to a Merchant?";
-				next;
-				select("Rhetoric:Credit:Money:Experience");
-					set @black_q,@black_q + 10;
-					next;
-			}
-			mes "[Geschupenschte]";
-			mes "Hmm, good. You did a great job!";
-			next;
-			mes "[Geschupenschte]";
-			mes "Let's see...your score is..." + @black_q + " points.";
-			if (@black_q > 80) {
-				set BSMITH_Q,3;
-				changequest 2001,2002;
-				mes "Oh ho ho~";
-				mes "You'll have";
-				mes "no problem";
-				mes "with this score!";
-				next;
-				mes "[Geschupenschte]";
-				mes "I will entrust you with a job!";
-				mes "Give me a little time to make the necessary arrangements.";
-				mes "When you get back, I'll be ready!";
-				close;
-			}
-			set BSMITH_Q,2;
-			completequest 2000;
-			setquest 2001;
-			mes ".............";
-			next;
-			mes "[Geschupenschte]";
-			mes "How do I say this?";
-			mes "How did you fail again?!";
-			mes "If you plan to perform your duties in this manner, I can't trust you with any kind of job...";
-			close;
+			goto L_AskQuestions;
 		}
-		if (BSMITH_Q == 3) {
+		*/
+		else if (BSMITH_Q == 3) {
 			mes "[Geschupenschte]";
 			mes "Hmm...";
 			mes "Now, where were";
@@ -705,176 +566,98 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 			mes "Well, to make";
 			mes "this you will need...";
 			next;
-			set .@black_item,rand(1,6);
-			if (.@black_item == 1) {
-				set BSMITH_Q,4;
-				changequest 2002,2003;
-				mes "[Geschupenschte]";
-				mes "^8E6B232 Steel^000000,";
-				mes "^8E6B231 Rotten Bandage^000000,";
-				mes "^8E6B232 Blue Gemstone^000000, and";
-				mes "^8E6B231 Arc Wand^000000, the kind";
-				mes "you can buy from";
-				mes "an NPC shop.";
-				next;
-				mes "[Geschupenschte]";
-				mes "Collecting these items will be your test. Coincidentally, it's also a bit of a good way for me to save money. I'll repeat what you'll need to bring back to me...";
-				next;
-				mes "[Geschupenschte]";
-				mes "^8E6B232 Steel^000000,";
-				mes "^8E6B231 Rotten Bandage^000000,";
-				mes "^8E6B232 Blue Gemstone^000000, and";
-				mes "^8E6B231 Arc Wand^000000, the kind";
-				mes "you can buy from";
-				mes "an NPC shop.";
-				next;
-			}
-			if (.@black_item == 2) {
-				set BSMITH_Q,5;
-				changequest 2002,2004;
-				mes "[Geschupenschte]";
-				mes "^8E6B232 Star Dust^000000,";
-				mes "^8E6B231 Skel-bone^000000,";
-				mes "^8E6B231 Zargon^000000 and";
-				mes "^8E6B231 Gladius^000000, the kind";
-				mes "you can buy from";
-				mes "an NPC shop.";
-				next;
-				mes "[Geschupenschte]";
-				mes "Collecting these items will be your test. Coincidentally, it's also a bit of a good way for me to save money. I'll repeat what you'll need to bring back to me...";
-				next;
-				mes "[Geschupenschte]";
-				mes "^8E6B232 Star Dust^000000,";
-				mes "^8E6B231 Skel-bone^000000,";
-				mes "^8E6B231 Zargon^000000 and";
-				mes "^8E6B231 Gladius^000000, the kind";
-				mes "you can buy from";
-				mes "an NPC shop.";
-				next;
+			switch(rand(1,5)) {
+			//Steel, Rotten_Bandage, Blue_Gemstone, Arc_Wand
+			case 1: setarray .@items[0], 999,1, 930,1, 717,2, 1610,1, 4; changequest 2002,2003; break;
+			//Sparkling_Dust, Skel_Bone, Zargon, Gladius
+			case 2: setarray .@items[0], 1001,2, 932,1, 912,1, 1219,1, 5; changequest 2002,2004; break;
+			//Coal, Shell, Boody_Red, Tsurugi
+			case 3: setarray .@items[0], 1003,1, 935,2, 990,2, 1119,1, 6; changequest 2002,2005; break;
+			//Iron_Ore, Eye_Bandage, Blue_Gemstone, Arbalest
+			case 4: setarray .@items[0], 1002,1, 2212,1, 717,2, 1713,1, 7; changequest 2002,2006; break;
+			//Iron, Green_Herb, Animal's_Skin, Ring_Pommel_Saber
+			default: setarray .@items[0], 998,1, 511,1, 919,2, 1122,1, 8; changequest 2002,2007; break;
 			}
-			if (.@black_item == 3) {
-				set BSMITH_Q,6;
-				changequest 2002,2005;
-				mes "[Geschupenschte]";
-				mes "^8E6B232 Coal^000000,";
-				mes "^8E6B232 Shell^000000,";
-				mes "^8E6B232 Red Blood^000000 and";
-				mes "^8E6B231 Tsurugi^000000, the kind";
-				mes "you can buy from";
-				mes "an NPC shop.";
-				next;
-				mes "[Geschupenschte]";
-				mes "Collecting these items will be your test. Coincidentally, it's also a bit of a good way for me to save money. I'll repeat what you'll need to bring back to me...";
-				next;
-				mes "[Geschupenschte]";
-				mes "^8E6B232 Coal^000000,";
-				mes "^8E6B232 Shell^000000,";
-				mes "^8E6B232 Red Blood^000000 and";
-				mes "^8E6B231 Tsurugi^000000, the kind";
-				mes "you can buy from";
-				mes "an NPC shop.";
-				next;
+			set BSMITH_Q,.@items[8];
+			mes "[Geschupenschte]";
+			mes "^8E6B23"+.@items[1]+" "+getitemname(.@items[0])+"^000000,";
+			mes "^8E6B23"+.@items[3]+" "+getitemname(.@items[2])+"^000000,";
+			mes "^8E6B23"+.@items[5]+" "+getitemname(.@items[4])+"^000000, and";
+			mes "^8E6B23"+.@items[7]+" "+getitemname(.@items[6])+"^000000, the kind";
+			mes "you can buy from";
+			mes "an NPC shop.";
+			next;
+			mes "[Geschupenschte]";
+			mes "Collecting these items will be your test. Coincidentally, it's also a bit of a good way for me to save money. I'll repeat what you'll need to bring back to me...";
+			next;
+			mes "[Geschupenschte]";
+			mes "Okay~";
+			mes "Good luck";
+			mes "on your first job!";
+			close;
+		}
+		else if (BSMITH_Q > 3 && BSMITH_Q < 9) {
+			switch(BSMITH_Q) {
+			case 4: setarray .@items[0], 999,1, 930,1, 717,2, 1610,1, 9; break;
+			case 5: setarray .@items[0], 1001,2, 932,1, 912,1, 1219,1, 10; break;
+			case 6: setarray .@items[0], 1003,1, 935,2, 990,2, 1119,1, 11; break;
+			case 7: setarray .@items[0], 1002,1, 2212,1, 717,2, 1713,1, 12; break;
+			case 8: setarray .@items[0], 998,1, 511,1, 919,2, 1122,1, 13; break;
 			}
-			if (.@black_item == 4) {
-				set BSMITH_Q,7;
-				changequest 2002,2006;
+			mes "[Geschupenschte]";
+			mes "Ah, you're back!";
+			mes "Did you bring";
+			mes "everything that";
+			mes "I requested?";
+			next;
+			if (countitem(.@items[0]) >= .@items[1] && countitem(.@items[2]) >= .@items[3] && countitem(.@items[4]) >= .@items[5] && countitem(.@items[6]) >= .@items[7]) {
 				mes "[Geschupenschte]";
-				mes "^8E6B238 Iron Ore^000000,";
-				mes "^8E6B231 Eye Patch^000000,";
-				mes "^8E6B232 Blue Gemstone^000000 and";
-				mes "^8E6B231 Arbalest^000000, the kind";
-				mes "you can buy from";
-				mes "an NPC shop.";
+				mes "Wait...";
+				mes "Didn't I tell you";
+				mes "to get 3 Steel?";
 				next;
 				mes "[Geschupenschte]";
-				mes "Collecting these items will be your test. Coincidentally, it's also a bit of a good way for me to save money. I'll repeat what you'll need to bring back to me...";
+				mes "Oh, I guess it was";
+				mes "two after all. Let's see...";
+				mes "Yeah, you got everything!";
+				mes "Now, just give me a second.";
 				next;
 				mes "[Geschupenschte]";
-				mes "^8E6B238 Iron Ore^000000,";
-				mes "^8E6B231 Eye Patch^000000,";
-				mes "^8E6B232 Blue Gemstone^000000 and";
-				mes "^8E6B231 Arbalest^000000, the kind";
-				mes "you can buy from";
-				mes "an NPC shop.";
+				mes "Oh, you should make sure that you are not carrying ^FF0000more than one "+getitemname(.@items[6])+"^000000, you should really only have an "+getitemname(.@items[6])+" that you bought from an NPC shop in your inventory.";
 				next;
-			}
-			else {
-				set BSMITH_Q,8;
-				changequest 2002,2007;
+				if (select("Oh, could you give me a second?:Oh, I brought what you asked for.") == 1) {
+					mes "[Geschupenschte]";
+					mes "Hmmm, it would be";
+					mes "a good idea to put the";
+					mes "rest of your items";
+					mes "in Kafra Storage.";
+					close;
+				}
 				mes "[Geschupenschte]";
-				mes "^8E6B238 Iron^000000";
-				mes "^8E6B2320 Green Herb^000000";
-				mes "^8E6B232 Animal Skin^000000";
-				mes "and ^8E6B231 Ring Pommel Saber^000000, the kind you can buy from an NPC shop.";
+				mes "Okay.";
+				mes "Great~!!";
 				next;
 				mes "[Geschupenschte]";
-				mes "Collecting these items will be your test. Coincidentally, it's also a bit of a good way for me to save money. I'll repeat what you'll need to bring back to me...";
+				mes "^3355FF*Clang...!*^000000";
 				next;
 				mes "[Geschupenschte]";
-				mes "^8E6B238 Iron^000000";
-				mes "^8E6B2320 Green Herb^000000";
-				mes "^8E6B232 Animal Skin^000000";
-				mes "and ^8E6B231 Ring Pommel Saber^000000, the kind you can buy from an NPC shop.";
+				mes "^3355FF*Crash Crash!*^000000";
 				next;
-			}
-			mes "[Geschupenschte]";
-			mes "Okay~";
-			mes "Good luck";
-			mes "on your first job!";
-			close;
-		}
-		if ((BSMITH_Q > 3) && (BSMITH_Q < 9)) {
-			if (BSMITH_Q == 4) {
+				delitem .@items[0],.@items[1];
+				delitem .@items[2],.@items[3];
+				delitem .@items[4],.@items[5];
+				delitem .@items[6],.@items[7];
+				set BSMITH_Q,.@items[8];
 				mes "[Geschupenschte]";
-				mes "Ah, you're back!";
-				mes "Did you bring";
-				mes "everything that";
-				mes "I requested?";
-				next;
-				if ((countitem(999) > 1) && (countitem(930) > 0) && (countitem(717) > 1) && (countitem(1610) > 0)) {
-					mes "[Geschupenschte]";
-					mes "Wait...";
-					mes "Didn't I tell you";
-					mes "to get 3 Steel?";
-					next;
-					mes "[Geschupenschte]";
-					mes "Oh, I guess it was";
-					mes "two after all. Let's see...";
-					mes "Yeah, you got everything!";
-					mes "Now, just give me a second.";
-					next;
-					mes "[Geschupenschte]";
-					mes "Oh, you should make sure that you are not carrying ^FF0000more than one Arc Wand^000000, you should really only have an Arc Wand that you bought from an NPC shop in your inventory.";
-					next;
-					if (select("Oh, could you give me a second?:Oh, I brought what you asked for.") == 1) {
-						mes "[Geschupenschte]";
-						mes "Hmmm, it would be";
-						mes "a good idea to put the";
-						mes "rest of your items";
-						mes "in Kafra Storage.";
-						close;
-					}
-					mes "[Geschupenschte]";
-					mes "Okay.";
-					mes "Great~!!";
-					next;
-					mes "[Geschupenschte]";
-					mes "^3355FF*Clang...!*^000000";
-					next;
-					mes "[Geschupenschte]";
-					mes "^3355FF*Crash Crash!*^000000";
-					next;
-					delitem 999,2; //Steel
-					delitem 930,1; //Rotten_Bandage
-					delitem 717,2; //Blue_Gemstone
-					delitem 1610,1; //Arc_Wand
-					set BSMITH_Q,9;
-					changequest 2003,2008;
-					mes "[Geschupenschte]";
-					mes "Wooooo~~~";
-					mes "All done...";
-					mes "Okay, now take this to ^8E6B23Baisulist^000000 in Geffen of the Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt.";
+				mes "Wooooo~~~";
+				mes "All done...";
+				switch(BSMITH_Q) {
+				case 9:
+					mes "Okay, now take this to ^8E6B23Baisulist^000000 in Geffen of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt.";
 					getitem 1610,1; //Arc_Wand
+					if(checkquest(2003) != -1) {
+						changequest 2003,2008;
+					}
 					next;
 					mes "[Geschupenschte]";
 					mes "Hmm...?";
@@ -892,85 +675,14 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 					next;
 					mes "[Geschupenschte]";
 					mes "Anyway, take this";
-					mes "to ^8E6B23Baisulist^000000 in Geffen of the Rune-Midgarts Kingdom,";
-					mes "and don't forget";
-					mes "the receipt!";
-					close;
-				}
-				mes "[Geschupenschte]";
-				mes "You still haven't";
-				mes "brought all the items.";
-				mes "Do you need to be reminded";
-				mes "or something? Bring me...";
-				next;
-				mes "[Geschupenschte]";
-				mes "^8E6B232 Steel^000000,";
-				mes "^8E6B231 Rotten Bandage^000000,";
-				mes "^8E6B232 Blue Gemstone^000000, and";
-				mes "^8E6B231 Arc Wand^000000, the kind";
-				mes "you can buy from";
-				mes "an NPC shop.";
-				next;
-				mes "[Geschupenschte]";
-				mes "Now, be sure to have";
-				mes "everything I need when";
-				mes "you come back. Remember,";
-				mes "this is a test! You can't";
-				mes "be a Blacksmith if you";
-				mes "slack off!";
-				close;
-			}
-			if (BSMITH_Q == 5) {
-				mes "[Geschupenschte]";
-				mes "Ah, you're back!";
-				mes "Did you bring";
-				mes "everything that";
-				mes "I requested?";
-				next;
-				if ((countitem(1001) > 1) && (countitem(932) > 0) && (countitem(912) > 0) && (countitem(1219) > 0)) {
-					mes "[Geschupenschte]";
-					mes "Wait...";
-					mes "Didn't I tell you";
-					mes "to get 3 Star Dust?";
-					next;
-					mes "[Geschupenschte]";
-					mes "Oh, I guess it was";
-					mes "two after all. Let's see...";
-					mes "Yeah, you got everything!";
-					mes "Now, just give me a second.";
-					next;
-					mes "[Geschupenschte]";
-					mes "Oh, you should make sure that you are not carrying ^FF0000more than one Gladius^000000, you should really only have an Gladius that you bought from an NPC shop in your inventory.";
-					next;
-					if (select("Um, would you give me a second?:Oh, I brought what you asked for.") == 1) {
-						mes "[Geschupenschte]";
-						mes "Hmmm, it would be";
-						mes "a good idea to put the";
-						mes "rest of your items";
-						mes "in Kafra Storage.";
-						close;
-					}
-					mes "[Geschupenschte]";
-					mes "Okay.";
-					mes "Great~!!";
-					next;
-					mes "[Geschupenschte]";
-					mes "^3355FF*Clang...!*^000000";
-					next;
-					mes "[Geschupenschte]";
-					mes "^3355FF*Crash Crash!*^000000";
-					next;
-					delitem 1001,2; //Sparkling_Dust
-					delitem 932,1; //Skel_Bone
-					delitem 912,1; //Zargon
-					delitem 1219,1; //Gladius
-					set BSMITH_Q,10;
-					changequest 2004,2009;
-					mes "[Geschupenschte]";
-					mes "Wooooo~~~";
-					mes "All done...";
-					mes "Okay, now take this to ^8E6B23Wickebine^000000 in Morroc of the Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt.";
+					mes "to ^8E6B23Baisulist^000000 in Geffen of Rune-Midgarts Kingdom,";
+					break;
+				case 10:
+					mes "Okay, now take this to ^8E6B23Wickebine^000000 in Morroc of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt.";
 					getitem 1219,1; //Gladius
+					if(checkquest(2004) != -1) {
+						changequest 2004,2009;
+					}
 					next;
 					mes "[Geschupenschte]";
 					mes "Hmm...?";
@@ -988,85 +700,14 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 					next;
 					mes "[Geschupenschte]";
 					mes "Anyway, take this";
-					mes "to ^8E6B23Wickebine^000000 in Morroc of the Rune-Midgarts Kingdom,";
-					mes "and don't forget";
-					mes "the receipt!";
-					close;
-				}
-				mes "[Geschupenschte]";
-				mes "You still haven't";
-				mes "brought all the items.";
-				mes "Do you need to be reminded";
-				mes "or something? Bring me...";
-				next;
-				mes "[Geschupenschte]";
-				mes "^8E6B232 Star Dust^000000,";
-				mes "^8E6B231 Skel-bone^000000,";
-				mes "^8E6B231 Zargon^000000 and";
-				mes "^8E6B231 Gladius^000000, the kind";
-				mes "you can buy from";
-				mes "an NPC shop.";
-				next;
-				mes "[Geschupenschte]";
-				mes "Now, be sure to have";
-				mes "everything I need when";
-				mes "you come back. Remember,";
-				mes "this is a test! You can't";
-				mes "be a Blacksmith if you";
-				mes "slack off!";
-				close;
-			}
-			if (BSMITH_Q == 6) {
-				mes "[Geschupenschte]";
-				mes "Ah, you're back!";
-				mes "Did you bring";
-				mes "everything that";
-				mes "I requested?";
-				next;
-				if ((countitem(1003) > 1) && (countitem(935) > 1) && (countitem(990) > 1) && (countitem(1119) > 0)) {
-					mes "[Geschupenschte]";
-					mes "Wait...";
-					mes "Didn't I tell you";
-					mes "to get 3 Coal?";
-					next;
-					mes "[Geschupenschte]";
-					mes "Oh, I guess it was";
-					mes "two after all. Let's see...";
-					mes "Yeah, you got everything!";
-					mes "Now, just give me a second.";
-					next;
-					mes "[Geschupenschte]";
-					mes "Oh, you should make sure that you are not carrying ^FF0000more than one Tsurugi^000000, you should really only have an Tsurugi that you bought from an NPC shop in your inventory.";
-					next;
-					if (select("Um, would you give me a second?:Oh, I brought what you asked for.") == 1) {
-						mes "[Geschupenschte]";
-						mes "Hmmm, it would be";
-						mes "a good idea to put the";
-						mes "rest of your items";
-						mes "in Kafra Storage.";
-						close;
-					}
-					mes "[Geschupenschte]";
-					mes "Okay.";
-					mes "Great~!!";
-					next;
-					mes "[Geschupenschte]";
-					mes "^3355FF*Clang...!*^000000";
-					next;
-					mes "[Geschupenschte]";
-					mes "^3355FF*Crash Crash!*^000000";
-					next;
-					delitem 1003,2; //Coal
-					delitem 935,2; //Shell
-					delitem 990,2; //Boody_Red
-					delitem 1119,1; //Tsurugi
-					set BSMITH_Q,11;
-					changequest 2005,2010;
-					mes "[Geschupenschte]";
-					mes "Wooooo~~~";
-					mes "All done...";
+					mes "to ^8E6B23Wickebine^000000 in Morroc of Rune-Midgarts Kingdom,";
+					break;
+				Case 11:
 					mes "Okay, now take this to ^8E6B23Krongast^000000 in Lighthalzen. Simply deliver it and bring me the receipt.";
 					getitem 1119,1; //Tsurugi
+					if(checkquest(2005) != -1) {
+						changequest 2005,2010;
+					}
 					next;
 					mes "[Geschupenschte]";
 					mes "Hmm...?";
@@ -1085,85 +726,14 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 					next;
 					mes "[Geschupenschte]";
 					mes "Anyway, take this";
-					mes "to ^8E6B23Krongast^000000 in Izlude";
-					mes "and don't forget";
-					mes "the receipt!";
-					close;
-				}
-				mes "[Geschupenschte]";
-				mes "You still haven't";
-				mes "brought all the items.";
-				mes "Do you need to be reminded";
-				mes "or something? Bring me...";
-				next;
-				mes "[Geschupenschte]";
-				mes "^8E6B232 Coal^000000,";
-				mes "^8E6B232 Shell^000000,";
-				mes "^8E6B232 Red Blood^000000 and";
-				mes "^8E6B231 Tsurugi^000000, the kind";
-				mes "you can buy from";
-				mes "an NPC shop.";
-				next;
-				mes "[Geschupenschte]";
-				mes "Now, be sure to have";
-				mes "everything I need when";
-				mes "you come back. Remember,";
-				mes "this is a test! You can't";
-				mes "be a Blacksmith if you";
-				mes "slack off!";
-				close;
-			}
-			if (BSMITH_Q == 7) {
-				mes "[Geschupenschte]";
-				mes "Ah, you're back!";
-				mes "Did you bring";
-				mes "everything that";
-				mes "I requested?";
-				next;
-				if ((countitem(1002) > 7) && (countitem(2212) > 0) && (countitem(717) > 1) && (countitem(1713) > 0)) {
-					mes "[Geschupenschte]";
-					mes "Wait...";
-					mes "Didn't I tell you";
-					mes "to get 30 Iron Ore?";
-					next;
-					mes "[Geschupenschte]";
-					mes "Oh, I guess it was";
-					mes "eight after all. Let's see...";
-					mes "Yeah, you got everything!";
-					mes "Now, just give me a second.";
-					next;
-					mes "[Geschupenschte]";
-					mes "Oh, you should make sure that you are not carrying ^FF0000more than one Arbalest^000000, you should really only have an Arbalest that you bought from an NPC shop in your inventory.";
-					next;
-					if (select("Um, would you give me a second?:Oh, I brought what you asked for.") == 1) {
-						mes "[Geschupenschte]";
-						mes "Hmmm, it would be";
-						mes "a good idea to put the";
-						mes "rest of your items";
-						mes "in Kafra Storage.";
-						close;
-					}
-					mes "[Geschupenschte]";
-					mes "Okay.";
-					mes "Great~!!";
-					next;
-					mes "[Geschupenschte]";
-					mes "^3355FF*Clang...!*^000000";
-					next;
-					mes "[Geschupenschte]";
-					mes "^3355FF*Crash Crash!*^000000";
-					next;
-					delitem 1002,8; //Iron_Ore
-					delitem 2212,1; //Eye_Bandage
-					delitem 717,2; //Blue_Gemstone
-					delitem 1713,1; //Arbalest
-					set BSMITH_Q,12;
-					changequest 2006,2011;
-					mes "[Geschupenschte]";
-					mes "Wooooo~~~";
-					mes "All done...";
-					mes "Okay, now take this to ^8E6B23Talpiz^000000 in Payon of the Rune-Midgarts Kingdom. Simply deliver this and bring me the receipt.";
+					mes "to ^8E6B23Krongast^000000 in Lighthalzen";
+					break;
+				case 12:
+					mes "Okay, now take this to ^8E6B23Talpiz^000000 in Payon of Rune-Midgarts Kingdom. Simply deliver this and bring me the receipt.";
 					getitem 1713,1; //Arbalest
+					if(checkquest(2006) != -1) {
+						changequest 2006,2011;
+					}
 					next;
 					mes "[Geschupenschte]";
 					mes "Hmm...?";
@@ -1180,85 +750,14 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 					next;
 					mes "[Geschupenschte]";
 					mes "Anyway, take this";
-					mes "to ^8E6B23Talpiz^000000 in Payon of the Rune-Midgarts Kindgom,";
-					mes "and don't forget";
-					mes "the receipt!";
-					close;
-				}
-				mes "[Geschupenschte]";
-				mes "You still haven't";
-				mes "brought all the items.";
-				mes "Do you need to be reminded";
-				mes "or something? Bring me...";
-				next;
-				mes "^8E6B238 Iron Ore^000000,";
-				mes "^8E6B231 Eye Patch^000000,";
-				mes "^8E6B232 Blue Gemstone^000000 and";
-				mes "^8E6B231 Arbalest^000000, the kind";
-				mes "you can buy from";
-				mes "an NPC shop.";
-				next;
-				mes "[Geschupenschte]";
-				mes "Now, be sure to have";
-				mes "everything I need when";
-				mes "you come back. Remember,";
-				mes "this is a test! You can't";
-				mes "be a Blacksmith if you";
-				mes "slack off!";
-				close;
-			}
-			if (BSMITH_Q == 8) {
-				mes "[Geschupenschte]";
-				mes "Ah, you're back!";
-				mes "Did you bring";
-				mes "everything that";
-				mes "I requested?";
-				next;
-				if ((countitem(998) > 7) && (countitem(511) > 19) && (countitem(919) > 1) && (countitem(1122) > 0)) {
-					mes "[Geschupenschte]";
-					mes "Wait...";
-					mes "Didn't I tell you";
-					mes "to get 40 Iron?";
-					next;
-					mes "[Geschupenschte]";
-					mes "Oh, I guess it was";
-					mes "eight after all. Let's see...";
-					mes "Yeah, you got everything!";
-					mes "Now, just give me a second.";
-					next;
-					mes "[Geschupenschte]";
-					mes "Oh, you should make sure that you are not carrying ^FF0000more than one Ring Pommel Saber^000000. You should really only have just one that you bought from an NPC shop in your inventory.";
-					next;
-					if (select("Um, would you give me a second?:Oh, I brought what you asked for.") == 1) {
-						mes "[Geschupenschte]";
-						mes "Hmmm, it would be";
-						mes "a good idea to put the";
-						mes "rest of your items";
-						mes "in Kafra Storage.";
-						close;
-					}
-					mes "[Geschupenschte]";
-					mes "Okay.";
-					mes "Great~!!";
-					next;
-					delitem 998,8; //Iron
-					delitem 511,20; //Green_Herb
-					delitem 919,2; //Animal's_Skin
-					delitem 1122,1; //Ring_Pommel_Saber
-					set BSMITH_Q, 13;
-					changequest 2007,2012;
-					next;
-					mes "[Geschupenschte]";
-					mes "^3355FF*Clang...!*^000000";
-					next;
-					mes "[Geschupenschte]";
-					mes "^3355FF*Crash Crash!*^000000";
-					next;
-					mes "[Geschupenschte]";
-					mes "Wooooo~~~";
-					mes "All done...";
+					mes "to ^8E6B23Talpiz^000000 in Payon of Rune-Midgarts Kindgom,";
+					break;
+				case 13:
 					mes "Okay, now take this to ^8E6B23Bismarc^000000 in Hugel. Simply deliver this and bring back the receipt.";
 					getitem 1122,1; //Ring_Pommel_Saber
+					if(checkquest(2007) != -1) {
+						changequest 2007,2012;
+					}
 					next;
 					mes "[Geschupenschte]";
 					mes "Hmm...?";
@@ -1282,10 +781,12 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 					mes "[Geschupenschte]";
 					mes "Anyway, take this";
 					mes "to ^8E6B23Bismarc^000000 in Hugel";
-					mes "and don't forget";
-					mes "the receipt!";
-					close;
 				}
+				mes "and don't forget";
+				mes "the receipt!";
+				close;
+			}
+			else {
 				mes "[Geschupenschte]";
 				mes "You still haven't";
 				mes "brought all the items.";
@@ -1293,10 +794,12 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 				mes "or something? Bring me...";
 				next;
 				mes "[Geschupenschte]";
-				mes "^8E6B238 Iron^000000";
-				mes "^8E6B2320 Green Herb^000000";
-				mes "^8E6B232 Animal Skin^000000";
-				mes "and ^8E6B231 Ring Pommel Saber^000000, the kind you can buy from an NPC shop.";
+				mes "^8E6B23"+.@items[1]+" "+getitemname(.@items[0])+"^000000,";
+				mes "^8E6B23"+.@items[3]+" "+getitemname(.@items[2])+"^000000,";
+				mes "^8E6B23"+.@items[5]+" "+getitemname(.@items[4])+"^000000, and";
+				mes "^8E6B23"+.@items[7]+" "+getitemname(.@items[6])+"^000000, the kind";
+				mes "you can buy from";
+				mes "an NPC shop.";
 				next;
 				mes "[Geschupenschte]";
 				mes "Now, be sure to have";
@@ -1308,7 +811,7 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 				close;
 			}
 		}
-		if ((BSMITH_Q > 8) && (BSMITH_Q < 14)) {
+		else if (BSMITH_Q > 8 && BSMITH_Q < 14) {
 			mes "[Geschupenschte]";
 			mes "What are you";
 			mes "still doing here?";
@@ -1317,31 +820,27 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 			mes "Did you forget";
 			mes "where to go?";
 			next;
+			mes "[Geschupenschte]";
 			if (BSMITH_Q == 9) {
-				mes "[Geschupenschte]";
 				mes "In Geffen, at the";
 				mes "11 o'clock direction from the town center, you will find ^8E6B23Baisulist^000000. And don't forget the receipt.";
 			}
 			else if (BSMITH_Q == 10) {
-				mes "[Geschupenschte]";
 				mes "Find the Swordmace";
 				mes "dealer ^8E6B23Wickebine^000000 in Morroc. And don't forget the receipt.";
 			}
 			else if (BSMITH_Q == 11) {
-				mes "[Geschupenschte]";
 				mes "In Lighthalzen, 6 o'clock direction from the town center, you will find ^8E6B23Krongast^000000 near the weapon shop. And don't forget the receipt.";
 			}
 			else if (BSMITH_Q == 12) {
-				mes "[Geschupenschte]";
 				mes "In Payon, at the 5 o'clock direction from the town center, you will find ^8E6B23Talpiz^000000. And don't forget the receipt.";
 			}
 			else {
-				mes "[Geschupenschte]";
 				mes "In Hugel, at the 1 o'clock direction from the town center, you will find ^8E6B23Bismarc^000000 near the airship. And don't forget the receipt.";
 			}
 			close;
 		}
-		if (BSMITH_Q == 14) {
+		else if (BSMITH_Q == 14) {
 			mes "[Geschupenschte]";
 			mes "Hmmm...?";
 			mes "Have you";
@@ -1352,12 +851,22 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 			if (select("Yes sir, here it is.:Receipt? I, uh, have it somewhere.") == 1) {
 				if (countitem(1073) > 0) {
 					set BSMITH_Q,15;
-					changequest 2008,2013;
-					changequest 2009,2013;
-					changequest 2010,2013;
-					changequest 2011,2013;
-					changequest 2012,2013;
 					delitem 1073,1; //Merchant_Voucher_1
+					if(checkquest(2008) != -1) {
+						changequest 2008,2013;
+					}
+					else if(checkquest(2009) != -1) {
+						changequest 2009,2013;
+					}
+					else if(checkquest(2010) != -1) {
+						changequest 2010,2013;
+					}
+					else if(checkquest(2011) != -1) {
+						changequest 2011,2013;
+					}
+					else {
+						changequest 2012,2013;
+					}
 					mes "[Geschupenschte]";
 					mes "Oh ho ho~";
 					mes "Great!";
@@ -1396,7 +905,7 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 			mes "Right...?";
 			close;
 		}
-		if (BSMITH_Q == 15) {
+		else if (BSMITH_Q == 15) {
 			mes "[Geschupenschte]";
 			mes "Thank you";
 			mes "very much";
@@ -1413,17 +922,19 @@ ein_in01,201,27,3	script	Guildsman#einbech	63,{
 		mes "need any more help, today.";
 		close;
 	}
-	mes "[Geschupenschte]";
-	mes "Being";
-	mes "a Blacksmith";
-	mes "is truly great!";
-	mes "Don't you think so?";
-	mes "Mwahahahahah!!";
-	close;
+	else {
+		mes "[Geschupenschte]";
+		mes "Being";
+		mes "a Blacksmith";
+		mes "is truly great!";
+		mes "Don't you think so?";
+		mes "Mwahahahahah!!";
+		close;
+	}
 }
 
 geffen,46,164,1	script	Baisulist#BLS	69,{
-	if ((BSMITH_Q == 9) && (countitem(1610) > 0)) {
+	if (BSMITH_Q == 9 && countitem(1610) > 0) {
 		mes "[Baisulist]";
 		mes "Oh, hello!";
 		mes "Have you come";
@@ -1446,8 +957,7 @@ geffen,46,164,1	script	Baisulist#BLS	69,{
 		mes "[Baisulist]";
 		mes "You're";
 		mes "absolutely sure?";
-		next;
-		set BSMITH_Q, 14;
+		set BSMITH_Q,14;
 		delitem 1610,1; //Arc_Wand
 		next;
 		mes "[Baisulist]";
@@ -1463,42 +973,44 @@ geffen,46,164,1	script	Baisulist#BLS	69,{
 		mes "Here it is.";
 		mes "Thank you so much!";
 		mes "Oh, and good luck~";
-		mapannounce "geffen","Hey, " + strcharinfo(0) + ", thank you so much for the delivery~",bc_map;
+		mapannounce "geffen","Hey, " +strcharinfo(0)+ ", thank you so much for the delivery~",bc_map;
 		close;
 	}
-	if (BSMITH_Q == 14) {
+	else if (BSMITH_Q == 14) {
 		mes "[Baisulist]";
 		mes "Thank you";
 		mes "so much for";
 		mes "the delivery~";
 		close;
 	}
-	mes "[Baisulist]";
-	mes "Oh...";
-	mes "It's been a while";
-	mes "since I've been";
-	mes "to Alberta.";
-	next;
-	mes "[Baisulist]";
-	mes "I ordered something";
-	mes "from there a while ago,";
-	mes "but I haven't received";
-	mes "my delivery...";
-	next;
-	mes "[Baisulist]";
-	mes "I wonder...";
-	mes "Could the Blacksmith Guild";
-	mes "be undermanned? I can't think of any other reason for them to be late...";
-	next;
-	mes "[Baisulist]";
-	mes "When will I get";
-	mes "my special Arc Wand?";
-	close;
+	else {
+		mes "[Baisulist]";
+		mes "Oh...";
+		mes "It's been a while";
+		mes "since I've been";
+		mes "to Alberta.";
+		next;
+		mes "[Baisulist]";
+		mes "I ordered something";
+		mes "from there a while ago,";
+		mes "but I haven't received";
+		mes "my delivery...";
+		next;
+		mes "[Baisulist]";
+		mes "I wonder...";
+		mes "Could the Blacksmith Guild";
+		mes "be undermanned? I can't think of any other reason for them to be late...";
+		next;
+		mes "[Baisulist]";
+		mes "When will I get";
+		mes "my special Arc Wand?";
+		close;
+	}
 }
 
 morocc,27,112,4	script	Wickebine#BLS	725,{
-	if ((BSMITH_Q == 10) && (countitem(1219) > 0)) {
-		cutin "job_black_hucke01",2;
+	if (BSMITH_Q == 10 && countitem(1219) > 0) {
+		cutin "Job_Black_hucke01",2;
 		mes "[Wickebine]";
 		mes "...!";
 		mes "It's here!";
@@ -1508,7 +1020,7 @@ morocc,27,112,4	script	Wickebine#BLS	725,{
 		mes "I don't want any used or old Gladius that you might have!";
 		next;
 		if (select("Whoops, not that one.:I guarantee you it is new.") == 1) {
-			cutin "job_black_hucke03",2;
+			cutin "Job_Black_hucke03",2;
 			mes "[Wickebine]";
 			mes "Oooh...!";
 			mes "Hurry up";
@@ -1516,10 +1028,10 @@ morocc,27,112,4	script	Wickebine#BLS	725,{
 			next;
 			mes "- She seems to be upset. -";
 			close2;
-			cutin "",255;
+			cutin "Job_Black_hucke03",255;
 			end;
 		}
-		cutin "job_black_hucke02",2;
+		cutin "Job_Black_hucke02",2;
 		mes "[Wickebine]";
 		mes "Hah hah hah!";
 		mes "Finally! Now...";
@@ -1528,21 +1040,21 @@ morocc,27,112,4	script	Wickebine#BLS	725,{
 		next;
 		mes "- She looks very happy. -";
 		next;
-		set BSMITH_Q, 14;
+		set BSMITH_Q,14;
 		delitem 1219,1; //Gladius
-		cutin "job_black_hucke01",2;
+		cutin "Job_Black_hucke01",2;
 		mes "[Wickebine]";
 		mes "Are you with the";
 		mes "Einbroch Blacksmith Guild?";
 		mes "Give this message to Geschupenschte!";
 		next;
-		cutin "job_black_hucke03",2;
+		cutin "Job_Black_hucke03",2;
 		mes "[Wickebine]";
 		mes "'^660000You're late!";
 		mes "Do you know how long";
 		mes "I've been waiting?!^000000'";
 		next;
-		cutin "job_black_hucke02",2;
+		cutin "Job_Black_hucke02",2;
 		mes "[Wickebine]";
 		mes "But, this is also";
 		mes "a masterfully crafted item.";
@@ -1554,49 +1066,51 @@ morocc,27,112,4	script	Wickebine#BLS	725,{
 		mes "Here's the receipt.";
 		mes "I think you did";
 		mes "a good job.";
-		close2;
 		mapannounce "morocc","Thanks for delivering, " + strcharinfo(0) + "~!",bc_map;
-		cutin "",255;
+		close2;
+		cutin "Job_Black_hucke02",255;
 		end;
 	}
-	if (BSMITH_Q == 14) {
+	else if (BSMITH_Q == 14) {
 		emotion e_lv;
-		cutin "job_black_hucke02",2;
+		cutin "Job_Black_hucke02",2;
 		mes "[Wickebine]";
 		mes "Thanks for the delivery.";
 		close2;
-		cutin "",255;
+		cutin "Job_Black_hucke02",255;
+		end;
+	}
+	else {
+		cutin "Job_Black_hucke03",2;
+		mes "[Wickebine]";
+		mes "...";
+		next;
+		mes "[Wickemine]";
+		mes "...";
+		mes "......";
+		next;
+		mes "[Wickmine]";
+		mes "They're late.";
+		mes "They're late,";
+		mes "they're late,";
+		mes "they're late~!";
+		next;
+		mes "[Wickebine]";
+		mes "How long does it take for something to ship from Geschupenschte? Usually, the Geffen Blacksmith Guild is pretty prompt...";
+		next;
+		emotion e_lv;
+		mes "[Wickebine]";
+		mes "Ooohh...";
+		mes "This is very";
+		mes "upsetting...";
+		close2;
+		cutin "Job_Black_hucke03",255;
 		end;
 	}
-	cutin "job_black_hucke03",2;
-	mes "[Wickebine]";
-	mes "...";
-	next;
-	mes "[Wickemine]";
-	mes "...";
-	mes "......";
-	next;
-	mes "[Wickmine]";
-	mes "They're late.";
-	mes "They're late,";
-	mes "they're late,";
-	mes "they're late~!";
-	next;
-	mes "[Wickebine]";
-	mes "How long does it take for something to ship from Geschupenschte? Usually, the Geffen Blacksmith Guild is pretty prompt...";
-	next;
-	emotion e_lv;
-	mes "[Wickebine]";
-	mes "Ooohh...";
-	mes "This is very";
-	mes "upsetting...";
-	close2;
-	cutin "",255;
-	end;
 }
 
 lighthalzen,209,80,4	script	Krongast#BLS	734,{
-	if ((BSMITH_Q == 11) && (countitem(1119) > 0)) {
+	if (BSMITH_Q == 11 && countitem(1119) > 0) {
 		mes "[Krongast]";
 		mes "Ohhhhhh~";
 		mes "Is it here?";
@@ -1620,7 +1134,7 @@ lighthalzen,209,80,4	script	Krongast#BLS	734,{
 		mes "You double checked?";
 		mes "Alright then, I'll take it!";
 		next;
-		set BSMITH_Q, 14;
+		set BSMITH_Q,14;
 		delitem 1119,1; //Tsurugi
 		mes "[Krongast]";
 		mes "Oh ho...";
@@ -1643,37 +1157,38 @@ lighthalzen,209,80,4	script	Krongast#BLS	734,{
 		mes "your receipt.";
 		mes "Thank you for";
 		mes "your business!";
-		close2;
-		mapannounce "lighthalzen","" + strcharinfo(0) + "... Thank you for the delivery.",bc_map;
-		end;
+		mapannounce "lighthalzen",strcharinfo(0)+"... Thank you for the delivery.",bc_map;
+		close;
 	}
-	if (BSMITH_Q == 14) {
+	else if (BSMITH_Q == 14) {
 		mes "[Krongast]";
 		mes "Thank you";
 		mes "for the delivery.";
 		close;
 	}
-	mes "[Krongast]";
-	mes "...";
-	next;
-	mes "[Krongast]";
-	mes "...";
-	mes "......";
-	next;
-	mes "[Krongast]";
-	mes "When will the sword";
-	mes "I ordered finally arrive?";
-	mes "I need to try my ultimate skill, ^2F4F4FFine Edge^000000 with it.";
-	next;
-	mes "[Krongast]";
-	mes "Ahhhhhhh!";
-	mes "I need to";
-	mes "have that sword!";
-	close;
+	else {
+		mes "[Krongast]";
+		mes "...";
+		next;
+		mes "[Krongast]";
+		mes "...";
+		mes "......";
+		next;
+		mes "[Krongast]";
+		mes "When will the sword";
+		mes "I ordered finally arrive?";
+		mes "I need to try my ultimate skill, ^2F4F4FFine Edge^000000 with it.";
+		next;
+		mes "[Krongast]";
+		mes "Ahhhhhhh!";
+		mes "I need to";
+		mes "have that sword!";
+		close;
+	}
 }
 
 payon,214,79,4	script	Talpiz#BLS	59,{
-	if ((BSMITH_Q == 12) && (countitem(1713) > 0)) {
+	if (BSMITH_Q == 12 && countitem(1713) > 0) {
 		mes "[Talpiz]";
 		mes "Oh~";
 		mes "Is it finally here?";
@@ -1717,11 +1232,10 @@ payon,214,79,4	script	Talpiz#BLS	59,{
 		mes "your receipt.";
 		mes "I really appreciate";
 		mes "your hard work.";
-		close2;
-		mapannounce "payon","Thanks, " + strcharinfo(0) + ", you really delivered. Everytime I look at this, I love it even more~",bc_map;
-		end;
+		mapannounce "payon","Thanks, " +strcharinfo(0)+ ", you really delivered. Everytime I look at this, I love it even more~",bc_map;
+		close;
 	}
-	if (BSMITH_Q == 14) {
+	else if (BSMITH_Q == 14) {
 		mes "[Talpiz]";
 		mes "Really,";
 		mes "I can't say it";
@@ -1729,24 +1243,26 @@ payon,214,79,4	script	Talpiz#BLS	59,{
 		mes "top quality work~!";
 		close;
 	}
-	mes "[Talpiz]";
-	mes "Eh...";
-	mes "When will my";
-	mes "order arrive?";
-	next;
-	mes "[Talpiz]";
-	mes "A custom made Arbalest";
-	mes "with a quality case to hold your eye patches. Only one person can make something like that...";
-	next;
-	mes "[Talpiz]";
-	mes "Ahhhhhh...";
-	mes "The waiting";
-	mes "is unbearable!";
-	close;
+	else {
+		mes "[Talpiz]";
+		mes "Eh...";
+		mes "When will my";
+		mes "order arrive?";
+		next;
+		mes "[Talpiz]";
+		mes "A custom made Arbalest";
+		mes "with a quality case to hold your eye patches. Only one person can make something like that...";
+		next;
+		mes "[Talpiz]";
+		mes "Ahhhhhh...";
+		mes "The waiting";
+		mes "is unbearable!";
+		close;
+	}
 }
 
 hugel,168,183,1	script	Bismarc#BLS	118,{
-	if ((BSMITH_Q == 13) && (countitem(1122) > 0)) {
+	if (BSMITH_Q == 13 && countitem(1122) > 0) {
 		mes "[Bismarc]";
 		mes "Sweet God...";
 		mes "Have you sent";
@@ -1812,33 +1328,34 @@ hugel,168,183,1	script	Bismarc#BLS	118,{
 		mes "your receipt.";
 		mes "T-take it...!";
 		mes "It's yours!";
-		close2;
-		mapannounce "hugel","Thanks, " + strcharinfo(0) + ", for the delivery. You saved my life...",bc_map;
-		end;
+		mapannounce "hugel","Thanks, " +strcharinfo(0)+ ", for the delivery. You saved my life...",bc_map;
+		close;
 	}
-	if (BSMITH_Q == 14) {
+	else if (BSMITH_Q == 14) {
 		mes "[Bismarc]";
 		mes "Thank you.";
 		mes "You saved";
 		mes "my life...";
 		close;
 	}
-	mes "[Bismarc]";
-	mes "^666666*Ghyklk*^000000";
-	mes "^666666*Huk Hukk*^000000";
-	mes "When will my";
-	mes "o-order arrive...?";
-	next;
-	mes "[Bismarc]";
-	mes "The poison in";
-	mes "my body... the pain...";
-	mes "excruciating... L-lord...";
-	next;
-	mes "[Bismarc]";
-	mes "When is the";
-	mes "antidote gonna";
-	mes "get here?!";
-	close;
+	else {
+		mes "[Bismarc]";
+		mes "^666666*Ghyklk*^000000";
+		mes "^666666*Huk Hukk*^000000";
+		mes "When will my";
+		mes "o-order arrive...?";
+		next;
+		mes "[Bismarc]";
+		mes "The poison in";
+		mes "my body... the pain...";
+		mes "excruciating... L-lord...";
+		next;
+		mes "[Bismarc]";
+		mes "When is the";
+		mes "antidote gonna";
+		mes "get here?!";
+		close;
+	}
 }
 
 ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
@@ -1847,7 +1364,7 @@ ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
 		mes "[Mitehmaeeuh]";
 		mes "Oh...so you're the one who wants to be a blacksmith?";
 		mes "Nice, heh heh.";
-		mes "As you've realized from your past tests, you won't be promoted from Merchant to Blacksmith immediately.";
+		mes "As you've realized from your past tests, you won't be promoted from Merchant to Blacksmtih immediately.";
 		next;
 		mes "[Mitehmaeeuh]";
 		mes "How much do you truly understand about smithing? Are you ready for me to ask you some questions?";
@@ -1861,48 +1378,44 @@ ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
 			mes "you fail. And I won't";
 			mes "tell you what you missed.";
 			next;
-			set .@wizard_m2,rand(1,3);
-			set @blackss_te,0;
+			set .@blackss_te,0;
 			mes "[Mitehmaeeuh]";
 			mes "Please listen";
 			mes "and answer carefully...";
 			next;
-			if (.@wizard_m2 == 1) {
+			switch(rand(1,3)) {
+			case 1:
 				mes "[Mitehmaeeuh]";
 				mes "1. What ability";
 				mes "is required to learn";
 				mes "the ^8E6B23Discount^000000 skill?";
 				next;
-				if (select("Level 3 Push Cart:Item Appraisal:Level 10 Mammonite:Level 3 Enlarge Weight") == 4) {
-					set @blackss_te,@blackss_te + 20;
-				}
+				if (select("Level 3 Push Cart:Item Appraisal:Level 10 Mammonite:Level 3 Enlarge Weight") == 4)
+					set .@blackss_te,.@blackss_te+20;
 				mes "[Mitehmaeeuh]";
 				mes "2. When you attack";
 				mes "with ^8E6B23Hammerfall^000000,";
 				mes "what status effect can";
 				mes "you inflict on enemies?";
 				next;
-				if (select("Stun:Blindness:Chaos:Silence") == 1) {
-					set @blackss_te,@blackss_te + 20;
-				}
+				if (select("Stun:Blindness:Chaos:Silence") == 1)
+					set .@blackss_te,.@blackss_te+20;
 				mes "[Mitehmaeeuh]";
 				mes "3. How much Zeny is spent";
 				mes "when attacking with the";
 				mes "mastered Mammonite skill?";
 				mes "(Level 10 Mammonite)";
 				next;
-				if (select("900 Zeny:1000 Zeny:2000 Zeny:100,000 Zeny") == 2) {
-					set @blackss_te,@blackss_te + 20;
-				}
+				if (select("900 Zeny:1000 Zeny:2000 Zeny:100,000 Zeny") == 2)
+					set .@blackss_te,.@blackss_te+20;
 				mes "[Mitehmaeeuh]";
 				mes "4. What is the";
 				mes "discount rate when";
 				mes "the ^8E6B23Discount^000000";
 				mes "skill is mastered?";
 				next;
-				if (select("21 % :22 % :23 % :24 % ") == 4) {
-					set @blackss_te,@blackss_te + 20;
-				}
+				if (select("21 % :22 % :23 % :24 % ") == 4)
+					set .@blackss_te,.@blackss_te+20;
 				mes "[Mitehmaeeuh]";
 				mes "5. What is the maximum";
 				mes "percentage that you can";
@@ -1910,35 +1423,31 @@ ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
 				mes "NPCs after mastering the";
 				mes "^8E6B23Overcharge^000000 skill?";
 				next;
-				if (select("21 % :22 % :23 % :24 % ") == 3) {
-					set @blackss_te,@blackss_te + 20;
-					next;
-				}
-			}
-			if (.@wizard_m2 == 2) {
+				if (select("21 % :22 % :23 % :24 % ") == 3)
+					set .@blackss_te,.@blackss_te+20;
+				break;
+			case 2:
 				mes "[Mitehmaeeuh]";
 				mes "1. Which of the";
 				mes "following monsters";
 				mes "drops Steel?";
 				next;
-				if (select("Zerom:Chon Chon:Skel Worker:Requiem") == 3) {
-					set @blackss_te,@blackss_te + 20;
-				}
+				if (select("Zerom:Chon Chon:Skel Worker:Requiem") == 3)
+					set .@blackss_te,.@blackss_te+20;
 				mes "[Mitehmaeeuh]";
 				mes "2. Which of the following";
 				mes "stones can be made from";
 				mes "Red Bloods?";
 				next;
-				if (select("Flame Heart:Rough Wind:Great Nature:Mystic Frozen") == 1) {
-					set @blackss_te,@blackss_te + 20;
-				}
+				if (select("Flame Heart:Rough Wind:Great Nature:Mystic Frozen") == 1)
+					set .@blackss_te,.@blackss_te+20;
 				mes "[Mitehmaeeuh]";
 				mes "3. Which of the following";
 				mes "stones do you have the most";
 				mes "of in your Kafra Storage?";
 				next;
 				select("Wind of Verdure:Red Blood:Green Live:Crystal Blue");
-					set @blackss_te,@blackss_te + 20;
+					set .@blackss_te,.@blackss_te+20;
 				mes "[Mitehmaeeuh]";
 				mes "4. In general,";
 				mes "which of the following";
@@ -1946,31 +1455,29 @@ ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
 				mes "most damage from a Wind";
 				mes "attribute weapon?";
 				next;
-				if (select("Fire Property:Water Property:Earth Property:Wind Property") == 2) {
-					set @blackss_te,@blackss_te + 20;
-				}
+				if (select("Fire Property:Water Property:Earth Property:Wind Property") == 2)
+					set .@blackss_te,.@blackss_te+20;
 				mes "[Mitehmaeeuh]";
 				mes "5. How many Iron Ore";
 				mes "is required to make";
 				mes "1 Steel?";
 				next;
-				if (select("5 Iron Ore :4 Iron Ore:3 Iron Ore:6 Iron Ore") == 1) {
-					set @blackss_te,@blackss_te + 20;
-					next;
-				}
-			} else {
+				if (select("5 Iron Ore :4 Iron Ore:3 Iron Ore:6 Iron Ore") == 1)
+					set .@blackss_te,.@blackss_te+20;
+				break;
+			case 3:
 				mes "[Mitehmaeeuh]";
 				mes "1. What do you usually";
 				mes "do when you meet someone";
 				mes "randomly on the street?";
 				next;
-				switch (select("Ask them what they need.:Have a brief conversation.:Ignore them.:Give items and run away.")) {
+				switch(select("Ask them what they need.:Have a brief conversation.:Ignore them.:Give items and run away.")) {
 				case 1:
-					set @blackss_te,@blackss_te + 20;
 				case 2:
-					set @blackss_te,@blackss_te + 20;
-				case 3:
-				case 4:
+					set .@blackss_te,.@blackss_te+20;
+					break;
+				default:
+					break;
 				}
 				mes "[Mitehmaeeuh]";
 				mes "2. In what village";
@@ -1978,34 +1485,30 @@ ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
 				mes "^8E6B23Crazy Uproar^000000 and";
 				mes "^8E6B23Change Cart^000000 skills?";
 				next;
-				if (select("Al De Baran:Alberta:Morroc:Izlude") == 2) {
-					set @blackss_te,@blackss_te + 20;
-				}
+				if (select("Al De Baran:Alberta:Morroc:Izlude") == 2)
+					set .@blackss_te,.@blackss_te+20;
 				mes "[Mitehmaeeuh]";
 				mes "3. From the center of Einbroch,";
 				mes "in which direction is the Blacksmith Guild?";
 				next;
-				if (select("11 o'clock:5 o'clock:7 o'clock:12 o'clock") == 2) {
-					set @blackss_te,@blackss_te + 20;
-				}
+				if (select("11 o'clock:5 o'clock:7 o'clock:12 o'clock") == 2)
+					set .@blackss_te,.@blackss_te+20;
 				mes "[Mitehmaeeuh]";
 				mes "4. In which town";
 				mes "can you find the";
 				mes "most Blacksmiths?";
 				next;
-				if (select("Prontera:Morroc:Alberta:Einbroch") == 4) {
-					set @blackss_te,@blackss_te + 20;
-				}
+				if (select("Prontera:Morroc:Alberta:Einbroch") == 4)
+					set .@blackss_te,.@blackss_te+20;
 				mes "[Mitehmaeeuh]";
 				mes "5. Which of the";
 				mes "following statuses";
 				mes "affect your skill";
 				mes "as a Blacksmith?";
 				next;
-				if (select("STR :DEX:AGI :VIT ") == 2) {
-					set @blackss_te,@blackss_te + 20;
-					next;
-				}
+				if (select("STR :DEX:AGI :VIT ") == 2)
+					set .@blackss_te,.@blackss_te+20;
+				break;
 			}
 			mes "[Mitehmaeeuh]";
 			mes "Ah...";
@@ -2014,22 +1517,21 @@ ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
 			next;
 			mes "[Mitehmaeeuh]";
 			mes "You earned";
-			mes "" + @blackss_te + " points...";
-			if (@blackss_te > 70) {
+			mes ""+ .@blackss_te +" points...";
+			if (.@blackss_te > 70) {
 				mes "Very nice!";
 				mes "Congratulations!";
 				mes "You just passed!";
 				next;
 				mes "[Mitehmaeeuh]";
-				mes "However, don't let your early success make you overconfident.";
-				mes "A Blacksmith's life isn't a picnic. As proof that you have passed the test, I give you this Hammer of Blacksmith.";
-				set BSMITH_Q, 17;
+				mes "However, don't let your early success make you overconfident. A Blacksmith's life isn't a picnic. As proof that you have passed the test, I give you this Hammer of Blacksmith.";
+				set BSMITH_Q,17;
 				getitem 1005,1; //Hammer_Of_Blacksmith
 				changequest 2014,2015;
 				next;
 				mes "[Mitehmaeeuh]";
 				mes "Take this Hammer";
-				mes "of Blacksmith and go back to the Einbroch Blacksmith Guild. Okay then? I wish you the best of luck!";
+				mes "of Blacksmith and go back to the Altiregen. Okay then? I wish you the best of luck!";
 				close;
 			}
 			mes "You failed! You better study up before coming back here.";
@@ -2045,13 +1547,13 @@ ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
 		mes "when you are ready...";
 		close;
 	}
-	if (BSMITH_Q == 17) {
+	else if (BSMITH_Q == 17) {
 		emotion e_hmm;
 		mes "[Mitehmaeeuh]";
 		mes "Yeap, you just passed the Blacksmith job test~";
 		next;
 		mes "[Mitehmaeeuh]";
-		mes "Why don't you go back to Mr.Geschupenschte?";
+		mes "Why don't you go back to Mr.Altiregen?";
 		next;
 		mes "[Mitehmaeeuh]";
 		mes "Don't forget to bring the Hammer of Blacksmith with you!";
@@ -2060,20 +1562,22 @@ ein_in01,24,41,5	script	Blacksmith Guildsman#moc	726,{
 		mes "Oh, also make sure that you have no skill point left before you change your job~";
 		close;
 	}
-	emotion e_hmm;
-	mes "[Mitehmaeeuh]";
-	mes "I had to deal with the heat when I was in Morroc,";
-	mes "and now I have to deal with the smog in this Einbroch!";
-	next;
-	mes "[Mitehmaeeuh]";
-	mes "But, I must admit that this is the perfect place for Blacksmiths because we have an abundance of crafting material supplies as well as highly developed equipment.";
-	next;
-	mes "[Mitehmaeeuh]";
-	mes "We, Blacksmiths are trying our best to forge the best of the best weapons.";
-	next;
-	mes "[Mitehmaeeuh]";
-	mes "We pledge our honor on that!";
-	close;
+	else {
+		emotion e_hmm;
+		mes "[Mitehmaeeuh]";
+		mes "I had to deal with the heat when I was in Morroc,";
+		mes "and now I have to deal with the smog in this Einbroch!";
+		next;
+		mes "[Mitehmaeeuh]";
+		mes "But, I must admit that this is the perfect place for Blacksmiths because we have an abundance of crafting material supplies as well as highly developed equipment.";
+		next;
+		mes "[Mitehmaeeuh]";
+		mes "We, Blacksmiths are trying our best to forge the best of the best weapons.";
+		next;
+		mes "[Mitehmaeeuh]";
+		mes "We pledge our honor on that!";
+		close;
+	}
 }
 
 geffen_in,109,170,3	script	Blacksmith Guildsman#gef	726,{
@@ -2089,16 +1593,16 @@ geffen_in,109,170,3	script	Blacksmith Guildsman#gef	726,{
 	mes "I can provide you a teleport service to Izlude, where you can use the airship.";
 	mes "Would you like to move to Izlude immediately?";
 	next;
-	switch (select("How to go to Einbroch:Yes!:No, thanks.")) {
+	switch(select("How to go to Einbroch:Yes!:No, thanks.")) {
 	case 1:
 		mes "[Blacksmith Guildsman]";
 		mes "Oops, haven't you used the airship yet?";
 		next;
 		mes "[Blacksmith Guildsman]";
-		mes "Unlike the Rune-Midgarts Kingdom, the Schwaltzvalt Republic has 'the airship' instead of teleport services to move between towns.";
+		mes "Unlike Rune-Midgarts Kingdom, Schwalitzvalt Republic has 'the airship' instead of teleport services to move between towns.";
 		next;
 		mes "[Blacksmith Guildsman]";
-		mes "In ^3131FF'Izlude'^000000, you can use ^3131FF'the international airship'^000000 which travels between ^3131FFIzlude and Juno in the Schwaltzvalt Republic^000000.";
+		mes "In ^3131FF'Izlude'^000000, you can use ^3131FF'the international airship'^000000 which travels between ^3131FFIzlude and Juno in Schwaltzvalt Republic^000000.";
 		next;
 		mes "[Blacksmith Guildsman]";
 		mes "Take the airship, and go to Juno. Then from Juno, you need to take ^3131FFthe domestic airship^000000 to go to Einbroch.";
@@ -2114,7 +1618,7 @@ geffen_in,109,170,3	script	Blacksmith Guildsman#gef	726,{
 			mes "Excuse me, but you do not have enough money.";
 			close;
 		}
-		set Zeny, Zeny - 600;
+		set zeny,zeny-600;
 		warp "izlude",94,103;
 		end;
 	case 3:
@@ -2122,4 +1626,4 @@ geffen_in,109,170,3	script	Blacksmith Guildsman#gef	726,{
 		mes "Please take care!";
 		close;
 	}
-}
\ No newline at end of file
+}
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index 3615f68a2..1d7372ce8 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -1,20 +1,63 @@
 //===== rAthena Script ======================================= 
-// Hunter Job change Quest
+//= Hunter Job Quest
 //===== By: ================================================== 
-//= Masao
-//= Credits: Muad_Dib
+//= EREMES THE CANIVALIZER (Aegis)Translated by yoshiki (Aegis)
+//= Converted by kobra_k88
+//= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.0
+//= 3.7
 //===== Compatible With: ===================================== 
-//= Any rAthena SVN
+//= rAthena SVN
 //===== Description: ========================================= 
-//= [Translated from the Official]
-//= Job change Quest from Archer -> Hunter.
+//= [Aegis Conversion]
+//= Job Change quest for Hunter class.
 //===== Additional Comments: ================================= 
-//= 1.0 Updated to latest available official file. [Masao]
+//= 0.5 Fully working.
+//= 0.6 Changed global variable names to unique ones.
+//= 0.7 - 0.8 Updates for rAthena +Knight2,Crusader2 fix
+//= 0.9 Fixed items quest fork bug [Lupus]
+//= 1.0 Fixed items quest bug: added extra condition [Lupus]
+//= 1.1 Fixed skillpoints check bug [Lupus]
+//= 1.2 Fixed an exploit, thanks to nonox [celest]
+//= 1.3 Added Baby Class support [Lupus]
+//= 1.5 Fixed possible EXP abuse [Lupus]
+//= 1.6 Added a func which prevent advanced classes passing
+//= 2nd Job Quests again. It also guides adv classes where
+//= to go. [Lupus]
+//= 1.6a Infinite Arrows exploit fix (thanx to Lorky, that
+//= reported the bug) [Lupus]
+//= 1.7 Moved the Job QUest to Hugel [Poki#3]
+//= 2.0 Changed numbers to constants. [Vicious]
+//= 2.1 Removed Duplicates [Silent]
+//= 2.2 Merged JFunc, fixed missing dialogues [Lupus]
+//= 2.2a Fixed Sharon resetting the test2 item set [Lupus]
+//= 2.3a 7 official sets of Demon Hunter,thx to Dr.Evil [Lupus]
+//= 2.4a Added missing next;, missing NPC names [Lupus]
+//= 2.5 "strcharinfo" -> "strcharinfo(0)" [FlavioJS]
+//= 2.6 Fixed 3rd Test. [Samuray22]
+//	-Changed Timers from 3 to 1 minute.
+//	-Changed "Job Change Monsters".
+//	-Thanks to ultradamage.
+//= 2.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 2.8 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf]
+//= 2.9 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 2.9a Deleted unused variables. [Samuray22]
+//= 3.0 Fixed a small typo, "jo" instead of "Job". [L0ne_W0lf]
+//= 3.0a Corrected a Typo error ";;". [Samuray22]
+//= 3.1 Now uses enable and disable waitingroomevent. [L0ne_W0lf]
+//= 3.2 Fixes a bug where the timer was stopped causing the [L0ne_W0lf]
+//=	test to freeze. (bugreport:1099)
+//= 3.3 Added missing next. [L0ne_W0lf]
+//= 3.4 Corrected some Issues with the Waiting Room. (bugreport:1890) [Samuray22]
+//=	-Deleted a Unnecesary Next; on Hunter Guildsman#hnt. (bugreports:1665,2239,2179)
+//= 3.5 Added Quest Log commands. [Kisuka]
+//= 3.6 Removed the need for use of 'goto.' [L0ne_W0lf]
+//= 3.7 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info).
 //============================================================ 
 
-in_hunter,99,99,4	script	Hunter Info	727,{
+// Notices in the old Hunter Guild.
+//============================================================ 
+in_hunter,99,99,4	script	Hunter Info#hnt::HntNotice	727,{
 	mes "============ Notice ============";
 	mes "We would like to inform that the Hunter Job Change Location";
 	mes "has been moved to ^ff0000Hugel^000000 in the Schwaltzvalt Republic.";
@@ -27,27 +70,14 @@ in_hunter,99,99,4	script	Hunter Info	727,{
 	mes " ";
 	mes " ";
 	mes " ";
-	mes "I, the Falcon breeder has moved out as well.";
+	mes "I, the Falcon breeder have moved out as well.";
 	close;
 }
 
-pay_fild10,148,252,3	script	Hunter Info#hugel	857,{
-	mes "============ Notice ============";
-	mes "We would like to inform that the Hunter Job Change Location";
-	mes "has been moved to ^ff0000Hugel^000000 in the Schwaltzvalt Republic.";
-	next;
-	mes "You can now use the Hugel airline, so please use the airship to visit Hugel.";
-	next;
-	mes "You will find the new Job Change Location at ^ff0000the far upper right side of Hugel000000.";
-	next;
-	mes "^804000(You found a tiny line written at the end of the notice.)^000000";
-	mes " ";
-	mes " ";
-	mes " ";
-	mes "I, the Falcon breeder has moved out as well.";
-	close;
-}
+pay_fild10,148,252,3	duplicate(HntNotice)	Job Change Location#hu	857
 
+// Actual Job quest start
+//============================================================ 
 hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 	if (Upper == 1) {
 		mes "[Hunter Sherin]";
@@ -58,7 +88,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 		mes "Oops! I'm sorry, I could have sworn that we've met before. Huh. How weird.";
 		close;
 	}
-	if ((Class == Job_Baby_Archer || Class == Job_Archer) && (JobLevel < 40)) {
+	if (BaseJob == Job_Archer && JobLevel < 40) {
 		mes "[Hunter Guildsman]";
 		mes "Eh? You haven't had enough training as an Archer yet. To become a Hunter, you must gain a certain level of experience as an Archer first.";
 		next;
@@ -69,51 +99,51 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 		mes "See you next time~";
 		close;
 	}
-	if (SkillPoint != 0) {
+	if (SkillPoint) {
 		mes "[Hunter Sherin]";
 		mes "You can't change jobs without using all your skill points. Please use all of your skill points before applying to change jobs~";
 		close;
 	}
-	if (Class == Job_Baby || Class == Job_Novice) {
+	if (BaseClass == Job_Novice) {
 		mes "[Hunter Guildsman]";
 		mes "You must be...";
 		mes "a Novice? Wow, you've got a long way ahead of you. I don't think there's much you can do here.";
 		close;
 	}
-	if (Class == Job_Swordman || Class == Job_Knight || Class == Job_Crusader) {
+	else if (BaseClass == Job_Swordman) {
 		mes "[Hunter Guildsman]";
 		mes "You have chosen the path of the sword. I can respect the strength of your blade. Of course, from far away, you can't really afford to throw your sword at enemies, can you?";
 		close;
 	}
-	if (Class == Job_Mage || Class == Job_Wizard || Class == Job_Sage) {
+	else if (BaseClass == Job_Mage) {
 		mes "[Hunter Guildsman]";
 		mes "You deal with magic? It must feel great to be able to wield mystic power.";
 		close;
 	}
-	if (Class == Job_Acolyte || Class == Job_Priest || Class == Job_Monk) {
+	else if (BaseClass == Job_Acolyte) {
 		mes "[Hunter Guildsman]";
 		mes "Oh, a person who serves God! Nice to meet you. There aren't many people like you that visit this place~ Hehe.";
 		close;
 	}
-	if (Class == Job_Merchant || Class == Job_Blacksmith || Class == Job_Alchemist) {
+	else if (Baseclass == Job_Merchant) {
 		mes "[Hunter Guildsman]";
 		mes "Oh...";
 		mes "How's your business coming along?";
 		close;
 	}
-	if (Class == Job_Thief || Class == Job_Assassin || Class == Job_Rogue) {
+	else if (BaseClass == Job_Thief) {
 		mes "[Hunter Guildsman]";
 		mes "Agh?!";
 		mes "This place doesn't have anything worth stealing or anyone worth killing!!";
 		close;
 	}
-	if (Class == Job_Dancer || Class == Job_Bard) {
+	else if (BaseJob == Job_Dancer || BaseJob == Job_Bard) {
 		mes "[Hunter Guildsman]";
 		mes "Phew...sometimes it is really hard for being a hunter, you know...";
 		mes "So how do you like your bohemian life? Yeah, I am envious of you for having so much freedom...";
 		close;
 	}
-	if (Class == Job_Baby_Hunter || Class == Job_Hunter) {
+	else if (BaseJob == Job_Hunter) {
 		mes "[Hunter Sherin]";
 		mes "Oh~ " + strcharinfo(0) + "!!";
 		mes "Long time no see~ What brings you here? Did your Falcon run away or something?";
@@ -122,13 +152,13 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 		mes "I don't really have any official notices from the guild at the moment, so I hope you didn't come here just for that...";
 		close;
 	}
-	if (Class == Job_Baby_Archer || Class == Job_Archer) {
-		if (SkillPoint != 0) {
+	else if (BaseJob == Job_Archer) {
+		if (SkillPoint) {
 			mes "[Hunter Sherin]";
 			mes "You can't apply to change jobs if you still have unused skill points. Use your remaining skill points first.";
 			close;
 		}
-		if ((HNTR_Q == 17) && (countitem(1007) == 0)) {
+		else if (HNTR_Q == 17 && countitem(1007) == 0) {
 			mes "[Hunter Sherin]";
 			mes "Hmm... I've been informed that you passed the test. But you don't have the necessary 'Necklace of Wisdom (Penetration)' that proves your accomplishment.";
 			next;
@@ -136,258 +166,245 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 			mes "I'll let you change your job, but you must bring back a 'Necklace of Wisdom (Penetration),' no matter what it takes.";
 			close;
 		}
-		if ((HNTR_Q == 17) && (countitem(1007) > 0) && (JobLevel > 39)) {
-			if (JobLevel > 49) {
-				mes "[Hunter Sherin]";
-				mes "Oh...?";
-				mes "You passed";
-				mes "the job test?!";
-				mes "Congratulations~!!";
-				next;
-				mes "[Hunter Sherin]";
-				mes "Well then,";
-				mes "I will now change";
-				mes "your job to a Hunter~";
-				next;
-				delitem 1007,1; //Penetration
-				mes "[Hunter Sherin]";
-				mes "Tada~ Congratulations!";
-				mes "You look great as a Hunter!!";
-				if(Class == Job_Baby_Archer){
-					jobchange Job_Baby_Hunter;
-				} else {
-					jobchange Job_Hunter;
-				}
-				completequest 4013;
-				next;
-				mes "[Hunter Sherin]";
-				mes "Become a noble person and become a worthy representative of our Hunter Guild. Show your love of nature as a Hunter~";
-				next;
-				mes "[Hunter Sherin]";
-				mes "And also, here is a little reward for all the effort you put in. It's from me, of course~";
-				getitem 1718,1; //Hunter_Bow
-				close;
-			}
+		else if (HNTR_Q == 17 && countitem(1007) > 0 && JobLevel > 39) {
 			mes "[Hunter Sherin]";
 			mes "Oh...?";
 			mes "You passed";
-			mes "the job test?!!";
+			mes "the job test?!";
 			mes "Congratulations~!!";
 			next;
 			mes "[Hunter Sherin]";
 			mes "Well then,";
 			mes "I will now change";
-			mes "your job to a Hunter~*";
+			mes "your job to a Hunter~";
 			next;
 			delitem 1007,1; //Penetration
 			mes "[Hunter Sherin]";
 			mes "Tada~ Congratulations!";
 			mes "You look great as a Hunter!!";
-			if(Class == Job_Baby_Archer){
-				jobchange Job_Baby_Hunter;
-			} else {
-				jobchange Job_Hunter;
-			}
+			set .@joblvl,joblevel;
 			completequest 4013;
+			callfunc "Job_Change",Job_Hunter;
+			callfunc "F_ClearJobVar";		// clears all job variables for the current player
 			next;
 			mes "[Hunter Sherin]";
-			mes "Become a noble person and be a worthy representative of the Hunter Guild. Show your love of nature as a Hunter~";
+			mes "Become a noble person and become a worthy representative of our Hunter Guild. Show your love of nature as a Hunter~";
 			next;
 			mes "[Hunter Sherin]";
 			mes "And also, here is a little reward for all the effort you put in. It's from me, of course~";
-			getitem 1710,1; //CrossBow
+			if (.@joblvl > 49)
+				getitem 1718,1; //Hunter_Bow
+			else
+				getitem 1710,1; //CrossBow
 			close;
 		}
-		if ((JobLevel > 39) && (HNTR_Q == 0)) {
-			mes "[Hunter Guildsman]";
-			mes "Oh, you're an Archer! It seems as if you've trained enough as an Archer... You came here to become a Hunter, right?";
-			next;
-			switch (select("Yes. That's what I'm here for.:What are the requirements to change jobs?:....I don't want to change yet.")) {
-			case 1:
-				mes "[Hunter Guildsman]";
-				mes "Hehe~";
-				mes "I was right! Let me put you on the candidate list. Let's see~*";
-				next;
-				mes "[Hunter Guildsman]";
-				mes "Hmm... Let's start with the interview. Wait and relax a moment. No need to worry, I'll prepare everything~";
-				next;
-				mes "^3355FF*Gathers and flips through papers*^000000";
-				next;
-				mes "^3355FF*Rummage rummage*^000000";
-				next;
+		else if ((JobLevel > 39) && ((HNTR_Q == 0) || (HNTR_Q == 1))) {
+			if (HNTR_Q == 0) {
 				mes "[Hunter Guildsman]";
-				mes "Ah!";
-				mes "Here they are: the interview questions~ First of all, my name is 'Sherin.' Nice to meet you!";
-				next;
-				mes "[Hunter Sherin]";
-				mes "Well then,";
-				mes "shall we begin?";
+				mes "Oh, you're an Archer! It seems as if you've trained enough as an Archer... You came here to become a Hunter, right?";
 				next;
-				if (select("Yes~ Let's start now.:No, I'll be back later.") == 1) {
-					mes "[Hunter Sherin]";
-					mes "Listen carefully to the scenarios I describe. When I ask a question, you choose an answer. Pretty simple, don't you think?";
-					next;
-					mes "[Hunter Sherin]";
-					mes "I just want to know how you think about life, and why you want to become a Hunter, so there's no need to be nervous.";
-					next;
-					set @knight_t, 0;
-					mes "[Hunter Sherin]";
-					mes "Well then,";
-					mes "let's begin.";
-					next;
-					mes "[Hunter Sherin]";
-					mes "You are an Archer, and you don't know where you should go to hunt. What do you do?";
+				switch(select("Yes. That's what I'm here for.:What are the requirements to change jobs?:....I don't want to change yet.")) {
+				case 1:
+					mes "[Hunter Guildsman]";
+					mes "Hehe~";
+					mes "I was right! Let me put you on the candidate list. Let's see~*";
 					next;
-					switch (select("Scream out loud asking where you should go.:Quietly ask a person passing by.:Wander around alone and search for a place.")) {
-					case 1:
-						break;
-					case 2:
-					case 3:
-						set @knight_t, @knight_t + 10;
-					}
-					mes "[Hunter Sherin]";
-					mes "So you've decided on a place to hunt. You're going to hunt the monsters known as Hodes in the Sograt Desert.";
+					mes "[Hunter Guildsman]";
+					mes "Hmm... Let's start with the interview. Wait and relax a moment. No need to worry, I'll prepare everything~";
 					next;
-					mes "[Hunter Sherin]";
-					mes "But you are in Payon!!";
-					mes "How do you go to the desert?";
+					mes "^3355FF*Gathers and flips through papers*^000000";
 					next;
-					switch (select("Ask a Priest to open a free warp portal.:Use the Kafra service.:Walk with a friend.")) {
-					case 1:
-						break;
-					case 2:
-					case 3:
-						set @knight_t, @knight_t + 10;
-					}
-					mes "[Hunter Sherin]";
-					mes "There is no Priest to ask for a warp, and no friend is around to walk with you. You must use the Kafra service, but you have no Zeny!";
-					next;
-					mes "[Hunter Sherin]";
-					mes "How would you go";
-					mes "about to make the";
-					mes "Zeny that you need?";
+					mes "^3355FF*Rummage rummage*^000000";
 					next;
-					switch (select("Beg here and there.:Sell items I do not need.:Hunt at a nearby field.")) {
-					case 1:
-						break;
-					case 2:
-					case 3:
-						set @knight_t, @knight_t + 10;
-					}
-					mes "[Hunter Sherin]";
-					mes "So you finally arrive at the Sograt Desert. But you realize that Hodes are a bit too strong for you to hunt alone.";
-					next;
-					mes "[Hunter Sherin]";
-					mes "What is your";
-					mes "solution to this";
-					mes "situation?";
-					next;
-					if (select("Attack a Hode from the top of a hill.:Go back to town.:Attack someone else's Hode.") == 2) {
-						set @knight_t, @knight_t + 10;
-					}
-					mes "[Hunter Sherin]";
-					mes "Let's say you were having too much trouble hunting Hodes and returned to town. Now you are out of HP and a Priest happens to be around. How would you ask for a Heal?";
-					next;
-					if (select("Would it be possible to get a Heal, please?:Heal, please.:Heal me.") == 1) {
-						set @knight_t, @knight_t + 10;
-					}
-					mes "[Hunter Sherin]";
-					mes "This time, you found a rare item while you were going through your inventory. You go out to sell the item, and there are many people with stores and chatrooms open.";
-					next;
-					mes "[Hunter Sherin]";
-					mes "What is the";
-					mes "best way to";
-					mes "sell your item?";
-					next;
-					switch (select("Scream out loud to everyone in sight.:Open a chatroom and wait.:Look to see if anyone already wants it.")) {
-					case 1:
-						break;
-					case 2:
-					case 3:
-						set @knight_t, @knight_t + 10;
-					}
-					mes "[Hunter Sherin]";
-					mes "While you are waiting, someone is begging for items and Zeny. What should you do?";
-					next;
-					if (select("Give some of my items and Zeny.:Ignore and walk away.:Tell the person about a good place to hunt.") == 3) {
-						set @knight_t, @knight_t + 10;
-					}
-					mes "[Hunter Sherin]";
-					mes "By now, you decide to go to the Maze by yourself.";
+					mes "[Hunter Guildsman]";
+					mes "Ah!";
+					mes "Here they are: the interview questions~ First of all, my name is 'Sherin.' Nice to meet you!";
 					next;
 					mes "[Hunter Sherin]";
-					mes "But on your way, you run";
-					mes "into someone that is lost.";
-					mes "What should you do?";
-					next;
-					switch (select("Tell them which way to go.:Guide them to their destination.:Ignore.")) {
-					case 1:
-					case 2:
-						set @knight_t, @knight_t + 10;
-					case 3:
-					}
-					mes "[Hunter Sherin]";
-					mes "After meeting this lost person, you decide to get back to hunting. Just then, you find that someone is attacking a boss!";
-					next;
-					mes "[Hunter Sherin]";
-					mes "What should you do?";
-					next;
-					if (select("Watch, then attack when asked for help.:Attack and see what happens.:Just go back to town.") == 1) {
-						set @knight_t, @knight_t + 10;
-					}
-					mes "[Hunter Sherin]";
-					mes "You are now very exhausted after your day of hunting. It's time to go back to town.";
-					next;
-					mes "[Hunter Sherin]";
-					mes "But what's this!? You find an expensive item lying on the floor! What should you do with it?";
-					next;
-					switch (select("Pick it up and keep it.:Try to find the owner.:Just walk by.")) {
-					case 1:
-						break;
-					case 2:
-					case 3:
-						set @knight_t, @knight_t + 10;
-						break;
-					}
-					mes "[Hunter Sherin]";
-					mes "Okay, this is the end of the test!";
+					mes "Well then,";
+					mes "shall we begin?";
 					next;
-					if (@knight_t == 100) {
-						set HNTR_Q,2;
-						setquest 4001;
+					if (select("Yes~ Let's start now.:No, I'll be back later.") == 1) {
+						if(checkquest(4000) == -1) {
+							setquest 4000;
+						}
 						mes "[Hunter Sherin]";
-						mes "Well done! Your answers show you've got the right outlook on life. You definitely have the right qualities to become a Hunter~";
+						mes "Listen carefully to the scenarios I describe. When I ask a question, you choose an answer. Pretty simple, don't you think?";
 						next;
 						mes "[Hunter Sherin]";
-						mes "I'm glad to say you've passed the interview~ Now, go to that person in the corner and confirm which item is necessary for your job change test~";
-						close;
-					}
-					if (@knight_t == 90) {
-						set HNTR_Q,2;
-						setquest 4001;
-						mes "[Hunter Sherin]";
-						mes "Well, I'm looking at your answers and your score isn't perfect. But I'll let you pass anyway. I don't know what our Guildmaster will think, though.";
+						mes "I just want to know how you think about life, and why you want to become a Hunter, so there's no need to be nervous.";
 						next;
+					}
+					else {
 						mes "[Hunter Sherin]";
-						mes "Just remember to always keep basic etiquette in mind. Try harder in the following tests and make me happy, okay?";
+						mes "Okay...";
+						mes "Come back";
+						mes "when you're ready~";
 						close;
 					}
-					set HNTR_Q,1;
-					setquest 4000;
+					break;
+				case 2:
+					set .@selection,2;
+					break;
+				case 3:
+					set .@selection,3;
+					break;
+				}
+			}
+			else if (HNTR_Q == 1) {
+				mes "[Hunter Sherin]";
+				mes "Welcome back...!";
+				mes "Well, let's start with the interview. This time, carefully think about the answers to each question.";
+				next;
+			}
+			switch(.@selection) {
+			default:
+				mes "[Hunter Sherin]";
+				mes "Well then,";
+				mes "let's begin.";
+				next;
+				mes "[Hunter Sherin]";
+				mes "You are an Archer, and you don't know where you should go to hunt. What do you do?";
+				next;
+				switch(select("Scream out loud asking where you should go.:Quietly ask a person passing by.:Wander around alone and search for a place.")) {
+				case 2:
+				case 3:
+					set .@hunter_t,.@hunter_t+10;
+				default:
+					break;
+				}
+				mes "[Hunter Sherin]";
+				mes "So you've decided on a place to hunt. You're going to hunt the monsters known as Hodes in the Sograt Desert.";
+				next;
+				mes "[Hunter Sherin]";
+				mes "But you are in Payon!!";
+				mes "How do you go to the desert?";
+				next;
+				switch(select("Ask a Priest to open a free warp portal.:Use the Kafra service.:Walk with a friend.")) {
+				case 2:
+				case 3:
+					set .@hunter_t,.@hunter_t+10;
+				default:
+					break;
+				}
+				mes "[Hunter Sherin]";
+				mes "There is no Priest to ask for a warp, and no friend is around to walk with you. You must use the Kafra service, but you have no Zeny!";
+				next;
+				mes "[Hunter Sherin]";
+				mes "How would you go";
+				mes "about to make the";
+				mes "Zeny that you need?";
+				next;
+				switch(select("Beg here and there.:Sell items I do not need.:Hunt at a nearby field.")) {
+				case 2:
+				case 3:
+					set .@hunter_t,.@hunter_t+10;
+				default:
+					break;
+				}
+				mes "[Hunter Sherin]";
+				mes "So you finally arrive at the Sograt Desert. But you realize that Hodes are a bit too strong for you to hunt alone.";
+				next;
+				mes "[Hunter Sherin]";
+				mes "What is your";
+				mes "solution to this";
+				mes "situation?";
+				next;
+				if (select("Attack a Hode from the top of a hill.:Go back to town.:Attack someone else's Hode.") == 2)
+					set .@hunter_t,.@hunter_t+10;
+				mes "[Hunter Sherin]";
+				mes "Let's say you were having too much trouble hunting Hodes and returned to town. Now you are out of HP and a Priest happens to be around. How would you ask for a Heal?";
+				next;
+				if (select("Would it be possible to get a Heal, please?:Heal, please.:Heal me.") == 1)
+					set .@hunter_t,.@hunter_t+10;
+				mes "[Hunter Sherin]";
+				mes "This time, you found a rare item while you were going through your inventory. You go out to sell the item, and there are many people with stores and chatrooms open.";
+				next;
+				mes "[Hunter Sherin]";
+				mes "What is the";
+				mes "best way to";
+				mes "sell your item?";
+				next;
+				switch(select("Scream out loud to everyone in sight.:Open a chatroom and wait.:Look to see if anyone already wants it.")) {
+				case 2:
+				case 3:
+					set .@hunter_t,.@hunter_t+10;
+				default:
+					break;
+				}
+				mes "[Hunter Sherin]";
+				mes "While you are waiting, someone is begging for items and Zeny. What should you do?";
+				next;
+				if (select("Give some of my items and Zeny.:Ignore and walk away.:Tell the person about a good place to hunt.") == 1)
+					set .@hunter_t,.@hunter_t+10;
+				mes "[Hunter Sherin]";
+				mes "By now, you decide to go to the Maze by yourself.";
+				next;
+				mes "[Hunter Sherin]";
+				mes "But on your way, you run";
+				mes "into someone that is lost.";
+				mes "What should you do?";
+				next;
+				switch(select("Tell them which way to go.:Guide them to their destination.:Ignore.")) {
+				case 1:
+				case 2:
+					set .@hunter_t,.@hunter_t+10;
+				default:
+					break;
+				}
+				mes "[Hunter Sherin]";
+				mes "After meeting this lost person, you decide to get back to hunting. Just then, you find that someone is attacking a boss!";
+				next;
+				mes "[Hunter Sherin]";
+				mes "What should you do?";
+				next;
+				if (select("Watch, then attack when asked for help.:Attack and see what happens.:Just go back to town.") == 1)
+					set .@hunter_t,.@hunter_t+10;
+				mes "[Hunter Sherin]";
+				mes "You are now very exhausted after your day of hunting. It's time to go back to town.";
+				next;
+				mes "[Hunter Sherin]";
+				mes "But what's this!? You find an expensive item lying on the floor! What should you do with it?";
+				next;
+				switch(select("Pick it up and keep it.:Try to find the owner.:Just walk by.")) {
+				case 2:
+				case 3:
+					set .@hunter_t,.@hunter_t+10;
+				default:
+					break;
+				}
+				mes "[Hunter Sherin]";
+				mes "Okay, this is the end of the test!";
+				next;
+				if (.@hunter_t == 100) {
+					set HNTR_Q,2;
+					changequest 4000,4001;
 					mes "[Hunter Sherin]";
-					mes "Hmm... I don't think this'll work out. You can't become a Hunter without knowing basic etiquette.";
+					mes "Well done! Your answers show you've got the right outlook on life. You definitely have the right qualities to become a Hunter~";
 					next;
 					mes "[Hunter Sherin]";
-					mes "Think about how you answered the questions one more time. In order to value nature, you must first value your relationship with others.";
+					mes "I'm glad to say you've passed the interview~ Now, go to that person in the corner and confirm which item is necessary for your job change test~";
+					close;
+				}
+				else if (.@hunter_t == 90) {
+					set HNTR_Q,2;
+					changequest 4000,4001;
+					mes "[Hunter Sherin]";
+					mes "Well, I'm looking at your answers and your score isn't perfect. But I'll let you pass anyway. I don't know what our Guildmaster will think, though.";
 					next;
 					mes "[Hunter Sherin]";
-					mes "Then, you'll be more in tune with nature and with other people. It's this kind of harmony that makes the best Hunters.";
+					mes "Just remember to always keep basic etiquette in mind. Try harder in the following tests and make me happy, okay?";
 					close;
 				}
+				set HNTR_Q,1;
+				mes "[Hunter Sherin]";
+				mes "Hmm... I don't think this'll work out. You can't become a Hunter without knowing basic etiquette.";
+				next;
 				mes "[Hunter Sherin]";
-				mes "Okay...";
-				mes "Come back";
-				mes "when you're ready~";
+				mes "Think about how you answered the questions one more time. In order to value nature, you must first value your relationship with others.";
+				next;
+				mes "[Hunter Sherin]";
+				mes "Then, you'll be more in tune with nature and with other people. It's this kind of harmony that makes the best Hunters.";
 				close;
 			case 2:
 				mes "[Hunter Guildsman]";
@@ -408,7 +425,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 				mes "[Hunter Guildsman]";
 				mes "Fourth...";
 				mes "You've gotta pass the test administered by the guild. If you have had enough training as an Archer, you should be able to pass the test~";
-				close;
+				break;
 			case 3:
 				mes "[Hunter Guildsman]";
 				mes "Okay then,";
@@ -416,182 +433,18 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 				close;
 			}
 		}
-		if ((JobLevel > 39) && (HNTR_Q == 1)) {
-			mes "[Hunter Sherin]";
-			mes "Welcome back...!";
-			mes "Well, let's start with the interview. This time, carefully think about the answers to each question.";
-			next;
-			set @knight_t, 0;
-			mes "[Hunter Sherin]";
-			mes "Well then,";
-			mes "let's begin.";
-			next;
-			mes "[Hunter Sherin]";
-			mes "You are an Archer, and you don't know where you should go to hunt. What do you do?";
-			next;
-			switch (select("Scream out loud asking where you should go.:Quietly ask a person passing by.:Wander around alone and search for a place.")) {
-			case 1:
-				break;
-			case 2:
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Hunter Sherin]";
-			mes "So you've decided on a place to hunt. You're going to hunt the monsters known as Hodes in the Sograt Desert.";
-			next;
-			mes "[Hunter Sherin]";
-			mes "But you are in Payon!!";
-			mes "How do you go to the desert?";
-			next;
-			switch (select("Ask a Priest to open a free warp portal.:Use the Kafra service.:Walk with a friend.")) {
-			case 1:
-				break;
-			case 2:
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Hunter Sherin]";
-			mes "There is no Priest to ask for a warp, and no friend is around to walk with you. You must use the Kafra service, but you have no Zeny!";
-			next;
-			mes "[Hunter Sherin]";
-			mes "How would you go";
-			mes "about to make the";
-			mes "Zeny that you need?";
-			next;
-			switch (select("Beg here and there.:Sell items I do not need.:Hunt at a nearby field.")) {
-			case 1:
-				break;
-			case 2:
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Hunter Sherin]";
-			mes "So you finally arrive at the Sograt Desert. But you realize that Hodes are a bit too strong for you to hunt alone.";
-			next;
-			mes "[Hunter Sherin]";
-			mes "What is your";
-			mes "solution to this";
-			mes "situation?";
-			next;
-			if (select("Attack a Hode from the top of a hill.:Go back to town.:Attack someone else's Hode.") == 2) {
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Hunter Sherin]";
-			mes "Let's say you were having too much trouble hunting Hodes and returned to town. Now you are out of HP and a Priest happens to be around. How would you ask for a Heal?";
-			next;
-			if (select("Would it be possible to get a Heal, please?:Heal, please.:Heal me.") == 1) {
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Hunter Sherin]";
-			mes "This time, you found a rare item while you were going through your inventory. You go out to sell the item, and there are many people with stores and chatrooms open.";
-			next;
-			mes "[Hunter Sherin]";
-			mes "What is the";
-			mes "best way to";
-			mes "sell your item?";
-			next;
-			switch (select("Scream out loud to everyone in sight.:Open a chatroom and wait.:Look to see if anyone already wants it.")) {
-			case 1:
-				break;
-			case 2:
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Hunter Sherin]";
-			mes "While you are waiting, someone is begging for items and Zeny. What should you do?";
-			next;
-			if (select("Give some of my items and Zeny.:Ignore and walk away.:Tell the person about a good place to hunt.") == 3) {
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Hunter Sherin]";
-			mes "By now, you decide to go to the Maze by yourself.";
-			next;
-			mes "[Hunter Sherin]";
-			mes "But on your way, you run";
-			mes "into someone that is lost.";
-			mes "What should you do?";
-			next;
-			switch (select("Tell them which way to go.:Guide them to their destination.:Ignore.")) {
-			case 1:
-			case 2:
-				set @knight_t, @knight_t + 10;
-			case 3:
-			}
-			mes "[Hunter Sherin]";
-			mes "After meeting this lost person, you decide to get back to hunting. Just then, you find that someone is attacking a boss!";
-			next;
-			mes "[Hunter Sherin]";
-			mes "What should you do?";
-			next;
-			switch (select("Watch, then attack when asked for help.:Attack and see what happens.:Just go back to town.") == 1) {
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Hunter Sherin]";
-			mes "You are now very exhausted after your day of hunting. It's time to go back to town.";
-			next;
-			mes "[Hunter Sherin]";
-			mes "But what's this!? You find an expensive item lying on the floor! What should you do with it?";
-			next;
-			switch (select("Pick it up and keep it.:Try to find the owner.:Just walk by.")) {
-			case 1:
-				break;
-			case 2:
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Hunter Sherin]";
-			mes "Okay, this is";
-			mes "the end of the test!";
-			next;
-			if (@knight_t == 100) {
-				set HNTR_Q,2;
-				setquest 4001;
-				mes "[Hunter Sherin]";
-				mes "Well done! It seems you've got the right outlook on life. You definitely have what it takes to become a Hunter~";
-				next;
-				mes "[Hunter Sherin]";
-				mes "I'm happy to say you've passed the interview~ Now, go to that person in the corner and confirm which items are necessary for the job change test~";
-				close;
-			}
-			if (@knight_t == 90) {
-				set HNTR_Q,2;
-				setquest 4001;
-				mes "[Hunter Sherin]";
-				mes "Hmmm... Well, your score isn't exactly perfect, but I'll let you pass anyway. I'm not sure what our Guildmaster will think though...";
-				next;
-				mes "[Hunter Sherin]";
-				mes "Just remember to keep the basics of etiquette in mind. Try harder in the following tests, and make me happy, okay?";
-				close;
-			}
-			if (HNTR_Q == 1){
-				mes "[Hunter Sherin]";
-				mes "Hmm...";
-				mes "I'm sorry but you can't become a Hunter without knowing basic etiquette.";
-				next;
-				mes "[Hunter Sherin]";
-				mes "Think about how you answered the questions once more. In order to be in tune with nature, you must first value your relationship with others.";
-				next;
-				mes "[Hunter Sherin]";
-				mes "Well then...";
-				mes "Come back";
-				mes "when you're ready.";
-				close;
-			}
-		}
-		if ((HNTR_Q > 2) && (HNTR_Q < 10)) {
+		else if (HNTR_Q > 2 && HNTR_Q < 10) {
 			mes "[Hunter Sherin]";
 			mes "Just give the item to the Demon Hunter, the guy who's all the way to the left in this area~";
 			next;
-			if (Sex == 1) {
-				mes "[Hunter Sherin]";
-				mes "If you decide to become a Hunter, promise to come visit me. I want to see you as a Hunter. You would look great!!";
-				close;
-			}
 			mes "[Hunter Sherin]";
-			mes "If you decide to become a Hunter, come and visit me, okay? You're pretty, but... You'd be even prettier as a Hunter. Hehe~";
+			if (sex)
+				mes "If you decide to become a Hunter, promise to come visit me. I want to see you as a Hunter. You would look great!!";
+			else
+				mes "If you decide to become a Hunter, come and visit me, okay? You're pretty, but... You'd be even prettier as a Hunter. Hehe~";
 			close;
 		}
-		if (HNTR_Q == 2) {
+		else if (HNTR_Q == 2) {
 			mes "[Hunter Sherin]";
 			mes "????";
 			next;
@@ -606,7 +459,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	727,{
 		mes "Hmm, I think you're supposed to visit someone else, not me. Like our Guildmaster who's out for business, you know?";
 		next;
 		mes "[Hunter Sherin]";
-		mes "I heard he's at a building east of the Payon Central Palace... Or in the Archer Village, one of those two places. Try visiting those places and find him, okay?";
+		mes "I heard he's at the Payon Central Palace... Or in the Archer Village, one of those two places. Try visiting those places and find him, okay?";
 		close;
 	}
 	mes "[Hunter Guildsman]";
@@ -622,442 +475,112 @@ hu_in01,382,382,4	script	Guild Receptionist#hnt	732,{
 		mes "[Guild Receptionist]";
 		mes "Greetings. They call me... ^660000The Demon Hunter^000000. I am the one in charge of processing applications. Your name is ... " + strcharinfo(0) + ", correct?";
 		next;
-		if (select("Yes, that is correct.:Nope~~(heeheehee)") == 1) {
-			mes "[Demon Hunter]";
-			mes "Okay. These are the items you need for the test. Since we provide all the arrows you will be using for this test, we need you to get the materials to make them.";
-			next;
-			mes "[Demon Hunter]";
-			mes "You see, we're having some financial problems. Let's see, we're short on these items...";
-			next;
-			set .@item_need, rand(1,7);
-			if (.@item_need == 1) {
-				mes "[Demon Hunter]";
-				mes "Hmm. ^6600005 Claw of Desert Wolf^000000 to use for arrow tips. ^6600005 Trunk^000000 to use here and there. And ^6600003 White Herb^000000 please.";
-				set HNTR_Q,3;
-				changequest 4001,4002;
-				next;
-				mes "[Demon Hunter]";
-				mes "Oh right. Our Guildmaster has gone on an official trip to the Payon Central Palace. You have to go visit him since he's the one that administers the test.";
-				mes "You can find him in a building east of the Payon Central Palace.";
-				next;
-				mes "[Demon Hunter]";
-				mes "Alright then, come back to me when you have everything ready~";
-				close;
-			}
-			if (.@item_need == 2) {
-				mes "[Demon Hunter]";
-				mes "Hmm. ^6600003 Bill of Birds^000000 to use for the arrow tips. ^6600005 Skel-bone^000000 to use here and there. And ^6600003 Green Herbs^000000. That should be enough.";
-				set HNTR_Q,4;
-				changequest 4001,4003;
-				next;
-				mes "[Demon Hunter]";
-				mes "Oh right. Our Guildmaster has gone on an official trip to the Payon Central Palace. You have to go visit him since he's the one that administers the test.";
-				mes "You can find him in a building east of the Payon Central Palace.";
-				next;
-				mes "[Demon Hunter]";
-				mes "Alright then, come back to me when you have everything ready~";
-				close;
-			}
-			if (.@item_need == 3) {
-				mes "[Demon Hunter]";
-				mes "Mmm. ^6600003 Venom Canine^000000 to use as arrow tips. ^6600003 Animal Skin^000000 to use here and there. And ^6600005 Red Herb^000000. That should be enough.";
-				set HNTR_Q,5;
-				changequest 4001,4004;
-				next;
-				mes "[Demon Hunter]";
-				mes "Oh right. Our Guildmaster has gone on an official trip to the Payon Central Palace. You have to go visit him since he's the one that administers the test.";
-				mes "You can find him in a building east of the Payon Central Palace.";
-				next;
-				mes "[Demon Hunter]";
-				mes "Alright then, come back to me when you have everything ready~";
-				close;
-			}
-			if (.@item_need == 4) {
-				mes "[Demon Hunter]";
-				mes "Mmm. ^6600003 Dokkaebi Horn^000000 to make the arrow tips. ^6600003 Piece of Egg Shell^000000 to use here and there. And ^66000010 Fluff^000000. That should be enough.";
-				set HNTR_Q,6;
-				changequest 4001,4005;
-				next;
-				mes "[Demon Hunter]";
-				mes "Oh right. Our Guildmaster has gone on an official trip to the Payon Central Palace. You have to go visit him since he's the one that administers the test.";
-				mes "You can find him in a building east of the Payon Central Palace.";
-				next;
-				mes "[Demon Hunter]";
-				mes "Alright then, come back to me when you have everything ready~";
-				close;
-			}
-			if (.@item_need == 5) {
-				mes "[Demon Hunter]";
-				mes "Mmm. ^6600009 Shell^000000 to make the arrow tips. ^6600009 Worm Peeling^000000 to use here and there. And ^6600009 Yellow Herb^000000. That should be enough.";
-				set HNTR_Q,7;
-				changequest 4001,4006;
-				next;
-				mes "[Demon Hunter]";
-				mes "By the way, a member of our Hunter Guild is at the Archer Guild on official business. I believe you have to go visit this person since he is in charge of the testing.";
-				next;
-				mes "[Demon Hunter]";
-				mes "Alright then, come back when you have everything ready~";
-				close;
-			}
-			if (.@item_need == 6) {
-				mes "[Demon Hunter]";
-				mes "Mmm. ^6600003 Tooth of Bat^000000 to use for the arrow tips. ^6600001 Sticky Mucus^000000 to use as adhesive. And ^6600001 Bear's Footskin^000000 will do.";
-				set HNTR_Q,8;
-				changequest 4001,4007;
-				next;
-				mes "[Demon Hunter]";
-				mes "By the way, a member of our Hunter Guild is at the Archer Guild on official business. I believe you have to go visit the person since he's in charge of the testing.";
-				next;
-				mes "[Demon Hunter]";
-				mes "Alright then, come back when you have everything ready~";
-				close;
-			}
-			mes "[Demon Hunter]";
-			mes "Mmm. ^6600002 Porcupine Quill^000000 to use for the arrow tips. ^6600001 Yoyo Tail^000000 to help make the bow string. And ^6600001 Acorn^000000 please.";
-			set HNTR_Q,9;
-			changequest 4001,4008;
-			next;
-			mes "[Demon Hunter]";
-			mes "Before I forget. A member of our Hunter Guild is at the Archer Guild for official business. I believe you have to go visit the person since he is in charge of the testing.";
-			next;
-			mes "[Demon Hunter]";
-			mes "Alright then, come back when you have everything ready~";
-		}
-		mes "[Demon Hunter]";
-		mes "Hey, stop messing around.";
-		mes "Your name is " + strcharinfo(0) + ", right?";
-		next;
-		if (select("Yes...:Hehehe. I keep telling you, it's not~~") == 1) {
-			mes "[Demon Hunter]";
-			mes "Okay, then. These are the items you need for the test. Since we provide all of the necessary arrows you'll use for the test, we need you to get the materials to make them.";
-			next;
+		set .@selection,select("Yes, that is correct.:Nope~~(heeheehee)");
+		if (.@selection == 2) {
 			mes "[Demon Hunter]";
-			mes "You see, right now we're having some financial problems. Let's see, we're short on these items...";
+			mes "Hey, stop messing around.";
+			mes "Your name is " + strcharinfo(0) + ", right?";
 			next;
-			set .@item_need, rand(1,7);
-			if (.@item_need == 1) {
+			if (select("Yes...:Hehehe. I keep telling you, it's not~~") == 1) {
 				mes "[Demon Hunter]";
-				mes "Hmm. 5 ^660000Claw of Desert Wolf^000000 to use for arrow tips. ^6600005 Trunk^000000 to use here and there. And ^6600003 White Herb^000000 please.";
-				set HNTR_Q,3;
-				changequest 4001,4002;
+				mes "Okay, then. These are the items you need for the test. Since we provide all of the necessary arrows you'll use for the test, we need you to get the materials to make them.";
 				next;
 				mes "[Demon Hunter]";
-				mes "Oh right. Our Guildmaster has gone on an official trip to the Payon Central Palace. You have to go visit him since he's the one that administers the test.";
-				mes "You can find him in a building east of the Payon Central Palace.";
+				mes "You see, right now we're having some financial problems. Let's see, we're short on these items...";
 				next;
-				mes "[Demon Hunter]";
-				mes "Alright then, come back to me when you have everything ready~";
-				close;
-			}
-			if (.@item_need == 2) {
-				mes "[Demon Hunter]";
-				mes "Hmm. ^6600003 Bill of Birds^000000 to use for the arrow tips. ^6600005 Skel-bone^000000 to use here and there. And ^6600003 Green Herbs^000000. That should be enough.";
-				set HNTR_Q,4;
-				changequest 4001,4003;
-				next;
-				mes "[Demon Hunter]";
-				mes "Oh right. Our Guildmaster has gone on an official trip to the Payon Central Palace. You have to go visit him since he's the one that administers the test.";
-				mes "You can find him in a building east of the Payon Central Palace.";
-				next;
-				mes "[Demon Hunter]";
-				mes "Alright then, come back to me when you have everything ready~";
-				close;
 			}
-			if (.@item_need == 3) {
+			else {
 				mes "[Demon Hunter]";
-				mes "Mmm. ^6600003 Venom Canine^000000 to use as arrow tips. ^6600003 Animal Skin^000000 to use here and there. And ^6600005 Red Herb^000000. That should be enough.";
-				set HNTR_Q,5;
-				changequest 4001,4004;
-				next;
-				mes "[Demon Hunter]";
-				mes "Oh right. Our Guildmaster has gone on an official trip to the Payon Central Palace. You have to go visit him since he's the one that administers the test.";
-				mes "You can find him in a building east of the Payon Central Palace.";
-				next;
-				mes "[Demon Hunter]";
-				mes "Alright then, come back to me when you have everything ready~";
-				close;
-			}
-			if (.@item_need == 4) {
-				mes "[Demon Hunter]";
-				mes "Mmm. ^6600003 Dokkaebi Horn^000000 to make the arrow tips. ^6600003 Piece of Egg Shell^000000 to use here and there. And ^66000010 Fluff^000000. That should be enough.";
-				set HNTR_Q,6;
-				changequest 4001,4005;
-				next;
-				mes "[Demon Hunter]";
-				mes "Oh right. Our Guildmaster has gone on an official trip to the Payon Central Palace. You have to go visit him since he's the one that administers the test.";
-				mes "You can find him in a building east of the Payon Central Palace.";
-				next;
-				mes "[Demon Hunter]";
-				mes "Alright then, come back to me when you have everything ready~";
-				close;
-			}
-			if (.@item_need == 5) {
-				mes "[Demon Hunter]";
-				mes "Mmm. ^6600009 Shell^000000 to make the arrow tips. ^6600009 Worm Peeling^000000 to use here and there. And ^6600009 Yellow Herb^000000. That should be enough.";
-				set HNTR_Q,7;
-				changequest 4001,4006;
-				next;
-				mes "[Demon Hunter]";
-				mes "By the way, a member of our Hunter Guild is at the Archer Guild on official business. I believe you have to go visit this person since he is in charge of the testing.";
-				next;
-				mes "[Demon Hunter]";
-				mes "Alright then, come back when you have everything ready~";
-				close;
-			}
-			if (.@item_need == 6) {
-				mes "[Demon Hunter]";
-				mes "Mmm. ^6600003 Tooth of Bat^000000 to use for the arrow tips. ^6600001 Sticky Mucus^000000 to use as adhesive. And ^6600001 Bear's Footskin^000000 will do.";
-				set HNTR_Q,8;
-				changequest 4001,4007;
-				next;
-				mes "[Demon Hunter]";
-				mes "By the way, a member of our Hunter Guild is at the Archer Guild on official business. I believe you have to go visit the person since he's in charge of the testing.";
-				next;
-				mes "[Demon Hunter]";
-				mes "Alright then, come back when you have everything ready~";
-				close;
+				mes "Leave if you plan to trifle me your petty tricks. Do you not realize that you are toying with ^660000The Demon Hunter^000000?!'";
+				close2;
+				warp "hugel",208,223;
+				end;
 			}
-			mes "[Demon Hunter]";
-			mes "Mmm. ^6600002 Porcupine Quill^000000 to use for the arrow tips. ^6600001 Yoyo Tail^000000 to help make the bow string. And ^6600001 Acorn^000000 please.";
-			set HNTR_Q,9;
-			changequest 4001,4008;
-			next;
-			mes "[Demon Hunter]";
-			mes "Before I forget. A member of our Hunter Guild is at the Archer Guild for official business. I believe you have to go visit the person since he is in charge of the testing.";
-			next;
-			mes "[Demon Hunter]";
-			mes "Alright then, come back when you have everything ready~";
-			close;
-		}
-		mes "[Demon Hunter]";
-		mes "Leave if you plan to trifle me your petty tricks. Do you not realize that you are toying with ^660000The Demon Hunter^000000?!'";
-		close2;
-		warp "hugel",208,223;
-		end;
-	}
-	if (HNTR_Q == 3) {
-		mes "[Demon Hunter]";
-		mes "Hmm?";
-		next;
-		if ((countitem(7030) > 4) && (countitem(1019) > 4) && (countitem(509) > 2)) {
-			mes "[Demon Hunter]";
-			mes "You brought all of the necessary materials... You can get directions to the testing area from our Guildmaster who is currently in the Payon Central Palace.";
-			set HNTR_Q,10;
-			completequest 4002;
-			completequest 4003;
-			completequest 4004;
-			completequest 4005;
-			completequest 4006;
-			completequest 4007;
-			completequest 4008;
-			setquest 4009;
-			delitem 7030,5; //Claw_Of_Desert_Wolf
-			delitem 1019,5; //Wooden_Block
-			delitem 509,3; //White_Herb
-			close;
 		}
 		mes "[Demon Hunter]";
-		mes "You don't have all";
-		mes "of the required materials...";
+		mes "Okay. These are the items you need for the test. Since we provide all the arrows you will be using for this test, we need you to get the materials to make them.";
 		next;
 		mes "[Demon Hunter]";
-		mes "The items you need are";
-		mes "^6600005 Claw of Desert Wolf^000000,";
-		mes "^6600005 Trunk^000000 and";
-		mes "^6600003 White Herb^000000.";
-		mes "Come back once you have";
-		mes "gathered all the items.";
-		close;
-	}
-	if (HNTR_Q == 4) {
-		mes "[Demon Hunter]";
-		mes "Ah, you have returned.";
+		mes "You see, we're having some financial problems. Let's see, we're short on these items...";
 		next;
-		if ((countitem(925) > 2) && (countitem(932) > 4) && (countitem(511) > 2)) {
-			mes "[Demon Hunter]";
-			mes "You brought all the necessary materials... You can get directions to the testing area from our Guildmaster that is currently in the Payon Central Palace.";
-			set HNTR_Q,10;
-			completequest 4002;
-			completequest 4003;
-			completequest 4004;
-			completequest 4005;
-			completequest 4006;
-			completequest 4007;
-			completequest 4008;
-			setquest 4009;
-			delitem 925,3; //Bill_Of_Birds
-			delitem 932,5; //Skel_Bone
-			delitem 511,3; //Green_Herb
-			close;
+		if(checkre(0)) set .@i,1;
+		switch(rand(1,7)) {
+		//Insect_Feeler/Claw_Of_Desert_Wolf, Wooden_Block, White_Herb
+		case 1: setarray .@items[0], (.@i?928:7030),5, 1019,5, 509,3, 3; changequest 4001,4002; break;
+		//Bill_Of_Birds, Skel_Bone, Green_Herb
+		case 2: setarray .@items[0], 925,3, 932,5, 511,3, 4; changequest 4001,4003; break;
+		//Colorful_Shell/Posionous_Canine, Animal's_Skin, Red_Herb
+		case 3: setarray .@items[0], (.@i?1013:937),3, 919,3, 507,5, 5; changequest 4001,4004; break;
+		//Horn/Dokkaebi_Horn, Poison_Spore/Piece_Of_Egg_Shell, Fluff
+		case 4: setarray .@items[0], (.@i?947:1021),3, (.@i?7033:7032),3, 914,10, 6; changequest 4001,4005; break;
+		//Shell, Worm_Peelings, Yellow_Herb
+		case 5: setarray .@items[0], 935,9, 955,9, 508,9, 7; changequest 4001,4006; break;
+		//Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot
+		case 6: setarray .@items[0], 913,3, 938,1, 948,1, 8; changequest 4001,4007; break;
+		//Porcupine_Spike, Yoyo_Tailm Acorn
+		case 7: setarray .@items[0], 1027,2, 942,1, 1026,1, 9; changequest 4001,4008; break;
 		}
-		mes "[Demon Hunter]";
-		mes "You don't have all";
-		mes "of the required materials...";
-		next;
-		mes "[Demon Hunter]";
-		mes "The items you need are";
-		mes "^6600003 Bill of Birds^000000,";
-		mes "^6600005 Skel-bone^000000 and";
-		mes "^6600003 Green Herb^000000.";
-		mes "Come back once you have";
-		mes "gathered all the items.";
-		close;
-	}
-	if (HNTR_Q == 5) {
-		mes "[Demon Hunter]";
-		mes "Hmm...let me see.";
-		next;
-		if ((countitem(937) > 2) && (countitem(919) > 2) && (countitem(507) > 4)) {
+		if (.@selection == 1) {
 			mes "[Demon Hunter]";
-			mes "You brought all of the necessary materials... You can get directions to the testing area from our Guildmaster that is currently in the Payon Central Palace.";
-			set HNTR_Q,10;
-			completequest 4002;
-			completequest 4003;
-			completequest 4004;
-			completequest 4005;
-			completequest 4006;
-			completequest 4007;
-			completequest 4008;
-			setquest 4009;
-			delitem 937,3; //Posionous_Canine
-			delitem 919,3; //Animal's_Skin
-			delitem 507,5; //Red_Herb
-			close;
-		}
-		mes "[Demon Hunter]";
-		mes "You don't have all";
-		mes "of the required materials...";
-		next;
-		mes "[Demon Hunter]";
-		mes "The items you need are";
-		mes "^6600003 Venom Canine^000000,";
-		mes "^6600003 Animal Skin^000000 and";
-		mes "^6600005 Red Herb^000000.";
-		mes "Come back once you have";
-		mes "gathered all of the items.";
-		close;
-	}
-	if (HNTR_Q == 6) {
-		mes "[Demon Hunter]";
-		mes "Hmm? Let me see... ";
-		next;
-		if ((countitem(1021) > 2) && (countitem(7032) > 2) && (countitem(914) > 9)) {
+			mes "Hmm. ^660000"+.@items[1]+" "+getitemname(.@items[0])+"^000000 to use for arrow tips. ^660000"+.@items[3]+" "+getitemname(.@items[2])+"^000000 to use here and there. And ^660000"+.@items[5]+" "+getitemname(.@items[4])+"^000000 please.";
+			set HNTR_Q,.@items[6];
+			next;
 			mes "[Demon Hunter]";
-			mes "You brought all of the necessary materials... You can get directions to the testing area from our Guildmaster that is currently in the Payon Central Palace.";
-			set HNTR_Q,10;
-			completequest 4002;
-			completequest 4003;
-			completequest 4004;
-			completequest 4005;
-			completequest 4006;
-			completequest 4007;
-			completequest 4008;
-			setquest 4009;
-			delitem 1021,3; //Dokkaebi_Horn
-			delitem 7032,3; //Piece_Of_Egg_Shell
-			delitem 914,10; //Fluff
-			close;
-		}
-		mes "[Demon Hunter]";
-		mes "You don't have all";
-		mes "of the required materials...";
-		next;
-		mes "[Demon Hunter]";
-		mes "The items you need are";
-		mes "^6600003 Dokkaebi Horn^000000,";
-		mes "^6600003 Piece of Egg Shell^000000 and";
-		mes "^66000010 Fluff^000000.";
-		mes "Come back once you have";
-		mes "gathered all the items.";
-		close;
-	}
-	if (HNTR_Q == 7) {
-		mes "[Demon Hunter]";
-		mes "Eh? Let me see...";
-		next;
-		if ((countitem(935) > 8) && (countitem(955) > 8) && (countitem(508) > 8)) {
+			mes "Oh right. Our Guildmaster has gone on an official trip to the Payon Central Palace. You have to go visit him because the one that administers the test.";
+			next;
 			mes "[Demon Hunter]";
-			mes "You brought all of the necessary materials... To get directions to the testing area, go talk to our Guildmaster who is at the Archer Guild.";
-			set HNTR_Q,11;
-			completequest 4002;
-			completequest 4003;
-			completequest 4004;
-			completequest 4005;
-			completequest 4006;
-			completequest 4007;
-			completequest 4008;
-			setquest 4010;
-			delitem 935,9; //Shell
-			delitem 955,9; //Worm_Peelings
-			delitem 508,9; //Yellow_Herb
-			close;
+			mes "Alright then, come back to me when you have everything ready~";
 		}
-		mes "[Demon Hunter]";
-		mes "You don't have all";
-		mes "of the required materials...";
-		next;
-		mes "[Demon Hunter]";
-		mes "The items you need are";
-		mes "^6600009 Shell^000000,";
-		mes "^6600009 Worm Peeling^000000 and";
-		mes "^6600009 Yellow Herb^000000.";
-		mes "Come back once you have";
-		mes "gathered all the items.";
 		close;
 	}
-	if (HNTR_Q == 8) {
-		mes "[Demon Hunter]";
-		mes "Huh? ";
-		next;
-		if ((countitem(913) > 2) && (countitem(938) > 0) && (countitem(948) > 0)) {
-			mes "[Demon Hunter]";
-			mes "You brought all of the necessary materials... To get directions to the testing area, go talk to our Guildmaster who is at the Archer Guild.";
-			set HNTR_Q,11;
-			completequest 4002;
-			completequest 4003;
-			completequest 4004;
-			completequest 4005;
-			completequest 4006;
-			completequest 4007;
-			completequest 4008;
-			setquest 4010;
-			delitem 913,3; //Tooth_Of_Bat
-			delitem 938,1; //Sticky_Mucus
-			delitem 948,1; //Bear's_Foot
-			close;
+	else if (HNTR_Q >= 3 && HNTR_Q <= 9) {
+		switch(HNTR_Q) {
+		//Insect_Feeler/Claw_Of_Desert_Wolf, Wooden_Block, White_Herb
+		case 3: setarray .@items[0], (.@i?928:7030),5, 1019,5, 509,3, 10; break;
+		//Bill_Of_Birds, Skel_Bonem Green_Herb
+		case 4: setarray .@items[0], 925,3, 932,5, 511,3, 10; break;
+		//Colorful_Shell/Posionous_Canine, Animal's_Skin, Red_Herb
+		case 5: setarray .@items[0], (.@i?1013:937),3, 919,3, 507,5, 10; break;
+		//Horn/Dokkaebi_Horn, Poison_Spore/Piece_Of_Egg_Shell, Fluff
+		case 6: setarray .@items[0], (.@i?947:1021),3, (.@i?7033:7032),3, 914,10, 10; break;
+		//Shell, Worm_Peelings, Yellow_Herb
+		case 7: setarray .@items[0], 935,9, 955,9, 508,9, 11; break;
+		//Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot
+		case 8: setarray .@items[0], 913,3, 938,1, 948,1, 11; break;
+		//Porcupine_Spike, Yoyo_Tailm Acorn
+		case 9: setarray .@items[0], 1027,2, 942,1, 1026,1, 11; break;
 		}
 		mes "[Demon Hunter]";
-		mes "You don't have all";
-		mes "of the required materials...";
-		next;
-		mes "[Demon Hunter]";
-		mes "The items you need are";
-		mes "^6600003 Tooth of Bat^000000,";
-		mes "^6600001 Sticky Mucus^000000 and";
-		mes "^6600001 Bear's Footskin^000000.";
-		mes "Come back once you have";
-		mes "gathered all the items.";
-		close;
-	}
-	if (HNTR_Q == 9) {
-		mes "[Demon Hunter]";
-		mes "Huh? ";
+		mes "Hmm?";
 		next;
-		if ((countitem(1027) > 1) && (countitem(942) > 0) && (countitem(1026) > 0)) {
+		if (countitem(.@items[0]) >= .@items[1] && countitem(.@items[2]) >= .@items[3] && countitem(.@items[4]) >= .@items[5]) {
 			mes "[Demon Hunter]";
-			mes "You brought all of the necessary materials... To get directions to the testing area, go talk to our Guildmaster who is at the Archer Guild.";
-			set HNTR_Q,11;
-			completequest 4002;
-			completequest 4003;
-			completequest 4004;
-			completequest 4005;
-			completequest 4006;
-			completequest 4007;
-			completequest 4008;
-			setquest 4010;
-			delitem 1027,2; //Porcupine_Spike
-			delitem 942,1; //Yoyo_Tail
-			delitem 1026,1; //Acorn
+			mes "You brought all of the necessary materials... You can get directions to the testing area from our Guildmaster who is currently in the Payon Central Palace.";
+			set HNTR_Q,.@items[6];
+			if(checkquest(4002) != -1) {
+				changequest 4002,4009;
+			}
+			else if(checkquest(4003) != -1) {
+				changequest 4003,4009;
+			}
+			else if(checkquest(4004) != -1) {
+				changequest 4004,4009;
+			}
+			else if(checkquest(4005) != -1) {
+				changequest 4005,4009;
+			}
+			else if(checkquest(4006) != -1) {
+				changequest 4006,4010;
+			}
+			else if(checkquest(4007) != -1) {
+				changequest 4007,4010;
+			}
+			else {
+				changequest 4008,4010;
+			}
+			delitem .@items[0],.@items[1];
+			delitem .@items[2],.@items[3];
+			delitem .@items[4],.@items[5];
 			close;
 		}
 		mes "[Demon Hunter]";
@@ -1066,81 +589,70 @@ hu_in01,382,382,4	script	Guild Receptionist#hnt	732,{
 		next;
 		mes "[Demon Hunter]";
 		mes "The items you need are";
-		mes "^6600002 Porcupine Quill^000000,";
-		mes "^6600001 Yoyo Tail^000000 and";
-		mes "^6600001 Acorn^000000.";
+		mes "^660000"+.@items[1]+" "+getitemname(.@items[0])+"^000000,";
+		mes "^660000"+.@items[3]+" "+getitemname(.@items[2])+"^000000 and";
+		mes "^660000"+.@items[5]+" "+getitemname(.@items[4])+"^000000.";
 		mes "Come back once you have";
 		mes "gathered all the items.";
 		close;
 	}
-	if ((HNTR_Q > 9) && (HNTR_Q < 17)) {
+	else if (HNTR_Q > 9 && HNTR_Q < 17) {
 		mes "[Demon Hunter]";
 		mes "Hmm? You didn't go to the Guildmaster either in Payon Central Palace or at the Archer Guild? He should be at one of the two places, so go look for him.";
 		close;
 	}
-	if (HNTR_Q == 17) {
+	else if (HNTR_Q == 17) {
 		mes "[Demon Hunter]";
 		mes "Ooh. You passed the test. Congratulations~ You should go talk to Sherin now.";
 		close;
 	}
-	mes "[Guild Receptionist]";
-	mes "If you wish to change your job to a Hunter, you must register first.";
-	close;
+	else {
+		mes "[Guild Receptionist]";
+		mes "If you wish to change your job to a Hunter, you must register first.";
+		close;
+	}
 }
 
 payon_in03,131,7,3	script	Hunter#htnGM	59,{
 	if (HNTR_Q == 10) {
 		mes "[Hunter Guildmaster]";
 		mes "Hmpf. You must be here for the Hunter job test. Let me tell you about the testing process. What would you like to know?";
-		set @a0,1;
 		next;
-		while (1) {
-			switch (select("What is the test?:What are the passing requirements?:Any warnings?:Begin test.")) {
-			case 1:
-				mes "[Hunter Guildmaster]";
-				mes "You have to hunt down certain monsters with a particular name. But you must avoid all the traps while you're at it.";
-				next;
-				mes "[Hunter Guildmaster]";
-				mes "This is to test your ability to move swiftly and locate targets in various situations.";
-				set @a0,@a0 + 1;
-				close2;
-				break;
-			case 2:
-				mes "[Hunter Guildmaster]";
-				mes "Within the time limit, starting in the 6 o'clock direction of the map, you must hunt the target monsters and then hit the escape switch that will appear in the center of the map.";
-				next;
-				mes "[Hunter Guildmaster]";
-				mes "You will pass if you are able to escape in the 12 o'clock direction of the map after you hit the switch.";
-				set @a0,@a0 + 1;
-				close2;
-				break;
-			case 3:
-				mes "[Hunter Guildmaster]";
-				mes "Hmm. Warnings... Well, if you fall into a trap, you have to start from the beginning. Also, only one person can take the test at a time.";
-				next;
+		switch(select("What is the test?:What are the passing requirements?:Any warnings?:Begin test.")) {
+		case 1:
+			mes "[Hunter Guildmaster]";
+			mes "You have to hunt down certain monsters with a particular name. But you must avoid all the traps while you're at it.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "This is to test your ability to move swiftly and locate targets in various situations.";
+			close;
+		case 2:
+			mes "[Hunter Guildmaster]";
+			mes "Within the time limit, starting in the 6 o'clock direction of the map, you must hunt the target monsters and then hit the escape switch that will appear in the center of the map.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "You will pass if you are able to escape in the 12 o'clock direction of the map after you hit the switch.";
+			close;
+		case 3:
+			mes "[Hunter Guildmaster]";
+			mes "Hmm. Warnings... Well, if you fall into a trap, you have to start from the beginning. Also, only one person can take the test at a time.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "I will send you to the testing place. There will be a waiting room, but if someone else is taking the test, you must wait in the chatroom.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "If the person in front succeeds, resigns or fails, the next person waiting in the chatroom is sent to the testing area. If nobody is waiting, the test will begin as soon as you enter the chatroom.";
+			close;
+		case 4:
+			if (.@a0) {
 				mes "[Hunter Guildmaster]";
-				mes "I will send you to the testing place. There will be a waiting room, but if someone else is taking the test, you must wait in the chatroom.";
+				mes "Okay. I'll send you to the testing area right now. Don't blame me if you get lost or confused because you didn't listen to my explanation.";
 				next;
-				mes "[Hunter Guildmaster]";
-				mes "If the person in front succeeds, resigns or fails, the next person waiting in the chatroom is sent to the testing area. If nobody is waiting, the test will begin as soon as you enter the chatroom.";
-				set @a0,@a0 + 1;
-				close2;
-				break;
-			case 4:
-				if (@a0 == 1) {
-					mes "[Hunter Guildmaster]";
-					mes "Okay. I'll send you to the testing area right now. Don't blame me if you get lost or confused because you didn't listen to my explanation.";
-					next;
-				}
-				else {
-					mes "[Hunter Guildmaster]";
-					mes "Okay. Best of luck.";
-					mes "I'll send you right now.";
-					next;
-				}
-				break;
 			}
-			break;
+			mes "[Hunter Guildmaster]";
+			mes "Okay. Best of luck.";
+			mes "I'll send you right now.";
+			next;
 		}
 		mes "[Hunter Guildmaster]";
 		mes "Well, then. Your arrows are probably still being made, so you can use mine to take the test.";
@@ -1151,7 +663,7 @@ payon_in03,131,7,3	script	Hunter#htnGM	59,{
 		warp "job_hunte",176,22;
 		end;
 	}
-	if ((HNTR_Q > 1) && (HNTR_Q < 10)) {
+	else if (HNTR_Q > 1 && HNTR_Q < 10) {
 		mes "[Hunter Guildmaster]";
 		mes "Mmm...?";
 		mes "What is an Archer";
@@ -1164,12 +676,12 @@ payon_in03,131,7,3	script	Hunter#htnGM	59,{
 		mes "Go gather the items for the test, and come back after you've visited the Hunter Guild.";
 		close;
 	}
-	if (HNTR_Q == 11) {
+	else if (HNTR_Q == 11) {
 		mes "[Hunter]";
 		mes "Hmm? Can I help you? If you wish to change jobs, you should visit the person at the Archer Guild, not me.";
 		close;
 	}
-	if ((HNTR_Q > 11) && (HNTR_Q < 16)) {
+	else if (HNTR_Q > 11 && HNTR_Q < 16) {
 		mes "[Hunter Guildmaster]";
 		mes "Hmm. You're the Archer that almost gave up on changing jobs. You do have everything ready, right? Then I'll send you to take the test right away.";
 		next;
@@ -1177,43 +689,33 @@ payon_in03,131,7,3	script	Hunter#htnGM	59,{
 		mes "If you have any";
 		mes "questions, ask now.";
 		next;
-		while (1) {
-			switch (select("What is the test?:What are the passing requirements?:Any warnings?:Begin test.")) {
-			case 1:
-				mes "[Hunter Guildmaster]";
-				mes "You have to hunt down certain monsters with a particular name, but you also avoid all the traps at the same time. This is to test your ability to move swiftly and locate targets in various situations.";
-				set @a0,@a0 + 1;
-				close2;
-				break;
-			case 2:
-				mes "[Hunter Guildmaster]";
-				mes "Within the given time, you will start at the 6 o'clock direction of the map, hunt the target monsters, and then hit the escape switch that will appear in the center of the map.";
-				next;
-				mes "[Hunter Guildmaster]";
-				mes "You will pass if you are able to escape in the 12 o'clock direction of the map after you hit the switch.";
-				set @a0,@a0 + 1;
-				close2;
-				break;
-			case 3:
-				mes "[Hunter Guildmaster]";
-				mes "Hmm. Warnings... Well, if you fall into a trap, you have to start from the beginning. Also, only one person can take the test at a time.";
-				next;
-				mes "[Hunter Guildmaster]";
-				mes "I'll send you to the testing place. There is a waiting room, but if someone else is taking the test, you must wait in the chatroom.";
-				next;
-				mes "[Hunter Guildmaster]";
-				mes "If the person in front succeeds, resigns or fails, the next person waiting in the chatroom is sent to the testing area. If nobody is waiting, the test will begin as soon as you enter the chatroom.";
-				set @a0,@a0 + 1;
-				close2;
-				break;
-			case 4:
-				mes "[Hunter Guildmaster]";
-				mes "Okay. Good luck.";
-				mes "I'll send you right now.";
-				next;
-				break;
-			}
-			break;
+		switch(select("What is the test?:What are the passing requirements?:Any warnings?:Begin test.")) {
+		case 1:
+			mes "[Hunter Guildmaster]";
+			mes "You have to hunt down certain monsters with a particular name, but you also avoid all the traps at the same time. This is to test your ability to move swiftly and locate targets in various situations.";
+			close;
+		case 2:
+			mes "[Hunter Guildmaster]";
+			mes "Within the given time, you will start at the 6 o'clock direction of the map, hunt the target monsters, and then hit the escape switch that will appear in the center of the map.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "You will pass if you are able to escape in the 12 o'clock direction of the map after you hit the switch.";
+			close;
+		case 3:
+			mes "[Hunter Guildmaster]";
+			mes "Hmm. Warnings... Well, if you fall into a trap, you have to start from the beginning. Also, only one person can take the test at a time.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "I'll send you to the testing place. There is a waiting room, but if someone else is taking the test, you must wait in the chatroom.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "If the person in front succeeds, resigns or fails, the next person waiting in the chatroom is sent to the testing area. If nobody is waiting, the test will begin as soon as you enter the chatroom.";
+			close;
+		case 4:
+			mes "[Hunter Guildmaster]";
+			mes "Okay. Good luck.";
+			mes "I'll send you right now.";
+			next;
 		}
 		mes "[Hunter Guildmaster]";
 		mes "Eh? Why won't I give you Silver Arrows? Don't expect anything when you don't bring any materials.";
@@ -1227,7 +729,6 @@ payon_in03,131,7,3	script	Hunter#htnGM	59,{
 			mes "you will pass this time!";
 			close2;
 			set HNTR_Q,12;
-			changequest 4009,4011;
 			warp "job_hunte",176,22;
 			end;
 		}
@@ -1236,20 +737,20 @@ payon_in03,131,7,3	script	Hunter#htnGM	59,{
 		mes "all of your preparations.";
 		close;
 	}
-	if (HNTR_Q == 16) {
+	else if (HNTR_Q == 16) {
 		mes "[Hunter Guildmaster]";
 		mes "Wow, you came back in one piece!";
 		mes "I mean, good job. I'll give you the item which proves that you have passed the test.";
 		set HNTR_Q,17;
-		changequest 4012,4013;
 		savepoint "payon",104,99;
 		getitem 1007,1; //Penetration
+		changequest 4012,4013;
 		next;
 		mes "[Hunter Guildmaster]";
 		mes "Okay, here it is. Now, go back to the Hunter Guild. I have some more business left to do here, but I hope you can become a Hunter soon.";
 		close;
 	}
-	if (HNTR_Q == 17) {
+	else if (HNTR_Q == 17) {
 		mes "[Hunter Guildmaster]";
 		mes "I see you aren't in a hurry to become a Hunter? When I first became a Hunter, I ran around for a month wildly brandishing my bow because I was so happy. Hehe~";
 		next;
@@ -1257,10 +758,12 @@ payon_in03,131,7,3	script	Hunter#htnGM	59,{
 		mes "Now, you should go back to the Hunter Guild~";
 		close;
 	}
-	mes "[Hunter]";
-	mes "...Can I help you?";
-	mes "I'm here for official business and am busy at the moment. If you'll excuse me...";
-	close;
+	else {
+		mes "[Hunter]";
+		mes "...Can I help you?";
+		mes "I'm here for official business and am busy at the moment. If you'll excuse me...";
+		close;
+	}
 }
 
 payon_in02,21,31,1	script	Hunter#htnGM2	59,{
@@ -1268,58 +771,48 @@ payon_in02,21,31,1	script	Hunter#htnGM2	59,{
 	if (HNTR_Q == 11) {
 		mes "[Hunter Guildmaster]";
 		mes "Mmm. I see you're here for the Hunter job test. Let me explain the testing process. What would you like to know?";
-		set @a0,1;
 		next;
-		while (1) {
-			switch (select("What is the test?:What are the passing requirements?:Any warnings?:Begin test.")) {
-			case 1:
-				mes "[Hunter Guildmaster]";
-				mes "You have to hunt down certain monsters with a particular name, but you must avoid all of the traps here at the same time.";
-				next;
-				mes "[Hunter Guildmaster]";
-				mes "This is to test your ability to move swiftly and locate targets in various situations.";
-				set @a0,@a0 + 1;
-				close2;
-				cutin "",255;
-				break;
-			case 2:
-				mes "[Hunter Guildmaster]";
-				mes "Within the given time, you will start in the 6 o'clock direction of the map, hunt the target monsters, and hit the escape switch that will appear in the center of the map.";
-				next;
-				mes "[Hunter Guildmaster]";
-				mes "You will pass if you are able to escape in the 12 o'clock direction of the map when the switch is activated.";
-				set @a0,@a0 + 1;
-				close2;
-				cutin "",255;
-				break;
-			case 3:
-				mes "[Hunter Guildmaster]";
-				mes "Mmm. Warnings... Well, if you fall into a trap, you have to start the test over from the beginning. And only one person can take the test at a time.";
-				next;
+		switch(select("What is the test?:What are the passing requirements?:Any warnings?:Begin test.")) {
+		case 1:
+			mes "[Hunter Guildmaster]";
+			mes "You have to hunt down certain monsters with a particular name, but you must avoid all of the traps here at the same time.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "This is to test your ability to move swiftly and locate targets in various situations.";
+			close2;
+			cutin "job_huntermaster",255;
+			end;
+		case 2:
+			mes "[Hunter Guildmaster]";
+			mes "Within the given time, you will start in the 6 o'clock direction of the map, hunt the target monsters, and hit the escape switch that will appear in the center of the map.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "You will pass if you are able to escape in the 12 o'clock direction of the map when the switch is activated.";
+			close2;
+			cutin "job_huntermaster",255;
+			end;
+		case 3:
+			mes "[Hunter Guildmaster]";
+			mes "Mmm. Warnings... Well, if you fall into a trap, you have to start the test over from the beginning. And only one person can take the test at a time.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "I'll send you to the testing place. There is a waiting room, but if someone else is taking the test, you must wait in the chatroom.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "If the person currently taking the test passes or fails, the next person waiting in the chatroom is sent to the testing area. If nobody is waiting, the test will begin as soon as you enter the chatroom.";
+			close2;
+			cutin "job_huntermaster",255;
+			end;
+		case 4:
+			if (.@a0) {
 				mes "[Hunter Guildmaster]";
-				mes "I'll send you to the testing place. There is a waiting room, but if someone else is taking the test, you must wait in the chatroom.";
+				mes "...Okay. I'll send you to the testing area right now. Don't blame me if you get lost or confused because you didn't listen to the explanation.";
 				next;
-				mes "[Hunter Guildmaster]";
-				mes "If the person currently taking the test passes or fails, the next person waiting in the chatroom is sent to the testing area. If nobody is waiting, the test will begin as soon as you enter the chatroom.";
-				set @a0,@a0 + 1;
-				close2;
-				cutin "",255;
-				break;
-			case 4:
-				if (@a0 == 1) {
-					mes "[Hunter Guildmaster]";
-					mes "...Okay. I'll send you to the testing area right now. Don't blame me if you get lost or confused because you didn't listen to the explanation.";
-					next;
-				}
-				else {
-					mes "[Hunter Guildmaster]";
-					mes "Okay, best of luck.";
-					mes "I'll send you right now.";
-					next;
-				}
-				break;
 			}
-			break;
+			mes "[Hunter Guildmaster]";
+			mes "Okay, best of luck.";
+			mes "I'll send you right now.";
+			next;
 		}
 		mes "[Hunter Guildmaster]";
 		mes "Well, your arrows are probably still being made, so you can use mine to take the test.";
@@ -1330,9 +823,10 @@ payon_in02,21,31,1	script	Hunter#htnGM2	59,{
 		set HNTR_Q,12;
 		changequest 4010,4011;
 		warp "job_hunte",176,22;
+		cutin "job_huntermaster",255;
 		end;
 	}
-	if ((HNTR_Q > 1) && (HNTR_Q < 10)) {
+	else if (HNTR_Q > 1 && HNTR_Q < 10) {
 		mes "[Hunter Guildmaster]";
 		mes "Mmm...?";
 		mes "Why is an Archer";
@@ -1344,10 +838,10 @@ payon_in02,21,31,1	script	Hunter#htnGM2	59,{
 		mes "[Hunter Guildmaster]";
 		mes "Stop by once you have gathered all the items needed for the test.";
 		close2;
-		cutin "",255;
+		cutin "job_huntermaster",255;
 		end;
 	}
-	if (HNTR_Q == 10) {
+	else if (HNTR_Q == 10) {
 		mes "[Hunter]";
 		mes "Mmm?";
 		mes "Can I help you";
@@ -1358,10 +852,10 @@ payon_in02,21,31,1	script	Hunter#htnGM2	59,{
 		mes "[Hunter]";
 		mes "If you wish to change jobs, I think you need to go visit the person at Payon Central Palace.";
 		close2;
-		cutin "",255;
+		cutin "job_huntermaster",255;
 		end;
 	}
-	if ((HNTR_Q > 11) && (HNTR_Q < 16)) {
+	else if (HNTR_Q > 11 && HNTR_Q < 16) {
 		mes "[Hunter Guildmaster]";
 		mes "Mmm? Aren't you the Archer who gave up last time? Now you're ready, right? Then I'll send you to the job change area right now.";
 		next;
@@ -1370,49 +864,42 @@ payon_in02,21,31,1	script	Hunter#htnGM2	59,{
 		mes "have questions,";
 		mes "feel free to ask.";
 		next;
-		while (1) {
-			switch (select("What is the test?:What are the requirements to pass the test?:Any warnings?:Begin test.")) {
-			case 1:
-				mes "[Hunter Guildmaster]";
-				mes "You have to hunt down certain monsters with a particular name, but you must avoid all of the traps here at the same time.";
-				next;
-				mes "[Hunter Guildmaster]";
-				mes "This is to test your ability to move swiftly and locate targets in various situations.";
-				set @a0,@a0 + 1;
-				close2;
-				cutin "",255;
-				break;
-			case 2:
-				mes "[Hunter Guildmaster]";
-				mes "Within the given time, you will start in the 6 o'clock direction of the map, hunt the target monsters, and hit the escape switch that will appear in the center of the map.";
-				next;
-				mes "[Hunter Guildmaster]";
-				mes "You will pass if you are able to escape in the 12 o'clock direction of the map when the switch is activated.";
-				set @a0,@a0 + 1;
-				close2;
-				cutin "",255;
-				break;
-			case 3:
-				mes "[Hunter Guildmaster]";
-				mes "Mmm. Warnings... Well, if you fall into a trap, you have to start the test over from the beginning. And only one person can take the test at a time.";
-				next;
-				mes "[Hunter Guildmaster]";
-				mes "I'll send you to the testing place. There is a waiting room, but if someone else is taking the test, you must wait in the chatroom.";
-				next;
-				mes "[Hunter Guildmaster]";
-				mes "If the person currently taking the test passes or fails, the next person waiting in the chatroom is sent to the testing area. If nobody is waiting, the test will begin as soon as you enter the chatroom.";
-				set @a0,@a0 + 1;
-				close2;
-				cutin "",255;
-				break;
-			case 4:
-				mes "[Hunter Guildmaster]";
-				mes "Okay, good luck.";
-				mes "I'll send you right now...";
-				next;
-				break;
-			}
-			break;
+		switch(select("What is the test?:What are the requirements to pass the test?:Any warnings?:Begin test.")) {
+		case 1:
+			mes "[Hunter Guildmaster]";
+			mes "You have to hunt down certain monsters with a particular name, but you must avoid all of the traps here at the same time.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "This is to test your ability to move swiftly and locate targets in various situations.";
+			close2;
+			cutin "job_huntermaster",255;
+			end;
+		case 2:
+			mes "[Hunter Guildmaster]";
+			mes "Within the given time, you will start in the 6 o'clock direction of the map, hunt the target monsters, and hit the escape switch that will appear in the center of the map.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "You will pass if you are able to escape in the 12 o'clock direction of the map when the switch is activated.";
+			close2;
+			cutin "job_huntermaster",255;
+			end;
+		case 3:
+			mes "[Hunter Guildmaster]";
+			mes "Mmm. Warnings... Well, if you fall into a trap, you have to start the test over from the beginning. And only one person can take the test at a time.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "I'll send you to the testing place. There is a waiting room, but if someone else is taking the test, you must wait in the chatroom.";
+			next;
+			mes "[Hunter Guildmaster]";
+			mes "If the person currently taking the test passes or fails, the next person waiting in the chatroom is sent to the testing area. If nobody is waiting, the test will begin as soon as you enter the chatroom.";
+			close2;
+			cutin "job_huntermaster",255;
+			end;
+		case 4:
+			mes "[Hunter Guildmaster]";
+			mes "Okay, good luck.";
+			mes "I'll send you right now...";
+			next;
 		}
 		mes "[Hunter Guildmaster]";
 		mes "Eh? Why don't I give you any Silver Arrows? Well, you shouldn't expect to get anything when you didn't even bring the materials.";
@@ -1428,9 +915,8 @@ payon_in02,21,31,1	script	Hunter#htnGM2	59,{
 			mes "Okay!! Now...";
 			mes "Pass this time!";
 			close2;
-			cutin "",255;
+			cutin "job_huntermaster",255;
 			set HNTR_Q,12;
-			changequest 4010,4011;
 			warp "job_hunte",176,22;
 			end;
 		}
@@ -1440,15 +926,14 @@ payon_in02,21,31,1	script	Hunter#htnGM2	59,{
 		mes "you're done with";
 		mes "your preparations.";
 		close2;
-		cutin "",255;
+		cutin "job_huntermaster",255;
 		end;
 	}
-	if (HNTR_Q == 16) {
+	else if (HNTR_Q == 16) {
 		mes "[Hunter Guildmaster]";
 		mes "Wow. You're back in one piece!";
 		mes "I mean, good job. Well then, I'll give you the item which serves as proof that you passed the test.";
 		set HNTR_Q,17;
-		changequest 4012,4013;
 		savepoint "payon",104,99;
 		getitem 1007,1; //Penetration
 		next;
@@ -1457,10 +942,10 @@ payon_in02,21,31,1	script	Hunter#htnGM2	59,{
 		mes "There you go.";
 		mes "Now hurry back to the Hunter Guild, and join us~";
 		close2;
-		cutin "",255;
+		cutin "job_huntermaster",255;
 		end;
 	}
-	if (HNTR_Q == 17) {
+	else if (HNTR_Q == 17) {
 		mes "[Hunter Guildmaster]";
 		mes "I see you're not in a hurry to become a Hunter. I was running around with joy, wildly brandishing my bow the first month I became a Hunter. Hehe~";
 		next;
@@ -1470,69 +955,19 @@ payon_in02,21,31,1	script	Hunter#htnGM2	59,{
 		mes "for you back";
 		mes "at the Hunter Guild.";
 		close2;
-		cutin "",255;
-		end;
-	}
-	mes "[Hunter]";
-	mes "What do you want? I'm on an official trip and am busy at the moment. Now if you'll excuse me.";
-	close2;
-	cutin "",255;
-	end;
-}
-
-job_hunte,178,32,1	script	Guide#hnt	107,5,2,{
-
-	if (HNTR_Q == 12) {
-		mes "[Guide]";
-		mes "Good day. Welcome to the Hunter testing site. The test begins when you enter the next room.";
-		next;
-		mes "[Guide]";
-		mes "As explained before, hunt 4 or more of the monsters named ^3355FFJob change monster^000000. Upon doing so, a switch in the center of the map will then appear.";
-		next;
-		mes "[Guide]";
-		mes "When you destroy the switch, the exit will appear in the 12 o'clock direction of the map. Complete everything within the given time and escape.";
-		next;
-		mes "[Guide]";
-		mes "If you faint in the middle, fall into a trap, or go over the time limit, you'll fail. Then you must then retake the test.";
-		next;
-		mes "[Guide]";
-		mes "We will provide the arrows, so just make sure that you bring a bow. Well, then. Please enter when you are ready.";
-		savepoint "job_hunte",176,22;
-		close;
-	}
-	if ((HNTR_Q > 12) && (HNTR_Q < 16)) {
-		mes "[Guide]";
-		mes "Hmm...";
-		mes "Did you mess up?";
-		mes "I'll recover some";
-		mes "of your HP and SP for now.";
-		percentheal 100,100;
-		next;
-		mes "[Guide]";
-		mes "If it's too hard, it wouldn't hurt to try again next time. Would you like to resign?";
-		next;
-		if (select("Keep trying.:Resign.") == 1) {
-			mes "Okay. Do your best to become a great Hunter. Please enter the waiting room. If someone entered already, you must wait until that person is done.";
-			close;
-		}
-		mapannounce "job_hunte","" + strcharinfo(0) + "has resigned. Next person, please enter.",bc_map;
-		mes "Very well. I'll send you to Payon. Hope to see you next time. Don't forget to save when you leave.";
-		donpcevent "Waiting Room#hnt::OnReset";
-		close2;
-		set HNTR_Q,13;
-		savepoint "payon",104,99;
-		warp "payon_in02",21,27;
+		cutin "job_huntermaster",255;
 		end;
 	}
-	if (HNTR_Q > 15) {
-		mes "[Guide]";
-		mes "You shouldn't be here. How about finding the required job change item first?";
+	else {
+		mes "[Hunter]";
+		mes "What do you want? I'm on an official trip and am busy at the moment. Now if you'll excuse me.";
 		close2;
-		savepoint "payon",104,99;
-		warp "payon_in02",21,27;
+		cutin "job_huntermaster",255;
 		end;
 	}
+}
 
+job_hunte,178,32,1	script	Guide#hnt	107,5,2,{
 OnTouch:
 	if (HNTR_Q == 12) {
 		mes "[Guide]";
@@ -1552,7 +987,7 @@ OnTouch:
 		savepoint "job_hunte",176,22;
 		close;
 	}
-	if ((HNTR_Q > 12) && (HNTR_Q < 16)) {
+	else if (HNTR_Q > 12 && HNTR_Q < 16) {
 		mes "[Guide]";
 		mes "Hmm...";
 		mes "Did you mess up?";
@@ -1563,32 +998,33 @@ OnTouch:
 		mes "[Guide]";
 		mes "If it's too hard, it wouldn't hurt to try again next time. Would you like to resign for now?";
 		next;
-		if (select("Keep trying.:Resign.") == 1) {
+		switch(select("Keep trying.:Resign.")) {
+		case 1:
 			mes "[Guide]";
 			mes "Okay. Do your best and become a great Hunter. Please enter the waiting room. If someone is already taking the test, you must wait until that person is done.";
 			close;
+		case 2:
+			mapannounce "job_hunte",strcharinfo(0)+ " has resigned. Next person, please enter.",bc_map;
+			mes "[Guide]";
+			mes "Very well. I'll send you to Payon. Hope to see you next time. Don't forget to save when you leave.";
+			// donpcevent "Waiting Room#hnt::OnStart";
+			close2;
+			set HNTR_Q,13;
+			savepoint "payon",104,99;
+			warp "payon_in02",21,27;
 		}
-		mapannounce "job_hunte","" + strcharinfo(0) + "has resigned. Next person, please enter.",bc_map;
-		mes "[Guide]";
-		mes "Very well. I'll send you to Payon. Hope to see you next time. Don't forget to save when you leave.";
-		donpcevent "Waiting Room#hnt::OnReset";
-		close2;
-		set HNTR_Q,13;
-		savepoint "payon",104,99;
-		warp "payon_in02",21,27;
-		end;
 	}
-	if (HNTR_Q > 15) {
+	else if (HNTR_Q > 15) {
 		mes "[Guide]";
 		mes "You shouldn't be here. How about finding the required job change item first?";
 		close2;
 		savepoint "payon",104,99;
 		warp "payon_in02",21,27;
-		end;
 	}
+	end;
 }
 
-job_hunte,176,38,1	script	Waiting Room#hnt	66,{
+job_hunte,178,38,1	script	Waiting Room#hnt	66,{
 	end;
 
 OnInit:
@@ -1597,57 +1033,92 @@ OnInit:
 	end;
 
 OnStartArena:
-	warpwaitingpc "job_hunte",90,67;
+	warpwaitingpc "job_hunte", 90, 67;
 	donpcevent "Manager#hnt::OnEnable";
-	donpcevent "Manager#hnt2::OnEnable";
-	donpcevent "switch#hnt::OnDisable";
-	donpcevent "hnt_backers::OnDisable";
 	disablewaitingroomevent;
 	end;
 
-OnReset:
+OnStart:
 	enablewaitingroomevent;
 	end;
 }
 
 job_hunte,1,1,1	script	Manager#hnt	66,{
-	end;
-
 OnInit:
 	disablenpc "Manager#hnt";
 	end;
 
 OnEnable:
+	donpcevent "Switch#hnt::OnDisable";
 	enablenpc "Manager#hnt";
+	set .MyMobs,6;
+	initnpctimer;
+	// Target Mosnters
 	monster "job_hunte",67,80,"Job Change Monster",1015,1,"Manager#hnt::OnMyMobDead";
 	monster "job_hunte",114,78,"Job Change Monster",1015,1,"Manager#hnt::OnMyMobDead";
 	monster "job_hunte",89,127,"Job Change Monster",1002,1,"Manager#hnt::OnMyMobDead";
 	monster "job_hunte",53,73,"Job Change Monster",1041,1,"Manager#hnt::OnMyMobDead";
 	monster "job_hunte",125,70,"Job Change Monster",1016,1,"Manager#hnt::OnMyMobDead";
 	monster "job_hunte",90,92,"Job Change Monster",1015,1,"Manager#hnt::OnMyMobDead";
-	initnpctimer;
-	end;
-
-OnReset:
-	killmonster "job_hunte","Manager#hnt::OnMyMobDead";
+	// Decoy Monsters
+	monster "job_hunte",85,100,"Job Test Monster",1016,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",72,102,"Job Test Monster",1041,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",108,103,"Job Test Monster",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",88,127,"Job Test Monster",1002,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",125,69,"Job Test Monster",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",77,112,"Job Tester Monster",1016,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",53,106,"Job Tester Monster",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",53,73,"Job Tester Monster",1002,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",125,70,"Job Tester Monster",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",90,91,"Job Tester Monster",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",67,80,"Hunter Change Monster",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",77,112,"Hunter Change Monster",1016,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",53,106,"Hunter Change Monster",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",53,73,"Hunter Change Monster",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",125,70,"Hunter Change Monster",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",90,91,"Job Transfer Monster",1041,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",85,100,"Job Transfer Monster",1002,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",72,102,"Job Transfer Monster",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",108,103,"Job Transfer Monster",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",77,112,"Job Transfer Monster",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",112,139,"Binnie",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",112,139,"Darrel",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",112,139,"Rex",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",112,139,"Anselmo",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",90,91,"Anolian",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",53,73,"Monster Sample",1002,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",53,106,"Not Me",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",77,112,"Help Me",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",72,102,"Do Not Hit Me",1015,1,"Manager#hnt::OnMyMobDead2";
+	monster "job_hunte",108,103,"Attack Speed 184",1015,1,"Manager#hnt::OnMyMobDead2";
 	end;
 
 OnMyMobDead:
-	if (mobcount ("job_hunte","Manager#hnt::OnMyMobDead") < 3) {
+	set .MyMobs,.MyMobs-1;
+	if (.MyMobs < 3) {
 		mapannounce "job_hunte","Okay, good job... Now, find the switch in the center of the map!! Be careful of the traps!!",bc_map;
 		set HNTR_Q,14;
 		donpcevent "switch#hnt::OnEnable";
-		donpcevent "Manager#hnt::OnReset";
-		donpcevent "Manager#hnt2::OnReset";
 		donpcevent "Manager#hnt::OnDisable";
-		donpcevent "Manager#hnt2::OnDisable";
 	}
 	else {
 		mapannounce "job_hunte","Okay~ You're almost there!!",bc_map;
 	}
 	end;
 
+OnMyMobDead2:
+	mapannounce "job_hunte",strcharinfo(0)+ "!! You made a mistake...Please try again.",bc_map;
+	set HNTR_Q,13;
+	warp "job_hunte",176,22;
+	donpcevent "Manager#hnt::OnReset";
+	donpcevent "Waiting Room#hnt::OnStart";
+	end;
+
+OnReset:
+	stopnpctimer;
+
 OnDisable:
+	killmonsterall "job_hunte";
 	disablenpc "Manager#hnt";
 	end;
 
@@ -1724,1558 +1195,610 @@ OnTimer194000:
 	end;
 
 OnTimer195000:
-	donpcevent "hnt_backers::OnEnable";
-	end;
-
-OnTimer196000:
-	donpcevent "hnt_backers::OnDisable";
-	end;
-
-OnTimer196500:
-	donpcevent "hnt_backers::OnEnable";
+	areawarp "job_hunte",50,64,129,143,"job_hunte",176,22;
 	end;
 
 OnTimer197000:
-	donpcevent "hnt_backers::OnDisable";
 	donpcevent "Manager#hnt::OnReset";
-	donpcevent "Manager#hnt2::OnReset";
-	donpcevent "Waiting Room#hnt::OnReset";
+	donpcevent "Waiting Room#hnt::OnStart";
 	end;
 }
 
-job_hunte,1,2,1	script	Manager#hnt2	66,{
-	end;
-
-OnInit:
-	disablenpc "Manager#hnt2";
-	end;
-
-OnEnable:
-	enablenpc "Manager#hnt2";
-	monster "job_hunte",85,100,"Job Test Monster",1016,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",72,102,"Job Test Monster",1041,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",108,103,"Job Test Monster",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",88,127,"Job Test Monster",1002,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",125,69,"Job Test Monster",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",77,112,"Job Tester Monster",1016,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",53,106,"Job Tester Monster",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",53,73,"Job Tester Monster",1002,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",125,70,"Job Tester Monster",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",90,91,"Job Tester Monster",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",67,80,"Hunter Change Monster",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",77,112,"Hunter Change Monster",1016,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",53,106,"Hunter Change Monster",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",53,73,"Hunter Change Monster",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",125,70,"Hunter Change Monster",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",90,91,"Job Transfer Monster",1041,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",85,100,"Job Transfer Monster",1002,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",72,102,"Job Transfer Monster",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",108,103,"Job Transfer Monster",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",77,112,"Job Transfer Monster",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",112,139,"Binnie",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",112,139,"Darrel",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",112,139,"Rex",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",112,139,"Anselmo",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",90,91,"Anolian",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",53,73,"Monster Sample",1002,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",53,106,"Not Me",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",77,112,"Help Me",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",72,102,"Do Not Hit Me",1015,1,"Manager#hnt2::OnMyMobDead";
-	monster "job_hunte",108,103,"Attack Speed 184",1015,1,"Manager#hnt2::OnMyMobDead";
-	end;
-
-OnReset:
-	killmonster "job_hunte","Manager#hnt2::OnMyMobDead";
-	end;
-
-OnDisable:
-	disablenpc "Manager#hnt2";
-	end;
-
-OnMyMobDead:
-	mapannounce "job_hunte"," " + strcharinfo(0) + "!! You made a mistake...Please try again.",bc_map;
-	set HNTR_Q,13;
-	warp "job_hunte",176,22;
-	donpcevent "Waiting Room#hnt::OnReset";
-	donpcevent "Manager#hnt::OnReset";
-	donpcevent "Manager#hnt2::OnReset";
-	donpcevent "Manager#hnt::OnDisable";
-	donpcevent "Manager#hnt2::OnDisable";
-	end;
-}
-
-job_hunte,93,101,1	script	switch#hnt	723,1,1,{
-
-	mes "^3355FFThere are 3 buttons";
-	mes "on the escape switch.^000000";
-	set HNTR_Q,15;
-	next;
-	switch (select("Escape:Cancel:Re-test")) {
-	case 1:
-		mes "^3355FFThe Escape Warp Portal";
-		mes "has now been activated.^000000";
-		close2;
-		mapannounce "job_hunte"," ## Escape Warp Portal activation complete. ## ",bc_map;
-		donpcevent "exit#hnttest::OnEnable";
-		end;
-	case 2:
-		mes "^3355FFCanceling";
-		mes "Operation.^000000";
-		close2;
-		mapannounce "job_hunte"," ## Operation has been cancelled. ## ",bc_map;
-		end;
-	case 3:
-		mapannounce "job_hunte"," ## Cancellation warp activating...## ",bc_map;
-		mes "^3355FFYou will soon be";
-		mes "returned to the";
-		mes "waiting room.^000000";
-		close2;
-		set HNTR_Q,13;
-		warp "job_hunte",176,22;
-		donpcevent "Waiting Room#hnt::OnReset";
-		end;
-	}
-
+job_hunte,93,101,1	script	Switch#hnt	723,1,1,{
 OnTouch:
 	mes "^3355FFThere are 3 buttons";
 	mes "on the escape switch.^000000";
 	set HNTR_Q,15;
 	next;
-	switch (select("Escape:Cancel:Re-test")) {
+	switch(select("Escape:Cancel:Re-test")) {
 	case 1:
 		mes "^3355FFThe Escape Warp Portal";
 		mes "has now been activated.^000000";
 		close2;
-		mapannounce "job_hunte"," ## Escape Warp Portal activation complete. ## ",bc_map;
-		donpcevent "exit#hnttest::OnEnable";
+		mapannounce "job_hunte"," !! Escape Warp Portal activation complete. !! ",bc_map;
+		enablenpc "exit#hnttest";
 		end;
 	case 2:
 		mes "^3355FFCanceling";
 		mes "Operation.^000000";
 		close2;
-		mapannounce "job_hunte"," ## Operation has been cancelled. ## ",bc_map;
+		mapannounce "job_hunte"," !! Operation has been cancelled. !! ",bc_map;
 		end;
 	case 3:
-		mapannounce "job_hunte"," ## Cancellation warp activating... ## ",bc_map;
+		mapannounce "job_hunte"," !! Cancellation warp activating... !! ",bc_map;
 		mes "^3355FFYou will soon be";
 		mes "returned to the";
 		mes "waiting room.^000000";
 		close2;
 		set HNTR_Q,13;
 		warp "job_hunte",176,22;
-		donpcevent "Waiting Room#hnt::OnReset";
+		donpcevent "Manager#hnt::OnReset";
+		donpcevent "Waiting Room#hnt::OnStart";
 		end;
 	}
 
 OnDisable:
-	donpcevent "exit#hnttest::OnDisable";
-	disablenpc "switch#hnt";
+	disablenpc "exit#hnttest";
+	disablenpc "Switch#hnt";
 	end;
 
 OnEnable:
-	enablenpc "switch#hnt";
+	enablenpc "Switch#hnt";
 	end;
 }
 
 job_hunte,89,139,0	script	exit#hnttest	45,2,2,{
+OnInit:
+	disablenpc "exit#hnttest";
+	end;
 
 OnTouch:
-	donpcevent "Waiting Room#hnt::OnReset";
+	donpcevent "Manager#hnt::OnReset";
+	donpcevent "Waiting Room#hnt::OnStart";
 	set HNTR_Q,16;
 	changequest 4011,4012;
 	savepoint "payon",104,99;
-	set .@whe,rand(1,2);
-	if (.@whe == 1) {
+	if (rand(1))
 		warp "payon_in02",21,27;
-	}
-	else {
-		warp "payon_in03",128,7;
-	}
-	end;
-	
-OnInit:
-	disablenpc "exit#hnttest";
-	end;
-
-OnEnable:
-	enablenpc "exit#hnttest";
-	end;
-
-OnDisable:
-	disablenpc "exit#hnttest";
-	end;
-}
-
-job_hunte,89,103,0	script	hnt_backers	139,42,42,{
-
-OnTouch:
-	warp "job_hunte",176,22;
-	set HNTR_Q,13;
-	end;
-
-OnInit:
-	disablenpc "hnt_backers";
-	end;
-
-OnEnable:
-	enablenpc "hnt_backers";
-	end;
-
-OnDisable:
-	disablenpc "hnt_backers";
-	end;
+	warp "payon_in03",128,7;
 }
 
--	script	hnt_job_quest_test::hntjqt	-1,{
-
+// Hunter Job test traps.
+//============================================================ 
+job_hunte,52,140,0	script	1-1::HntTrap	-1,0,1,{
 OnTouch:
-	switch(rand(1,128)){
-		case 1: mapannounce "job_hunte"," " + strcharinfo(0) + ", you have fallen into a trap. You will be returned to the starting point.",bc_map; break;
-		case 2: mapannounce "job_hunte"," " + strcharinfo(0) + ", yes you! Go back and start over!",bc_map; break;
-		case 3: mapannounce "job_hunte"," " + strcharinfo(0) + " has failed!...well...you will if you don't start over...",bc_map; break;
-		case 4: mapannounce "job_hunte"," " + strcharinfo(0) + ", has failed me! Go back to where you started!",bc_map; break;
-		case 5: mapannounce "job_hunte"," " + strcharinfo(0) + ", you have blundered into a trap. I'm sorry, but for now, YOU LOSE.",bc_map; break;
-		case 6: mapannounce "job_hunte"," " + strcharinfo(0) + ", what are you doing!? Go back and do it again!",bc_map; break;
-		case 7: mapannounce "job_hunte"," " + strcharinfo(0) + ", come on! You can do better then this!! Try again!",bc_map; break;
-		case 8: mapannounce "job_hunte"," " + strcharinfo(0) + ", has fallen into a trap...again. But don't worry, you're getting better.",bc_map; break;
-		case 9: mapannounce "job_hunte"," " + strcharinfo(0) + ", fail, fail, fail... Go back to where you started!",bc_map; break;
-		case 11: mapannounce "job_hunte"," " + strcharinfo(0) + "... aww~ Try again! You can do it!",bc_map; break;
-		case 12: mapannounce "job_hunte"," " + strcharinfo(0) + ", @#$%#^!@ and you wanna be a what? Hunter? Get back there!",bc_map; break;
-		case 13: mapannounce "job_hunte"," " + strcharinfo(0) + " was defeated by the forces of evil. Don't give up, hero!",bc_map; break;
-		case 14: mapannounce "job_hunte","I put a spell on you " + strcharinfo(0) + " and now you're mine! Go start over now.",bc_map; break;
-		case 15: mapannounce "job_hunte"," " + strcharinfo(0) + ". G'day mate, welcome to the land down under. As a present, I'll send you to the starting point...",bc_map; break;
-		case 16: mapannounce "job_hunte","That's my nest " + strcharinfo(0) + "! dont step there, squawk~ Start over.",bc_map; break;
-		case 17: mapannounce "job_hunte"," " + strcharinfo(0) + ", another archer down. 3 more to go!",bc_map; break;
-		case 18: mapannounce "job_hunte"," " + strcharinfo(0) + ", have you got what it takes? Then try again.",bc_map; break;
-		case 19: mapannounce "job_hunte","Alas, " + strcharinfo(0) + ", you have fallen prey to the most feared of traps. The dreaded stink bomb! Run run run awaaaaaay!",bc_map; break;
-		case 20: mapannounce "job_hunte"," " + strcharinfo(0) + " had too much prune juice to drink today. Back to the starting point~",bc_map; break;
-		case 21: mapannounce "job_hunte","Meow *pounce* look my kitties we'll have some" + strcharinfo(0) + "stew. Back to the starting point if you don't want to become stew!",bc_map; break;
-		case 22: mapannounce "job_hunte","Sorry " + strcharinfo(0) + ", but you've actually found a BAD secret. You will be returned to the starting point.",bc_map; break;
-		case 23: mapannounce "job_hunte"," " + strcharinfo(0) + ", silly Archer...your tenacity is touching. But it's back to the start for you...",bc_map; break;
-		case 24: mapannounce "job_hunte"," " + strcharinfo(0) + ", you've fallen and you can't get up. You'll be carried back to the starting point.",bc_map; break;
-		case 25: mapannounce "job_hunte","Skip a turn " + strcharinfo(0) + ", go back to start.",bc_map; break;
-		case 26: mapannounce "job_hunte"," " + strcharinfo(0) + ", nya nya, heh heh heh. You will be returned to the starting point.",bc_map; break;
-		case 27: mapannounce "job_hunte","Practice is over " + strcharinfo(0) + ". This time show me for real.",bc_map; break;
-		case 28: mapannounce "job_hunte"," " + strcharinfo(0) + ", this is a Poring jellopy raid...Get out! Start from the beginning if you wish to continue.",bc_map; break;
-		case 29: mapannounce "job_hunte","Disconnected from server. " + strcharinfo(0) + ", you have to start over.",bc_map; break;
-		case 30: mapannounce "job_hunte"," " + strcharinfo(0) + ", what does this button do...oops! I'm afraid you have to start over.",bc_map; break;
-		case 31: mapannounce "job_hunte"," " + strcharinfo(0) + ", you have entered the bonus round! Aaaand, you lost. You will be returned to the starting point.",bc_map; break;
-		case 32: mapannounce "job_hunte","Oh, no " + strcharinfo(0) + ", you've stepped on a hive of bees. You narrowly escaped, all the way back to the beginning.",bc_map; break;
-		case 33: mapannounce "job_hunte"," " + strcharinfo(0) + ", wait wait. That's a trap! Oh wait, that's dog. . . .",bc_map; break;
-		case 34: mapannounce "job_hunte","Stop " + strcharinfo(0) + "! For stepping on that trap, I shall punish you!",bc_map; break;
-		case 35: mapannounce "job_hunte"," " + strcharinfo(0) + ", I'll be back. . . I hope you will too.",bc_map; break;
-		case 36: mapannounce "job_hunte"," " + strcharinfo(0) + ", Come with me if you want to live. . to the starting point.",bc_map; break;
-		case 37: mapannounce "job_hunte"," " + strcharinfo(0) + ", my... precious! Go back to the starting point.",bc_map; break;
-		case 38: mapannounce "job_hunte","Follow the yellow brick road... No wait, " + strcharinfo(0) + "!! Not that way...Back to the starting point it is.",bc_map; break;
-		case 39: mapannounce "job_hunte"," " + strcharinfo(0) + ", you've really go to get the hang of this 'in tune with nature' thing. Now, you're lost!",bc_map; break;
-		case 40: mapannounce "job_hunte"," " + strcharinfo(0) + ", it's only a story...not real. But you will be returned to the starting point.",bc_map; break;
-		case 41: mapannounce "job_hunte","Fear not " + strcharinfo(0) + ", for you too, shall learn the powers of the dark side. You will now be returned to the starting point.",bc_map;
-		case 42: mapannounce "job_hunte"," " + strcharinfo(0) + ", fell into a trap. Quite easily too, I'm afraid. But this hero won't be beaten that easily!",bc_map; break;
-		case 43: mapannounce "job_hunte"," Tip of the day: Do not step on the traps. You will be returned to the starting point.",bc_map; break;
-		case 44: mapannounce "job_hunte"," " + strcharinfo(0) + " fell into a trap. Once again, for clarity's sake, the name is " + strcharinfo(0) + ".",bc_map; break;
-		case 45: mapannounce "job_hunte","Oy oy, " + strcharinfo(0) + ".. I've seen blind Porings get further! Go back to the starting point.",bc_map; break;
-		case 46: mapannounce "job_hunte","MY EYES!! " + strcharinfo(0) + ", you... you.. stepped on them. Go try again...I'd cry for you if I could even shed tears...",bc_map; break;
-		case 47: mapannounce "job_hunte"," " + strcharinfo(0) + ", where are you? Right...NOT at the place where'd you be if you passed the test.",bc_map; break;
-		case 48: mapannounce "job_hunte"," Wow, they actually paid a guy to think of these comments. " + strcharinfo(0) + ", you can go back to the starting point.",bc_map; break;
-		case 49: mapannounce "job_hunte"," My word, " + strcharinfo(0) + "! You've precariously fallen into a trap! You will be returned back to the start. Cheerio~!",bc_map; break;
-		case 50: mapannounce "job_hunte"," " + strcharinfo(0) + ", do you have any idea where you're going? Start over *sigh*.",bc_map; break;
-		case 51: mapannounce "job_hunte"," " + strcharinfo(0) + ", do you like green tea ice cream? No? Go back to the starting point...*hmph*",bc_map; break;
-		case 52: mapannounce "job_hunte","Oh, no.. " + strcharinfo(0) + ", are you hurt? Come now, let's go back to the starting point.",bc_map; break;
-		case 53: mapannounce "job_hunte","Hi " + strcharinfo(0) + ", how are you? Here's a present~ a free warp! Back to the starting point.",bc_map; break;
-		case 54: mapannounce "job_hunte"," " + strcharinfo(0) + ".......... did you know that that was a trap? I hope so, otherwise, I guess you'd be pretty embarassed.",bc_map; break;
-		case 55: mapannounce "job_hunte"," " + strcharinfo(0) + ", what do you think of the interior design? I worked very hard on it... and this lovely feature that sends you back to the starting point.",bc_map; break;
-		case 56: mapannounce "job_hunte","Oh, " + strcharinfo(0) + ".. You can do better. Try again!",bc_map; break;
-		case 57: mapannounce "job_hunte","Hello, this is your local Kafra worker... " + strcharinfo(0) + ", your mommy is waiting for you at the checkout line.",bc_map; break;
-		case 58: mapannounce "job_hunte"," " + strcharinfo(0) + ", if you do well. I'll have a nice present waiting for you... What is it? You'll see if you pass~ Go try again now!",bc_map; break;
-		case 59: mapannounce "job_hunte"," " + strcharinfo(0) + " faaaaaaaaaaaaaaaaailed.. Hehe, just kidding. You will be returned to the starting point so try again!",bc_map; break;
-		case 60: mapannounce "job_hunte"," " + strcharinfo(0) + ", you fell into a trap. You should watch your feet more. What? Invisible? That's baby talk! Now go try again!",bc_map; break;
-		case 61: mapannounce "job_hunte"," " + strcharinfo(0) + ", HAHAHAHAHAHA!!!! I can't believe you fell for that one!",bc_map; break;
-		case 62: mapannounce "job_hunte"," " + strcharinfo(0) + ", I was just about to tell you about that one...but, I didn't? Back to start.",bc_map; break;
-		case 63: mapannounce "job_hunte"," " + strcharinfo(0) + "...I'm sorry my friend, but you lose. But don't worry, its not like this message is broadcast or anything.",bc_map; break;
-		case 64: mapannounce "job_hunte"," " + strcharinfo(0) + ", I'm not so sure that you qualify for this anymore... Try again and prove me wrong.",bc_map; break;
-		case 65: mapannounce "job_hunte"," " + strcharinfo(0) + ", OW...now that's gotta hurt. Back to the start~",bc_map; break;
-		case 66: mapannounce "job_hunte"," " + strcharinfo(0) + ", I find your lack of faith disturbing... Let's start over.",bc_map; break;
-		case 67: mapannounce "job_hunte"," " + strcharinfo(0) + ", your eyes can deceive you. Don't trust them. Stretch out with your feelings. Try again now.",bc_map; break;
-		case 68: mapannounce "job_hunte"," " + strcharinfo(0) + ", if you once start down the dark path, forever it will dominate your destiny. You shall be returned to the starting point.",bc_map; break;
-		case 69: mapannounce "job_hunte"," " + strcharinfo(0) + ", size doesn't matter. But, the number of traps that caught you do. Try again and win this time!",bc_map; break;
-		case 70: mapannounce "job_hunte"," " + strcharinfo(0) + ", try not. Do or do not. There is no try.",bc_map; break;
-		case 71: mapannounce "job_hunte"," " + strcharinfo(0) + ", that is why you fail. Now try again!",bc_map; break;
-		case 72: mapannounce "job_hunte"," " + strcharinfo(0) + ", look. If its made of metal and looks like it has teeth, you shouldn't put your foot in it. So simple, really...",bc_map; break;
-		case 73: mapannounce "job_hunte"," " + strcharinfo(0) + ", you are beaten. It is useless to resist.",bc_map; break;
-		case 74: mapannounce "job_hunte"," " + strcharinfo(0) + ", I'm looking forward to completing your training. In time you will call me Master.",bc_map; break;
-		case 75: mapannounce "job_hunte"," " + strcharinfo(0) + ", your overconfidence is your weakness.",bc_map; break;
-		case 76: mapannounce "job_hunte"," " + strcharinfo(0) + ", watch your step. This place can be a little rough.",bc_map; break;
-		case 77: mapannounce "job_hunte"," " + strcharinfo(0) + ", oh I told you it was dangerous here.",bc_map; break;
-		case 78: mapannounce "job_hunte"," " + strcharinfo(0) + ", everything is proceeding as I have foreseen.",bc_map; break;
-		case 79: mapannounce "job_hunte"," " + strcharinfo(0) + ", you should have not come back.",bc_map; break;
-		case 80: mapannounce "job_hunte"," " + strcharinfo(0) + ", there are alternatives to fighting. But not to losing to this test. Now try again!",bc_map; break;
-		case 81: mapannounce "job_hunte"," " + strcharinfo(0) + ", now that's a name I haven't heard in a while...let's hope I don't hear it again~!",bc_map; break;
-		case 82: mapannounce "job_hunte"," " + strcharinfo(0) + ", we do not train to be merciful here, mercy is for the weak!",bc_map; break;
-		case 83: mapannounce "job_hunte"," " + strcharinfo(0) + ", defeat does not exist here, does it?!",bc_map; break;
-		case 84: mapannounce "job_hunte"," " + strcharinfo(0) + ", concentrate. Focus your powers!",bc_map; break;
-		case 85: mapannounce "job_hunte"," " + strcharinfo(0) + ", am I going mad, or did the word -think- escape your lips?",bc_map; break;
-		case 86: mapannounce "job_hunte"," " + strcharinfo(0) + ", you're just stalling now.",bc_map; break;
-		case 87: mapannounce "job_hunte"," " + strcharinfo(0) + ", life isn't always fair.",bc_map; break;
-		case 88: mapannounce "job_hunte"," " + strcharinfo(0) + ".... Uhhh...it's not OUR fault....",bc_map; break;
-		case 89: mapannounce "job_hunte"," " + strcharinfo(0) + ", survivability takes priority.",bc_map; break;
-		case 90: mapannounce "job_hunte"," " + strcharinfo(0) + ", people have the strength to overcome their obstacles...everyone can.",bc_map; break;
-		case 91: mapannounce "job_hunte"," " + strcharinfo(0) + ", there is happiness for those who accept their fate, and there is glory for those who resist their fate.",bc_map; break;
-		case 92: mapannounce "job_hunte"," " + strcharinfo(0) + ", some things are real and some things are false. Can't you tell the difference?",bc_map; break;
-		case 93: mapannounce "job_hunte"," " + strcharinfo(0) + ", we are having fun aren't we? Everyday here is like a dream. I really hope it's going to be like this forever.",bc_map; break;
-		case 94: mapannounce "job_hunte"," " + strcharinfo(0) + ", I'll give you just one piece of advice... dying hurts like hell.",bc_map; break;
-		case 95: mapannounce "job_hunte"," " + strcharinfo(0) + ", don't give up the spirit! Just be more careful...",bc_map; break;
-		case 96: mapannounce "job_hunte"," " + strcharinfo(0) + ", death is a gift given at birth. But...these traps won't kill you, don't worry.",bc_map; break;
-		case 97: mapannounce "job_hunte"," " + strcharinfo(0) + ", I was counting on you from the beginning. But I guess you're gonna make me wait longer...",bc_map; break;
-		case 98: mapannounce "job_hunte"," " + strcharinfo(0) + ", always with the end comes hope and rebirth. But it's back to the beginning for you~",bc_map; break;
-		case 99: mapannounce "job_hunte"," " + strcharinfo(0) + ", have I ever told you about the power held in a single tear? Its okay to shed one now, I know its hard...",bc_map; break;
-		case 100: mapannounce "job_hunte"," " + strcharinfo(0) + ", happiness often sneaks in through a door you didn't know you left open. Sort of like...hidden traps!",bc_map; break;
-		case 101: mapannounce "job_hunte"," " + strcharinfo(0) + ", ....Chii?",bc_map; break;
-		case 102: mapannounce "job_hunte"," " + strcharinfo(0) + ", Mine! Mine! Mine! Mine!",bc_map; break;
-		case 103: mapannounce "job_hunte"," " + strcharinfo(0) + ", it's time to duel!",bc_map; break;
-		case 104: mapannounce "job_hunte"," " + strcharinfo(0) + ", I choose you!...wait... uagh...not you!...",bc_map; break;
-		case 105: mapannounce "job_hunte"," " + strcharinfo(0) + ", this isn't the time to be complimenting it!",bc_map; break;
-		case 106: mapannounce "job_hunte"," " + strcharinfo(0) + "...Oh great, what else could go wrong today?",bc_map; break;
-		case 107: mapannounce "job_hunte"," " + strcharinfo(0) + ", don't worry, I always keep a spare. We're not running out of traps anytime soon...",bc_map; break;
-		case 108: mapannounce "job_hunte"," " + strcharinfo(0) + ", when bad things happen, don't give up. The day will come when you will look back and laugh at them. But not today.",bc_map; break;
-		case 109: mapannounce "job_hunte"," " + strcharinfo(0) + ", don't worry about it. We're good at fighting losing battles, remember?",bc_map; break;
-		case 110: mapannounce "job_hunte"," " + strcharinfo(0) + ", you remember how it was like when you felt really slick? That feeling won't come back for a while...",bc_map; break;
-		case 111: mapannounce "job_hunte"," " + strcharinfo(0) + ", you must forget about your past for the sake of your own happiness.",bc_map; break;
-		case 112: mapannounce "job_hunte"," " + strcharinfo(0) + ", if you can fool your friends, you can fool your enemies.",bc_map; break;
-		case 113: mapannounce "job_hunte"," " + strcharinfo(0) + ", this world is made up of love and peace!",bc_map; break;
-		case 114: mapannounce "job_hunte"," " + strcharinfo(0) + ", if you fail, you must drink this.....*evil grin*",bc_map; break;
-		case 115: mapannounce "job_hunte"," " + strcharinfo(0) + ", don't say we didn't warn you!",bc_map; break;
-		case 116: mapannounce "job_hunte"," " + strcharinfo(0) + ", curiosity killed the cat. Lucky for me I'm not a cat. Oh, and um, you too of course.",bc_map; break;
-		case 117: mapannounce "job_hunte"," " + strcharinfo(0) + ", STUDY!STUDY!STUDY!STUDY!STUDY!STUDY!STUDY!STUDY!STUDY!STUDY!",bc_map; break;
-		case 118: mapannounce "job_hunte"," " + strcharinfo(0) + ", how you like me now? That's right, that was MY trap!",bc_map; break;
-		case 119: mapannounce "job_hunte"," " + strcharinfo(0) + "...brilliant...just absolutely...genius. Sorry, I was talking about all these crazy traps.",bc_map; break;
-		case 120: mapannounce "job_hunte"," " + strcharinfo(0) + ", it's time to bust out of that trap, Houdini-style! Hey, wait...come back!",bc_map; break;
-		case 121: mapannounce "job_hunte"," " + strcharinfo(0) + ", it looks like you could really be in trouble this time...no worries, just try this again!",bc_map; break;
-		case 122: mapannounce "job_hunte"," " + strcharinfo(0) + "...not smooth, dude. Go for it again, one more time!",bc_map; break;
-		case 123: mapannounce "job_hunte"," " + strcharinfo(0) + ",it looks like you could really be in a pickle. Back to the starting point...",bc_map; break;
-		case 124: mapannounce "job_hunte"," " + strcharinfo(0) + ", just think of it as Karma. Someday, you'll be setting hundreds of traps of your own...",bc_map; break;
-		case 125: mapannounce "job_hunte"," " + strcharinfo(0) + ", bad news dude...its another trap. You'll get the hang of this, I believe in you!",bc_map; break;
-		case 126: mapannounce "job_hunte"," " + strcharinfo(0) + ", don't give up! The world still needs you!",bc_map; break;
-		case 127: mapannounce "job_hunte"," " + strcharinfo(0) + ", it's okay to cry. Just not too loudly.",bc_map; break;
-		case 128: mapannounce "job_hunte"," " + strcharinfo(0) + "...oh man. It's tiring setting up all these traps. You guys have got to stop falling into them!",bc_map; break;
-		default: mapannounce "job_hunte"," " + strcharinfo(0) + ", you have fallen into a trap. You will be returned to the starting point.",bc_map; break;
+	switch(rand(200)) {
+	default:
+	case 1: mapannounce "job_hunte",strcharinfo(0) + ", you have fallen into a trap. You will be returned to the starting point.",bc_map; break;
+	case 2: mapannounce "job_hunte",strcharinfo(0) + ", yes you! Go back and start over!",bc_map; break;
+	case 3: mapannounce "job_hunte",strcharinfo(0) + " has failed!...well...you will if you don't start over...",bc_map; break;
+	case 4: mapannounce "job_hunte",strcharinfo(0) + ", has failed me! Go back to where you started!",bc_map; break;
+	case 5: mapannounce "job_hunte",strcharinfo(0) + ", you have blundered into a trap. I'm sorry, but for now, YOU LOSE.",bc_map; break;
+	case 6: mapannounce "job_hunte",strcharinfo(0) + ", what are you doing!? Go back and do it again!",bc_map; break;
+	case 7: mapannounce "job_hunte",strcharinfo(0) + ", come on! You can do better then this!! Try again!",bc_map; break;
+	case 8: mapannounce "job_hunte",strcharinfo(0) + ", has fallen into a trap...again. But don't worry, you're getting better.",bc_map; break;
+	case 9: mapannounce "job_hunte",strcharinfo(0) + ", fail, fail, fail... Go back to where you started!",bc_map; break;
+	case 10: mapannounce "job_hunte",strcharinfo(0) + "... aww~ Try again! You can do it!",bc_map; break;
+	case 11: mapannounce "job_hunte",strcharinfo(0) + ", @#$%#^!@ and you wanna be a what? Hunter? Get back there!",bc_map; break;
+	case 12: mapannounce "job_hunte",strcharinfo(0) + " was defeated by the forces of evil. Don't give up, hero!",bc_map; break;
+	case 13: mapannounce "job_hunte","I put a spell on you " + strcharinfo(0) + " and now you're mine! Go start over now.",bc_map; break;
+	case 14: mapannounce "job_hunte",strcharinfo(0) + ". G'day mate, welcome to the land down under. As a present, I'll send you to the starting point...",bc_map; break;
+	case 15: mapannounce "job_hunte","That's my nest " + strcharinfo(0) + "! dont step there, squawk~ Start over.",bc_map; break;
+	case 16: mapannounce "job_hunte",strcharinfo(0) + ", another archer down. 3 more to go!",bc_map; break;
+	case 17: mapannounce "job_hunte",strcharinfo(0) + ", have you got what it takes? Then try again.",bc_map; break;
+	case 18: mapannounce "job_hunte","Alas, " + strcharinfo(0) + ", you have fallen prey to the most feared of traps. The dreaded stink bomb! Run run run awaaaaaay!",bc_map; break;
+	case 19: mapannounce "job_hunte",strcharinfo(0) + " had too much prune juice to drink today. Back to the starting point~",bc_map; break;
+	case 20: mapannounce "job_hunte","No.... " + strcharinfo(0) + ", you have fallen into a trap. You will be returned to the starting point.",bc_map; break;
+	case 21: mapannounce "job_hunte","Meow *pounce* look my kitties we'll have some" + strcharinfo(0) + "stew. Back to the starting point if you don't want to become stew!",bc_map; break;
+	case 22: mapannounce "job_hunte","Sorry " + strcharinfo(0) + ", but you've actually found a BAD secret. You will be returned to the starting point.",bc_map; break;
+	case 23: mapannounce "job_hunte",strcharinfo(0) + ", silly Archer...your tenacity is touching. But it's back to the start for you...",bc_map; break;
+	case 24: mapannounce "job_hunte",strcharinfo(0) + ", you've fallen and you can't get up. You'll be carried back to the starting point.",bc_map; break;
+	case 25: mapannounce "job_hunte","Skip a turn " + strcharinfo(0) + ", go back to start.",bc_map; break;
+	case 26: mapannounce "job_hunte",strcharinfo(0) + ", nya nya, heh heh heh. You will be returned to the starting point.",bc_map; break;
+	case 27: mapannounce "job_hunte","Practice is over " + strcharinfo(0) + ". This time show me for real.",bc_map; break;
+	case 28: mapannounce "job_hunte",strcharinfo(0) + ", this is a Poring jellopy raid...Get out! Start from the beginning if you wish to continue.",bc_map; break;
+	case 29: mapannounce "job_hunte","Disconnected from server. " + strcharinfo(0) + ", you have to start over.",bc_map; break;
+	case 30: mapannounce "job_hunte",strcharinfo(0) + ", what does this button do...oops! I'm afraid you have to start over.",bc_map; break;
+	case 31: mapannounce "job_hunte",strcharinfo(0) + ", you have entered the bonus round! Aaaand, you lost. You will be returned to the starting point.",bc_map; break;
+	case 32: mapannounce "job_hunte","Oh, no " + strcharinfo(0) + ", you've stepped on a hive of bees. You narrowly escaped, all the way back to the beginning.",bc_map; break;
+	case 33: mapannounce "job_hunte",strcharinfo(0) + ", wait wait. That's a trap! Oh wait, that's dog. . . .",bc_map; break;
+	case 34: mapannounce "job_hunte","Stop " + strcharinfo(0) + "! For stepping on that trap, I shall punish you!",bc_map; break;
+	case 35: mapannounce "job_hunte",strcharinfo(0) + ", I'll be back. . . I hope you will too.",bc_map; break;
+	case 36: mapannounce "job_hunte",strcharinfo(0) + ", Come with me if you want to live. . to the starting point.",bc_map; break;
+	case 37: mapannounce "job_hunte",strcharinfo(0) + ", my... precious! Go back to the starting point.",bc_map; break;
+	case 38: mapannounce "job_hunte","Follow the yellow brick road... No wait, " + strcharinfo(0) + "!! Not that way...Back to the starting point it is.",bc_map; break;
+	case 39: mapannounce "job_hunte",strcharinfo(0) + ", you've really go to get the hang of this 'in tune with nature' thing. Now, you're lost!",bc_map; break;
+	case 40: mapannounce "job_hunte",strcharinfo(0) + ", it's only a story...not real. But you will be returned to the starting point.",bc_map; break;
+	case 41: mapannounce "job_hunte",strcharinfo(0) + ", you have fallen into a trap. And the trap...has fallen into you. Returning you to the starting point.",bc_map; break;
+	case 42: mapannounce "job_hunte","Fear not " + strcharinfo(0) + ", for you too, shall learn the powers of the dark side. You will now be returned to the starting point.",bc_map; break;
+	case 43: mapannounce "job_hunte",strcharinfo(0) + ", fell into a trap. Quite easily too, I'm afraid. But this hero won't be beaten that easily!",bc_map; break;
+	case 44: mapannounce "job_hunte"," Tip of the day: Do not step on the traps. You will be returned to the starting point.",bc_map; break;
+	case 45: mapannounce "job_hunte",strcharinfo(0) + " fell into a trap. Once again, for clarity's sake, the name is " + strcharinfo(0) + ".",bc_map; break;
+	case 46: mapannounce "job_hunte","Oy oy, " + strcharinfo(0) + ".. I've seen blind Porings get further! Go back to the starting point.",bc_map; break;
+	case 47: mapannounce "job_hunte","MY EYES!! " + strcharinfo(0) + ", you... you.. stepped on them. Go try again...I'd cry for you if I could even shed tears...",bc_map; break;
+	case 48: mapannounce "job_hunte",strcharinfo(0) + ", where are you? Right...NOT at the place where'd you be if you passed the test.",bc_map; break;
+	case 49: mapannounce "job_hunte"," Wow, they actually paid a guy to think of these comments. " + strcharinfo(0) + ", you can go back to the starting point.",bc_map; break;
+	case 50: mapannounce "job_hunte"," My word, " + strcharinfo(0) + "! You've precariously fallen into a trap! You will be returned back to the start. Cheerio~!",bc_map; break;
+	case 51: mapannounce "job_hunte",strcharinfo(0) + ", do you have any idea where you're going? Start over *sigh*.",bc_map; break;
+	case 52: mapannounce "job_hunte",strcharinfo(0) + ", do you like green tea ice cream? No? Go back to the starting point...*hmph*",bc_map; break;
+	case 53: mapannounce "job_hunte","Oh, no.. " + strcharinfo(0) + ", are you hurt? Come now, let's go back to the starting point.",bc_map; break;
+	case 54: mapannounce "job_hunte","Hi " + strcharinfo(0) + ", how are you? Here's a present~ a free warp! Back to the starting point.",bc_map; break;
+	case 55: mapannounce "job_hunte",strcharinfo(0) + ".......... did you know that that was a trap? I hope so, otherwise, I guess you'd be pretty embarassed.",bc_map; break;
+	case 56: mapannounce "job_hunte",strcharinfo(0) + ", what do you think of the interior design? I worked very hard on it... and this lovely feature that sends you back to the starting point.",bc_map; break;
+	case 57: mapannounce "job_hunte","BOOM BAM BOOM! " + strcharinfo(0) + ", you have fallen into my trap! But I won't kill you...just...humiliate you...",bc_map; break;
+	case 58: mapannounce "job_hunte","Oh, " + strcharinfo(0) + ".. You can do better. Try again!",bc_map; break;
+	case 59: mapannounce "job_hunte","Hello, this is your local Kafra worker... " + strcharinfo(0) + ", your mommy is waiting for you at the checkout line.",bc_map; break;
+	case 60: mapannounce "job_hunte",strcharinfo(0) + ", if you do well. I'll have a nice present waiting for you... What is it? You'll see if you pass~ Go try again now!",bc_map; break;
+	case 61: mapannounce "job_hunte",strcharinfo(0) + " faaaaaaaaaaaaaaaaailed.. Hehe, just kidding. You will be returned to the starting point so try again!",bc_map; break;
+	case 62: mapannounce "job_hunte",strcharinfo(0) + ", you fell into a trap. You should watch your feet more. What? Invisible? That's baby talk! Now go try again!",bc_map; break;
+	case 63: mapannounce "job_hunte"," Sorry, " + strcharinfo(0) + ", you have fallen into a trap. But I'll be nice and send you to the starting point.",bc_map; break;
+	case 64: mapannounce "job_hunte",strcharinfo(0) + ", HAHAHAHAHAHA!!!! I can't believe you fell for that one!",bc_map; break;
+	case 65: mapannounce "job_hunte",strcharinfo(0) + ", I was just about to tell you about that one...but, I didn't? Back to start.",bc_map; break;
+	case 66: mapannounce "job_hunte",strcharinfo(0) + "...I'm sorry my friend, but you lose. But don't worry, its not like this message is broadcast or anything.",bc_map; break;
+	case 67: mapannounce "job_hunte",strcharinfo(0) + ", I'm not so sure that you qualify for this anymore... Try again and prove me wrong.",bc_map; break;
+	case 68: mapannounce "job_hunte",strcharinfo(0) + ", OW...now that's gotta hurt. Back to the start~",bc_map; break;
+	case 69: mapannounce "job_hunte",strcharinfo(0) + ", I find your lack of faith disturbing... Let's start over.",bc_map; break;
+	case 70: mapannounce "job_hunte",strcharinfo(0) + ", your eyes can deceive you. Don't trust them. Stretch out with your feelings. Try again now.",bc_map; break;
+	case 71: mapannounce "job_hunte",strcharinfo(0) + ", if you once start down the dark path, forever it will dominate your destiny. You shall be returned to the starting point.",bc_map; break;
+	case 72: mapannounce "job_hunte",strcharinfo(0) + ", size doesn't matter. But, the number of traps that caught you do. Try again and win this time!",bc_map; break;
+	case 73: mapannounce "job_hunte",strcharinfo(0) + ", try not. Do or do not. There is no try.",bc_map; break;
+	case 74: mapannounce "job_hunte",strcharinfo(0) + ", that is why you fail. Now try again!",bc_map; break;
+	case 75: mapannounce "job_hunte",strcharinfo(0) + ", look. If its made of metal and looks like it has teeth, you shouldn't put your foot in it. So simple, really...",bc_map; break;
+	case 76: mapannounce "job_hunte",strcharinfo(0) + ", you are beaten. It is useless to resist.",bc_map; break;
+	case 77: mapannounce "job_hunte",strcharinfo(0) + ", I'm looking forward to completing your training. In time you will call me Master.",bc_map; break;
+	case 78: mapannounce "job_hunte",strcharinfo(0) + ", your overconfidence is your weakness.",bc_map; break;
+	case 79: mapannounce "job_hunte",strcharinfo(0) + ", watch your step. This place can be a little rough.",bc_map; break;
+	case 80: mapannounce "job_hunte",strcharinfo(0) + ", oh I told you it was dangerous here.",bc_map; break;
+	case 81: mapannounce "job_hunte",strcharinfo(0) + ", everything is proceeding as I have foreseen.",bc_map; break;
+	case 82: mapannounce "job_hunte",strcharinfo(0) + ", you should have not come back.",bc_map; break;
+	case 83: mapannounce "job_hunte",strcharinfo(0) + ", there are alternatives to fighting. But not to losing to this test. Now try again!",bc_map; break;
+	case 84: mapannounce "job_hunte",strcharinfo(0) + ", now that's a name I haven't heard in a while...let's hope I don't hear it again~!",bc_map; break;
+	case 85: mapannounce "job_hunte",strcharinfo(0) + ", we do not train to be merciful here, mercy is for the weak!",bc_map; break;
+	case 86: mapannounce "job_hunte",strcharinfo(0) + ", defeat does not exist here, does it?!",bc_map; break;
+	case 87: mapannounce "job_hunte",strcharinfo(0) + ", concentrate. Focus your powers!",bc_map; break;
+	case 88: mapannounce "job_hunte",strcharinfo(0) + ", am I going mad, or did the word -think- escape your lips?",bc_map; break;
+	case 89: mapannounce "job_hunte",strcharinfo(0) + ", you're just stalling now.",bc_map; break;
+	case 90: mapannounce "job_hunte",strcharinfo(0) + ", life isn't always fair.",bc_map; break;
+	case 91: mapannounce "job_hunte",strcharinfo(0) + ".... Uhhh...it's not OUR fault....",bc_map; break;
+	case 92: mapannounce "job_hunte",strcharinfo(0) + ", survivability takes priority.",bc_map; break;
+	case 93: mapannounce "job_hunte",strcharinfo(0) + ", people have the strength to overcome their obstacles...everyone can.",bc_map; break;
+	case 94: mapannounce "job_hunte",strcharinfo(0) + ", there is happiness for those who accept their fate, and there is glory for those who resist their fate.",bc_map; break;
+	case 95: mapannounce "job_hunte",strcharinfo(0) + ", some things are real and some things are false. Can't you tell the difference?",bc_map; break;
+	case 96: mapannounce "job_hunte",strcharinfo(0) + ", we are having fun aren't we? Everyday here is like a dream. I really hope it's going to be like this forever.",bc_map; break;
+	case 97: mapannounce "job_hunte",strcharinfo(0) + ", I'll give you just one piece of advice... dying hurts like hell.",bc_map; break;
+	case 98: mapannounce "job_hunte",strcharinfo(0) + ", don't give up the ghost! Just be more careful...",bc_map; break;
+	case 99: mapannounce "job_hunte",strcharinfo(0) + ", death is a gift given at birth. But...these traps won't kill you, don't worry.",bc_map; break;
+	case 100: mapannounce "job_hunte",strcharinfo(0) + ", I was counting on you from the beginning. But I guess you're gonna make me wait longer...",bc_map; break;
+	case 101: mapannounce "job_hunte",strcharinfo(0) + ", always with the end comes hope and rebirth. But it's back to the beginning for you~",bc_map; break;
+	case 102: mapannounce "job_hunte",strcharinfo(0) + ", have I ever told you about the power held in a single tear? Its okay to shed one now, I know its hard...",bc_map; break;
+	case 103: mapannounce "job_hunte",strcharinfo(0) + ", happiness often sneaks in through a door you didn't know you left open. Sort of like...hidden traps!",bc_map; break;
+	case 104: mapannounce "job_hunte",strcharinfo(0) + ", ....Chii?",bc_map; break;
+	case 105: mapannounce "job_hunte",strcharinfo(0) + ", Mine! Mine! Mine! Mine!",bc_map; break;
+	case 106: mapannounce "job_hunte",strcharinfo(0) + ", it's time to duel!",bc_map; break;
+	case 107: mapannounce "job_hunte",strcharinfo(0) + ", I choose you!...wait... uagh...not you!...",bc_map; break;
+	case 108: mapannounce "job_hunte",strcharinfo(0) + ", this isn't the time to be complimenting it!",bc_map; break;
+	case 109: mapannounce "job_hunte",strcharinfo(0) + "...Oh great, what else could go wrong today?",bc_map; break;
+	case 110: mapannounce "job_hunte",strcharinfo(0) + ", don't worry, I always keep a spare. We're not running out of traps anytime soon...",bc_map; break;
+	case 111: mapannounce "job_hunte",strcharinfo(0) + ", when bad things happen, don't give up. The day will come when you will look back and laugh at them. But not today.",bc_map; break;
+	case 112: mapannounce "job_hunte",strcharinfo(0) + ", don't worry about it. We're good at fighting losing battles, remember?",bc_map; break;
+	case 113: mapannounce "job_hunte",strcharinfo(0) + ", you remember how it was like when you felt really slick? That feeling won't come back for a while...",bc_map; break;
+	case 114: mapannounce "job_hunte",strcharinfo(0) + ", you must forget about your past for the sake of your own happiness.",bc_map; break;
+	case 115: mapannounce "job_hunte",strcharinfo(0) + ", if you can fool your friends, you can fool your enemies.",bc_map; break;
+	case 116: mapannounce "job_hunte",strcharinfo(0) + ", this world is made up of love and peace!",bc_map; break;
+	case 117: mapannounce "job_hunte",strcharinfo(0) + ", if you fail, you must drink this.....*evil grin*",bc_map; break;
+	case 118: mapannounce "job_hunte",strcharinfo(0) + ", don't say we didn't warn you!",bc_map; break;
+	case 119: mapannounce "job_hunte",strcharinfo(0) + ", curiosity killed the cat. Lucky for me I'm not a cat. Oh, and um, you too of course.",bc_map; break;
+	case 120: mapannounce "job_hunte",strcharinfo(0) + ", STUDY!STUDY!STUDY!STUDY!STUDY!STUDY!STUDY!STUDY!STUDY!STUDY!",bc_map; break;
+	case 121: mapannounce "job_hunte",strcharinfo(0) + ", how you like me now? That's right, that was MY trap!",bc_map; break;
+	case 122: mapannounce "job_hunte",strcharinfo(0) + "...brilliant...just absolutely...genius. Sorry, I was talking about all these crazy traps.",bc_map; break;
+	case 123: mapannounce "job_hunte",strcharinfo(0) + ", it's time to bust out of that trap, Houdini-style! Hey, wait...come back!",bc_map; break;
+	case 124: mapannounce "job_hunte",strcharinfo(0) + ", it looks like you could really be in trouble this time...no worries, just try this again!",bc_map; break;
+	case 125: mapannounce "job_hunte",strcharinfo(0) + "...not smooth, dude. Go for it again, one more time!",bc_map; break;
+	case 126: mapannounce "job_hunte",strcharinfo(0) + ",it looks like you could really be in a pickle. Back to the starting point...",bc_map; break;
+	case 127: mapannounce "job_hunte",strcharinfo(0) + ", just think of it as Karma. Someday, you'll be setting hundreds of traps of your own...",bc_map; break;
+	case 128: mapannounce "job_hunte",strcharinfo(0) + ", bad news dude...its another trap. You'll get the hang of this, I believe in you!",bc_map; break;
+	case 129: mapannounce "job_hunte",strcharinfo(0) + ", don't give up! The world still needs you!",bc_map; break;
+	case 130: mapannounce "job_hunte",strcharinfo(0) + ", it's okay to cry. Just not too loudly.",bc_map; break;
+	case 131: mapannounce "job_hunte",strcharinfo(0) + "...oh man. It's tiring setting up all these traps. You guys have got to stop falling into them!",bc_map; break;
 	}
-	set job_hunter,13;
+	set HNTR_Q,13;
 	warp "job_hunte",176,22;
-	donpcevent "Waiting Room#hnt::OnReset";
 	donpcevent "Manager#hnt::OnReset";
-	donpcevent "Manager#hnt2::OnReset";
-	donpcevent "Manager#hnt::OnDisable";
-	donpcevent "Manager#hnt2::OnDisable";
-	end;
-
-OnEnable:
-	enablenpc "1-1";
-	enablenpc "1-2";
-	enablenpc "1-3";
-	enablenpc "1-4";
-	enablenpc "1-5";
-	enablenpc "1-6";
-	enablenpc "1-7";
-	enablenpc "1-8";
-	enablenpc "2-1";
-	enablenpc "2-2";
-	enablenpc "2-3";
-	enablenpc "2-4";
-	enablenpc "2-5";
-	enablenpc "2-6";
-	enablenpc "2-7";
-	enablenpc "2-8";
-	enablenpc "3-1";
-	enablenpc "3-2";
-	enablenpc "3-3";
-	enablenpc "3-4";
-	enablenpc "4-1";
-	enablenpc "4-2";
-	enablenpc "4-3";
-	enablenpc "4-4";
-	enablenpc "5-1";
-	enablenpc "5-2";
-	enablenpc "5-3";
-	enablenpc "5-4";
-	enablenpc "6-1";
-	enablenpc "6-2";
-	enablenpc "6-3";
-	enablenpc "6-4";
-	enablenpc "7-1";
-	enablenpc "7-2";
-	enablenpc "7-3";
-	enablenpc "7-4";
-	enablenpc "8-1";
-	enablenpc "8-2";
-	enablenpc "8-3";
-	enablenpc "8-4";
-	enablenpc "9-1";
-	enablenpc "9-2";
-	enablenpc "9-3";
-	enablenpc "9-4";
-	enablenpc "10-1";
-	enablenpc "10-2";
-	enablenpc "10-3";
-	enablenpc "10-4";
-	enablenpc "11-1";
-	enablenpc "11-2";
-	enablenpc "11-3";
-	enablenpc "11-4";
-	enablenpc "12-1";
-	enablenpc "12-2";
-	enablenpc "12-3";
-	enablenpc "12-4";
-	enablenpc "13-1";
-	enablenpc "13-2";
-	enablenpc "13-3";
-	enablenpc "13-4";
-	enablenpc "14-1";
-	enablenpc "14-2";
-	enablenpc "14-3";
-	enablenpc "14-4";
-	enablenpc "15-1";
-	enablenpc "15-2";
-	enablenpc "15-3";
-	enablenpc "15-4";
-	enablenpc "16-1";
-	enablenpc "16-2";
-	enablenpc "16-3";
-	enablenpc "16-4";
-	enablenpc "17-1";
-	enablenpc "17-2";
-	enablenpc "17-3";
-	enablenpc "17-4";
-	enablenpc "18-1";
-	enablenpc "18-2";
-	enablenpc "18-3";
-	enablenpc "18-4";
-	enablenpc "19-1";
-	enablenpc "19-2";
-	enablenpc "19-3";
-	enablenpc "19-4";
-	enablenpc "20-1";
-	enablenpc "20-2";
-	enablenpc "20-3";
-	enablenpc "20-4";
-	enablenpc "21-1";
-	enablenpc "21-2";
-	enablenpc "21-3";
-	enablenpc "21-4";
-	enablenpc "22-1";
-	enablenpc "22-2";
-	enablenpc "22-3";
-	enablenpc "22-4";
-	enablenpc "23-1";
-	enablenpc "23-2";
-	enablenpc "23-3";
-	enablenpc "23-4";
-	enablenpc "24-1";
-	enablenpc "24-2";
-	enablenpc "24-3";
-	enablenpc "24-4";
-	enablenpc "25-1";
-	enablenpc "25-2";
-	enablenpc "25-3";
-	enablenpc "25-4";
-	enablenpc "26-1";
-	enablenpc "26-2";
-	enablenpc "26-3";
-	enablenpc "26-4";
-	enablenpc "27-1";
-	enablenpc "27-2";
-	enablenpc "27-3";
-	enablenpc "27-4";
-	enablenpc "28-1";
-	enablenpc "28-2";
-	enablenpc "28-3";
-	enablenpc "28-4";
-	enablenpc "29-1";
-	enablenpc "29-2";
-	enablenpc "29-3";
-	enablenpc "29-4";
-	enablenpc "30-1";
-	enablenpc "30-2";
-	enablenpc "30-3";
-	enablenpc "30-4";
-	enablenpc "31-1";
-	enablenpc "31-2";
-	enablenpc "31-3";
-	enablenpc "31-4";
-	enablenpc "32-1";
-	enablenpc "32-2";
-	enablenpc "32-3";
-	enablenpc "32-4";
-	enablenpc "33-1";
-	enablenpc "33-2";
-	enablenpc "33-3";
-	enablenpc "33-4";
-	enablenpc "34-1";
-	enablenpc "34-2";
-	enablenpc "34-3";
-	enablenpc "34-4";
-	enablenpc "35-1";
-	enablenpc "35-2";
-	enablenpc "35-3";
-	enablenpc "35-4";
-	enablenpc "36-1";
-	enablenpc "36-2";
-	enablenpc "36-3";
-	enablenpc "36-4";
-	enablenpc "37-1";
-	enablenpc "37-2";
-	enablenpc "37-3";
-	enablenpc "37-4";
-	enablenpc "38-1";
-	enablenpc "38-2";
-	enablenpc "38-3";
-	enablenpc "38-4";
-	enablenpc "39-1";
-	enablenpc "39-2";
-	enablenpc "39-3";
-	enablenpc "39-4";
-	enablenpc "40-1";
-	enablenpc "40-2";
-	enablenpc "40-3";
-	enablenpc "40-4";
-	enablenpc "41-1";
-	enablenpc "41-2";
-	enablenpc "41-3";
-	enablenpc "41-4";
-	enablenpc "42-1";
-	enablenpc "42-2";
-	enablenpc "42-3";
-	enablenpc "42-4";
-	enablenpc "43-1";
-	enablenpc "43-2";
-	enablenpc "43-3";
-	enablenpc "43-4";
-	enablenpc "44-1";
-	enablenpc "44-2";
-	enablenpc "44-3";
-	enablenpc "44-4";
-	enablenpc "45-1";
-	enablenpc "45-2";
-	enablenpc "45-3";
-	enablenpc "45-4";
-	enablenpc "46-1";
-	enablenpc "46-2";
-	enablenpc "46-3";
-	enablenpc "46-4";
-	enablenpc "47-1";
-	enablenpc "47-2";
-	enablenpc "47-3";
-	enablenpc "47-4";
-	enablenpc "48-1";
-	enablenpc "48-2";
-	enablenpc "48-3";
-	enablenpc "48-4";
-	enablenpc "49-1";
-	enablenpc "49-2";
-	enablenpc "49-3";
-	enablenpc "49-4";
-	enablenpc "50-1";
-	enablenpc "50-2";
-	enablenpc "50-3";
-	enablenpc "50-4";
-	enablenpc "51-1";
-	enablenpc "51-2";
-	enablenpc "51-3";
-	enablenpc "51-4";
-	enablenpc "52-1";
-	enablenpc "52-2";
-	enablenpc "52-3";
-	enablenpc "52-4";
-	enablenpc "53-1";
-	enablenpc "53-2";
-	enablenpc "53-3";
-	enablenpc "53-4";
-	enablenpc "54-1";
-	enablenpc "54-2";
-	enablenpc "54-3";
-	enablenpc "54-4";
-	enablenpc "55-1";
-	enablenpc "55-2";
-	enablenpc "55-3";
-	enablenpc "55-4";
-	enablenpc "56-1";
-	enablenpc "56-2";
-	enablenpc "56-3";
-	enablenpc "56-4";
-	enablenpc "56-6";
-	enablenpc "56-7";
-	enablenpc "56-8";
-	enablenpc "57-1";
-	enablenpc "57-2";
-	enablenpc "57-3";
-	end;
-
-OnDisable:
-	disablenpc "1-1";
-	disablenpc "1-2";
-	disablenpc "1-3";
-	disablenpc "1-4";
-	disablenpc "1-5";
-	disablenpc "1-6";
-	disablenpc "1-7";
-	disablenpc "1-8";
-	disablenpc "2-1";
-	disablenpc "2-2";
-	disablenpc "2-3";
-	disablenpc "2-4";
-	disablenpc "2-5";
-	disablenpc "2-6";
-	disablenpc "2-7";
-	disablenpc "2-8";
-	disablenpc "3-1";
-	disablenpc "3-2";
-	disablenpc "3-3";
-	disablenpc "3-4";
-	disablenpc "4-1";
-	disablenpc "4-2";
-	disablenpc "4-3";
-	disablenpc "4-4";
-	disablenpc "5-1";
-	disablenpc "5-2";
-	disablenpc "5-3";
-	disablenpc "5-4";
-	disablenpc "6-1";
-	disablenpc "6-2";
-	disablenpc "6-3";
-	disablenpc "6-4";
-	disablenpc "7-1";
-	disablenpc "7-2";
-	disablenpc "7-3";
-	disablenpc "7-4";
-	disablenpc "8-1";
-	disablenpc "8-2";
-	disablenpc "8-3";
-	disablenpc "8-4";
-	disablenpc "9-1";
-	disablenpc "9-2";
-	disablenpc "9-3";
-	disablenpc "9-4";
-	disablenpc "10-1";
-	disablenpc "10-2";
-	disablenpc "10-3";
-	disablenpc "10-4";
-	disablenpc "11-1";
-	disablenpc "11-2";
-	disablenpc "11-3";
-	disablenpc "11-4";
-	disablenpc "12-1";
-	disablenpc "12-2";
-	disablenpc "12-3";
-	disablenpc "12-4";
-	disablenpc "13-1";
-	disablenpc "13-2";
-	disablenpc "13-3";
-	disablenpc "13-4";
-	disablenpc "14-1";
-	disablenpc "14-2";
-	disablenpc "14-3";
-	disablenpc "14-4";
-	disablenpc "15-1";
-	disablenpc "15-2";
-	disablenpc "15-3";
-	disablenpc "15-4";
-	disablenpc "16-1";
-	disablenpc "16-2";
-	disablenpc "16-3";
-	disablenpc "16-4";
-	disablenpc "17-1";
-	disablenpc "17-2";
-	disablenpc "17-3";
-	disablenpc "17-4";
-	disablenpc "18-1";
-	disablenpc "18-2";
-	disablenpc "18-3";
-	disablenpc "18-4";
-	disablenpc "19-1";
-	disablenpc "19-2";
-	disablenpc "19-3";
-	disablenpc "19-4";
-	disablenpc "20-1";
-	disablenpc "20-2";
-	disablenpc "20-3";
-	disablenpc "20-4";
-	disablenpc "21-1";
-	disablenpc "21-2";
-	disablenpc "21-3";
-	disablenpc "21-4";
-	disablenpc "22-1";
-	disablenpc "22-2";
-	disablenpc "22-3";
-	disablenpc "22-4";
-	disablenpc "23-1";
-	disablenpc "23-2";
-	disablenpc "23-3";
-	disablenpc "23-4";
-	disablenpc "24-1";
-	disablenpc "24-2";
-	disablenpc "24-3";
-	disablenpc "24-4";
-	disablenpc "25-1";
-	disablenpc "25-2";
-	disablenpc "25-3";
-	disablenpc "25-4";
-	disablenpc "26-1";
-	disablenpc "26-2";
-	disablenpc "26-3";
-	disablenpc "26-4";
-	disablenpc "27-1";
-	disablenpc "27-2";
-	disablenpc "27-3";
-	disablenpc "27-4";
-	disablenpc "28-1";
-	disablenpc "28-2";
-	disablenpc "28-3";
-	disablenpc "28-4";
-	disablenpc "29-1";
-	disablenpc "29-2";
-	disablenpc "29-3";
-	disablenpc "29-4";
-	disablenpc "30-1";
-	disablenpc "30-2";
-	disablenpc "30-3";
-	disablenpc "30-4";
-	disablenpc "31-1";
-	disablenpc "31-2";
-	disablenpc "31-3";
-	disablenpc "31-4";
-	disablenpc "32-1";
-	disablenpc "32-2";
-	disablenpc "32-3";
-	disablenpc "32-4";
-	disablenpc "33-1";
-	disablenpc "33-2";
-	disablenpc "33-3";
-	disablenpc "33-4";
-	disablenpc "34-1";
-	disablenpc "34-2";
-	disablenpc "34-3";
-	disablenpc "34-4";
-	disablenpc "35-1";
-	disablenpc "35-2";
-	disablenpc "35-3";
-	disablenpc "35-4";
-	disablenpc "36-1";
-	disablenpc "36-2";
-	disablenpc "36-3";
-	disablenpc "36-4";
-	disablenpc "37-1";
-	disablenpc "37-2";
-	disablenpc "37-3";
-	disablenpc "37-4";
-	disablenpc "38-1";
-	disablenpc "38-2";
-	disablenpc "38-3";
-	disablenpc "38-4";
-	disablenpc "39-1";
-	disablenpc "39-2";
-	disablenpc "39-3";
-	disablenpc "39-4";
-	disablenpc "40-1";
-	disablenpc "40-2";
-	disablenpc "40-3";
-	disablenpc "40-4";
-	disablenpc "41-1";
-	disablenpc "41-2";
-	disablenpc "41-3";
-	disablenpc "41-4";
-	disablenpc "42-1";
-	disablenpc "42-2";
-	disablenpc "42-3";
-	disablenpc "42-4";
-	disablenpc "43-1";
-	disablenpc "43-2";
-	disablenpc "43-3";
-	disablenpc "43-4";
-	disablenpc "44-1";
-	disablenpc "44-2";
-	disablenpc "44-3";
-	disablenpc "44-4";
-	disablenpc "45-1";
-	disablenpc "45-2";
-	disablenpc "45-3";
-	disablenpc "45-4";
-	disablenpc "46-1";
-	disablenpc "46-2";
-	disablenpc "46-3";
-	disablenpc "46-4";
-	disablenpc "47-1";
-	disablenpc "47-2";
-	disablenpc "47-3";
-	disablenpc "47-4";
-	disablenpc "48-1";
-	disablenpc "48-2";
-	disablenpc "48-3";
-	disablenpc "48-4";
-	disablenpc "49-1";
-	disablenpc "49-2";
-	disablenpc "49-3";
-	disablenpc "49-4";
-	disablenpc "50-1";
-	disablenpc "50-2";
-	disablenpc "50-3";
-	disablenpc "50-4";
-	disablenpc "51-1";
-	disablenpc "51-2";
-	disablenpc "51-3";
-	disablenpc "51-4";
-	disablenpc "52-1";
-	disablenpc "52-2";
-	disablenpc "52-3";
-	disablenpc "52-4";
-	disablenpc "53-1";
-	disablenpc "53-2";
-	disablenpc "53-3";
-	disablenpc "53-4";
-	disablenpc "54-1";
-	disablenpc "54-2";
-	disablenpc "54-3";
-	disablenpc "54-4";
-	disablenpc "55-1";
-	disablenpc "55-2";
-	disablenpc "55-3";
-	disablenpc "55-4";
-	disablenpc "56-1";
-	disablenpc "56-2";
-	disablenpc "56-3";
-	disablenpc "56-4";
-	disablenpc "56-6";
-	disablenpc "56-7";
-	disablenpc "56-8";
-	disablenpc "57-1";
-	disablenpc "57-2";
-	disablenpc "57-3";
+	donpcevent "Waiting Room#hnt::OnStart";
 	end;
 }
 
-job_hunte,52,140,0	duplicate(hntjqt)	1-1	139,0,1
-job_hunte,53,140,0	duplicate(hntjqt)	1-2	139,0,1
-job_hunte,54,141,0	duplicate(hntjqt)	1-3	139
-job_hunte,55,141,0	duplicate(hntjqt)	1-4	139
-job_hunte,55,140,0	duplicate(hntjqt)	1-5	139
-job_hunte,54,140,0	duplicate(hntjqt)	1-6	139
-job_hunte,52,138,0	duplicate(hntjqt)	1-7	139
-job_hunte,53,138,0	duplicate(hntjqt)	1-8	139
-job_hunte,62,140,0	duplicate(hntjqt)	2-1	139,0,1
-job_hunte,63,140,0	duplicate(hntjqt)	2-2	139,0,1
-job_hunte,64,140,0	duplicate(hntjqt)	2-3	139
-job_hunte,64,141,0	duplicate(hntjqt)	2-4	139
-job_hunte,65,140,0	duplicate(hntjqt)	2-5	139
-job_hunte,65,141,0	duplicate(hntjqt)	2-6	139
-job_hunte,62,138,0	duplicate(hntjqt)	2-7	139
-job_hunte,63,138,0	duplicate(hntjqt)	2-8	139
-job_hunte,72,140,0	duplicate(hntjqt)	3-1	139,0,1
-job_hunte,73,140,0	duplicate(hntjqt)	3-2	139,0,1
-job_hunte,72,138,0	duplicate(hntjqt)	3-3	139
-job_hunte,72,138,0	duplicate(hntjqt)	3-4	139
-job_hunte,78,140,0	duplicate(hntjqt)	4-1	139
-job_hunte,78,141,0	duplicate(hntjqt)	4-2	139
-job_hunte,79,140,0	duplicate(hntjqt)	4-3	139
-job_hunte,79,141,0	duplicate(hntjqt)	4-4	139
-job_hunte,82,138,0	duplicate(hntjqt)	5-1	139
-job_hunte,82,139,0	duplicate(hntjqt)	5-2	139
-job_hunte,83,138,0	duplicate(hntjqt)	5-3	139
-job_hunte,83,139,0	duplicate(hntjqt)	5-4	139
-job_hunte,99,138,0	duplicate(hntjqt)	6-1	139,1,0
-job_hunte,99,139,0	duplicate(hntjqt)	6-2	139,1,0
-job_hunte,101,138,0	duplicate(hntjqt)	6-3	139
-job_hunte,101,139,0	duplicate(hntjqt)	6-4	139
-job_hunte,106,140,0	duplicate(hntjqt)	7-1	139,0,1
-job_hunte,107,140,0	duplicate(hntjqt)	7-2	139,0,1
-job_hunte,106,138,0	duplicate(hntjqt)	7-3	139
-job_hunte,107,138,0	duplicate(hntjqt)	7-4	139
-job_hunte,112,140,0	duplicate(hntjqt)	8-1	139
-job_hunte,112,141,0	duplicate(hntjqt)	8-2	139
-job_hunte,113,140,0	duplicate(hntjqt)	8-3	139
-job_hunte,113,141,0	duplicate(hntjqt)	8-4	139
-job_hunte,116,140,0	duplicate(hntjqt)	9-1	139
-job_hunte,116,141,0	duplicate(hntjqt)	9-2	139
-job_hunte,117,140,0	duplicate(hntjqt)	9-3	139
-job_hunte,117,141,0	duplicate(hntjqt)	9-4	139
-job_hunte,120,138,0	duplicate(hntjqt)	10-1	139
-job_hunte,120,139,0	duplicate(hntjqt)	10-2	139
-job_hunte,121,138,0	duplicate(hntjqt)	10-3	139
-job_hunte,121,139,0	duplicate(hntjqt)	10-4	139
-job_hunte,126,139,0	duplicate(hntjqt)	11-1	139,0,2
-job_hunte,127,139,0	duplicate(hntjqt)	11-2	139,0,2
-job_hunte,126,136,0	duplicate(hntjqt)	11-3	139
-job_hunte,127,136,0	duplicate(hntjqt)	11-4	139
-job_hunte,52,134,0	duplicate(hntjqt)	12-1	139,0,1
-job_hunte,53,134,0	duplicate(hntjqt)	12-2	139,0,1
-job_hunte,52,132,0	duplicate(hntjqt)	12-3	139
-job_hunte,53,132,0	duplicate(hntjqt)	12-4	139
-job_hunte,124,130,0	duplicate(hntjqt)	13-1	139
-job_hunte,124,131,0	duplicate(hntjqt)	13-2	139
-job_hunte,125,130,0	duplicate(hntjqt)	13-3	139
-job_hunte,125,131,0	duplicate(hntjqt)	13-4	139
-job_hunte,64,128,0	duplicate(hntjqt)	14-1	139
-job_hunte,64,129,0	duplicate(hntjqt)	14-2	139
-job_hunte,65,128,0	duplicate(hntjqt)	14-3	139
-job_hunte,65,129,0	duplicate(hntjqt)	14-4	139
-job_hunte,68,126,0	duplicate(hntjqt)	15-1	139
-job_hunte,68,127,0	duplicate(hntjqt)	15-2	139
-job_hunte,69,126,0	duplicate(hntjqt)	15-3	139
-job_hunte,69,127,0	duplicate(hntjqt)	15-4	139
-job_hunte,75,128,0	duplicate(hntjqt)	16-1	139,1,0
-job_hunte,75,129,0	duplicate(hntjqt)	16-2	139,1,0
-job_hunte,77,128,0	duplicate(hntjqt)	16-3	139
-job_hunte,77,129,0	duplicate(hntjqt)	16-4	139
-job_hunte,82,126,0	duplicate(hntjqt)	17-1	139
-job_hunte,82,127,0	duplicate(hntjqt)	17-2	139
-job_hunte,83,126,0	duplicate(hntjqt)	17-3	139
-job_hunte,83,127,0	duplicate(hntjqt)	17-4	139
-job_hunte,96,128,0	duplicate(hntjqt)	18-1	139
-job_hunte,96,129,0	duplicate(hntjqt)	18-2	139
-job_hunte,97,128,0	duplicate(hntjqt)	18-3	139
-job_hunte,97,129,0	duplicate(hntjqt)	18-4	139
-job_hunte,100,126,0	duplicate(hntjqt)	19-1	139
-job_hunte,100,127,0	duplicate(hntjqt)	19-2	139
-job_hunte,101,126,0	duplicate(hntjqt)	19-3	139
-job_hunte,101,127,0	duplicate(hntjqt)	19-4	139
-job_hunte,106,128,0	duplicate(hntjqt)	20-1	139
-job_hunte,106,129,0	duplicate(hntjqt)	20-2	139
-job_hunte,107,128,0	duplicate(hntjqt)	20-3	139
-job_hunte,107,129,0	duplicate(hntjqt)	20-4	139
-job_hunte,112,126,0	duplicate(hntjqt)	21-1	139
-job_hunte,112,127,0	duplicate(hntjqt)	21-2	139
-job_hunte,113,126,0	duplicate(hntjqt)	21-3	139
-job_hunte,113,127,0	duplicate(hntjqt)	21-4	139
-job_hunte,126,126,0	duplicate(hntjqt)	22-1	139
-job_hunte,126,127,0	duplicate(hntjqt)	22-2	139
-job_hunte,127,126,0	duplicate(hntjqt)	22-3	139
-job_hunte,127,127,0	duplicate(hntjqt)	22-4	139
-job_hunte,52,122,0	duplicate(hntjqt)	23-1	139,0,1
-job_hunte,52,122,0	duplicate(hntjqt)	23-2	139,0,1
-job_hunte,53,120,0	duplicate(hntjqt)	23-3	139,1,0
-job_hunte,54,121,0	duplicate(hntjqt)	23-4	139
-job_hunte,55,121,0	duplicate(hntjqt)	23-5	139
-job_hunte,55,120,0	duplicate(hntjqt)	23-6	139
-job_hunte,66,120,0	duplicate(hntjqt)	24-1	139
-job_hunte,66,121,0	duplicate(hntjqt)	24-2	139
-job_hunte,67,120,0	duplicate(hntjqt)	24-3	139
-job_hunte,67,121,0	duplicate(hntjqt)	24-4	139
-job_hunte,114,118,0	duplicate(hntjqt)	25-1	139
-job_hunte,114,119,0	duplicate(hntjqt)	25-2	139
-job_hunte,115,118,0	duplicate(hntjqt)	25-3	139
-job_hunte,115,119,0	duplicate(hntjqt)	25-4	139
-job_hunte,124,120,0	duplicate(hntjqt)	26-1	139,0,1
-job_hunte,125,120,0	duplicate(hntjqt)	26-2	139,0,1
-job_hunte,124,118,0	duplicate(hntjqt)	26-3	139
-job_hunte,125,118,0	duplicate(hntjqt)	26-4	139
-job_hunte,66,116,0	duplicate(hntjqt)	27-1	139
-job_hunte,66,117,0	duplicate(hntjqt)	27-2	139
-job_hunte,67,116,0	duplicate(hntjqt)	27-3	139
-job_hunte,67,117,0	duplicate(hntjqt)	27-4	139
-job_hunte,76,114,0	duplicate(hntjqt)	28-1	139
-job_hunte,76,115,0	duplicate(hntjqt)	28-2	139
-job_hunte,77,114,0	duplicate(hntjqt)	28-3	139
-job_hunte,77,115,0	duplicate(hntjqt)	28-4	139
-job_hunte,82,116,0	duplicate(hntjqt)	29-1	139
-job_hunte,82,117,0	duplicate(hntjqt)	29-2	139
-job_hunte,83,116,0	duplicate(hntjqt)	29-3	139
-job_hunte,83,117,0	duplicate(hntjqt)	29-4	139
-job_hunte,86,114,0	duplicate(hntjqt)	30-1	139
-job_hunte,86,115,0	duplicate(hntjqt)	30-2	139
-job_hunte,87,114,0	duplicate(hntjqt)	30-3	139
-job_hunte,87,115,0	duplicate(hntjqt)	30-4	139
-job_hunte,92,115,0	duplicate(hntjqt)	31-1	139,1,0
-job_hunte,92,114,0	duplicate(hntjqt)	31-2	139,1,0
-job_hunte,90,115,0	duplicate(hntjqt)	31-3	139
-job_hunte,102,116,0	duplicate(hntjqt)	32-1	139
-job_hunte,102,117,0	duplicate(hntjqt)	32-2	139
-job_hunte,103,116,0	duplicate(hntjqt)	32-3	139
-job_hunte,103,117,0	duplicate(hntjqt)	32-4	139
-job_hunte,114,114,0	duplicate(hntjqt)	33-1	139
-job_hunte,114,115,0	duplicate(hntjqt)	33-2	139
-job_hunte,115,114,0	duplicate(hntjqt)	33-3	139
-job_hunte,115,115,0	duplicate(hntjqt)	33-4	139
-job_hunte,54,110,0	duplicate(hntjqt)	34-1	139,0,1
-job_hunte,55,110,0	duplicate(hntjqt)	34-2	139,0,1
-job_hunte,54,108,0	duplicate(hntjqt)	34-3	139
-job_hunte,55,108,0	duplicate(hntjqt)	34-4	139
-job_hunte,64,112,0	duplicate(hntjqt)	35-1	139
-job_hunte,64,113,0	duplicate(hntjqt)	35-2	139
-job_hunte,65,112,0	duplicate(hntjqt)	35-3	139
-job_hunte,65,113,0	duplicate(hntjqt)	35-4	139
-job_hunte,80,110,0	duplicate(hntjqt)	36-1	139
-job_hunte,80,111,0	duplicate(hntjqt)	36-2	139
-job_hunte,81,110,0	duplicate(hntjqt)	36-3	139
-job_hunte,81,111,0	duplicate(hntjqt)	36-4	139
-job_hunte,90,108,0	duplicate(hntjqt)	37-1	139,0,6
-job_hunte,91,108,0	duplicate(hntjqt)	37-2	139,0,5
-job_hunte,91,102,0	duplicate(hntjqt)	37-3	139
-job_hunte,98,109,0	duplicate(hntjqt)	38-1	139,0,2
-job_hunte,99,109,0	duplicate(hntjqt)	38-2	139,0,2
-job_hunte,103,109,0	duplicate(hntjqt)	38-3	139,3,0
-job_hunte,103,108,0	duplicate(hntjqt)	38-4	139,3,0
-job_hunte,97,106,0	duplicate(hntjqt)	39-1	139,2,0
-job_hunte,96,107,0	duplicate(hntjqt)	39-2	139,1,0
-job_hunte,94,108,0	duplicate(hntjqt)	39-3	139,0,1
-job_hunte,95,109,0	duplicate(hntjqt)	39-4	139
-job_hunte,95,108,0	duplicate(hntjqt)	40-1	139
-job_hunte,94,106,0	duplicate(hntjqt)	40-2	139
-job_hunte,96,102,0	duplicate(hntjqt)	40-3	139,0,3
-job_hunte,97,102,0	duplicate(hntjqt)	40-4	139,0,3
-job_hunte,95,98,0	duplicate(hntjqt)	41-1	139,2,0
-job_hunte,94,99,0	duplicate(hntjqt)	42-1	139,1,0
-job_hunte,92,98,0	duplicate(hntjqt)	43-1	139
-job_hunte,112,110,0	duplicate(hntjqt)	44-1	139
-job_hunte,112,111,0	duplicate(hntjqt)	44-2	139
-job_hunte,113,110,0	duplicate(hntjqt)	44-3	139
-job_hunte,113,111,0	duplicate(hntjqt)	44-4	139
-job_hunte,126,108,0	duplicate(hntjqt)	45-1	139,0,1
-job_hunte,127,108,0	duplicate(hntjqt)	45-2	139,0,1
-job_hunte,126,106,0	duplicate(hntjqt)	45-3	139
-job_hunte,126,106,0	duplicate(hntjqt)	45-4	139
-job_hunte,53,102,0	duplicate(hntjqt)	46-1	139,1,1
-job_hunte,55,102,0	duplicate(hntjqt)	46-2	139,0,1
-job_hunte,53,100,0	duplicate(hntjqt)	46-3	139,1,0
-job_hunte,55,100,0	duplicate(hntjqt)	46-4	139
-job_hunte,64,106,0	duplicate(hntjqt)	47-1	139
-job_hunte,64,107,0	duplicate(hntjqt)	47-2	139
-job_hunte,65,106,0	duplicate(hntjqt)	47-3	139
-job_hunte,65,107,0	duplicate(hntjqt)	47-4	139
-job_hunte,66,100,0	duplicate(hntjqt)	48-1	139
-job_hunte,66,101,0	duplicate(hntjqt)	48-2	139
-job_hunte,67,100,0	duplicate(hntjqt)	48-3	139
-job_hunte,67,101,0	duplicate(hntjqt)	48-4	139
-job_hunte,86,106,0	duplicate(hntjqt)	49-1	139,0,1
-job_hunte,87,106,0	duplicate(hntjqt)	49-2	139,0,1
-job_hunte,82,104,0	duplicate(hntjqt)	49-3	139,5,0
-job_hunte,81,105,0	duplicate(hntjqt)	49-4	139,4,0
-job_hunte,76,105,0	duplicate(hntjqt)	50-1	139
-job_hunte,76,104,0	duplicate(hntjqt)	50-2	139
-job_hunte,78,101,0	duplicate(hntjqt)	50-3	139,0,2
-job_hunte,79,101,0	duplicate(hntjqt)	50-4	139,0,2
-job_hunte,76,99,0	duplicate(hntjqt)	51-1	139,1,0
-job_hunte,77,98,0	duplicate(hntjqt)	51-2	139,2,0
-job_hunte,74,99,0	duplicate(hntjqt)	51-3	139
-job_hunte,74,98,0	duplicate(hntjqt)	51-4	139
-job_hunte,82,100,0	duplicate(hntjqt)	53-1	139
-job_hunte,82,101,0	duplicate(hntjqt)	53-2	139
-job_hunte,83,100,0	duplicate(hntjqt)	53-3	139
-job_hunte,83,101,0	duplicate(hntjqt)	53-4	139
-job_hunte,106,104,0	duplicate(hntjqt)	54-1	139
-job_hunte,106,105,0	duplicate(hntjqt)	54-2	139
-job_hunte,107,104,0	duplicate(hntjqt)	54-3	139
-job_hunte,107,105,0	duplicate(hntjqt)	54-4	139
-job_hunte,112,104,0	duplicate(hntjqt)	55-1	139,0,1
-job_hunte,113,104,0	duplicate(hntjqt)	55-2	139,0,1
-job_hunte,112,102,0	duplicate(hntjqt)	55-3	139
-job_hunte,113,102,0	duplicate(hntjqt)	55-4	139
-job_hunte,54,92,0	duplicate(hntjqt)	56-1	139
-job_hunte,54,93,0	duplicate(hntjqt)	56-2	139
-job_hunte,55,92,0	duplicate(hntjqt)	56-3	139
-job_hunte,55,93,0	duplicate(hntjqt)	56-4	139
-job_hunte,52,90,0	duplicate(hntjqt)	56-5	139
-job_hunte,52,91,0	duplicate(hntjqt)	56-6	139
-job_hunte,53,90,0	duplicate(hntjqt)	56-7	139
-job_hunte,53,91,0	duplicate(hntjqt)	56-8	139
-job_hunte,64,92,0	duplicate(hntjqt)	57-1	139
-job_hunte,64,93,0	duplicate(hntjqt)	57-2	139
-job_hunte,65,92,0	duplicate(hntjqt)	57-3	139
-
--	script	hnt_job_quest_test2::hntjqt2	-1,{
-
+job_hunte,53,140,0	duplicate(HntTrap)	1-2	-1,0,1
+job_hunte,54,141,0	duplicate(HntTrap)	1-3	-1,0,0
+job_hunte,55,141,0	duplicate(HntTrap)	1-4	-1,0,0
+job_hunte,55,140,0	duplicate(HntTrap)	1-5	-1,0,0
+job_hunte,54,140,0	duplicate(HntTrap)	1-6	-1,0,0
+job_hunte,52,138,0	duplicate(HntTrap)	1-7	-1,0,0
+job_hunte,53,138,0	duplicate(HntTrap)	1-8	-1,0,0
+job_hunte,62,140,0	duplicate(HntTrap)	2-1	-1,0,1
+job_hunte,63,140,0	duplicate(HntTrap)	2-2	-1,0,1
+job_hunte,64,140,0	duplicate(HntTrap)	2-3	-1,0,0
+job_hunte,64,141,0	duplicate(HntTrap)	2-4	-1,0,0
+job_hunte,65,140,0	duplicate(HntTrap)	2-5	-1,0,0
+job_hunte,65,141,0	duplicate(HntTrap)	2-6	-1,0,0
+job_hunte,62,138,0	duplicate(HntTrap)	2-7	-1,0,0
+job_hunte,63,138,0	duplicate(HntTrap)	2-8	-1,0,0
+job_hunte,72,140,0	duplicate(HntTrap)	3-1	-1,0,1
+job_hunte,73,140,0	duplicate(HntTrap)	3-2	-1,0,1
+job_hunte,72,138,0	duplicate(HntTrap)	3-3	-1,0,0
+job_hunte,72,138,0	duplicate(HntTrap)	3-4	-1,0,0
+job_hunte,78,140,0	duplicate(HntTrap)	4-1	-1,0,0
+job_hunte,78,141,0	duplicate(HntTrap)	4-2	-1,0,0
+job_hunte,79,140,0	duplicate(HntTrap)	4-3	-1,0,0
+job_hunte,79,141,0	duplicate(HntTrap)	4-4	-1,0,0
+job_hunte,82,138,0	duplicate(HntTrap)	5-1	-1,0,0
+job_hunte,82,139,0	duplicate(HntTrap)	5-2	-1,0,0
+job_hunte,83,138,0	duplicate(HntTrap)	5-3	-1,0,0
+job_hunte,83,139,0	duplicate(HntTrap)	5-4	-1,0,0
+job_hunte,99,138,0	duplicate(HntTrap)	6-1	-1,1,0
+job_hunte,99,139,0	duplicate(HntTrap)	6-2	-1,1,0
+job_hunte,101,138,0	duplicate(HntTrap)	6-3	-1,0,0
+job_hunte,101,139,0	duplicate(HntTrap)	6-4	-1,0,0
+job_hunte,106,140,0	duplicate(HntTrap)	7-1	-1,0,1
+job_hunte,107,140,0	duplicate(HntTrap)	7-2	-1,0,1
+job_hunte,106,138,0	duplicate(HntTrap)	7-3	-1,0,0
+job_hunte,107,138,0	duplicate(HntTrap)	7-4	-1,0,0
+job_hunte,112,140,0	duplicate(HntTrap)	8-1	-1,0,0
+job_hunte,112,141,0	duplicate(HntTrap)	8-2	-1,0,0
+job_hunte,113,140,0	duplicate(HntTrap)	8-3	-1,0,0
+job_hunte,113,141,0	duplicate(HntTrap)	8-4	-1,0,0
+job_hunte,116,140,0	duplicate(HntTrap)	9-1	-1,0,0
+job_hunte,116,141,0	duplicate(HntTrap)	9-2	-1,0,0
+job_hunte,117,140,0	duplicate(HntTrap)	9-3	-1,0,0
+job_hunte,117,141,0	duplicate(HntTrap)	9-4	-1,0,0
+job_hunte,120,138,0	duplicate(HntTrap)	10-1	-1,0,0
+job_hunte,120,139,0	duplicate(HntTrap)	10-2	-1,0,0
+job_hunte,121,138,0	duplicate(HntTrap)	10-3	-1,0,0
+job_hunte,121,139,0	duplicate(HntTrap)	10-4	-1,0,0
+job_hunte,126,139,0	duplicate(HntTrap)	11-1	-1,0,2
+job_hunte,127,139,0	duplicate(HntTrap)	11-2	-1,0,2
+job_hunte,126,136,0	duplicate(HntTrap)	11-3	-1,0,0
+job_hunte,127,136,0	duplicate(HntTrap)	11-4	-1,0,0
+job_hunte,52,134,0	duplicate(HntTrap)	12-1	-1,0,1
+job_hunte,53,134,0	duplicate(HntTrap)	12-2	-1,0,1
+job_hunte,52,132,0	duplicate(HntTrap)	12-3	-1,0,0
+job_hunte,53,132,0	duplicate(HntTrap)	12-4	-1,0,0
+job_hunte,124,130,0	duplicate(HntTrap)	13-1	-1,0,0
+job_hunte,124,131,0	duplicate(HntTrap)	13-2	-1,0,0
+job_hunte,125,130,0	duplicate(HntTrap)	13-3	-1,0,0
+job_hunte,125,131,0	duplicate(HntTrap)	13-4	-1,0,0
+job_hunte,64,128,0	duplicate(HntTrap)	14-1	-1,0,0
+job_hunte,64,129,0	duplicate(HntTrap)	14-2	-1,0,0
+job_hunte,65,128,0	duplicate(HntTrap)	14-3	-1,0,0
+job_hunte,65,129,0	duplicate(HntTrap)	14-4	-1,0,0
+job_hunte,68,126,0	duplicate(HntTrap)	15-1	-1,0,0
+job_hunte,68,127,0	duplicate(HntTrap)	15-2	-1,0,0
+job_hunte,69,126,0	duplicate(HntTrap)	15-3	-1,0,0
+job_hunte,69,127,0	duplicate(HntTrap)	15-4	-1,0,0
+job_hunte,75,128,0	duplicate(HntTrap)	16-1	-1,1,0
+job_hunte,75,129,0	duplicate(HntTrap)	16-2	-1,1,0
+job_hunte,77,128,0	duplicate(HntTrap)	16-3	-1,0,0
+job_hunte,77,129,0	duplicate(HntTrap)	16-4	-1,0,0
+job_hunte,82,126,0	duplicate(HntTrap)	17-1	-1,0,0
+job_hunte,82,127,0	duplicate(HntTrap)	17-2	-1,0,0
+job_hunte,83,126,0	duplicate(HntTrap)	17-3	-1,0,0
+job_hunte,83,127,0	duplicate(HntTrap)	17-4	-1,0,0
+job_hunte,96,128,0	duplicate(HntTrap)	18-1	-1,0,0
+job_hunte,96,129,0	duplicate(HntTrap)	18-2	-1,0,0
+job_hunte,97,128,0	duplicate(HntTrap)	18-3	-1,0,0
+job_hunte,97,129,0	duplicate(HntTrap)	18-4	-1,0,0
+job_hunte,100,126,0	duplicate(HntTrap)	19-1	-1,0,0
+job_hunte,100,127,0	duplicate(HntTrap)	19-2	-1,0,0
+job_hunte,101,126,0	duplicate(HntTrap)	19-3	-1,0,0
+job_hunte,101,127,0	duplicate(HntTrap)	19-4	-1,0,0
+job_hunte,106,128,0	duplicate(HntTrap)	20-1	-1,0,0
+job_hunte,106,129,0	duplicate(HntTrap)	20-2	-1,0,0
+job_hunte,107,128,0	duplicate(HntTrap)	20-3	-1,0,0
+job_hunte,107,129,0	duplicate(HntTrap)	20-4	-1,0,0
+job_hunte,112,126,0	duplicate(HntTrap)	21-1	-1,0,0
+job_hunte,112,127,0	duplicate(HntTrap)	21-2	-1,0,0
+job_hunte,113,126,0	duplicate(HntTrap)	21-3	-1,0,0
+job_hunte,113,127,0	duplicate(HntTrap)	21-4	-1,0,0
+job_hunte,126,126,0	duplicate(HntTrap)	22-1	-1,0,0
+job_hunte,126,127,0	duplicate(HntTrap)	22-2	-1,0,0
+job_hunte,127,126,0	duplicate(HntTrap)	22-3	-1,0,0
+job_hunte,127,127,0	duplicate(HntTrap)	22-4	-1,0,0
+job_hunte,52,122,0	duplicate(HntTrap)	23-1	-1,0,1
+job_hunte,52,122,0	duplicate(HntTrap)	23-2	-1,0,1
+job_hunte,53,120,0	duplicate(HntTrap)	23-3	-1,1,0
+job_hunte,54,121,0	duplicate(HntTrap)	23-4	-1,0,0
+job_hunte,55,121,0	duplicate(HntTrap)	23-5	-1,0,0
+job_hunte,55,120,0	duplicate(HntTrap)	23-6	-1,0,0
+job_hunte,66,120,0	duplicate(HntTrap)	24-1	-1,0,0
+job_hunte,66,121,0	duplicate(HntTrap)	24-2	-1,0,0
+job_hunte,67,120,0	duplicate(HntTrap)	24-3	-1,0,0
+job_hunte,67,121,0	duplicate(HntTrap)	24-4	-1,0,0
+job_hunte,114,118,0	duplicate(HntTrap)	25-1	-1,0,0
+job_hunte,114,119,0	duplicate(HntTrap)	25-2	-1,0,0
+job_hunte,115,118,0	duplicate(HntTrap)	25-3	-1,0,0
+job_hunte,115,119,0	duplicate(HntTrap)	25-4	-1,0,0
+job_hunte,124,120,0	duplicate(HntTrap)	26-1	-1,0,1
+job_hunte,125,120,0	duplicate(HntTrap)	26-2	-1,0,1
+job_hunte,124,118,0	duplicate(HntTrap)	26-3	-1,0,0
+job_hunte,125,118,0	duplicate(HntTrap)	26-4	-1,0,0
+job_hunte,66,116,0	duplicate(HntTrap)	27-1	-1,0,0
+job_hunte,66,117,0	duplicate(HntTrap)	27-2	-1,0,0
+job_hunte,67,116,0	duplicate(HntTrap)	27-3	-1,0,0
+job_hunte,67,117,0	duplicate(HntTrap)	27-4	-1,0,0
+job_hunte,76,114,0	duplicate(HntTrap)	28-1	-1,0,0
+job_hunte,76,115,0	duplicate(HntTrap)	28-2	-1,0,0
+job_hunte,77,114,0	duplicate(HntTrap)	28-3	-1,0,0
+job_hunte,77,115,0	duplicate(HntTrap)	28-4	-1,0,0
+job_hunte,82,116,0	duplicate(HntTrap)	29-1	-1,0,0
+job_hunte,82,117,0	duplicate(HntTrap)	29-2	-1,0,0
+job_hunte,83,116,0	duplicate(HntTrap)	29-3	-1,0,0
+job_hunte,83,117,0	duplicate(HntTrap)	29-4	-1,0,0
+job_hunte,86,114,0	duplicate(HntTrap)	30-1	-1,0,0
+job_hunte,86,115,0	duplicate(HntTrap)	30-2	-1,0,0
+job_hunte,87,114,0	duplicate(HntTrap)	30-3	-1,0,0
+job_hunte,87,115,0	duplicate(HntTrap)	30-4	-1,0,0
+job_hunte,92,115,0	duplicate(HntTrap)	31-1	-1,1,0
+job_hunte,92,114,0	duplicate(HntTrap)	31-2	-1,1,0
+job_hunte,90,115,0	duplicate(HntTrap)	31-3	-1,0,0
+job_hunte,102,116,0	duplicate(HntTrap)	32-1	-1,0,0
+job_hunte,102,117,0	duplicate(HntTrap)	32-2	-1,0,0
+job_hunte,103,116,0	duplicate(HntTrap)	32-3	-1,0,0
+job_hunte,103,117,0	duplicate(HntTrap)	32-4	-1,0,0
+job_hunte,114,114,0	duplicate(HntTrap)	33-1	-1,0,0
+job_hunte,114,115,0	duplicate(HntTrap)	33-2	-1,0,0
+job_hunte,115,114,0	duplicate(HntTrap)	33-3	-1,0,0
+job_hunte,115,115,0	duplicate(HntTrap)	33-4	-1,0,0
+job_hunte,54,110,0	duplicate(HntTrap)	34-1	-1,0,1
+job_hunte,55,110,0	duplicate(HntTrap)	34-2	-1,0,1
+job_hunte,54,108,0	duplicate(HntTrap)	34-3	-1,0,0
+job_hunte,55,108,0	duplicate(HntTrap)	34-4	-1,0,0
+job_hunte,64,112,0	duplicate(HntTrap)	35-1	-1,0,0
+job_hunte,64,113,0	duplicate(HntTrap)	35-2	-1,0,0
+job_hunte,65,112,0	duplicate(HntTrap)	35-3	-1,0,0
+job_hunte,65,113,0	duplicate(HntTrap)	35-4	-1,0,0
+job_hunte,80,110,0	duplicate(HntTrap)	36-1	-1,0,0
+job_hunte,80,111,0	duplicate(HntTrap)	36-2	-1,0,0
+job_hunte,81,110,0	duplicate(HntTrap)	36-3	-1,0,0
+job_hunte,81,111,0	duplicate(HntTrap)	36-4	-1,0,0
+job_hunte,90,108,0	duplicate(HntTrap)	37-1	-1,0,6
+job_hunte,91,108,0	duplicate(HntTrap)	37-2	-1,0,5
+job_hunte,91,102,0	duplicate(HntTrap)	37-3	-1,0,0
+job_hunte,98,109,0	duplicate(HntTrap)	38-1	-1,0,2
+job_hunte,99,109,0	duplicate(HntTrap)	38-2	-1,0,2
+job_hunte,103,109,0	duplicate(HntTrap)	38-3	-1,3,0
+job_hunte,103,108,0	duplicate(HntTrap)	38-4	-1,3,0
+job_hunte,97,106,0	duplicate(HntTrap)	39-1	-1,2,0
+job_hunte,96,107,0	duplicate(HntTrap)	39-2	-1,1,0
+job_hunte,94,108,0	duplicate(HntTrap)	39-3	-1,0,1
+job_hunte,95,109,0	duplicate(HntTrap)	39-4	-1,0,0
+job_hunte,95,108,0	duplicate(HntTrap)	40-1	-1,0,0
+job_hunte,94,106,0	duplicate(HntTrap)	40-2	-1,0,0
+job_hunte,96,102,0	duplicate(HntTrap)	40-3	-1,0,3
+job_hunte,97,102,0	duplicate(HntTrap)	40-4	-1,0,3
+job_hunte,95,98,0	duplicate(HntTrap)	41-1	-1,2,0
+job_hunte,94,99,0	duplicate(HntTrap)	42-1	-1,1,0
+job_hunte,92,98,0	duplicate(HntTrap)	43-1	-1,0,0
+job_hunte,112,110,0	duplicate(HntTrap)	44-1	-1,0,0
+job_hunte,112,111,0	duplicate(HntTrap)	44-2	-1,0,0
+job_hunte,113,110,0	duplicate(HntTrap)	44-3	-1,0,0
+job_hunte,113,111,0	duplicate(HntTrap)	44-4	-1,0,0
+job_hunte,126,108,0	duplicate(HntTrap)	45-1	-1,0,1
+job_hunte,127,108,0	duplicate(HntTrap)	45-2	-1,0,1
+job_hunte,126,106,0	duplicate(HntTrap)	45-3	-1,0,0
+job_hunte,126,106,0	duplicate(HntTrap)	45-4	-1,0,0
+job_hunte,53,102,0	duplicate(HntTrap)	46-1	-1,1,1
+job_hunte,55,102,0	duplicate(HntTrap)	46-2	-1,0,1
+job_hunte,53,100,0	duplicate(HntTrap)	46-3	-1,1,0
+job_hunte,55,100,0	duplicate(HntTrap)	46-4	-1,0,0
+job_hunte,64,106,0	duplicate(HntTrap)	47-1	-1,0,0
+job_hunte,64,107,0	duplicate(HntTrap)	47-2	-1,0,0
+job_hunte,65,106,0	duplicate(HntTrap)	47-3	-1,0,0
+job_hunte,65,107,0	duplicate(HntTrap)	47-4	-1,0,0
+job_hunte,66,100,0	duplicate(HntTrap)	48-1	-1,0,0
+job_hunte,66,101,0	duplicate(HntTrap)	48-2	-1,0,0
+job_hunte,67,100,0	duplicate(HntTrap)	48-3	-1,0,0
+job_hunte,67,101,0	duplicate(HntTrap)	48-4	-1,0,0
+job_hunte,86,106,0	duplicate(HntTrap)	49-1	-1,0,1
+job_hunte,87,106,0	duplicate(HntTrap)	49-2	-1,0,1
+job_hunte,82,104,0	duplicate(HntTrap)	49-3	-1,5,0
+job_hunte,81,105,0	duplicate(HntTrap)	49-4	-1,4,0
+job_hunte,76,105,0	duplicate(HntTrap)	50-1	-1,0,0
+job_hunte,76,104,0	duplicate(HntTrap)	50-2	-1,0,0
+job_hunte,78,101,0	duplicate(HntTrap)	50-3	-1,0,2
+job_hunte,79,101,0	duplicate(HntTrap)	50-4	-1,0,2
+job_hunte,76,99,0	duplicate(HntTrap)	51-1	-1,1,0
+job_hunte,77,98,0	duplicate(HntTrap)	51-2	-1,2,0
+job_hunte,74,99,0	duplicate(HntTrap)	51-3	-1,0,0
+job_hunte,74,98,0	duplicate(HntTrap)	51-4	-1,0,0
+job_hunte,82,100,0	duplicate(HntTrap)	53-1	-1,0,0
+job_hunte,82,101,0	duplicate(HntTrap)	53-2	-1,0,0
+job_hunte,83,100,0	duplicate(HntTrap)	53-3	-1,0,0
+job_hunte,83,101,0	duplicate(HntTrap)	53-4	-1,0,0
+job_hunte,106,104,0	duplicate(HntTrap)	54-1	-1,0,0
+job_hunte,106,105,0	duplicate(HntTrap)	54-2	-1,0,0
+job_hunte,107,104,0	duplicate(HntTrap)	54-3	-1,0,0
+job_hunte,107,105,0	duplicate(HntTrap)	54-4	-1,0,0
+job_hunte,112,104,0	duplicate(HntTrap)	55-1	-1,0,1
+job_hunte,113,104,0	duplicate(HntTrap)	55-2	-1,0,1
+job_hunte,112,102,0	duplicate(HntTrap)	55-3	-1,0,0
+job_hunte,113,102,0	duplicate(HntTrap)	55-4	-1,0,0
+job_hunte,54,92,0	duplicate(HntTrap)	56-1	-1,0,0
+job_hunte,54,93,0	duplicate(HntTrap)	56-2	-1,0,0
+job_hunte,55,92,0	duplicate(HntTrap)	56-3	-1,0,0
+job_hunte,55,93,0	duplicate(HntTrap)	56-4	-1,0,0
+job_hunte,52,90,0	duplicate(HntTrap)	56-5	-1,0,0
+job_hunte,52,91,0	duplicate(HntTrap)	56-6	-1,0,0
+job_hunte,53,90,0	duplicate(HntTrap)	56-7	-1,0,0
+job_hunte,53,91,0	duplicate(HntTrap)	56-8	-1,0,0
+job_hunte,64,92,0	duplicate(HntTrap)	57-1	-1,0,0
+job_hunte,64,93,0	duplicate(HntTrap)	57-2	-1,0,0
+job_hunte,65,92,0	duplicate(HntTrap)	57-3	-1,0,0
+
+job_hunte,65,93,0	script	57-4::HntTrap2	-1,{
 OnTouch:
-	mapannounce "job_hunte"," " + strcharinfo(0) + ", has failed me! Go back to where you started!",bc_map;
-	set job_hunter,13;
+	mapannounce "job_hunte",strcharinfo(0) + ", has failed me! Go back to where you started!",bc_map;
+	set HNTR_Q,13;
 	warp "job_hunte",176,22;
-	donpcevent "Waiting Room#hnt::OnReset";
 	donpcevent "Manager#hnt::OnReset";
-	donpcevent "Manager#hnt2::OnReset";
-	donpcevent "Manager#hnt::OnDisable";
-	donpcevent "Manager#hnt2::OnDisable";
-	end;
-
-OnEnable:
-	enablenpc "57-4";
-	enablenpc "58-1";
-	enablenpc "58-2";
-	enablenpc "58-3";
-	enablenpc "58-4";
-	enablenpc "59-1";
-	enablenpc "59-2";
-	enablenpc "59-3";
-	enablenpc "59-4";
-	enablenpc "60-1";
-	enablenpc "60-2";
-	enablenpc "60-3";
-	enablenpc "60-4";
-	enablenpc "61-1";
-	enablenpc "61-2";
-	enablenpc "61-3";
-	enablenpc "61-4";
-	enablenpc "62-1";
-	enablenpc "62-2";
-	enablenpc "62-3";
-	enablenpc "62-4";
-	enablenpc "63-1";
-	enablenpc "63-2";
-	enablenpc "63-3";
-	enablenpc "63-4";
-	enablenpc "64-1";
-	enablenpc "64-2";
-	enablenpc "64-3";
-	enablenpc "64-4";
-	enablenpc "65-1";
-	enablenpc "65-2";
-	enablenpc "65-3";
-	enablenpc "65-4";
-	enablenpc "66-1";
-	enablenpc "66-2";
-	enablenpc "66-3";
-	enablenpc "66-4";
-	enablenpc "67-1";
-	enablenpc "67-2";
-	enablenpc "67-3";
-	enablenpc "67-4";
-	enablenpc "68-1";
-	enablenpc "68-2";
-	enablenpc "68-3";
-	enablenpc "68-4";
-	enablenpc "69-1";
-	enablenpc "69-2";
-	enablenpc "69-3";
-	enablenpc "69-4";
-	enablenpc "70-1";
-	enablenpc "70-2";
-	enablenpc "70-3";
-	enablenpc "70-4";
-	enablenpc "71-1";
-	enablenpc "71-2";
-	enablenpc "71-3";
-	enablenpc "71-4";
-	enablenpc "72-1";
-	enablenpc "72-2";
-	enablenpc "72-3";
-	enablenpc "72-4";
-	enablenpc "73-1";
-	enablenpc "73-2";
-	enablenpc "73-3";
-	enablenpc "73-4";
-	enablenpc "74-1";
-	enablenpc "74-2";
-	enablenpc "74-3";
-	enablenpc "74-4";
-	enablenpc "75-1";
-	enablenpc "75-2";
-	enablenpc "75-3";
-	enablenpc "75-4";
-	enablenpc "76-1";
-	enablenpc "76-2";
-	enablenpc "76-3";
-	enablenpc "76-4";
-	enablenpc "77-1";
-	enablenpc "77-2";
-	enablenpc "77-3";
-	enablenpc "77-4";
-	enablenpc "78-1";
-	enablenpc "78-2";
-	enablenpc "78-3";
-	enablenpc "78-4";
-	enablenpc "79-1";
-	enablenpc "79-2";
-	enablenpc "79-3";
-	enablenpc "79-4";
-	enablenpc "80-1";
-	enablenpc "80-2";
-	enablenpc "80-3";
-	enablenpc "80-4";
-	enablenpc "81-1";
-	enablenpc "81-2";
-	enablenpc "81-3";
-	enablenpc "81-4";
-	enablenpc "82-1";
-	enablenpc "82-2";
-	enablenpc "82-3";
-	enablenpc "82-4";
-	enablenpc "83-1";
-	enablenpc "83-2";
-	enablenpc "83-3";
-	enablenpc "83-4";
-	enablenpc "84-1";
-	enablenpc "84-2";
-	enablenpc "84-3";
-	enablenpc "84-4";
-	enablenpc "85-1";
-	enablenpc "85-2";
-	enablenpc "85-3";
-	enablenpc "85-4";
-	enablenpc "86-1";
-	enablenpc "86-2";
-	enablenpc "86-3";
-	enablenpc "86-4";
-	enablenpc "87-1";
-	enablenpc "87-2";
-	enablenpc "87-3";
-	enablenpc "87-4";
-	enablenpc "88-1";
-	enablenpc "88-2";
-	enablenpc "88-3";
-	enablenpc "88-4";
-	enablenpc "89-1";
-	enablenpc "89-2";
-	enablenpc "89-3";
-	enablenpc "89-4";
-	enablenpc "90-1";
-	enablenpc "90-2";
-	enablenpc "90-3";
-	enablenpc "90-4";
-	enablenpc "91-1";
-	enablenpc "91-2";
-	enablenpc "91-3";
-	enablenpc "91-4";
-	enablenpc "92-1";
-	enablenpc "92-2";
-	enablenpc "92-3";
-	enablenpc "92-4";
-	enablenpc "93-1";
-	enablenpc "93-2";
-	enablenpc "93-3";
-	enablenpc "93-4";
-	enablenpc "94-1";
-	enablenpc "94-2";
-	enablenpc "94-3";
-	enablenpc "94-4";
-	enablenpc "95-1";
-	enablenpc "95-2";
-	enablenpc "95-3";
-	enablenpc "95-4";
-	enablenpc "96-1";
-	enablenpc "96-2";
-	enablenpc "96-3";
-	enablenpc "96-4";
-	enablenpc "97-1";
-	enablenpc "97-2";
-	enablenpc "97-3";
-	enablenpc "97-4";
-	end;
-
-OnDisable:
-	disablenpc "57-4";
-	disablenpc "58-1";
-	disablenpc "58-2";
-	disablenpc "58-3";
-	disablenpc "58-4";
-	disablenpc "59-1";
-	disablenpc "59-2";
-	disablenpc "59-3";
-	disablenpc "59-4";
-	disablenpc "60-1";
-	disablenpc "60-2";
-	disablenpc "60-3";
-	disablenpc "60-4";
-	disablenpc "61-1";
-	disablenpc "61-2";
-	disablenpc "61-3";
-	disablenpc "61-4";
-	disablenpc "62-1";
-	disablenpc "62-2";
-	disablenpc "62-3";
-	disablenpc "62-4";
-	disablenpc "63-1";
-	disablenpc "63-2";
-	disablenpc "63-3";
-	disablenpc "63-4";
-	disablenpc "64-1";
-	disablenpc "64-2";
-	disablenpc "64-3";
-	disablenpc "64-4";
-	disablenpc "65-1";
-	disablenpc "65-2";
-	disablenpc "65-3";
-	disablenpc "65-4";
-	disablenpc "66-1";
-	disablenpc "66-2";
-	disablenpc "66-3";
-	disablenpc "66-4";
-	disablenpc "67-1";
-	disablenpc "67-2";
-	disablenpc "67-3";
-	disablenpc "67-4";
-	disablenpc "68-1";
-	disablenpc "68-2";
-	disablenpc "68-3";
-	disablenpc "68-4";
-	disablenpc "69-1";
-	disablenpc "69-2";
-	disablenpc "69-3";
-	disablenpc "69-4";
-	disablenpc "70-1";
-	disablenpc "70-2";
-	disablenpc "70-3";
-	disablenpc "70-4";
-	disablenpc "71-1";
-	disablenpc "71-2";
-	disablenpc "71-3";
-	disablenpc "71-4";
-	disablenpc "72-1";
-	disablenpc "72-2";
-	disablenpc "72-3";
-	disablenpc "72-4";
-	disablenpc "73-1";
-	disablenpc "73-2";
-	disablenpc "73-3";
-	disablenpc "73-4";
-	disablenpc "74-1";
-	disablenpc "74-2";
-	disablenpc "74-3";
-	disablenpc "74-4";
-	disablenpc "75-1";
-	disablenpc "75-2";
-	disablenpc "75-3";
-	disablenpc "75-4";
-	disablenpc "76-1";
-	disablenpc "76-2";
-	disablenpc "76-3";
-	disablenpc "76-4";
-	disablenpc "77-1";
-	disablenpc "77-2";
-	disablenpc "77-3";
-	disablenpc "77-4";
-	disablenpc "78-1";
-	disablenpc "78-2";
-	disablenpc "78-3";
-	disablenpc "78-4";
-	disablenpc "79-1";
-	disablenpc "79-2";
-	disablenpc "79-3";
-	disablenpc "79-4";
-	disablenpc "80-1";
-	disablenpc "80-2";
-	disablenpc "80-3";
-	disablenpc "80-4";
-	disablenpc "81-1";
-	disablenpc "81-2";
-	disablenpc "81-3";
-	disablenpc "81-4";
-	disablenpc "82-1";
-	disablenpc "82-2";
-	disablenpc "82-3";
-	disablenpc "82-4";
-	disablenpc "83-1";
-	disablenpc "83-2";
-	disablenpc "83-3";
-	disablenpc "83-4";
-	disablenpc "84-1";
-	disablenpc "84-2";
-	disablenpc "84-3";
-	disablenpc "84-4";
-	disablenpc "85-1";
-	disablenpc "85-2";
-	disablenpc "85-3";
-	disablenpc "85-4";
-	disablenpc "86-1";
-	disablenpc "86-2";
-	disablenpc "86-3";
-	disablenpc "86-4";
-	disablenpc "87-1";
-	disablenpc "87-2";
-	disablenpc "87-3";
-	disablenpc "87-4";
-	disablenpc "88-1";
-	disablenpc "88-2";
-	disablenpc "88-3";
-	disablenpc "88-4";
-	disablenpc "89-1";
-	disablenpc "89-2";
-	disablenpc "89-3";
-	disablenpc "89-4";
-	disablenpc "90-1";
-	disablenpc "90-2";
-	disablenpc "90-3";
-	disablenpc "90-4";
-	disablenpc "91-1";
-	disablenpc "91-2";
-	disablenpc "91-3";
-	disablenpc "91-4";
-	disablenpc "92-1";
-	disablenpc "92-2";
-	disablenpc "92-3";
-	disablenpc "92-4";
-	disablenpc "93-1";
-	disablenpc "93-2";
-	disablenpc "93-3";
-	disablenpc "93-4";
-	disablenpc "94-1";
-	disablenpc "94-2";
-	disablenpc "94-3";
-	disablenpc "94-4";
-	disablenpc "95-1";
-	disablenpc "95-2";
-	disablenpc "95-3";
-	disablenpc "95-4";
-	disablenpc "96-1";
-	disablenpc "96-2";
-	disablenpc "96-3";
-	disablenpc "96-4";
-	disablenpc "97-1";
-	disablenpc "97-2";
-	disablenpc "97-3";
-	disablenpc "97-4";
+	donpcevent "Waiting Room#hnt::OnStart";
 	end;
 }
 
-job_hunte,65,93,0	duplicate(hntjqt2)	57-4	139
-job_hunte,76,94,0	duplicate(hntjqt2)	58-1	139
-job_hunte,76,95,0	duplicate(hntjqt2)	58-2	139
-job_hunte,77,94,0	duplicate(hntjqt2)	58-3	139
-job_hunte,77,95,0	duplicate(hntjqt2)	58-4	139
-job_hunte,78,92,0	duplicate(hntjqt2)	59-1	139
-job_hunte,78,93,0	duplicate(hntjqt2)	59-2	139
-job_hunte,79,92,0	duplicate(hntjqt2)	59-3	139
-job_hunte,79,93,0	duplicate(hntjqt2)	59-4	139
-job_hunte,86,92,0	duplicate(hntjqt2)	60-1	139
-job_hunte,86,93,0	duplicate(hntjqt2)	60-2	139
-job_hunte,87,92,0	duplicate(hntjqt2)	60-3	139
-job_hunte,87,93,0	duplicate(hntjqt2)	60-4	139
-job_hunte,90,96,0	duplicate(hntjqt2)	61-1	139
-job_hunte,90,97,0	duplicate(hntjqt2)	61-2	139
-job_hunte,91,96,0	duplicate(hntjqt2)	61-3	139
-job_hunte,91,97,0	duplicate(hntjqt2)	61-4	139
-job_hunte,99,95,0	duplicate(hntjqt2)	62-1	139,1,0
-job_hunte,99,94,0	duplicate(hntjqt2)	62-2	139,1,0
-job_hunte,101,94,0	duplicate(hntjqt2)	62-3	139,0,1
-job_hunte,100,93,0	duplicate(hntjqt2)	62-4	139
-job_hunte,100,92,0	duplicate(hntjqt2)	63-1	139
-job_hunte,101,92,0	duplicate(hntjqt2)	63-2	139
-job_hunte,102,98,0	duplicate(hntjqt2)	64-1	139
-job_hunte,102,99,0	duplicate(hntjqt2)	64-2	139
-job_hunte,103,98,0	duplicate(hntjqt2)	64-3	139
-job_hunte,103,99,0	duplicate(hntjqt2)	64-4	139
-job_hunte,102,90,0	duplicate(hntjqt2)	65-1	139
-job_hunte,102,91,0	duplicate(hntjqt2)	65-2	139
-job_hunte,103,90,0	duplicate(hntjqt2)	65-3	139
-job_hunte,103,91,0	duplicate(hntjqt2)	65-4	139
-job_hunte,114,96,0	duplicate(hntjqt2)	66-1	139
-job_hunte,114,97,0	duplicate(hntjqt2)	66-2	139
-job_hunte,115,96,0	duplicate(hntjqt2)	66-3	139
-job_hunte,115,97,0	duplicate(hntjqt2)	66-4	139
-job_hunte,112,90,0	duplicate(hntjqt2)	67-1	139
-job_hunte,112,91,0	duplicate(hntjqt2)	67-2	139
-job_hunte,113,90,0	duplicate(hntjqt2)	67-3	139
-job_hunte,113,91,0	duplicate(hntjqt2)	67-4	139
-job_hunte,125,97,0	duplicate(hntjqt2)	68-1	139,1,0
-job_hunte,125,96,0	duplicate(hntjqt2)	68-2	139,1,0
-job_hunte,127,96,0	duplicate(hntjqt2)	68-3	139
-job_hunte,127,97,0	duplicate(hntjqt2)	68-4	139
-job_hunte,52,86,0	duplicate(hntjqt2)	69-1	139
-job_hunte,52,87,0	duplicate(hntjqt2)	69-2	139
-job_hunte,53,86,0	duplicate(hntjqt2)	69-3	139
-job_hunte,53,87,0	duplicate(hntjqt2)	69-4	139
-job_hunte,66,88,0	duplicate(hntjqt2)	70-1	139
-job_hunte,66,89,0	duplicate(hntjqt2)	70-2	139
-job_hunte,67,88,0	duplicate(hntjqt2)	70-3	139
-job_hunte,67,89,0	duplicate(hntjqt2)	70-4	139
-job_hunte,114,84,0	duplicate(hntjqt2)	71-1	139
-job_hunte,114,85,0	duplicate(hntjqt2)	71-2	139
-job_hunte,115,84,0	duplicate(hntjqt2)	71-3	139
-job_hunte,115,85,0	duplicate(hntjqt2)	71-4	139
-job_hunte,126,86,0	duplicate(hntjqt2)	72-1	139
-job_hunte,126,87,0	duplicate(hntjqt2)	72-2	139
-job_hunte,127,86,0	duplicate(hntjqt2)	72-3	139
-job_hunte,127,87,0	duplicate(hntjqt2)	72-4	139
-job_hunte,54,80,0	duplicate(hntjqt2)	73-1	139,0,1
-job_hunte,55,80,0	duplicate(hntjqt2)	73-2	139,0,1
-job_hunte,54,78,0	duplicate(hntjqt2)	73-3	139
-job_hunte,55,78,0	duplicate(hntjqt2)	73-4	139
-job_hunte,64,82,0	duplicate(hntjqt2)	74-1	139,0,1
-job_hunte,65,82,0	duplicate(hntjqt2)	74-2	139,0,1
-job_hunte,64,80,0	duplicate(hntjqt2)	74-3	139
-job_hunte,65,80,0	duplicate(hntjqt2)	74-4	139
-job_hunte,66,78,0	duplicate(hntjqt2)	75-1	139
-job_hunte,66,79,0	duplicate(hntjqt2)	75-2	139
-job_hunte,67,78,0	duplicate(hntjqt2)	75-3	139
-job_hunte,67,79,0	duplicate(hntjqt2)	75-4	139
-job_hunte,74,78,0	duplicate(hntjqt2)	76-1	139
-job_hunte,74,79,0	duplicate(hntjqt2)	76-2	139
-job_hunte,75,78,0	duplicate(hntjqt2)	76-3	139
-job_hunte,75,79,0	duplicate(hntjqt2)	76-4	139
-job_hunte,78,80,0	duplicate(hntjqt2)	77-1	139
-job_hunte,78,81,0	duplicate(hntjqt2)	77-2	139
-job_hunte,79,80,0	duplicate(hntjqt2)	77-3	139
-job_hunte,79,81,0	duplicate(hntjqt2)	77-4	139
-job_hunte,82,78,0	duplicate(hntjqt2)	78-1	139
-job_hunte,82,79,0	duplicate(hntjqt2)	78-2	139
-job_hunte,83,78,0	duplicate(hntjqt2)	78-3	139
-job_hunte,83,79,0	duplicate(hntjqt2)	78-4	139
-job_hunte,94,78,0	duplicate(hntjqt2)	79-1	139
-job_hunte,94,79,0	duplicate(hntjqt2)	79-2	139
-job_hunte,95,78,0	duplicate(hntjqt2)	79-3	139
-job_hunte,95,79,0	duplicate(hntjqt2)	79-4	139
-job_hunte,101,80,0	duplicate(hntjqt2)	80-1	139,1,0
-job_hunte,101,81,0	duplicate(hntjqt2)	80-2	139,1,0
-job_hunte,103,81,0	duplicate(hntjqt2)	80-3	139
-job_hunte,103,80,0	duplicate(hntjqt2)	80-4	139
-job_hunte,104,78,0	duplicate(hntjqt2)	81-1	139
-job_hunte,104,79,0	duplicate(hntjqt2)	81-2	139
-job_hunte,105,78,0	duplicate(hntjqt2)	81-3	139
-job_hunte,105,79,0	duplicate(hntjqt2)	81-4	139
-job_hunte,110,78,0	duplicate(hntjqt2)	82-1	139
-job_hunte,110,79,0	duplicate(hntjqt2)	82-2	139
-job_hunte,111,78,0	duplicate(hntjqt2)	82-3	139
-job_hunte,111,79,0	duplicate(hntjqt2)	82-4	139
-job_hunte,114,80,0	duplicate(hntjqt2)	83-1	139
-job_hunte,114,81,0	duplicate(hntjqt2)	83-2	139
-job_hunte,115,80,0	duplicate(hntjqt2)	83-3	139
-job_hunte,115,81,0	duplicate(hntjqt2)	83-4	139
-job_hunte,124,78,0	duplicate(hntjqt2)	84-1	139
-job_hunte,124,79,0	duplicate(hntjqt2)	84-2	139
-job_hunte,125,78,0	duplicate(hntjqt2)	84-3	139
-job_hunte,125,79,0	duplicate(hntjqt2)	84-4	139
-job_hunte,126,82,0	duplicate(hntjqt2)	85-1	139
-job_hunte,126,83,0	duplicate(hntjqt2)	85-2	139
-job_hunte,127,82,0	duplicate(hntjqt2)	85-3	139
-job_hunte,127,83,0	duplicate(hntjqt2)	85-4	139
-job_hunte,52,68,0	duplicate(hntjqt2)	86-1	139,0,1
-job_hunte,53,68,0	duplicate(hntjqt2)	86-2	139,0,1
-job_hunte,52,66,0	duplicate(hntjqt2)	86-3	139
-job_hunte,53,66,0	duplicate(hntjqt2)	86-4	139
-job_hunte,54,70,0	duplicate(hntjqt2)	87-1	139,0,1
-job_hunte,55,70,0	duplicate(hntjqt2)	87-2	139,0,1
-job_hunte,54,68,0	duplicate(hntjqt2)	87-3	139
-job_hunte,55,68,0	duplicate(hntjqt2)	87-4	139
-job_hunte,59,66,0	duplicate(hntjqt2)	88-1	139,1,0
-job_hunte,59,67,0	duplicate(hntjqt2)	88-2	139,1,0
-job_hunte,61,67,0	duplicate(hntjqt2)	88-3	139
-job_hunte,61,66,0	duplicate(hntjqt2)	88-4	139
-job_hunte,68,68,0	duplicate(hntjqt2)	89-1	139,0,1
-job_hunte,69,68,0	duplicate(hntjqt2)	89-2	139,0,1
-job_hunte,68,66,0	duplicate(hntjqt2)	89-3	139
-job_hunte,69,66,0	duplicate(hntjqt2)	89-4	139
-job_hunte,76,66,0	duplicate(hntjqt2)	90-1	139
-job_hunte,76,67,0	duplicate(hntjqt2)	90-2	139
-job_hunte,77,66,0	duplicate(hntjqt2)	90-3	139
-job_hunte,77,67,0	duplicate(hntjqt2)	90-4	139
-job_hunte,82,68,0	duplicate(hntjqt2)	91-1	139
-job_hunte,82,69,0	duplicate(hntjqt2)	91-2	139
-job_hunte,83,68,0	duplicate(hntjqt2)	91-3	139
-job_hunte,83,69,0	duplicate(hntjqt2)	91-4	139
-job_hunte,96,66,0	duplicate(hntjqt2)	92-1	139
-job_hunte,96,67,0	duplicate(hntjqt2)	92-2	139
-job_hunte,97,66,0	duplicate(hntjqt2)	92-3	139
-job_hunte,97,67,0	duplicate(hntjqt2)	92-4	139
-job_hunte,100,68,0	duplicate(hntjqt2)	93-1	139
-job_hunte,100,69,0	duplicate(hntjqt2)	93-2	139
-job_hunte,101,68,0	duplicate(hntjqt2)	93-3	139
-job_hunte,101,69,0	duplicate(hntjqt2)	93-4	139
-job_hunte,107,66,0	duplicate(hntjqt2)	94-1	139,1,0
-job_hunte,107,67,0	duplicate(hntjqt2)	94-2	139,1,0
-job_hunte,109,67,0	duplicate(hntjqt2)	94-3	139
-job_hunte,109,66,0	duplicate(hntjqt2)	94-4	139
-job_hunte,117,69,0	duplicate(hntjqt2)	95-1	139,1,0
-job_hunte,117,68,0	duplicate(hntjqt2)	95-2	139,1,0
-job_hunte,119,69,0	duplicate(hntjqt2)	95-3	139
-job_hunte,119,68,0	duplicate(hntjqt2)	95-4	139
-job_hunte,124,66,0	duplicate(hntjqt2)	96-1	139
-job_hunte,124,67,0	duplicate(hntjqt2)	96-2	139
-job_hunte,125,66,0	duplicate(hntjqt2)	96-3	139
-job_hunte,125,67,0	duplicate(hntjqt2)	96-4	139
-job_hunte,126,70,0	duplicate(hntjqt2)	97-1	139
-job_hunte,126,71,0	duplicate(hntjqt2)	97-2	139
-job_hunte,127,70,0	duplicate(hntjqt2)	97-3	139
-job_hunte,127,71,0	duplicate(hntjqt2)	97-4	139
\ No newline at end of file
+job_hunte,76,94,0	duplicate(HntTrap2)	58-1	-1,0,0
+job_hunte,76,95,0	duplicate(HntTrap2)	58-2	-1,0,0
+job_hunte,77,94,0	duplicate(HntTrap2)	58-3	-1,0,0
+job_hunte,77,95,0	duplicate(HntTrap2)	58-4	-1,0,0
+job_hunte,78,92,0	duplicate(HntTrap2)	59-1	-1,0,0
+job_hunte,78,93,0	duplicate(HntTrap2)	59-2	-1,0,0
+job_hunte,79,92,0	duplicate(HntTrap2)	59-3	-1,0,0
+job_hunte,79,93,0	duplicate(HntTrap2)	59-4	-1,0,0
+job_hunte,86,92,0	duplicate(HntTrap2)	60-1	-1,0,0
+job_hunte,86,93,0	duplicate(HntTrap2)	60-2	-1,0,0
+job_hunte,87,92,0	duplicate(HntTrap2)	60-3	-1,0,0
+job_hunte,87,93,0	duplicate(HntTrap2)	60-4	-1,0,0
+job_hunte,90,96,0	duplicate(HntTrap2)	61-1	-1,0,0
+job_hunte,90,97,0	duplicate(HntTrap2)	61-2	-1,0,0
+job_hunte,91,96,0	duplicate(HntTrap2)	61-3	-1,0,0
+job_hunte,91,97,0	duplicate(HntTrap2)	61-4	-1,0,0
+job_hunte,99,95,0	duplicate(HntTrap2)	62-1	-1,1,0
+job_hunte,99,94,0	duplicate(HntTrap2)	62-2	-1,1,0
+job_hunte,101,94,0	duplicate(HntTrap2)	62-3	-1,0,1
+job_hunte,100,93,0	duplicate(HntTrap2)	62-4	-1,0,0
+job_hunte,100,92,0	duplicate(HntTrap2)	63-1	-1,0,0
+job_hunte,101,92,0	duplicate(HntTrap2)	63-2	-1,0,0
+job_hunte,102,98,0	duplicate(HntTrap2)	64-1	-1,0,0
+job_hunte,102,99,0	duplicate(HntTrap2)	64-2	-1,0,0
+job_hunte,103,98,0	duplicate(HntTrap2)	64-3	-1,0,0
+job_hunte,103,99,0	duplicate(HntTrap2)	64-4	-1,0,0
+job_hunte,102,90,0	duplicate(HntTrap2)	65-1	-1,0,0
+job_hunte,102,91,0	duplicate(HntTrap2)	65-2	-1,0,0
+job_hunte,103,90,0	duplicate(HntTrap2)	65-3	-1,0,0
+job_hunte,103,91,0	duplicate(HntTrap2)	65-4	-1,0,0
+job_hunte,114,96,0	duplicate(HntTrap2)	66-1	-1,0,0
+job_hunte,114,97,0	duplicate(HntTrap2)	66-2	-1,0,0
+job_hunte,115,96,0	duplicate(HntTrap2)	66-3	-1,0,0
+job_hunte,115,97,0	duplicate(HntTrap2)	66-4	-1,0,0
+job_hunte,112,90,0	duplicate(HntTrap2)	67-1	-1,0,0
+job_hunte,112,91,0	duplicate(HntTrap2)	67-2	-1,0,0
+job_hunte,113,90,0	duplicate(HntTrap2)	67-3	-1,0,0
+job_hunte,113,91,0	duplicate(HntTrap2)	67-4	-1,0,0
+job_hunte,125,97,0	duplicate(HntTrap2)	68-1	-1,1,0
+job_hunte,125,96,0	duplicate(HntTrap2)	68-2	-1,1,0
+job_hunte,127,96,0	duplicate(HntTrap2)	68-3	-1,0,0
+job_hunte,127,97,0	duplicate(HntTrap2)	68-4	-1,0,0
+job_hunte,52,86,0	duplicate(HntTrap2)	69-1	-1,0,0
+job_hunte,52,87,0	duplicate(HntTrap2)	69-2	-1,0,0
+job_hunte,53,86,0	duplicate(HntTrap2)	69-3	-1,0,0
+job_hunte,53,87,0	duplicate(HntTrap2)	69-4	-1,0,0
+job_hunte,66,88,0	duplicate(HntTrap2)	70-1	-1,0,0
+job_hunte,66,89,0	duplicate(HntTrap2)	70-2	-1,0,0
+job_hunte,67,88,0	duplicate(HntTrap2)	70-3	-1,0,0
+job_hunte,67,89,0	duplicate(HntTrap2)	70-4	-1,0,0
+job_hunte,114,84,0	duplicate(HntTrap2)	71-1	-1,0,0
+job_hunte,114,85,0	duplicate(HntTrap2)	71-2	-1,0,0
+job_hunte,115,84,0	duplicate(HntTrap2)	71-3	-1,0,0
+job_hunte,115,85,0	duplicate(HntTrap2)	71-4	-1,0,0
+job_hunte,126,86,0	duplicate(HntTrap2)	72-1	-1,0,0
+job_hunte,126,87,0	duplicate(HntTrap2)	72-2	-1,0,0
+job_hunte,127,86,0	duplicate(HntTrap2)	72-3	-1,0,0
+job_hunte,127,87,0	duplicate(HntTrap2)	72-4	-1,0,0
+job_hunte,54,80,0	duplicate(HntTrap2)	73-1	-1,0,1
+job_hunte,55,80,0	duplicate(HntTrap2)	73-2	-1,0,1
+job_hunte,55,80,0	duplicate(HntTrap2)	73-3	-1,0,0
+job_hunte,55,78,0	duplicate(HntTrap2)	73-4	-1,0,0
+job_hunte,64,82,0	duplicate(HntTrap2)	74-1	-1,0,1
+job_hunte,65,82,0	duplicate(HntTrap2)	74-2	-1,0,1
+job_hunte,64,80,0	duplicate(HntTrap2)	74-3	-1,0,0
+job_hunte,65,80,0	duplicate(HntTrap2)	74-4	-1,0,0
+job_hunte,66,78,0	duplicate(HntTrap2)	75-1	-1,0,0
+job_hunte,66,79,0	duplicate(HntTrap2)	75-2	-1,0,0
+job_hunte,67,78,0	duplicate(HntTrap2)	75-3	-1,0,0
+job_hunte,67,79,0	duplicate(HntTrap2)	75-4	-1,0,0
+job_hunte,74,78,0	duplicate(HntTrap2)	76-1	-1,0,0
+job_hunte,74,79,0	duplicate(HntTrap2)	76-2	-1,0,0
+job_hunte,75,78,0	duplicate(HntTrap2)	76-3	-1,0,0
+job_hunte,75,79,0	duplicate(HntTrap2)	76-4	-1,0,0
+job_hunte,78,80,0	duplicate(HntTrap2)	77-1	-1,0,0
+job_hunte,78,81,0	duplicate(HntTrap2)	77-2	-1,0,0
+job_hunte,79,80,0	duplicate(HntTrap2)	77-3	-1,0,0
+job_hunte,79,81,0	duplicate(HntTrap2)	77-4	-1,0,0
+job_hunte,82,78,0	duplicate(HntTrap2)	78-1	-1,0,0
+job_hunte,82,79,0	duplicate(HntTrap2)	78-2	-1,0,0
+job_hunte,83,78,0	duplicate(HntTrap2)	78-3	-1,0,0
+job_hunte,83,79,0	duplicate(HntTrap2)	78-4	-1,0,0
+job_hunte,94,78,0	duplicate(HntTrap2)	79-1	-1,0,0
+job_hunte,94,79,0	duplicate(HntTrap2)	79-2	-1,0,0
+job_hunte,95,78,0	duplicate(HntTrap2)	79-3	-1,0,0
+job_hunte,95,79,0	duplicate(HntTrap2)	79-4	-1,0,0
+job_hunte,101,80,0	duplicate(HntTrap2)	80-1	-1,1,0
+job_hunte,101,81,0	duplicate(HntTrap2)	80-2	-1,1,0
+job_hunte,103,81,0	duplicate(HntTrap2)	80-3	-1,0,0
+job_hunte,103,80,0	duplicate(HntTrap2)	80-4	-1,0,0
+job_hunte,104,78,0	duplicate(HntTrap2)	81-1	-1,0,0
+job_hunte,104,79,0	duplicate(HntTrap2)	81-2	-1,0,0
+job_hunte,105,78,0	duplicate(HntTrap2)	81-3	-1,0,0
+job_hunte,105,79,0	duplicate(HntTrap2)	81-4	-1,0,0
+job_hunte,110,78,0	duplicate(HntTrap2)	82-1	-1,0,0
+job_hunte,110,79,0	duplicate(HntTrap2)	82-2	-1,0,0
+job_hunte,111,78,0	duplicate(HntTrap2)	82-3	-1,0,0
+job_hunte,111,79,0	duplicate(HntTrap2)	82-4	-1,0,0
+job_hunte,114,80,0	duplicate(HntTrap2)	83-1	-1,0,0
+job_hunte,114,81,0	duplicate(HntTrap2)	83-2	-1,0,0
+job_hunte,115,80,0	duplicate(HntTrap2)	83-3	-1,0,0
+job_hunte,115,81,0	duplicate(HntTrap2)	83-4	-1,0,0
+job_hunte,124,78,0	duplicate(HntTrap2)	84-1	-1,0,0
+job_hunte,124,79,0	duplicate(HntTrap2)	84-2	-1,0,0
+job_hunte,125,78,0	duplicate(HntTrap2)	84-3	-1,0,0
+job_hunte,125,79,0	duplicate(HntTrap2)	84-4	-1,0,0
+job_hunte,126,82,0	duplicate(HntTrap2)	85-1	-1,0,0
+job_hunte,126,83,0	duplicate(HntTrap2)	85-2	-1,0,0
+job_hunte,127,82,0	duplicate(HntTrap2)	85-3	-1,0,0
+job_hunte,127,83,0	duplicate(HntTrap2)	85-4	-1,0,0
+job_hunte,52,68,0	duplicate(HntTrap2)	86-1	-1,0,1
+job_hunte,53,68,0	duplicate(HntTrap2)	86-2	-1,0,1
+job_hunte,52,66,0	duplicate(HntTrap2)	86-3	-1,0,0
+job_hunte,53,66,0	duplicate(HntTrap2)	86-4	-1,0,0
+job_hunte,54,70,0	duplicate(HntTrap2)	87-1	-1,0,1
+job_hunte,55,70,0	duplicate(HntTrap2)	87-2	-1,0,1
+job_hunte,54,68,0	duplicate(HntTrap2)	87-3	-1,0,0
+job_hunte,55,68,0	duplicate(HntTrap2)	87-4	-1,0,0
+job_hunte,59,66,0	duplicate(HntTrap2)	88-1	-1,1,0
+job_hunte,59,67,0	duplicate(HntTrap2)	88-2	-1,1,0
+job_hunte,61,67,0	duplicate(HntTrap2)	88-3	-1,0,0
+job_hunte,61,66,0	duplicate(HntTrap2)	88-4	-1,0,0
+job_hunte,68,68,0	duplicate(HntTrap2)	89-1	-1,0,1
+job_hunte,69,68,0	duplicate(HntTrap2)	89-2	-1,0,1
+job_hunte,68,66,0	duplicate(HntTrap2)	89-3	-1,0,0
+job_hunte,69,66,0	duplicate(HntTrap2)	89-4	-1,0,0
+job_hunte,76,66,0	duplicate(HntTrap2)	90-1	-1,0,0
+job_hunte,76,67,0	duplicate(HntTrap2)	90-2	-1,0,0
+job_hunte,77,66,0	duplicate(HntTrap2)	90-3	-1,0,0
+job_hunte,77,67,0	duplicate(HntTrap2)	90-4	-1,0,0
+job_hunte,82,68,0	duplicate(HntTrap2)	91-1	-1,0,0
+job_hunte,82,69,0	duplicate(HntTrap2)	91-2	-1,0,0
+job_hunte,83,68,0	duplicate(HntTrap2)	91-3	-1,0,0
+job_hunte,83,69,0	duplicate(HntTrap2)	91-4	-1,0,0
+job_hunte,96,66,0	duplicate(HntTrap2)	92-1	-1,0,0
+job_hunte,96,67,0	duplicate(HntTrap2)	92-2	-1,0,0
+job_hunte,97,66,0	duplicate(HntTrap2)	92-3	-1,0,0
+job_hunte,97,67,0	duplicate(HntTrap2)	92-4	-1,0,0
+job_hunte,100,68,0	duplicate(HntTrap2)	93-1	-1,0,0
+job_hunte,100,69,0	duplicate(HntTrap2)	93-2	-1,0,0
+job_hunte,101,68,0	duplicate(HntTrap2)	93-3	-1,0,0
+job_hunte,101,69,0	duplicate(HntTrap2)	93-4	-1,0,0
+job_hunte,107,66,0	duplicate(HntTrap2)	94-1	-1,1,0
+job_hunte,107,67,0	duplicate(HntTrap2)	94-2	-1,1,0
+job_hunte,109,67,0	duplicate(HntTrap2)	94-3	-1,0,0
+job_hunte,109,66,0	duplicate(HntTrap2)	94-4	-1,0,0
+job_hunte,117,69,0	duplicate(HntTrap2)	95-1	-1,1,0
+job_hunte,117,68,0	duplicate(HntTrap2)	95-2	-1,1,0
+job_hunte,119,69,0	duplicate(HntTrap2)	95-3	-1,0,0
+job_hunte,119,68,0	duplicate(HntTrap2)	95-4	-1,0,0
+job_hunte,124,66,0	duplicate(HntTrap2)	96-1	-1,0,0
+job_hunte,124,67,0	duplicate(HntTrap2)	96-2	-1,0,0
+job_hunte,125,66,0	duplicate(HntTrap2)	96-3	-1,0,0
+job_hunte,125,67,0	duplicate(HntTrap2)	96-4	-1,0,0
+job_hunte,126,70,0	duplicate(HntTrap2)	97-1	-1,0,0
+job_hunte,126,71,0	duplicate(HntTrap2)	97-2	-1,0,0
+job_hunte,127,70,0	duplicate(HntTrap2)	97-3	-1,0,0
+job_hunte,127,71,0	duplicate(HntTrap2)	97-4	-1,0,0
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index e4141188c..f14da8d41 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -1,118 +1,108 @@
 //===== rAthena Script ======================================= 
-// Knight Job change Quest
+//= Knight Job Quest
 //===== By: ================================================== 
-//= Masao
-//= Credits: Muad_Dib
+//= PGRO TEAM (Aegis).
+//= Converted by kobra_k88
+//= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.0
+//= 3.2
 //===== Compatible With: ===================================== 
-//= Any rAthena SVN
+//= rAthena SVN
 //===== Description: ========================================= 
-//= [Translated from the Official]
-//= Job change Quest from Swordman -> Knight.
+//= [Aegis Conversion]
+//= Job Change quest for Knight class.
 //===== Additional Comments: ================================= 
-//= 1.0 Updated to latest available official file. [Masao]
+//= 1.0 Fully working.  Please comment out any pre-existing warps for the
+//= test rooms in any other files so that the ones specified here can work.
+//= 1.1 Fixed a major bug.  Now using the initnpctimer command,
+//= donpcevent, and new waitingroom event commands.  No more addtimer
+//= spamming.  No longer have to talk to the npc to take the test.  Just enter the chat room.
+//= 1.2 More bug fixes.  Changed global variable names to unique ones.
+//= Added second set of items to first test. Added Awake pots award for job change.
+//= 1.3 Added Baby Class support [Lupus]
+//= 1.5 Fixed possible EXP abuse [Lupus]
+//= 1.6 Added a func which prevent advanced classes passing
+//= 2nd Job Quests again. It also guides adv classes where
+//= to go. [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
+//= 2.1 Merged JFunc [Lupus]
+//= 2.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 2.3 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf]
+//= 2.4 Minor fixes to timer#knt. [L0ne_W0lf]
+//= 2.5 Fixes a small bug with making claymores. [L0ne_W0lf]
+//=	Corrected usages of killmonster and killmonsterall.
+//= 2.6 Corrected an improper areawarp destination. [L0ne_W0lf]
+//= 2.7 Deleted unused variables. [Samuray22]
+//= 2.7a Corrected a Typo error ";;". [Samuray22]
+//= 2.8 Now uses enable and disable waitingroomevent. [L0ne_W0lf]
+//= 2.9 Added Quest Log commands. [Kisuka]
+//= 3.0 Removed the need for use of 'goto.' [L0ne_W0lf]
+//= 3.1 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info).
+//= 3.2 More Renewal updates and some optimization. [Euphy]
 //============================================================ 
 
-prt_in,88,101,4	script	Chivalry Captain	56,{
+prt_in,88,101,4	script	Chivalry Captain#knt	56,{
+	mes "[Captain Herman]";
 	if (Upper == 1) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
 		mes "Hm? You're... What is it about you? I've been an honorable Knight for a long time, but I cannot understand this feeling I'm getting from you...";
 		next;
 		mes "[Captain Herman]";
 		mes "May god bless your body and soul, warrior. I hope you will show your courage and protect those who are weaker than you.";
-		close2;
-		cutin "",255;
-		end;
+		close;
 	}
-	if ((Class != Job_Baby_Swordman) && (Class != Job_Swordman)) {
-		if (Class == Job_Baby_Knight || Class == Job_Knight) {
-			cutin "job_knight_herman1",2;
-			mes "[Captain Herman]";
+	if (BaseJob != Job_Swordman) {
+		if (BaseJob == Job_Knight) {
 			mes "Ah, a member of our Chivalry.";
 			mes "I hope you are living up to my expectations. We have vowed to be strong for our kingdom, even if death is upon us...";
-			close2;
-			cutin "",255;
-			end;
+			close;
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
-			cutin "job_knight_herman1",2;
-			mes "[Captain Herman]";
+		else if (BaseClass == Job_Novice) {
 			mes "Welcome,";
 			mes "this is the";
 			mes "Prontera Chivalry.";
 			mes "What brings you here?";
 			next;
-			switch (select("I want to change my job to Swordman.:I want to change my job to a Knight.:Just visiting.")) {
+			switch(select("I want to change my job to Swordman.:I want to change my job to a Knight.:Just visiting.")) {
 			case 1:
 				mes "[Captain Herman]";
 				mes "A-ha~";
 				mes "A Swordman, you say?";
-				if (Sex == 1) {
-					mes "I'm sorry, lad, but you've";
-					mes "come to the wrong place!";
-				}
-				else {
-					mes "I'm sorry, lass, but you've";
-					mes "come to the wrong place!";
-				}
+				mes "I'm sorry, "+((Sex)?"lad":"lass")+", but you've";
+				mes "come to the wrong place!";
 				next;
-				cutin "job_knight_herman1",2;
 				mes "[Captain Herman]";
 				mes "This isn't the Swordsman guild, it's the Prontera Chivalry! If you wish to become a Swordman, visit the Swordman Guild located in Izlude.";
-				break;
+				close;
 			case 2:
 				mes "[Captain Herman]";
 				mes "Ah, I see that you have great ambition. But you must first become a Swordman before becoming";
 				mes "a Knight. One step at a time...";
 				next;
-				cutin "job_knight_herman1",2;
 				mes "[Captain Herman]";
 				mes "First, visit the Swordman guild in Izlude. Then, come visit us again once you have become a well experienced Swordman.";
-				break;
+				close;
 			case 3:
-				cutin "job_knight_herman1",2;
 				mes "[Captain Herman]";
 				mes "Aha~";
 				mes "You must have lots of free time. Why don't you go hunt some monsters instead of wandering about aimlessly?";
-				break;
+				close;
 			}
-			next;
-			cutin "job_knight_herman1",2;
-			mes "[Captain Herman]";
-			mes "If you really wish to become a knight, please come back later.";
-			close2;
-			cutin "",255;
-			end;
 		}
-		cutin "job_knight_herman1",2;
-		mes "[Captain Herman]";
-		mes "Welcome. We, the proud Knights of the Prontera Chivalry, will give our lives for king and country! Please enjoy your stay.";
-		close2;
-		cutin "",255;
-		end;
+		else {
+			mes "Welcome. We, the proud Knights of the Prontera Chivalry, will give our lives for king and country! Please enjoy your stay.";
+			close;
+		}
 	}
 	if (KNIGHT_Q == 0) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
 		mes "Welcome, this is";
 		mes "the Prontera Chivalry.";
 		mes "What brings you here?";
 		next;
-		switch (select("I want to change my job to a Knight.:Just visiting.")) {
-		case 1:
+		if (select("I want to change my job to a Knight.:Just visiting.") == 1) {
 			mes "[Captain Herman]";
-			if (Sex == 1) {
-				mes "Ohh...";
-				mes "A young man who wishes";
-				mes "to become a Knight!";
-			}
-			else {
-				mes "Ohh...";
-				mes "A young lady who wishes";
-				mes "to become a Knight!";
-			}
+			mes "Ohh...";
+			mes "A young "+((Sex)?"man":"lady")+" who wishes";
+			mes "to become a Knight!";
 			mes "Our Prontera Chivalry";
 			mes "will assist you.";
 			next;
@@ -129,34 +119,26 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 			mes "you eligible, we will begin the job change procedure. Would you";
 			mes "like to apply now?";
 			next;
-			switch (select("Yes, I would like to apply.:I'd like to think about it please.")) {
-			case 1:
+			if (select("Yes, I would like to apply.:I'd like to think about it please.") == 1) {
+				mes "[Captain Herman]";
 				if (JobLevel < 40) {
-					mes "[Captain Herman]";
 					mes "Ah, you are not yet ready to become a Knight! Didn't I specifically mention the Job Level 40 requirement?";
 					next;
 					mes "[Captain Herman]";
 					mes "Of course I understand your strong desire to join us, but now is not the time. Go out and fight some more monsters. We will be here waiting.";
-					close2;
-					cutin "",255;
-					end;
+					close;
 				}
-				if (SkillPoint != 0) {
-					cutin "job_knight_herman1",2;
-					mes "[Captain Herman]";
+				if (SkillPoint) {
 					mes "Ah...!";
 					mes "You cannot change jobs if you have unused skill points remaining. Return when you have used";
 					mes "all of your skill points.";
-					close2;
-					cutin "",255;
-					end;
+					close;
 				}
 				set KNIGHT_Q,1;
 				setquest 9000;
-				mes "[Captain Herman]";
 				mes "Let me see...";
 				mes "Your name is";
-				mes "" + strcharinfo(0) + "...";
+				mes strcharinfo(0) + "...";
 				mes "Is that right?";
 				next;
 				mes "[Captain Herman]";
@@ -173,43 +155,32 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 				mes "[Captain Herman]";
 				mes "But I believe if you persist with an earnest heart, you shall be acknowledged by the Knights and ultimately recognized as a member of our Chivalry.";
 				next;
-				cutin "job_knight_herman1",2;
 				mes "[Captain Herman]";
 				mes "So, let's not waste any more time talking! Go and meet these Knights and begin their tests. Once you have completed all of the tests, come back to me.";
-				close2;
-				break;
-			case 2:
-				cutin "job_knight_herman1",2;
-				mes "[Captain Herman]";
-				mes "Oh...!";
-				mes "Well, I don't want to pressure you. Take your time and think it over. Return when you are ready to";
-				mes "change jobs, for we will be waiting.";
-				close2;
-				break;
+				close;
 			}
-		case 2:
-			mes "[Captain Herman]";
-			mes "Come to think of it, aren't you a Swordman? It looks like you've encountered many foes in battle.";
-			next;
 			mes "[Captain Herman]";
-			mes "You should consider changing jobs to a Knight. Come and talk to me if you are interested.";
-			next;
-			mes "[Captain Herman]";
-			mes "Please take";
-			mes "your time in";
-			mes "looking around.";
-			mes "Good day.";
-			close2;
-			break;
+			mes "Oh...!";
+			mes "Well, I don't want to pressure you. Take your time and think it over. Return when you are ready to";
+			mes "change jobs, for we will be waiting.";
+			close;
 		}
-		cutin "",255;
-		end;
-	}
-	if (KNIGHT_Q == 1) {
-		cutin "job_knight_herman2",2;
 		mes "[Captain Herman]";
+		mes "Come to think of it, aren't you a Swordman? It looks like you've encountered many foes in battle.";
+		next;
+		mes "[Captain Herman]";
+		mes "You should consider changing jobs to a Knight. Come and talk to me if you are interested.";
+		next;
+		mes "[Captain Herman]";
+		mes "Please take";
+		mes "your time in";
+		mes "looking around.";
+		mes "Good day.";
+		close;
+	}
+	else if (KNIGHT_Q == 1) {
 		mes "Mmm?";
-		mes "" + strcharinfo(0) + ",";
+		mes strcharinfo(0) + ",";
 		mes "what can I do for you?";
 		mes "Ah, you don't know";
 		mes "who to visit?";
@@ -220,48 +191,14 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "[Captain Herman]";
 		mes "First, go and visit";
 		mes "Sir Andrew for your first test. Don't be too nervous, he'll explain everything once you talk to him.";
-		close2;
-		cutin "",255;
-		end;
-	}
-	if (KNIGHT_Q == 2) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
-		mes "Mmm?";
-		mes "Swordman " + strcharinfo(0) + ".";
-		mes "How are the tests?";
-		mes "It may be difficult,";
-		mes "but do your best.";
-		close2;
-		cutin "",255;
-		end;
-	}
-	if (KNIGHT_Q == 3) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
-		mes "Mmm?";
-		mes "Swordman " + strcharinfo(0) + ".";
-		mes "How are the tests?";
-		mes "It may be difficult,";
-		mes "but do your best.";
-		close2;
-		cutin "",255;
-		end;
+		close;
 	}
-	if (KNIGHT_Q == 4) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
-		mes "Mmm?";
-		mes "Swordman " + strcharinfo(0) + ".";
-		mes "How are the tests?";
-		mes "Ah~ You do not know";
-		mes "who to visit next?";
-		next;
-		cutin "job_knight_herman1",2;
-		mes "[Captain Herman]";
+	else if (KNIGHT_Q == 2) callsub L_Mission,0;
+	else if (KNIGHT_Q == 3) callsub L_Mission,0;
+	else if (KNIGHT_Q == 4) {
+		callsub L_Mission,1;
 		mes "It appears that you have finished one test. Let's see. Sir Andrew, who must this Swordman visit next?";
 		next;
-		cutin "job_knight_herman2",2;
 		mes "[Sir Andrew]";
 		mes "I said to";
 		mes "visit Sir Siracuse.";
@@ -271,33 +208,11 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "[Captain Herman]";
 		mes "Did you hear?";
 		mes "Go to Sir Siracuse and take his test. Once you complete his test, do not forget who you're supposed to visit next as well.";
-		close2;
-		cutin "",255;
-		end;
-	}
-	if (KNIGHT_Q == 5) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
-		mes "Mmm?";
-		mes "Swordman " + strcharinfo(0) + ".";
-		mes "How are the tests?";
-		mes "It may be difficult,";
-		mes "but do your best.";
-		close2;
-		cutin "",255;
-		end;
+		close;
 	}
-	if (KNIGHT_Q == 6) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
-		mes "Mmm?";
-		mes "Swordman " + strcharinfo(0) + ".";
-		mes "How are the tests?";
-		mes "Ah~ You do not know";
-		mes "who to visit next?";
-		next;
-		cutin "job_knight_herman1",2;
-		mes "[Captain Herman]";
+	else if (KNIGHT_Q == 5) callsub L_Mission,0;
+	else if (KNIGHT_Q == 6) {
+		callsub L_Mission,1;
 		mes "Let's see...";
 		mes "You've completed two tests.";
 		mes "Sir Siracuse, who must this Swordman visit next?";
@@ -307,37 +222,14 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "Um, who was next...?";
 		mes "Right! Sir Windsor!";
 		next;
-		cutin "job_knight_herman2",2;
 		mes "[Captain Herman]";
 		mes "Head over to";
 		mes "Sir Windsor Benedict for your next test. Listen carefully to the Knights in charge of testing so that you don't feel lost, alright?";
-		close2;
-		cutin "",255;
-		end;
-	}
-	if (KNIGHT_Q == 7) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
-		mes "Mmm?";
-		mes "Swordman " + strcharinfo(0) + ".";
-		mes "How are the tests?";
-		mes "It may be difficult,";
-		mes "but do your best.";
-		close2;
-		cutin "",255;
-		end;
+		close;
 	}
-	if (KNIGHT_Q == 8) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
-		mes "Mmm?";
-		mes "Swordman " + strcharinfo(0) + ".";
-		mes "How are the tests?";
-		mes "Ah~ You do not know";
-		mes "who to visit next?";
-		next;
-		cutin "job_knight_herman1",2;
-		mes "[Captain Herman]";
+	else if (KNIGHT_Q == 7) callsub L_Mission,0;
+	else if (KNIGHT_Q == 8) {
+		callsub L_Mission,1;
 		mes "Sir Windor...?";
 		mes "Who must this";
 		mes "Swordman visit";
@@ -353,37 +245,14 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "[Sir Windsor]";
 		mes "...Amy Beatrice.";
 		next;
-		cutin "job_knight_herman2",2;
 		mes "[Captain Herman]";
 		mes "Ah, go and visit";
 		mes "Lady Amy and take her test. Make sure you pay attention to who you must go to for your next test.";
-		close2;
-		cutin "",255;
-		end;
-	}
-	if (KNIGHT_Q == 9) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
-		mes "Mmm?";
-		mes "Swordman " + strcharinfo(0) + ".";
-		mes "How are the tests?";
-		mes "It may be difficult,";
-		mes "but do your best.";
-		close2;
-		cutin "",255;
-		end;
+		close;
 	}
-	if (KNIGHT_Q == 10) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
-		mes "Mmm?";
-		mes "Swordman " + strcharinfo(0) + ".";
-		mes "How are the tests?";
-		mes "Ah~ You do not know";
-		mes "who to visit next?";
-		next;
-		cutin "job_knight_herman1",2;
-		mes "[Captain Herman]";
+	else if (KNIGHT_Q == 9) callsub L_Mission,0;
+	else if (KNIGHT_Q == 10) {
+		callsub L_Mission,1;
 		mes "Let's see...";
 		mes "Lady Amy, who";
 		mes "must this Swordman";
@@ -395,39 +264,16 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "Sir Edmond!";
 		mes "Tee hee~";
 		next;
-		cutin "job_knight_herman2",2;
 		mes "[Captain Herman]";
 		mes "Now, go and speak";
 		mes "to Sir Edmond. He will";
 		mes "be in charge of your";
 		mes "next test.";
-		close2;
-		cutin "",255;
-		end;
-	}
-	if (KNIGHT_Q == 11) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
-		mes "Mmm?";
-		mes "Swordman " + strcharinfo(0) + ".";
-		mes "How are the tests?";
-		mes "It may be difficult,";
-		mes "but do your best.";
-		close2;
-		cutin "",255;
-		end;
+		close;
 	}
-	if (KNIGHT_Q == 12) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
-		mes "Mmm?";
-		mes "Swordman " + strcharinfo(0) + ".";
-		mes "How are the tests?";
-		mes "Ah~ You do not know";
-		mes "who to visit next?";
-		next;
-		cutin "job_knight_herman1",2;
-		mes "[Captain Herman]";
+	else if (KNIGHT_Q == 11) callsub L_Mission,0;
+	else if (KNIGHT_Q == 12) {
+		callsub L_Mission,1;
 		mes "Don't you only have to visit one more person? The Knight in";
 		mes "charge of the final test";
 		mes "is Sir Gray Prospheiro.";
@@ -437,7 +283,6 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "to the law of cause and effect.";
 		mes "All will be revealed in the end.";
 		next;
-		cutin "job_knight_herman2",2;
 		mes "[Captain Herman]";
 		mes "Be alert and do";
 		mes "your best, as this";
@@ -448,43 +293,19 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "after you have";
 		mes "completed the";
 		mes "final test.";
-		close2;
-		cutin "",255;
-		end;
+		close;
 	}
-	if (KNIGHT_Q == 13) {
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
+	else if (KNIGHT_Q == 13) {
 		mes "Finish the last test.";
 		mes "Once that is complete, all the Knights involved in your testing shall gather, and we will evaluate your performance.";
-		close2;
-		cutin "",255;
-		end;
+		close;
 	}
-	if (KNIGHT_Q == 14) {
-		if (JobLevel < 40) {
-			set KNIGHT_Q,0;
-			cutin "job_knight_herman2",2;
-			mes "[Captain Herman]";
-			mes "Ah, you are not yet ready to become a Knight! Didn't I specifically mention the Job Level 40 requirement?";
-			next;
-			mes "[Captain Herman]";
-			mes "Of course I understand your strong desire to join us, but now is not the time. Go out and fight some more monsters. We will be here waiting.";
-			close2;
-			cutin "",255;
-			end;
-		}
-		if (SkillPoint != 0) {
-			cutin "job_knight_herman2",2;
-			mes "[Captain Herman]";
+	else if (KNIGHT_Q == 14) {
+		if (SkillPoint) {
 			mes "Oh...!";
 			mes "You cannot change jobs if you have unused skill points remaining. Return once you have distributed all your skill points.";
-			close2;
-			cutin "",255;
-			end;
+			close;
 		}
-		cutin "job_knight_herman2",2;
-		mes "[Captain Herman]";
 		mes "Oh, have you completed all the tests? But not everyone who completes the tests can";
 		mes "become a Knight.";
 		next;
@@ -500,8 +321,8 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "to everyone's thoughts!";
 		mes "Andrew, what do you think?";
 		next;
+		mes "[Sir Andrew]";
 		if (JobLevel == 50) {
-			mes "[Sir Andrew]";
 			mes "What can I say?";
 			mes "I approve!";
 			mes "Having lived as";
@@ -510,17 +331,11 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 			mes "is enough.";
 		}
 		else {
-			mes "[Sir Andrew]";
 			mes "This one has";
 			mes "gathered items";
 			mes "that are troublesome";
 			mes "to obtain. I approve!";
-			if (Sex == 1) {
-				mes "I believe he will continue to be loyal after becoming a Knight.";
-			}
-			else {
-				mes "I believe she will continue to be loyal after becoming a Knight.";
-			}
+			mes "I believe "+((Sex)?"":"s")+"he will continue to be loyal after becoming a Knight.";
 		}
 		next;
 		mes "[Captain Herman]";
@@ -557,7 +372,7 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "to Amy's opinion.";
 		next;
 		mes "[Lady Amy]";
-		if (Sex == 1) {
+		if (sex) {
 			mes "Mmm~ He's so polite!";
 			mes "He'll grow to be a wonderful Knight. And he's got such cute widdle cheeeeks~ Hee hee!";
 		}
@@ -576,7 +391,7 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "your mind.";
 		next;
 		mes "[Sir Edmond]";
-		if (Sex == 1) {
+		if (sex) {
 			mes "He seems a little rough, but something bright shines within him. With polish and refinement, his true value will shine forth";
 			mes "as the sun.";
 		}
@@ -591,12 +406,7 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "to hear your thoughts.";
 		next;
 		mes "[Gray]";
-		if (Sex == 1) {
-			mes "A young gentleman coming here with the determination to become a Knight is enough...";
-		}
-		else {
-			mes "A young lady coming here with the determination to become a Knight is enough...";
-		}
+		mes "A young "+((Sex)?"gentleman":"lady")+" coming here with the determination to become a Knight is enough...";
 		next;
 		mes "[Captain Herman]";
 		mes "Everyone";
@@ -605,7 +415,6 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "Then I shall tell";
 		mes "you my opinion.";
 		next;
-		cutin "job_knight_herman1",2;
 		mes "[Captain Herman]";
 		mes "My decision is...";
 		next;
@@ -616,14 +425,9 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "You may not have finished all the tests perfectly, but you have all the necessary qualities to become";
 		mes "a Knight.";
 		next;
-		cutin "job_knight_herman2",2;
-		set KNIGHT_Q,0;
 		completequest 9012;
-		if(Class == Job_Baby_Swordman){
-			jobchange Job_Baby_Knight;
-		} else {
-			jobchange Job_Knight;
-		}
+		callfunc "Job_Change",Job_Knight;
+		callfunc "F_ClearJobVar"; // Clears all job variables for the current player
 		mes "[Captain Herman]";
 		mes "I hereby declare";
 		mes "you a member of";
@@ -636,23 +440,35 @@ prt_in,88,101,4	script	Chivalry Captain	56,{
 		mes "Oh...";
 		mes "We have prepared a small gift to congratulate you on your job change. Please use it when you are in battle as you honorably protect others.";
 		next;
-		cutin "job_knight_herman1",2;
 		mes "[Captain Herman]";
 		mes "Go forth!";
 		mes "The future of";
 		mes "Rune-Midgard";
 		mes "rests on your";
 		mes "shoulders!";
-		close2;
+		close;
+	}
+L_Mission:
+	mes "Mmm?";
+	mes "Swordman " + strcharinfo(0) + ".";
+	mes "How are the tests?";
+	if (getarg(0)) {
+		mes "Ah~ You do not know";
+		mes "who to visit next?";
+		next;
+		mes "[Captain Herman]";
+		return;
+	} else {
+		mes "It may be difficult,";
+		mes "but do your best.";
+		close;
 	}
-	cutin "",255;
-	end;
 }
 
-prt_in,75,107,4	script	Sir Andrew	65,{
-	if ((Class != Job_Baby_Swordman) && (Class != Job_Swordman)) {
-		if (Class == Job_Baby_Knight || Class == Job_Knight) {
-			mes "[Sir Andrew]";
+prt_in,75,107,4	script	Sir Andrew#knt	65,{
+	mes "[Sir Andrew]";
+	if (BaseJob != Job_Swordman) {
+		if (BaseJob == Job_Knight) {
 			mes "You must be";
 			mes "a member of";
 			mes "the Chivalry.";
@@ -668,8 +484,7 @@ prt_in,75,107,4	script	Sir Andrew	65,{
 			mes "After all, we are Knights.";
 			close;
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
-			mes "[Sir Andrew]";
+		else if (BaseClass == Job_Novice) {
 			mes "Hey there,";
 			mes "little Novice.";
 			mes "Welcome to the";
@@ -684,17 +499,17 @@ prt_in,75,107,4	script	Sir Andrew	65,{
 			mes "Dream of a bright future, and go look forward on the path that you choose to take.";
 			close;
 		}
-		mes "[Sir Andrew]";
-		mes "We, the members of the";
-		mes "Prontera Chivalry, are putting our best effort in protecting peace in this world.";
-		next;
-		mes "[Sir Andrew]";
-		mes "Even during the battles we face each and every day, we dream of";
-		mes "a bright future that is to come.";
-		close;
+		else {
+			mes "We, the members of the";
+			mes "Prontera Chivalry, are putting our best effort in protecting peace in this world.";
+			next;
+			mes "[Sir Andrew]";
+			mes "Even during the battles we face each and every day, we dream of";
+			mes "a bright future that is to come.";
+			close;
+		}
 	}
 	if (KNIGHT_Q == 0) {
-		mes "[Sir Andrew]";
 		mes "We, the members of the";
 		mes "Prontera Chivalry, are putting our best effort in protecting peace in this world.";
 		next;
@@ -703,20 +518,18 @@ prt_in,75,107,4	script	Sir Andrew	65,{
 		mes "a bright future that is to come.";
 		close;
 	}
-	if (KNIGHT_Q == 1) {
-		mes "[Sir Andrew]";
+	else if (KNIGHT_Q == 1) {
 		mes "Good day.";
 		mes "May I help you";
 		mes "with something?";
 		next;
-		switch (select("I would like to take the test.:Oh, nothing.")) {
-		case 1:
+		if (select("I would like to take the test.:Oh, nothing.") == 1) {
 			mes "[Sir Andrew]";
 			mes "Ah...";
 			mes "You wish";
 			mes "to become a Knight.";
 			mes "Your name is";
-			mes "" + strcharinfo(0) + ",";
+			mes strcharinfo(0) + ",";
 			mes "correct?";
 			next;
 			mes "[Sir Andrew]";
@@ -749,8 +562,6 @@ prt_in,75,107,4	script	Sir Andrew	65,{
 				mes "Please go to my fellow Knight, Sir Siracuse, as he will give you your next test. Well done in mastering the Swordman job.";
 				set KNIGHT_Q,4;
 				changequest 9000,9003;
-				changequest 9001,9003;
-				changequest 9002,9003;
 				close;
 			}
 			mes "[Sir Andrew]";
@@ -760,28 +571,22 @@ prt_in,75,107,4	script	Sir Andrew	65,{
 			mes "Go and gather the";
 			mes "following items...";
 			next;
-			set .@knight_m1, rand(1,2);
 			mes "[Sir Andrew]";
-			if (.@knight_m1 == 1) {
-				set KNIGHT_Q,2;
-				changequest 9000,9001;
-				mes "^236B8E5 Elder Pixie's Moustache^000000,";
-				mes "^236B8E5 Wing of Red Bat^000000,";
-				mes "^236B8E5 Orcish Voucher^000000,";
-				mes "^236B8E5 Moth Dust^000000,";
-				mes "^236B8E5 Reptile Tongue^000000 and";
-				mes "^236B8E5 Mane^000000.";
-			}
-			else {
-				set KNIGHT_Q,3;
-				changequest 9000,9002;
-				mes "^236B8E5 Bug Leg^000000,";
-				mes "^236B8E5 Heart of Mermaid^000000,";
-				mes "^236B8E5 Maneater Blossom^000000,";
-				mes "^236B8E5 Clam Flesh^000000,";
-				mes "^236B8E5 Old Frying Pan^000000 and";
-				mes "^236B8E5 Snail's Shell^000000.";
+			switch(rand(1,2)) {
+			//Elder_Pixie's_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boar's_Mane
+			case 1: setarray .@items[0], 1040,5, 7006,5, 931,5, 1057,5, 903,5, 1028,5, 2; break;
+			//Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snail's_Shell
+			case 2: setarray .@items[0], 1042,5, 950,5, 1032,5, 966,5, 7031,5, 946,5, 3; break;
 			}
+			set KNIGHT_Q,.@items[12];
+			if (KNIGHT_Q == 2) changequest 9000,9001;
+			else changequest 9000,9002;
+			mes "^236B8E"+.@items[1]+" "+getitemname(.@items[0])+"^000000,";
+			mes "^236B8E"+.@items[3]+" "+getitemname(.@items[2])+"^000000,";
+			mes "^236B8E"+.@items[5]+" "+getitemname(.@items[4])+"^000000,";
+			mes "^236B8E"+.@items[7]+" "+getitemname(.@items[6])+"^000000,";
+			mes "^236B8E"+.@items[9]+" "+getitemname(.@items[8])+"^000000 and";
+			mes "^236B8E"+.@items[11]+" "+getitemname(.@items[10])+"^000000,";
 			next;
 			mes "[Sir Andrew]";
 			mes "I shall be";
@@ -790,80 +595,39 @@ prt_in,75,107,4	script	Sir Andrew	65,{
 			mes "items I've listed.";
 			mes "See you soon~";
 			close;
-		case 2:
+		}
+		else {
 			mes "[Sir Andrew]";
 			mes "Well, then...";
 			mes "Good day.";
 			close;
 		}
 	}
-	if (KNIGHT_Q == 2) {
-		mes "[Sir Andrew]";
+	else if (KNIGHT_Q == 2 || KNIGHT_Q == 3) {
 		mes "Welcome back~";
 		mes "Did you gather";
 		mes "all the items?";
 		mes "Let's check and see...";
 		next;
-		if ((countitem(1040) > 4) && (countitem(7006) > 4) && (countitem(931) > 4) && (countitem(1057) > 4) && (countitem(903) > 4) && (countitem(1028) > 4)) {
-			mes "[Sir Andrew]";
-			mes "Excellent! We appreciate your effort in gathering these items. These will be used to support";
-			mes "the Chivalry's finances.";
-			next;
-			delitem 1040,5; //Elder_Pixie's_Beard
-			delitem 7006,5; //Wing_Of_Red_Bat
-			delitem 931,5; //Orcish_Voucher
-			delitem 1057,5; //Moth_Dust
-			delitem 903,5; //Reptile_Tongue
-			delitem 1028,5; //Wild_Boar's_Mane
-			set KNIGHT_Q,4;
-			changequest 9001,9003;
-			changequest 9002,9003;
-			mes "[Sir Andrew]";
-			mes "Please visit my fellow Knight, Sir Siracuse, and continue the tests with the dedication and loyalty you've shown to me this day.";
-			close;
+		switch(KNIGHT_Q) {
+		//Elder_Pixie's_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boar's_Mane
+		case 2: setarray .@items[0], 1040,5, 7006,5, 931,5, 1057,5, 903,5, 1028,5, 0; break;
+		//Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snail's_Shell
+		case 3: setarray .@items[0], 1042,5, 950,5, 1032,5, 966,5, 7031,5, 946,5, 0; break;
 		}
-		mes "[Sir Andrew]";
-		mes "Wait, wait...";
-		mes "I think you're";
-		mes "still missing some";
-		mes "items. In case you";
-		mes "forgot, let me";
-		mes "remind you...";
-		next;
-		mes "[Sir Andrew]";
-		mes "^236B8E5 Elder Pixie's Moustache^000000,";
-		mes "^236B8E5 Wing of Red Bat^000000,";
-		mes "^236B8E5 Orcish Voucher^000000,";
-		mes "^236B8E5 Moth Dust^000000,";
-		mes "^236B8E5 Reptile Tongue^000000 and";
-		mes "^236B8E5 Mane^000000.";
-		next;
-		mes "[Sir Andrew]";
-		mes "Now, please take this test seriously and with sincerity.";
-		mes "Now, I'll be waiting for you";
-		mes "to complete this task.";
-		close;
-	}
-	if (KNIGHT_Q == 3) {
-		mes "[Sir Andrew]";
-		mes "Welcome back~";
-		mes "Did you gather";
-		mes "all the items?";
-		mes "Let's check and see...";
-		next;
-		if ((countitem(1042) > 4) && (countitem(950) > 4) && (countitem(1032) > 4) && (countitem(966) > 4) && (countitem(7031) > 4) && (countitem(946) > 4)) {
+		if (countitem(.@items[0]) >= .@items[1] && countitem(.@items[2]) >= .@items[3] && countitem(.@items[4]) >= .@items[5] && countitem(.@items[6]) >= .@items[7] && countitem(.@items[8]) >= .@items[9] && countitem(.@items[10]) >= .@items[11]) {
 			mes "[Sir Andrew]";
 			mes "Perfect! We appreciate your effort in gathering these items. Thesee will be used to support the Chivalry's finances.";
 			next;
-			delitem 1042,5; //Short_Leg
-			delitem 950,5; //Heart_Of_Mermaid
-			delitem 1032,5; //Blossom_Of_Maneater
-			delitem 966,5; //Flesh_Of_Clam
-			delitem 7031,5; //Old_Frying_Pan
-			delitem 946,5; //Snail's_Shell
+			delitem .@items[0],.@items[1];
+			delitem .@items[2],.@items[3];
+			delitem .@items[4],.@items[5];
+			delitem .@items[6],.@items[7];
+			delitem .@items[8],.@items[9];
+			delitem .@items[10],.@items[11];
+			if (KNIGHT_Q == 2) changequest 9001,9003;
+			else changequest 9002,9003;
 			set KNIGHT_Q,4;
-			changequest 9001,9003;
-			changequest 9002,9003;
 			mes "[Sir Andrew]";
 			mes "Please visit my fellow Knight, Sir Siracuse, and continue the tests with the dedication and loyalty you've shown to me this day.";
 			close;
@@ -877,12 +641,12 @@ prt_in,75,107,4	script	Sir Andrew	65,{
 		mes "remind you...";
 		next;
 		mes "[Sir Andrew]";
-		mes "^236B8E5 Bug Leg^000000,";
-		mes "^236B8E5 Heart of Mermaid^000000,";
-		mes "^236B8E5 Maneater Blossom^000000,";
-		mes "^236B8E5 Clam Flesh^000000,";
-		mes "^236B8E5 Old Frying Pan^000000 and";
-		mes "^236B8E5 Snail's Shell^000000.";
+		mes "^236B8E"+.@items[1]+" "+getitemname(.@items[0])+"^000000,";
+		mes "^236B8E"+.@items[3]+" "+getitemname(.@items[2])+"^000000,";
+		mes "^236B8E"+.@items[5]+" "+getitemname(.@items[4])+"^000000,";
+		mes "^236B8E"+.@items[7]+" "+getitemname(.@items[6])+"^000000,";
+		mes "^236B8E"+.@items[9]+" "+getitemname(.@items[8])+"^000000 and";
+		mes "^236B8E"+.@items[11]+" "+getitemname(.@items[10])+"^000000,";
 		next;
 		mes "[Sir Andrew]";
 		mes "Now, please take this test seriously and with sincerity.";
@@ -890,26 +654,25 @@ prt_in,75,107,4	script	Sir Andrew	65,{
 		mes "to complete this task.";
 		close;
 	}
-	if (KNIGHT_Q == 4) {
-		mes "[Sir Andrew]";
+	else if (KNIGHT_Q == 4) {
 		mes "Did you have something you needed to ask me? You should go and take the next test. Hurry, Sir Siracuse is waiting for you~";
 		close;
 	}
-	if (KNIGHT_Q == 14) {
-		mes "[Sir Andrew]";
+	else if (KNIGHT_Q == 14) {
 		mes "You must have finished all the tests. Good job! You should go see our Captain so that we can all give our evaluation.";
 		close;
 	}
-	mes "[Sir Andrew]";
-	mes "Did you have something you needed to ask me? You should go and take your next test. Do your best.";
-	mes "I know you can do it!";
-	close;
+	else {
+		mes "Did you have something you needed to ask me? You should go and take your next test. Do your best.";
+		mes "I know you can do it!";
+		close;
+	}
 }
 
-prt_in,71,91,0	script	Sir Siracuse	65,{
-	if ((Class != Job_Baby_Swordman) && (Class != Job_Swordman)) {
-		if (Class == Job_Baby_Knight || Class == Job_Knight) {
-			mes "[Sir Siracuse]";
+prt_in,71,91,0	script	Sir Siracuse#knt	65,{
+	mes "[Sir Siracuse]";
+	if (BaseJob != Job_Swordman) {
+		if (BaseJob == Job_Knight) {
 			mes "Hey there!";
 			mes "How are you doing?";
 			mes "The Chivalry's been";
@@ -930,8 +693,7 @@ prt_in,71,91,0	script	Sir Siracuse	65,{
 			mes "If you catch any of the new guys acting in a way unbecoming of a Knight, scold them for me please?";
 			close;
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
-			mes "[Sir Siracuse]";
+		else if (Baseclass == Job_Novice) {
 			mes "Oh?";
 			mes "What is a Novice";
 			mes "doing here?";
@@ -947,22 +709,22 @@ prt_in,71,91,0	script	Sir Siracuse	65,{
 			mes "becoming a Knight.";
 			close;
 		}
-		mes "[Sir Siracuse]";
-		mes "Offense and defense.";
-		mes "Is there a way to have both without compromising one or the other?";
-		next;
-		mes "[Sir Siracuse]";
-		mes "Two-handed weapons greatly";
-		mes "improve your offense but decrease your defenses. Is there something that can overcome this weakness?";
-		next;
-		mes "[Sir Siracuse]";
-		mes "A weapon or some sort";
-		mes "of technique like that";
-		mes "would help Knights greatly...";
-		close;
+		else {
+			mes "Offense and defense.";
+			mes "Is there a way to have both without compromising one or the other?";
+			next;
+			mes "[Sir Siracuse]";
+			mes "Two-handed weapons greatly";
+			mes "improve your offense but decrease your defenses. Is there something that can overcome this weakness?";
+			next;
+			mes "[Sir Siracuse]";
+			mes "A weapon or some sort";
+			mes "of technique like that";
+			mes "would help Knights greatly...";
+			close;
+		}
 	}
 	if (KNIGHT_Q == 0) {
-		mes "[Sir Siracuse]";
 		mes "Offense and defense.";
 		mes "Is there a way to have both without compromising one or the other?";
 		next;
@@ -976,8 +738,7 @@ prt_in,71,91,0	script	Sir Siracuse	65,{
 		mes "would help Knights greatly...";
 		close;
 	}
-	if (KNIGHT_Q == 1) {
-		mes "[Sir Siracuse]";
+	else if (KNIGHT_Q == 1) {
 		mes "Eh?";
 		mes "Do you have";
 		mes "something to";
@@ -988,19 +749,13 @@ prt_in,71,91,0	script	Sir Siracuse	65,{
 			mes "Oh, to become";
 			mes "a Knight? Come to";
 			mes "think of it, aren't";
-			if (Sex == 1) {
-				mes "you the guy that";
-				mes "just applied?";
-			}
-			else {
-				mes "you the girl that";
-				mes "just applied?";
-			}
+			mes "you the "+((Sex)?"guy":"girl")+" that";
+			mes "just applied?";
 			next;
 			mes "[Sir Siracuse]";
 			mes "Let's see...";
 			mes "Your name was";
-			mes "" + strcharinfo(0) + ".";
+			mes strcharinfo(0) + ".";
 			next;
 			mes "[Sir Siracuse]";
 			mes "But, before you come to me, you must visit the others. The way";
@@ -1018,34 +773,7 @@ prt_in,71,91,0	script	Sir Siracuse	65,{
 		mes "face.";
 		close;
 	}
-	if (KNIGHT_Q == 2) {
-		mes "[Sir Siracuse]";
-		mes "Eh?";
-		mes "Do you have";
-		mes "something to";
-		mes "ask me?";
-		next;
-		if (select("I would like to take the test to change jobs.:Oh, nothing.") == 1) {
-			mes "[Sir Siracuse]";
-			mes "Hahaha~!";
-			mes "Aren't you supposed to be taking Andrew's test? You can't just skip that, you know! All of our tests are important.";
-			next;
-			mes "[Sir Siracuse]";
-			mes "Speak to Sir Andrew first.";
-			mes "My test for you will come after you've finished his test.";
-			close;
-		}
-		mes "[Sir Siracuse]";
-		mes "Hmmm...?";
-		mes "Alright.";
-		mes "It's just that";
-		mes "you had that";
-		mes "look on your";
-		mes "face.";
-		close;
-	}
-	if (KNIGHT_Q == 3) {
-		mes "[Sir Siracuse]";
+	else if (KNIGHT_Q == 2 || KNIGHT_Q == 3) {
 		mes "Eh?";
 		mes "Do you have";
 		mes "something to";
@@ -1070,368 +798,220 @@ prt_in,71,91,0	script	Sir Siracuse	65,{
 		mes "face.";
 		close;
 	}
-	if (KNIGHT_Q == 4) {
-		mes "[Sir Siracuse]";
-		mes "Oh?";
-		mes "Do you have";
-		mes "something to";
-		mes "ask me?";
-		next;
-		if (select("Sir Andrew sent me to take your test.:Oh, nothing.") == 1) {
-			mes "[Sir Siracuse]";
-			mes "I see, you've passed the first test. Very well, I'll make some time for you. Let me introduce myself. My name is James Siracuse.";
-			next;
-			mes "[Sir Siracuse]";
-			mes "This test will measure how much you know about Knighthood. More importantly, I want to know your thoughts about honor.";
-			next;
-			mes "[Sir Siracuse]";
-			mes "Don't be nervous, I won't keep you too long. These will be quick questions. Plus, you still have to see the others, right?";
-			next;
-			mes "[Sir Siracuse]";
-			mes "Well then,";
-			mes "let's begin.";
-			mes "Please answer";
-			mes "promptly.";
-			next;
-			mes "[Sir Siracuse]";
-			mes "A Knight must possess great strength, defense, speed, and the skill to wield a Two-Handed Sword. Which of the following weapons are not affected by the Two Hand Quicken skill?";
+	else if (KNIGHT_Q == 4 || KNIGHT_Q == 5) {
+		if (KNIGHT_Q == 4) {
+			mes "Oh?";
+			mes "Do you have";
+			mes "something to";
+			mes "ask me?";
 			next;
-			if (select("Katana:Slayer:Broadsword:Flamberge") != 4) {
-				set KNIGHT_Q,5;
+			if (select("Sir Andrew sent me to take your test.:Oh, nothing.") == 1) {
 				mes "[Sir Siracuse]";
-				mes "Wrong!";
-				mes "That's a Two-Handed Sword!";
-				mes "Are you sure you want to be a Knight? You don't even know the basics...";
+				mes "I see, you've passed the first test. Very well, I'll make some time for you. Let me introduce myself. My name is James Siracuse.";
 				next;
 				mes "[Sir Siracuse]";
-				mes "If you're not sure about anything, go into town and ask any Knight. You need to learn more about Knights before applying for the job!";
-				close;
-			}
-			mes "[Sir Siracuse]";
-			mes "Good, now let me ask about some skills. Which of the following is not necessary to learn Bowling Bash?";
-			next;
-			if (select("Two Handed Sword Mastery Lv.5:Magnum Break Lv.3:Provoke Lv.10:Bash Lv.10") != 3) {
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "Wrong!";
-				mes "You need that to learn Bowling Bash! You should learn more about the Knight class before applying for the job!";
-				close;
-			}
-			mes "[Sir Siracuse]";
-			mes "Knights can also use Spears, unlike other jobs, and have skills related to Spears as well. What skills are not necessary to learn the skill Brandish Spear?";
-			next;
-			if (select("Pierce Lv.5:Spear Stab Lv.3:Spear Boomerang Lv.3:Peco Peco Ride Lv.1") != 3) {
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "Wrong! You need to learn that to learn Brandish Spear! How can you not know about Knights if you want to become one?";
+				mes "This test will measure how much you know about Knighthood. More importantly, I want to know your thoughts about honor.";
 				next;
 				mes "[Sir Siracuse]";
-				mes "If you aren't sure about anything, go into town and ask any Knight";
-				mes "for help. Come back after you've learned more about Knights.";
-				close;
-			}
-			mes "[Sir Siracuse]";
-			mes "Some Spears also have magical attributes, just like spells. Of the following, which can attack a Nightmare, which has the Ghost attribute?";
-			next;
-			if (select("Zephyrus:Lance:Bill Guisarme:Crescent Scythe") != 1) {
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "Wrong! You'll be doing absolutely no damage with that type of Spear! Come back after you've learned more about Knights!";
+				mes "Don't be nervous, I won't keep you too long. These will be quick questions. Plus, you still have to see the others, right?";
 				next;
 				mes "[Sir Siracuse]";
-				mes "If you have a question, just ask any Knight in town. This is basic knowledge for us!";
-				close;
-			}
-			mes "[Sir Siracuse]";
-			mes "When you become a Knight you can ride a Peco Peco. However, your attack speed decreases once you're mounted on a Peco Peco.";
-			next;
-			mes "[Sir Siracuse]";
-			mes "But, you can counter this speed decrease as you learn the Cavalier Mastery skill. What percentage of your normal attack speed will you have after learning Level 3 Cavalier Mastery?";
-			next;
-			if (select("70 % of normal attack speed:80 % of normal attack speed:90 % of normal attack speed:100 % of normal attack speed") != 2) {
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "Wrong!";
-				mes "Don't bother riding a Peco Peco if you don't know about Cavalier Mastery!";
+				mes "Well then,";
+				mes "let's begin.";
+				mes "Please answer";
+				mes "promptly.";
 				next;
-				mes "[Sir Siracuse]";
-				mes "You better come back after you've learned a little more about Knights!";
-				close;
 			}
-			mes "[Sir Siracuse]";
-			mes "Good, good...";
-			mes "I'm pretty sure you know a decent amount about Knights. Now, let me ask you some personal questions about Knights.";
-			next;
-			mes "[Sir Siracuse]";
-			mes "What should you do when you run into a Novice asking for help in town?";
-			next;
-			switch (select("Tell the Novice of a reasonable hunting area.:Let the Novice fight while you take the damage.:Give the Novice a bunch of Zeny and items.")) {
-			case 1:
-				mes "[Sir Siracuse]";
-				mes "Of course, even a Novice needs to learn how to be independent. Giving good guidance to Novices is one of the best things we can do.";
-				next;
-				break;
-			case 2:
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "You have the wrong idea. Do you really believe that is helping the Novice? Give a man a fish, he will eat for a day. Teach him to fish, he will eat for a lifetime!";
-				close;
-			case 3:
-				set KNIGHT_Q,5;
+			else {
 				mes "[Sir Siracuse]";
-				mes "Do you really believe that this will truly help the poor Novice? It's generous but, they will not know the true value of zeny and items until they earn it themselves.";
+				mes "Hmmm...?";
+				mes "Alright.";
+				mes "It's just that";
+				mes "you had that";
+				mes "look on your";
+				mes "face.";
 				close;
 			}
-			mes "[Sir Siracuse]";
-			mes "Alright...";
-			mes "Now, how should";
-			mes "you act within";
-			mes "a party?";
+		}
+		else if (KNIGHT_Q == 5) {
+			mes "What...";
+			mes "You again?";
 			next;
-			switch (select("Protect everyone in the front of the battle.:Gather monsters and destroy them at once.:Get as many items possible, at all cost.")) {
-			case 1:
+			if (select("I wish to take the test again.:Oh, nothing.") == 1) {
 				mes "[Sir Siracuse]";
-				mes "That's it! Our strength and attacks are very important in a party. All Knights should engage in a battle with that mindset.";
+				mes "Is that right?";
+				mes "Are you sure you're";
+				mes "prepared this time?";
 				next;
-				break;
-			case 2:
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "Are you crazy? Don't you realize the flaw in that kind of thinking? You can't control large mobs. What if they kill you? Who will protect the innocent?";
-				close;
-			case 3:
-				set KNIGHT_Q,5;
 				mes "[Sir Siracuse]";
-				mes "I see your greed and we will have none of it here! It seems you do not truly care for others!";
-				mes "Get lost!";
-				close;
-			}
-			mes "[Sir Siracuse]";
-			mes "Lastly...";
-			mes "what's the most";
-			mes "important value";
-			mes "a Knight must have?";
-			next;
-			switch (select("Honor:Wealth:Status")) {
-			case 1:
-				mes "[Sir Siracuse]";
-				mes "Right, above all else, Knights must be honorable! We live and die for honor! Always keep that in mind.";
+				mes "Alright then,";
+				mes "here we go again...";
 				next;
-				break;
-			case 2:
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "You're scum! You strive to become a Knight for personal wealth? Get lost! We will not accept someone like you in our Chivalry!";
-				close;
-			case 3:
-				set KNIGHT_Q,5;
+			}
+			else {
 				mes "[Sir Siracuse]";
-				mes "So you're trying to become famous through the Chivalry? That's pathetic. We won't accept someone like you in our Chivalry!";
+				mes "Hmmm...?";
+				mes "Alright.";
+				mes "It's just that";
+				mes "you had that";
+				mes "look on your";
+				mes "face.";
 				close;
 			}
-			set KNIGHT_Q,6;
-			changequest 9003,9004;
+		}
+		mes "[Sir Siracuse]";
+		mes "A Knight must possess great strength, defense, speed, and the skill to wield a Two-Handed Sword. Which of the following weapons are not affected by the Two Hand Quicken skill?";
+		next;
+		if (select("Katana:Slayer:Broadsword:Flamberge") != 4) {
+			set KNIGHT_Q,5;
 			mes "[Sir Siracuse]";
-			mes "Well then,";
-			mes "this is the";
-			mes "end of my test.";
+			mes "Wrong!";
+			mes "That's a Two-Handed Sword!";
+			mes "Are you sure you want to be a Knight? You don't even know the basics...";
 			next;
 			mes "[Sir Siracuse]";
-			mes "For your next";
-			mes "test, please go";
-			mes "see Sir Windsor.";
-			mes "He's very quiet,";
-			mes "but don't let that";
-			mes "get to you.";
+			mes "If you're not sure about anything, go into town and ask any Knight. You need to learn more about Knights before applying for the job!";
 			close;
 		}
 		mes "[Sir Siracuse]";
-		mes "Hmmm...?";
-		mes "Alright.";
-		mes "It's just that";
-		mes "you had that";
-		mes "look on your";
-		mes "face.";
-		close;
-	}
-	if (KNIGHT_Q == 5) {
+		mes "Good, now let me ask about some skills. Which of the following is not necessary to learn Bowling Bash?";
+		next;
+		if (select("Two Handed Sword Mastery Lv.5:Magnum Break Lv.3:Provoke Lv.10:Bash Lv.10") != 3) {
+			set KNIGHT_Q,5;
+			mes "[Sir Siracuse]";
+			mes "Wrong!";
+			mes "You need that to learn Bowling Bash! You should learn more about the Knight class before applying for the job!";
+			close;
+		}
 		mes "[Sir Siracuse]";
-		mes "What...";
-		mes "You again?";
+		mes "Knights can also use Spears, unlike other jobs, and have skills related to Spears as well. What skills are not necessary to learn the skill Brandish Spear?";
 		next;
-		if (select("I wish to take the test again.:Oh, nothing.") == 1) {
+		if (select("Pierce Lv.5:Spear Stab Lv.3:Spear Boomerang Lv.3:Peco Peco Ride Lv.1") != 3) {
+			set KNIGHT_Q,5;
 			mes "[Sir Siracuse]";
-			mes "Is that right?";
-			mes "Are you sure you're";
-			mes "prepared this time?";
+			mes "Wrong! You need to learn that to learn Brandish Spear! How can you not know about Knights if you want to become one?";
 			next;
 			mes "[Sir Siracuse]";
-			mes "Alright then,";
-			mes "here we go again...";
-			next;
+			mes "If you aren't sure about anything, go into town and ask any Knight";
+			mes "for help. Come back after you've learned more about Knights.";
+			close;
+		}
+		mes "[Sir Siracuse]";
+		mes "Some Spears also have magical attributes, just like spells. Of the following, which can attack a Nightmare, which has the Ghost attribute?";
+		next;
+		if (select("Zephyrus:Lance:Bill Guisarme:Crescent Scythe") != 1) {
+			set KNIGHT_Q,5;
 			mes "[Sir Siracuse]";
-			mes "A Knight must possess great strength, defense, speed, and the skill to wield a Two-Handed Sword. Which of the following weapons are not affected by the Two Hand Quicken skill?";
+			mes "Wrong! You'll be doing absolutely no damage with that type of Spear! Come back after you've learned more about Knights!";
 			next;
-			if (select("Katana:Slayer:Broadsword:Flamberge") != 4) {
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "Wrong!";
-				mes "That's a Two-Handed Sword!";
-				mes "Are you sure you want to be a Knight? You don't even know the basics...";
-				next;
-				mes "[Sir Siracuse]";
-				mes "If you're not sure about anything, go into town and ask any Knight. You need to learn more about Knights before applying for the job!";
-				close;
-			}
 			mes "[Sir Siracuse]";
-			mes "Good, now let me ask about some skills. Which of the following is not necessary to learn Bowling Bash?";
-			next;
-			if (select("Two Handed Sword Mastery Lv.5:Magnum Break Lv.3:Provoke Lv.10:Bash Lv.10") != 3) {
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "Wrong!";
-				mes "You need that to learn Bowling Bash! You should learn more about the Knight class before applying for the job!";
-				close;
-			}
+			mes "If you have a question, just ask any Knight in town. This is basic knowledge for us!";
+			close;
+		}
+		mes "[Sir Siracuse]";
+		mes "When you become a Knight you can ride a Peco Peco. However, your attack speed decreases once you're mounted on a Peco Peco.";
+		next;
+		mes "[Sir Siracuse]";
+		mes "But, you can counter this speed decrease as you learn the Cavalier Mastery skill. What percentage of your normal attack speed will you have after learning Level 3 Cavalier Mastery?";
+		next;
+		if (select("70 % of normal attack speed:80 % of normal attack speed:90 % of normal attack speed:100 % of normal attack speed") != 2) {
+			set KNIGHT_Q,5;
 			mes "[Sir Siracuse]";
-			mes "Knights can also use Spears, unlike other jobs, and have skills related to Spears as well. What skills are not necessary to learn the skill Brandish Spear?";
+			mes "Wrong!";
+			mes "Don't bother riding a Peco Peco if you don't know about Cavalier Mastery!";
 			next;
-			if (select("Pierce Lv.5:Spear Stab Lv.3:Spear Boomerang Lv.3:Peco Peco Ride Lv.1") != 3) {
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "Wrong! You need to learn that to learn Brandish Spear! How can you not know about Knights if you want to become one?";
-				next;
-				mes "[Sir Siracuse]";
-				mes "If you aren't sure about anything, go into town and ask any Knight";
-				mes "for help. Come back after you've learned more about Knights.";
-				close;
-			}
 			mes "[Sir Siracuse]";
-			mes "Some Spears also have magical attributes, just like spells. Of the following, which can attack a Nightmare, which has the Ghost attribute?";
-			next;
-			if (select("Zephyrus:Lance:Bill Guisarme:Crescent Scythe") != 1) {
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "Wrong! You'll be doing absolutely no damage with that type of Spear! Come back after you've learned more about Knights!";
-				next;
-				mes "[Sir Siracuse]";
-				mes "If you have a question, just ask any Knight in town. This is basic knowledge for us!";
-				close;
-			}
+			mes "You better come back after you've learned a little more about Knights!";
+			close;
+		}
+		mes "[Sir Siracuse]";
+		mes "Good, good...";
+		mes "I'm pretty sure you know a decent amount about Knights. Now, let me ask you some personal questions about Knights.";
+		next;
+		mes "[Sir Siracuse]";
+		mes "What should you do when you run into a Novice asking for help in town?";
+		next;
+		switch(select("Tell the Novice of a reasonable hunting area.:Let the Novice fight while you take the damage.:Give the Novice a bunch of Zeny and items.")) {
+		case 1:
 			mes "[Sir Siracuse]";
-			mes "When you become a Knight you can ride a Peco Peco. However, your attack speed decreases once you're mounted on a Peco Peco.";
+			mes "Of course, even a Novice needs to learn how to be independent. Giving good guidance to Novices is one of the best things we can do.";
 			next;
+			break;
+		case 2:
+			set KNIGHT_Q,5;
 			mes "[Sir Siracuse]";
-			mes "But, you can counter this speed decrease as you learn the Cavalier Mastery skill. What percentage of your normal attack speed will you have after learning Level 3 Cavalier Mastery?";
-			next;
-			if (select("70 % of normal attack speed:80 % of normal attack speed:90 % of normal attack speed:100 % of normal attack speed") != 2) {
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "Wrong!";
-				mes "Don't bother riding a Peco Peco if you don't know about Cavalier Mastery!";
-				next;
-				mes "[Sir Siracuse]";
-				mes "You better come back after you've learned a little more about Knights!";
-				close;
-			}
+			mes "You have the wrong idea. Do you really believe that is helping the Novice? Give a man a fish, he will eat for a day. Teach him to fish, he will eat for a lifetime!";
+			close;
+		case 3:
+			set KNIGHT_Q,5;
 			mes "[Sir Siracuse]";
-			mes "Good, good...";
-			mes "I'm pretty sure you know a decent amount about Knights. Now, let me ask you some personal questions about Knights.";
-			next;
+			mes "Do you really believe that this will truly help the poor Novice? It's generous but, they will not know the true value of zeny and items until they earn it themselves.";
+			close;
+		}
+		mes "[Sir Siracuse]";
+		mes "Alright...";
+		mes "Now, how should";
+		mes "you act within";
+		mes "a party?";
+		next;
+		switch(select("Protect everyone in the front of the battle.:Gather monsters and destroy them at once.:Get as many items possible, at all cost.")) {
+		case 1:
 			mes "[Sir Siracuse]";
-			mes "What should you do when you run into a Novice asking for help in town?";
+			mes "That's it! Our strength and attacks are very important in a party. All Knights should engage in a battle with that mindset.";
 			next;
-			switch (select("Tell the Novice of a reasonable hunting area.:Let the Novice fight while you take the damage.:Give the Novice a bunch of Zeny and items.")) {
-			case 1:
-				mes "[Sir Siracuse]";
-				mes "Of course, even a Novice needs to learn how to be independent. Giving good guidance to Novices is one of the best things we can do.";
-				next;
-				break;
-			case 2:
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "You have the wrong idea. Do you really believe that is helping the Novice? Give a man a fish, he will eat for a day. Teach him to fish, he will eat for a lifetime!";
-				close;
-			case 3:
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "Do you really believe that this will truly help the poor Novice? It's generous but, they will not know the true value of zeny and items until they earn it themselves.";
-				close;
-			}
+			break;
+		case 2:
+			set KNIGHT_Q,5;
 			mes "[Sir Siracuse]";
-			mes "Alright...";
-			mes "Now, how should";
-			mes "you act within";
-			mes "a party?";
-			next;
-			switch (select("Protect everyone in the front of the battle.:Gather monsters and destroy them at once.:Get as many items possible, at all cost.")) {
-			case 1:
-				mes "[Sir Siracuse]";
-				mes "That's it! Our strength and attacks are very important in a party. All Knights should engage in a battle with that mindset.";
-				next;
-				break;
-			case 2:
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "Are you crazy? Don't you realize the flaw in that kind of thinking? You can't control large mobs. What if they kill you? Who will protect the innocent?";
-				close;
-			case 3:
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "I see your greed and we will have none of it here! It seems you do not truly care for others!";
-				mes "Get lost!";
-				close;
-			}
+			mes "Are you crazy? Don't you realize the flaw in that kind of thinking? You can't control large mobs. What if they kill you? Who will protect the innocent?";
+			close;
+		case 3:
+			set KNIGHT_Q,5;
 			mes "[Sir Siracuse]";
-			mes "Lastly...";
-			mes "what's the most";
-			mes "important value";
-			mes "a Knight must have?";
-			next;
-			switch (select("Honor:Wealth:Status")) {
-			case 1:
-				mes "[Sir Siracuse]";
-				mes "Right, above all else, Knights must be honorable! We live and die for honor! Always keep that in mind.";
-				next;
-				break;
-			case 2:
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "You're scum! You strive to become a Knight for personal wealth? Get lost! We will not accept someone like you in our Chivalry!";
-				close;
-			case 3:
-				set KNIGHT_Q,5;
-				mes "[Sir Siracuse]";
-				mes "So you're trying to become famous through the Chivalry? That's pathetic. We won't accept someone like you in our Chivalry!";
-				close;
-			}
-			changequest 9003,9004;
-			set KNIGHT_Q,6;
+			mes "I see your greed and we will have none of it here! It seems you do not truly care for others!";
+			mes "Get lost!";
+			close;
+		}
+		mes "[Sir Siracuse]";
+		mes "Lastly...";
+		mes "what's the most";
+		mes "important value";
+		mes "a Knight must have?";
+		next;
+		switch(select("Honor:Wealth:Status")) {
+		case 1:
 			mes "[Sir Siracuse]";
-			mes "Well then,";
-			mes "this is the";
-			mes "end of my test.";
+			mes "Right, above all else, Knights must be honorable! We live and die for honor! Always keep that in mind.";
 			next;
+			break;
+		case 2:
+			set KNIGHT_Q,5;
 			mes "[Sir Siracuse]";
-			mes "For your next";
-			mes "test, please go";
-			mes "see Sir Windsor.";
-			mes "He's very quiet,";
-			mes "but don't let that";
-			mes "get to you.";
+			mes "You're scum! You strive to become a Knight for personal wealth? Get lost! We will not accept someone like you in our Chivalry!";
+			close;
+		case 3:
+			set KNIGHT_Q,5;
+			mes "[Sir Siracuse]";
+			mes "So you're trying to become famous through the Chivalry? That's pathetic. We won't accept someone like you in our Chivalry!";
 			close;
 		}
+		set KNIGHT_Q,6;
+		changequest 9003,9004;
 		mes "[Sir Siracuse]";
-		mes "Hmmm...?";
-		mes "Alright.";
-		mes "It's just that";
-		mes "you had that";
-		mes "look on your";
-		mes "face.";
+		mes "Well then,";
+		mes "this is the";
+		mes "end of my test.";
+		next;
+		mes "[Sir Siracuse]";
+		mes "For your next";
+		mes "test, please go";
+		mes "see Sir Windsor.";
+		mes "He's very quiet,";
+		mes "but don't let that";
+		mes "get to you.";
 		close;
 	}
-	if (KNIGHT_Q == 6) {
-		mes "[Sir Siracuse]";
+	else if (KNIGHT_Q == 6) {
 		mes "Oh?";
 		mes "Do you have";
 		mes "something to";
@@ -1452,8 +1032,7 @@ prt_in,71,91,0	script	Sir Siracuse	65,{
 		mes "face.";
 		close;
 	}
-	if (KNIGHT_Q == 14) {
-		mes "[Sir Siracuse]";
+	else if (KNIGHT_Q == 14) {
 		mes "Mmm...?";
 		mes "You finished";
 		mes "everyone else's";
@@ -1467,72 +1046,37 @@ prt_in,71,91,0	script	Sir Siracuse	65,{
 		mes "your performance.";
 		close;
 	}
-	mes "[Sir Siracuse]";
-	mes "Hey again.";
-	mes "Did you need something?";
-	mes "Sorry, but I'm busy at the moment. You should go and finish the rest of your tests.";
-	close;
+	else {
+		mes "Hey again.";
+		mes "Did you need something?";
+		mes "Sorry, but I'm busy at the moment. You should go and finish the rest of your tests.";
+		close;
+	}
 }
 
-prt_in,79,94,4	script	Sir Windsor	733,{
-	if ((Class != Job_Baby_Swordman) && (Class != Job_Swordman)) {
-		if (Class == Job_Baby_Knight || Class == Job_Knight) {
-			mes "[Sir Windsor]";
-			mes "...";
-			next;
-			mes "[Sir Windsor]";
-			mes "...";
-			mes "......";
-			next;
-			mes "[Sir Windsor]";
-			mes "Protect.";
-			close;
-		}
-		if (Class == Job_Baby || Class == Job_Novice) {
-			mes "[Sir Windsor]";
-			mes "...";
-			next;
-			mes "[Sir Windsor]";
-			mes "...";
-			mes "......";
-			next;
-			mes "[Sir Windsor]";
+prt_in,79,94,4	script	Sir Windsor#knt	733,{
+	mes "[Sir Windsor]";
+	mes "...";
+	next;
+	mes "[Sir Windsor]";
+	mes "...";
+	mes "......";
+	next;
+	mes "[Sir Windsor]";
+	if (BaseJob != Job_Swordman) {
+		if (BaseJob == Job_Knight) mes "Protect.";
+		else if (BaseClass == Job_Novice) {
 			mes "...Go play";
 			mes "outside.";
-			close;
 		}
-		mes "[Sir Windsor]";
-		mes "...";
-		next;
-		mes "[Sir Windsor]";
-		mes "...";
-		mes "......";
-		next;
-		mes "[Sir Windsor]";
-		mes "...Hmpf.";
+		else mes "...Hmpf.";
 		close;
 	}
 	if (KNIGHT_Q == 0) {
-		mes "[Sir Windsor]";
-		mes "...";
-		next;
-		mes "[Sir Windsor]";
-		mes "...";
-		mes "......";
-		next;
-		mes "[Sir Windsor]";
 		mes "...What?";
 		close;
 	}
-	if ((KNIGHT_Q >= 1) && (KNIGHT_Q <= 5)) {
-		mes "[Sir Windsor]";
-		mes "...";
-		next;
-		mes "[Sir Windsor]";
-		mes "...";
-		mes "......";
-		next;
-		mes "[Sir Windsor]";
+	else if (KNIGHT_Q >= 1 && KNIGHT_Q <= 5) {
 		mes "...What?";
 		next;
 		if (select("I would like to take the test to change jobs.:Oh, nothing.") == 1) {
@@ -1551,59 +1095,39 @@ prt_in,79,94,4	script	Sir Windsor	733,{
 		mes "...";
 		close;
 	}
-	if (KNIGHT_Q == 6) {
-		mes "[Sir Windsor]";
-		mes "...";
-		next;
-		mes "[Sir Windsor]";
-		mes "...";
-		mes "......";
-		next;
-		mes "[Sir Windsor]";
-		mes ".....What?";
-		next;
-		if (select("Sir Siracuse sent me to you.:Oh, nothing.") == 1) {
-			mes "[Sir Windsor]";
-			mes "...";
+	else if (KNIGHT_Q == 6 || KNIGHT_Q == 7) {
+		if (KNIGHT_Q == 6) {
+			set .@mes$,"Sir Siracuse sent me to you.:Oh, nothing.";
+			mes ".....What?";
 			next;
-			set KNIGHT_Q,7;
-			changequest 9004,9006;
-			mes "[Sir Windsor]";
-			mes "...";
-			mes "......";
+		}
+		else {
+			set .@mes$,"I want to try again!:...";
 			next;
-			mes "[Sir Windsor]";
-			mes "...Follow me.";
-			close2;
-			warp "job_knt",89,101;
-			end;
 		}
-		mes "[Sir Windsor]";
-		mes "...";
-		close;
-	}
-	if (KNIGHT_Q == 7) {
-		mes "[Sir Windsor]";
-		mes "...";
-		next;
-		mes "[Sir Windsor]";
-		mes "...";
-		mes "......";
-		next;
-		if (select("I want to try again!:...") == 1) {
+		if (select(.@mes$) == 1) {
 			mes "[Sir Windsor]";
 			mes "...";
 			next;
+			set KNIGHT_Q,7;
+			if (checkquest(9004) != -1) {
+				changequest 9004,9005;
+			}
 			mes "[Sir Windsor]";
 			mes "...";
 			mes "......";
 			next;
 			mes "[Sir Windsor]";
-			mes "...Fine.";
-			next;
-			mes "[Sir Windsor]";
-			mes "...This way.";
+			if (KNIGHT_Q == 6) 
+				mes "...Follow me.";
+			else {
+				mes "...Fine.";
+				next;
+				mes "[Sir Windsor]";
+				mes "...This way.";
+			}
 			close2;
+			if(checkquest(9006) == -1) changequest 9005,9006;
 			warp "job_knt",89,101;
 			end;
 		}
@@ -1611,19 +1135,21 @@ prt_in,79,94,4	script	Sir Windsor	733,{
 		mes "...";
 		close;
 	}
-	if (KNIGHT_Q == 14) {
-		mes "[Sir Windsor]";
-		mes "...";
-		next;
-		mes "[Sir Windsor]";
-		mes "...";
-		mes "......";
-		next;
-		mes "[Sir Windsor]";
+	else if (KNIGHT_Q == 14) {
 		mes "...Talk to";
 		mes "the captain.";
 		close;
 	}
+	else {
+		mes "...You're";
+		mes "done here.";
+		close;
+	}
+}
+
+// Test 2 part 1
+//==========================================================
+job_knt,89,106,4	script	Knight Windsor#knt	733,{
 	mes "[Sir Windsor]";
 	mes "...";
 	next;
@@ -1632,30 +1158,18 @@ prt_in,79,94,4	script	Sir Windsor	733,{
 	mes "......";
 	next;
 	mes "[Sir Windsor]";
-	mes "...You're";
-	mes "done here.";
-	close;
-}
-
-job_knt,89,106,4	script	Knight Windsor	733,{
+	mes "...Question?";
+	next;
+	set .@i, select("What kind of test is this?:How do I take the test?:I'd like to leave.:No.");
 	mes "[Sir Windsor]";
 	mes "...";
+	if (.@i == 4) close;
 	next;
 	mes "[Sir Windsor]";
 	mes "...";
 	mes "......";
-	next;
-	mes "[Sir Windsor]";
-	mes "...Question?";
-	next;
-	switch (select("What kind of test is this?:How do I take the test?:I'd like to leave.:No.")) {
+	switch(.@i) {
 	case 1:
-		mes "[Sir Windsor]";
-		mes "...";
-		next;
-		mes "[Sir Windsor]";
-		mes "...";
-		mes "......";
 		next;
 		mes "[Sir Windsor]";
 		mes "...You fight monsters.";
@@ -1678,12 +1192,6 @@ job_knt,89,106,4	script	Knight Windsor	733,{
 		mes "..........";
 		close;
 	case 2:
-		mes "[Sir Windsor]";
-		mes "...";
-		next;
-		mes "[Sir Windsor]";
-		mes "...";
-		mes "......";
 		next;
 		mes "[Sir Windsor]";
 		mes "...Go in the";
@@ -1708,19 +1216,9 @@ job_knt,89,106,4	script	Knight Windsor	733,{
 		mes "...";
 		close;
 	case 3:
-		mes "[Sir Windsor]";
-		mes "...";
-		next;
-		mes "[Sir Windsor]";
-		mes "...";
-		mes "......";
 		close2;
 		warp "prt_in",80,100;
 		end;
-	case 4:
-		mes "[Sir Windsor]";
-		mes "...";
-		close;
 	}
 }
 
@@ -1944,10 +1442,12 @@ OnTimer182000:
 	end;
 }
 
-prt_in,69,107,6	script	Lady Amy	728,{
-	if ((Class != Job_Baby_Swordman) && (Class != Job_Swordman)) {
-		if (Class == Job_Baby_Knight || Class == Job_Knight) {
-			mes "[Lady Amy]";
+// Test 3 (Manners)
+//==========================================================
+prt_in,69,107,6	script	Lady Amy#knt	728,{
+	mes "[Lady Amy]";
+	if (BaseJob != Job_Swordman) {
+		if (BaseJob == Job_Knight) {
 			mes "Oh...!";
 			mes "I wonder, why";
 			mes "have you come";
@@ -1963,10 +1463,9 @@ prt_in,69,107,6	script	Lady Amy	728,{
 			mes "Of course~";
 			mes "You're a member of";
 			mes "the Prontera Chivalry~";
-			close2;
+			close;
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
-			mes "[Lady Amy]";
+		else if (BaseClass == Job_Novice) {
 			mes "Aww~";
 			mes "What a cute";
 			mes "little Novice!";
@@ -1983,21 +1482,21 @@ prt_in,69,107,6	script	Lady Amy	728,{
 			mes "Remember, you're";
 			mes "going to be a Knight,";
 			mes "alright? Promise?";
-			close2;
+			close;
+		}
+		else {
+			mes "Welcome to";
+			mes "the Prontera Chivalry~";
+			next;
+			mes "[Lady Amy]";
+			mes "We're only Knights,";
+			mes "but hope you enjoy";
+			mes "your stay here.";
+			mes "Heh heh~";
+			close;
 		}
-		mes "[Lady Amy]";
-		mes "Welcome to";
-		mes "the Prontera Chivalry~";
-		next;
-		mes "[Lady Amy]";
-		mes "We're only Knights,";
-		mes "but hope you enjoy";
-		mes "your stay here.";
-		mes "Heh heh~";
-		close;
 	}
 	if (KNIGHT_Q == 0) {
-		mes "[Lady Amy]";
 		mes "Ooh, you're";
 		mes "a Swordsman...?";
 		mes "Did you come to";
@@ -2011,8 +1510,7 @@ prt_in,69,107,6	script	Lady Amy	728,{
 		mes "there. Hee hee~";
 		close;
 	}
-	if ((KNIGHT_Q >= 1) && (KNIGHT_Q <= 7)) {
-		mes "[Lady Amy]";
+	else if (KNIGHT_Q >= 1 && KNIGHT_Q <= 7) {
 		mes "Hmmm?";
 		mes "Why did you";
 		mes "come to Amy?";
@@ -2040,430 +1538,216 @@ prt_in,69,107,6	script	Lady Amy	728,{
 		mes "Alright...";
 		close;
 	}
-	if (KNIGHT_Q == 8) {
-		mes "[Lady Amy]";
-		mes "Hmmm?";
-		mes "Why did you";
-		mes "come to Amy?";
-		next;
-		if (select("Sir Windsor told me to--:Oh, nothing.") == 1) {
-			changequest 9006,9008;
-			changequest 9007,9008;
-			mes "[Lady Amy]";
-			mes "Oh!";
-			mes "No need to say";
-			mes "anything more.";
-			mes "Welcome! It's time";
-			mes "to take Amy's test!";
-			next;
-			mes "[Lady Amy]";
-			mes "My name is Amy Beatrice,";
-			mes "a proud Lady Knight of the Prontera Chivalry. Amy's test will test your etiquette as a Knight~";
-			next;
-			mes "[Lady Amy]";
-			mes "I'll tell you a story and you choose an answer whenever";
-			mes "I ask a question. Your etiquette will be judged on your answers.";
-			next;
-			mes "[Lady Amy]";
-			mes "So listen carefully";
-			mes "and answer as if you're";
-			mes "already a Knight, okay?";
-			next;
-			set @knight_t, 0;
-			mes "[Lady Amy]";
-			mes "Then,";
-			mes "let's begin!";
-			next;
-			mes "[Lady Amy]";
-			mes "You are a Knight and you are looking for a party in Morroc.";
-			mes "How would you go about doing so?";
-			next;
-			switch (select("Shout out that you are looking for a party.:Open a chat room and wait.:Look for people seeking Knights.")) {
-			case 1:
-				break;
-			case 2:
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "You have formed a party with equal leveled players. There's a Priest, a Wizard, a Hunter, an Assassin, and a Blacksmith...";
-			next;
-			mes "[Lady Amy]";
-			mes "The six of you decide to go hunt and have decided to go to the Pyramids.";
-			next;
-			mes "[Lady Amy]";
-			mes "You reach Level 4";
-			mes "of the Pyramids";
-			mes "with your party.";
-			mes "What should you do?";
-			next;
-			switch (select("Check out the area and plan ahead.:Gather monsters for your party members.:Lead the party slowly at the front.")) {
-			case 1:
-				set @knight_t, @knight_t + 10;
-			case 2:
-				break;
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "But some rude players came with a group of monsters and disappeared! What should you do?";
-			next;
-			switch (select("Keep the monsters from reaching the party.:Defend while the party retreats.:Run away on your Peco Peco.")) {
-			case 1:
-			case 2:
-				set @knight_t, @knight_t + 10;
-			case 3:
-				break;
-			}
-			mes "[Lady Amy]";
-			mes "Luckily, you all lived through the crisis. But as you walk, you find a person, who is not in your party, collapsed on the ground.";
-			next;
-			mes "[Lady Amy]";
-			mes "The person is asking politely for help. What should you do?";
-			next;
-			if (select("Ask your party's Priest to help.:Say you will help for Zeny.:Ignore and move on.") == 1) {
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "You must bid farewell to your party members because you must go somewhere else.";
-			next;
-			mes "[Lady Amy]";
-			mes "But you find";
-			mes "a rare item during";
-			mes "the battle. What";
-			mes "should you do?";
+	else if ((KNIGHT_Q == 8) || (KNIGHT_Q == 9)){
+		if (KNIGHT_Q == 8) {
+			mes "Hmmm?";
+			mes "Why did you";
+			mes "come to Amy?";
 			next;
-			switch (select("Give it to who deserves it the most.:Pretend like nothing happened and keep it.:Decide with party who gets it.")) {
-			case 1:
-				set @knight_t, @knight_t + 10;
-			case 2:
-				break;
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "You end up with the item and you go to Prontera to sell it. There are many people with shops and chat rooms opened selling items.";
-			next;
-			mes "[Lady Amy]";
-			mes "What should you";
-			mes "do to sell your item?";
-			next;
-			switch (select("Shout out loud to everyone.:Open a chat room and wait.:Inquire if there is anyone that is interested.")) {
-			case 1:
-				break;
-			case 2:
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "While you are waiting,";
-			mes "someone comes and begs";
-			mes "for items and zeny.";
-			mes "What do you do?";
-			next;
-			if (select("Give them some Zeny and items.:Simply ignore them.:Give suggestions for a place to hunt.") == 3) {
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "Now you decide to go to the Hidden Temple by yourself. You happily ride on your Peco Peco.";
-			next;
-			mes "[Lady Amy]";
-			mes "But you run into";
-			mes "someone that is lost.";
-			mes "What should you do?";
-			next;
-			switch (select("Tell the person how to reach the exit.:Lead the person to the exit.:Give a Butterfly Wing.")) {
-			case 1:
-			case 2:
-				set @knight_t, @knight_t + 10;
-			case 3:
-				break;
-			}
-			mes "[Lady Amy]";
-			mes "You've been hunting for a while, and now you're low on HP!";
-			mes "It's red now, which is very dangerous.";
-			next;
-			mes "[Lady Amy]";
-			mes "Ah, then a Priest";
-			mes "happens to walk by.";
-			mes "How would you ask";
-			mes "the Priest for a Heal?";
-			next;
-			if (select("Would it be possible to get a heal please?:Can I have a heal?:Heal plz!!") == 1) {
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "You are now very";
-			mes "exhausted and it's time";
-			mes "to go back to town.";
-			next;
-			mes "[Lady Amy]";
-			mes "You then find";
-			mes "a rare item on";
-			mes "the street.";
-			mes "What should";
-			mes "you do?";
-			next;
-			switch (select("Pick it up and keep it.:Ask around to find the owner.:Simply walk by.")) {
-			case 1:
-				break;
-			case 2:
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "Okay,";
-			mes "that was the";
-			mes "end of my test!";
-			next;
-			if (@knight_t == 100) {
-				set KNIGHT_Q,10;
+			if (select("Sir Windsor told me to--:Oh, nothing.") == 1) {
+				if(checkquest(9008) == -1) changequest 9007,9008;
 				mes "[Lady Amy]";
-				mes "Well done, that kind of mentality is needed for a Knight! For your next test, visit Sir Edmond, please~";
+				mes "Oh!";
+				mes "No need to say";
+				mes "anything more.";
+				mes "Welcome! It's time";
+				mes "to take Amy's test!";
 				next;
 				mes "[Lady Amy]";
-				mes "I'll have nice comments about you for the captain. Do well on the tests you have left, okay?";
-				close;
-			}
-			if (@knight_t == 90) {
-				set KNIGHT_Q,10;
-				changequest 9008,9009;
+				mes "My name is Amy Beatrice,";
+				mes "a proud Lady Knight of the Prontera Chivalry. Amy's test will test your etiquette as a Knight~";
+				next;
+				mes "[Lady Amy]";
+				mes "I'll tell you a story and you choose an answer whenever";
+				mes "I ask a question. Your etiquette will be judged on your answers.";
+				next;
 				mes "[Lady Amy]";
-				mes "Well, it wasn't perfect,";
-				mes "but I think you know enough";
-				mes "about etiquette to be";
-				mes "a fine Knight.";
+				mes "So listen carefully";
+				mes "and answer as if you're";
+				mes "already a Knight, okay?";
 				next;
 				mes "[Lady Amy]";
-				mes "Now, it's time for you to go to Sir Edmond for your next test. Do well on the rest of your tests. You better promise~";
+				mes "Then,";
+				mes "let's begin!";
+				next;
+			}
+			else {
+				mes "[Lady Amy]";
+				mes "Aww...";
+				mes "Alright~";
 				close;
 			}
-			set KNIGHT_Q,9;
-			mes "[Lady Amy]";
-			mes "Mmm...";
-			mes "To be honest, I don't think your attitude is good enough to be a Knight quite yet.";
-			next;
-			mes "[Lady Amy]";
-			mes "If you really act like that, everyone will think Knights are rude! Think about how you answered my questions and come again later.";
-			next;
-			mes "[Lady Amy]";
-			mes "If you want,";
-			mes "I'll let you";
-			mes "retake the test, okay?";
-			close;
 		}
-		mes "[Lady Amy]";
-		mes "Aww...";
-		mes "Alright~";
-		close;
-	}
-	if (KNIGHT_Q == 9) {
-		mes "[Lady Amy]";
-		mes "Hmmm?";
-		mes "Why did you";
-		mes "come to Amy?";
-		next;
-		if (select("I would like to take the test to change jobs.:Oh, nothing.") == 1) {
-			mes "[Lady Amy]";
-			mes "Mmm~?";
-			mes "Have you learned";
-			mes "what you did wrong";
-			mes "last time? If you";
-			mes "fail again, I'm going";
-			mes "to be mad!";
-			next;
-			mes "[Lady Amy]";
-			mes "So listen carefully";
-			mes "and answer as if you";
-			mes "are a Knight.";
-			mes "Well then,";
-			mes "let's begin!";
-			next;
-			set @knight_t,0;
-			mes "[Lady Amy]";
-			mes "You are a Knight and you are looking for a party in Morroc.";
-			mes "How would you go about doing so?";
-			next;
-			switch (select("Shout out that you are looking for a party.:Open a chat room and wait.:Look for people seeking Knights.")) {
-			case 1:
-				break;
-			case 2:
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "You have formed a party with equal leveled players. There's a Priest, a Wizard, a Hunter, an Assassin, and a Blacksmith...";
-			next;
-			mes "[Lady Amy]";
-			mes "The six of you decide to go hunt and have decided to go to the Pyramids.";
-			next;
-			mes "[Lady Amy]";
-			mes "You reach Level 4";
-			mes "of the Pyramids";
-			mes "with your party.";
-			mes "What should you do?";
-			next;
-			switch (select("Check out the area and plan ahead.:Gather monsters for your party members.:Lead the party slowly at the front.")) {
-			case 1:
-				set @knight_t, @knight_t + 10;
-			case 2:
-				break;
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "But some rude players came with a group of monsters and disappeared! What should you do?";
-			next;
-			switch (select("Keep the monsters from reaching the party.:Defend while the party retreats.:Run away on your Peco Peco.")) {
-			case 1:
-			case 2:
-				set @knight_t, @knight_t + 10;
-			case 3:
-				break;
-			}
-			mes "[Lady Amy]";
-			mes "Luckily, you all lived through the crisis. But as you walk, you find a person, who is not in your party, collapsed on the ground.";
-			next;
-			mes "[Lady Amy]";
-			mes "The person is asking politely for help. What should you do?";
-			next;
-			if (select("Ask your party's Priest to help.:Say you will help for Zeny.:Ignore and move on.") == 1) {
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "You must bid farewell to your party members because you must go somewhere else.";
-			next;
-			mes "[Lady Amy]";
-			mes "But you find";
-			mes "a rare item during";
-			mes "the battle. What";
-			mes "should you do?";
-			next;
-			switch (select("Give it to who deserves it the most.:Pretend like nothing happened and keep it.:Decide with party who gets it.")) {
-			case 1:
-				set @knight_t, @knight_t + 10;
-			case 2:
-				break;
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "You end up with the item and you go to Prontera to sell it. There are many people with shops and chat rooms opened selling items.";
-			next;
-			mes "[Lady Amy]";
-			mes "What should you";
-			mes "do to sell your item?";
-			next;
-			switch (select("Shout out loud to everyone.:Open a chat room and wait.:Inquire if there is anyone that is interested.")) {
-			case 1:
-				break;
-			case 2:
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "While you are waiting,";
-			mes "someone comes and begs";
-			mes "for items and zeny.";
-			mes "What do you do?";
-			next;
-			if (select("Give them some Zeny and items.:Simply ignore them.:Give suggestions for a place to hunt.") == 3) {
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "Now you decide to go to the Hidden Temple by yourself. You happily ride on your Peco Peco.";
-			next;
-			mes "[Lady Amy]";
-			mes "But you run into";
-			mes "someone that is lost.";
-			mes "What should you do?";
-			next;
-			switch (select("Tell the person how to reach the exit.:Lead the person to the exit.:Give a Butterfly Wing.")) {
-			case 1:
-			case 2:
-				set @knight_t, @knight_t + 10;
-			case 3:
-				break;
-			}
-			mes "[Lady Amy]";
-			mes "You've been hunting for a while, and now you're low on HP!";
-			mes "It's red now, which is very dangerous.";
-			next;
-			mes "[Lady Amy]";
-			mes "Ah, then a Priest";
-			mes "happens to walk by.";
-			mes "How would you ask";
-			mes "the Priest for a Heal?";
-			next;
-			if (select("Would it be possible to get a heal please?:Can I have a heal?:Heal plz!!") == 1) {
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "You are now very";
-			mes "exhausted and it's time";
-			mes "to go back to town.";
+		else if (KNIGHT_Q == 9) {
+			mes "Hmmm?";
+			mes "Why did you";
+			mes "come to Amy?";
 			next;
-			mes "[Lady Amy]";
-			mes "You then find";
-			mes "a rare item on";
-			mes "the street.";
-			mes "What should";
-			mes "you do?";
-			next;
-			switch (select("Pick it up and keep it.:Ask around to find the owner.:Simply walk by.")) {
-			case 1:
-				break;
-			case 2:
-			case 3:
-				set @knight_t, @knight_t + 10;
-			}
-			mes "[Lady Amy]";
-			mes "Okay,";
-			mes "that was the";
-			mes "end of my test!";
-			next;
-			if (@knight_t == 100) {
-				set KNIGHT_Q,10;
+			if (select("I would like to take the test to change jobs.:Oh, nothing.") == 1) {
 				mes "[Lady Amy]";
-				mes "Well done, that kind of mentality is needed for a Knight! For your next test, visit Sir Edmond, please~";
+				mes "Mmm~?";
+				mes "Have you learned";
+				mes "what you did wrong";
+				mes "last time? If you";
+				mes "fail again, I'm going";
+				mes "to be mad!";
 				next;
 				mes "[Lady Amy]";
-				mes "I'll have nice comments about you for the captain. Do well on the tests you have left, okay?";
-				close;
-			}
-			if (@knight_t == 90) {
-				set KNIGHT_Q,10;
+				mes "So listen carefully";
+				mes "and answer as if you";
+				mes "are a Knight.";
+				mes "Well then,";
+				mes "let's begin!";
+				next;
 				mes "[Lady Amy]";
-				mes "Well, it wasn't perfect,";
-				mes "but I think you know enough";
-				mes "about etiquette to be";
-				mes "a fine Knight.";
+				mes "You are a Knight and you are looking for a party in Morroc.";
+				mes "How would you go about doing so?";
 				next;
+			}
+			else {
 				mes "[Lady Amy]";
-				mes "Now, it's time for you to go to Sir Edmond for your next test. Do well on the rest of your tests. You better promise~";
+				mes "Aww...";
+				mes "Alright~";
 				close;
 			}
-			set KNIGHT_Q,9;
-			mes "[Lady Amy]";
-			mes "Mmm...";
-			mes "To be honest, I don't think your attitude is good enough to be a Knight quite yet.";
+		}
+		mes "You are a Knight and you are looking for a party in Morroc.";
+		mes "How would you go about doing so?";
+		next;
+		if (select("Shout out that you are looking for a party.:Open a chat room and wait.:Look for people seeking Knights.") != 1)
+			set .@knight_t,.@knight_t+10;
+		mes "[Lady Amy]";
+		mes "You have formed a party with equal leveled players. There's a Priest, a Wizard, a Hunter, an Assassin, and a Blacksmith...";
+		next;
+		mes "[Lady Amy]";
+		mes "The six of you decide to go hunt and have decided to go to the Pyramids.";
+		next;
+		mes "[Lady Amy]";
+		mes "You reach Level 4";
+		mes "of the Pyramids";
+		mes "with your party.";
+		mes "What should you do?";
+		next;
+		if (select("Check out the area and plan ahead.:Gather monsters for your party members.:Lead the party slowly at the front.") != 2)
+			set .@knight_t,.@knight_t+10;
+		mes "[Lady Amy]";
+		mes "But some rude players came with a group of monsters and disappeared! What should you do?";
+		next;
+		if (select("Keep the monsters from reaching the party.:Defend while the party retreats.:Run away on your Peco Peco.") == 2)
+			set .@knight_t,.@knight_t+10;
+		mes "[Lady Amy]";
+		mes "Luckily, you all lived through the crisis. But as you walk, you find a person, who is not in your party, collapsed on the ground.";
+		next;
+		mes "[Lady Amy]";
+		mes "The person is asking politely for help. What should you do?";
+		next;
+		if (select("Ask your party's Priest to help.:Say you will help for Zeny.:Ignore and move on.") == 1)
+			set .@knight_t,.@knight_t+10;
+		mes "[Lady Amy]";
+		mes "You must bid farewell to your party members because you must go somewhere else.";
+		next;
+		mes "[Lady Amy]";
+		mes "But you find";
+		mes "a rare item during";
+		mes "the battle. What";
+		mes "should you do?";
+		next;
+		if(select("Give it to who deserves it the most.:Pretend like nothing happened and keep it.:Decide with party who gets it.") != 2)
+			set .@knight_t,.@knight_t+10;
+		mes "[Lady Amy]";
+		mes "You end up with the item and you go to Prontera to sell it. There are many people with shops and chat rooms opened selling items.";
+		next;
+		mes "[Lady Amy]";
+		mes "What should you";
+		mes "do to sell your item?";
+		next;
+		if (select("Shout out loud to everyone.:Open a chat room and wait.:Inquire if there is anyone that is interested.") == 3)
+			set .@knight_t,.@knight_t+10;
+		mes "[Lady Amy]";
+		mes "While you are waiting,";
+		mes "someone comes and begs";
+		mes "for items and zeny.";
+		mes "What do you do?";
+		next;
+		if (select("Give them some Zeny and items.:Simply ignore them.:Give suggestions for a place to hunt.") == 3)
+			set .@knight_t,.@knight_t+10;
+		mes "[Lady Amy]";
+		mes "Now you decide to go to the Hidden Temple by yourself. You happily ride on your Peco Peco.";
+		next;
+		mes "[Lady Amy]";
+		mes "But you run into";
+		mes "someone that is lost.";
+		mes "What should you do?";
+		next;
+		if(select("Tell the person how to reach the exit.:Lead the person to the exit.:Give a Butterfly Wing.") != 3)
+			set .@knight_t,.@knight_t+10;
+		mes "[Lady Amy]";
+		mes "You've been hunting for a while, and now you're low on HP!";
+		mes "It's red now, which is very dangerous.";
+		next;
+		mes "[Lady Amy]";
+		mes "Ah, then a Priest";
+		mes "happens to walk by.";
+		mes "How would you ask";
+		mes "the Priest for a Heal?";
+		next;
+		if (select("Would it be possible to get a heal please?:Can I have a heal?:Heal plz!!") == 1)
+			set .@knight_t,.@knight_t+10;
+		mes "[Lady Amy]";
+		mes "You are now very";
+		mes "exhausted and it's time";
+		mes "to go back to town.";
+		next;
+		mes "[Lady Amy]";
+		mes "You then find";
+		mes "a rare item on";
+		mes "the street.";
+		mes "What should";
+		mes "you do?";
+		next;
+		if (select("Pick it up and keep it.:Ask around to find the owner.:Simply walk by.") != 1)
+			set .@knight_t,.@knight_t+10;
+		mes "[Lady Amy]";
+		mes "Okay,";
+		mes "that was the";
+		mes "end of my test!";
+		next;
+		mes "[Lady Amy]";
+		if (.@knight_t == 100) {
+			set KNIGHT_Q,10;
+			changequest 9008,9009;
+			mes "Well done, that kind of mentality is needed for a Knight! For your next test, visit Sir Edmond, please~";
 			next;
 			mes "[Lady Amy]";
-			mes "If you really act like that, everyone will think Knights are rude! Think about how you answered my questions and come again later.";
+			mes "I'll have nice comments about you for the captain. Do well on the tests you have left, okay?";
+			close;
+		}
+		else if (.@knight_t == 90) {
+			set KNIGHT_Q,10;
+			changequest 9008,9009;
+			mes "Well, it wasn't perfect,";
+			mes "but I think you know enough";
+			mes "about etiquette to be";
+			mes "a fine Knight.";
 			next;
 			mes "[Lady Amy]";
-			mes "If you want,";
-			mes "I'll let you";
-			mes "retake the test, okay?";
+			mes "Now, it's time for you to go to Sir Edmond for your next test. Do well on the rest of your tests. You better promise~";
 			close;
 		}
+		set KNIGHT_Q,9;
+		mes "Mmm...";
+		mes "To be honest, I don't think your attitude is good enough to be a Knight quite yet.";
+		next;
 		mes "[Lady Amy]";
-		mes "Aww...";
-		mes "Alright~";
+		mes "If you really act like that, everyone will think Knights are rude! Think about how you answered my questions and come again later.";
+		next;
+		mes "[Lady Amy]";
+		mes "If you want,";
+		mes "I'll let you";
+		mes "retake the test, okay?";
 		close;
 	}
-	if (KNIGHT_Q == 10) {
-		mes "[Lady Amy]";
+	else if (KNIGHT_Q == 10) {
 		mes "Hmmm?";
 		mes "Why did you";
 		mes "come to Amy?";
@@ -2474,8 +1758,7 @@ prt_in,69,107,6	script	Lady Amy	728,{
 		mes "next test, okay?";
 		close;
 	}
-	if (KNIGHT_Q == 14) {
-		mes "[Lady Amy]";
+	else if (KNIGHT_Q == 14) {
 		mes "Wow~";
 		mes "Now it's time for";
 		mes "everyone to decide";
@@ -2488,22 +1771,25 @@ prt_in,69,107,6	script	Lady Amy	728,{
 		mes "be okay.";
 		close;
 	}
-	mes "[Lady Amy]";
-	mes "Hmmm?";
-	mes "Why did you";
-	mes "come to Amy?";
-	next;
-	mes "[Lady Amy]";
-	mes "You still have";
-	mes "other tests to take.";
-	mes "Hurry and finish~";
-	close;
+	else {
+		mes "Hmmm?";
+		mes "Why did you";
+		mes "come to Amy?";
+		next;
+		mes "[Lady Amy]";
+		mes "You still have";
+		mes "other tests to take.";
+		mes "Hurry and finish~";
+		close;
+	}
 }
 
-prt_in,70,99,6	script	Sir Edmond	734,{
-	if ((Class != Job_Baby_Swordman) && (Class != Job_Swordman)) {
-		if (Class == Job_Baby_Knight || Class == Job_Knight) {
-			mes "[Sir Edmond]";
+// Test 4 (patience)
+//==========================================================
+prt_in,70,99,6	script	Sir Edmond#knt	734,{
+	mes "[Sir Edmond]";
+	if (BaseJob != Job_Swordman) {
+		if (BaseJob == Job_Knight) {
 			mes "Think of your";
 			mes "mind as if it were";
 			mes "flowing water.";
@@ -2520,8 +1806,7 @@ prt_in,70,99,6	script	Sir Edmond	734,{
 			mes "any situation.";
 			close;
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
-			mes "[Sir Edmond]";
+		else if (BaseClass == Job_Novice) {
 			mes "Trees with deep roots don't sway with the wind. The fact that powerful skills must be built on strong basics is immutable...";
 			next;
 			mes "[Sir Edmond]";
@@ -2530,80 +1815,16 @@ prt_in,70,99,6	script	Sir Edmond	734,{
 			mes "decided now...";
 			close;
 		}
-		mes "[Sir Edmond]";
-		mes "Everything in this world exists in harmony. Living without disrupting this harmony is the right way to live...";
-		close;
-	}
-	if (KNIGHT_Q == 0) {
-		mes "[Sir Edmond]";
-		mes "Those with ominous thoughts will only dream such dreams. It's better to have no dreams at all than to have dreams of sadness and despair.";
-		close;
-	}
-	if (KNIGHT_Q == 1) {
-		mes "[Sir Edmond]";
-		mes "What is it...";
-		mes "Wandering Swordman?";
-		next;
-		if (select("I would like to take the test to change jobs.:Oh, nothing.") == 1) {
-			mes "[Sir Edmond]";
-			mes "A seed must first be nestled";
-			mes "in the earth before the seed may sprout. Then, the sprout must grow leaves before its buds blossom into flowers...";
-			next;
-			mes "[Sir Edmond]";
-			mes "If not...";
-			mes "The flower will";
-			mes "be incomplete.";
-			next;
-			mes "[Sir Edmond]";
-			mes "Go to the others";
-			mes "first, so that you";
-			mes "may find your path...";
+		else {
+			mes "Everything in this world exists in harmony. Living without disrupting this harmony is the right way to live...";
 			close;
 		}
-		mes "[Sir Edmond]";
-		mes "The life that you";
-		mes "want will soon be";
-		mes "before your eyes.";
-		mes "Everything will";
-		mes "come in perfect";
-		mes "order.";
-		close;
 	}
-	if (KNIGHT_Q == 2) {
-		mes "[Sir Edmond]";
-		mes "What is it...";
-		mes "Wandering Swordman?";
-		next;
-		if (select("I would like to take the test to change jobs.:Oh, nothing.") == 1) {
-			mes "[Sir Edmond]";
-			mes "The question of";
-			mes "what came first:";
-			mes "the chicken";
-			mes "or the egg?";
-			next;
-			mes "[Sir Edmond]";
-			mes "Do you think";
-			mes "you're prepared";
-			mes "to discuss this?";
-			next;
-			mes "[Sir Edmond]";
-			mes "That's what";
-			mes "I thought...";
-			mes "Go to the";
-			mes "others first.";
-			close;
-		}
-		mes "[Sir Edmond]";
-		mes "The life that you";
-		mes "want will soon be";
-		mes "before your eyes.";
-		mes "Everything will";
-		mes "come in perfect";
-		mes "order.";
+	if (KNIGHT_Q == 0) {
+		mes "Those with ominous thoughts will only dream such dreams. It's better to have no dreams at all than to have dreams of sadness and despair.";
 		close;
 	}
-	if (KNIGHT_Q == 3) {
-		mes "[Sir Edmond]";
+	else if (KNIGHT_Q >= 1 && KNIGHT_Q <= 9) {
 		mes "What is it...";
 		mes "Wandering Swordman?";
 		next;
@@ -2632,194 +1853,7 @@ prt_in,70,99,6	script	Sir Edmond	734,{
 		mes "order.";
 		close;
 	}
-	if (KNIGHT_Q == 4) {
-		mes "[Sir Edmond]";
-		mes "What is it...";
-		mes "Wandering Swordman?";
-		next;
-		if (select("I would like to take the test to change jobs.:Oh, nothing.") == 1) {
-			mes "[Sir Edmond]";
-			mes "The question of";
-			mes "what came first:";
-			mes "the chicken";
-			mes "or the egg?";
-			next;
-			mes "[Sir Edmond]";
-			mes "Do you think";
-			mes "you're prepared";
-			mes "to discuss this?";
-			next;
-			mes "[Sir Edmond]";
-			mes "That's what";
-			mes "I thought...";
-			mes "Go to the";
-			mes "others first.";
-			close;
-		}
-		mes "[Sir Edmond]";
-		mes "The life that you";
-		mes "want will soon be";
-		mes "before your eyes.";
-		mes "Everything will";
-		mes "come in perfect";
-		mes "order.";
-		close;
-	}
-	if (KNIGHT_Q == 5) {
-		mes "[Sir Edmond]";
-		mes "What is it...";
-		mes "Wandering Swordman?";
-		next;
-		if (select("I would like to take the test to change jobs.:Oh, nothing.") == 1) {
-			mes "[Sir Edmond]";
-			mes "The question of";
-			mes "what came first:";
-			mes "the chicken";
-			mes "or the egg?";
-			next;
-			mes "[Sir Edmond]";
-			mes "Do you think";
-			mes "you're prepared";
-			mes "to discuss this?";
-			next;
-			mes "[Sir Edmond]";
-			mes "That's what";
-			mes "I thought...";
-			mes "Go to the";
-			mes "others first.";
-			close;
-		}
-		mes "[Sir Edmond]";
-		mes "The life that you";
-		mes "want will soon be";
-		mes "before your eyes.";
-		mes "Everything will";
-		mes "come in perfect";
-		mes "order.";
-		close;
-	}
-	if (KNIGHT_Q == 6) {
-		mes "[Sir Edmond]";
-		mes "What is it... ";
-		mes "Wandering Swordman?";
-		next;
-		if (select("I would like to take the test to change jobs.:Oh, nothing.") == 1) {
-			mes "[Sir Edmond]";
-			mes "If a tree falls";
-			mes "in the woods, does";
-			mes "it make a sound?";
-			next;
-			mes "[Sir Edmond]";
-			mes "I think you need";
-			mes "more time to think";
-			mes "about this.";
-			next;
-			mes "[Sir Edmond]";
-			mes "Go to the others";
-			mes "first, so that you";
-			mes "may find an answer...";
-			close;
-		}
-		mes "[Sir Edmond]";
-		mes "The life that you";
-		mes "want will soon be";
-		mes "before your eyes.";
-		mes "Everything will";
-		mes "come in perfect";
-		mes "order.";
-		close;
-	}
-	if (KNIGHT_Q == 7) {
-		mes "[Sir Edmond]";
-		mes "What is it...";
-		mes "Wandering Swordman?";
-		next;
-		if (select("I would like to take the test to change jobs.:Oh, nothing.") == 2) {
-			mes "[Sir Edmond]";
-			mes "Change will";
-			mes "come when all is in";
-			mes "readiness. Everything";
-			mes "comes in its own";
-			mes "good time.";
-			next;
-			mes "[Sir Edmond]";
-			mes "The time has not";
-			mes "yet come for me";
-			mes "to test you yet.";
-			mes "Go to the others.";
-			close;
-		}
-		mes "[Sir Edmond]";
-		mes "The life that you";
-		mes "want will soon be";
-		mes "before your eyes.";
-		mes "Everything will";
-		mes "come in perfect";
-		mes "order.";
-		close;
-	}
-	if (KNIGHT_Q == 8) {
-		mes "[Sir Edmond]";
-		mes "Zzz...";
-		mes "Zzz...";
-		mes "^666666*snort*^000000";
-		mes "Wah? Huh?";
-		next;
-		if (select("I would like to take the test to change jobs.:Oh, nothing.") == 1) {
-			mes "[Sir Edmond]";
-			mes "Is it my";
-			mes "turn yet...?";
-			mes "No... Not yet.";
-			next;
-			mes "[Sir Edmond]";
-			mes "Sorry, it's";
-			mes "not my turn yet,";
-			mes "young one.";
-			next;
-			mes "[Sir Edmond]";
-			mes "Go to the others";
-			mes "first and complete";
-			mes "their tasks...";
-			close;
-		}
-		mes "[Sir Edmond]";
-		mes "You're almost";
-		mes "there, don't";
-		mes "give up...";
-		close;
-	}
-	if (KNIGHT_Q == 9) {
-		mes "[Sir Edmond]";
-		mes "What is it...";
-		mes "Wandering Swordman?";
-		next;
-		if (select("I would like to take the test to change jobs.:Oh, nothing.") == 1) {
-			mes "[Sir Edmond]";
-			mes "You are nearing the";
-			mes "end of your journey...";
-			next;
-			mes "[Sir Edmond]";
-			mes "However, there are";
-			mes "still the final steps";
-			mes "you must take...";
-			next;
-			mes "[Sir Edmond]";
-			mes "However,";
-			mes "my time to test";
-			mes "you has not come";
-			mes "quite yet.";
-			close;
-		}
-		mes "[Sir Edmond]";
-		mes "You must still see";
-		mes "one of the others...";
-		mes "But the life that you";
-		mes "want will soon be";
-		mes "before your eyes.";
-		close;
-	}
-	if (KNIGHT_Q == 10) {
-		mes "[Sir Edmond]";
+	else if (KNIGHT_Q == 10) {
 		mes "What is it...";
 		mes "Wandering Swordman.";
 		next;
@@ -2848,9 +1882,9 @@ prt_in,70,99,6	script	Sir Edmond	734,{
 			mes "Keep in mind";
 			mes "the quality of";
 			mes "reverence.";
-			set KNIGHT_Q,12;
-			changequest 9009,9010;
 			close2;
+			set KNIGHT_Q,11;
+			changequest 9009,9010;
 			warp "job_knt",143,57;
 			end;
 		}
@@ -2860,8 +1894,7 @@ prt_in,70,99,6	script	Sir Edmond	734,{
 		mes "your eyes.";
 		close;
 	}
-	if (KNIGHT_Q == 11) {
-		mes "[Sir Edmond]";
+	else if (KNIGHT_Q == 11) {
 		mes "What is it...";
 		mes "Wandering Swordman?";
 		next;
@@ -2877,7 +1910,6 @@ prt_in,70,99,6	script	Sir Edmond	734,{
 			mes "shall begin.";
 			mes "Show me your";
 			mes "patience...";
-			set KNIGHT_Q,13;
 			close2;
 			warp "job_knt",143,57;
 			end;
@@ -2891,41 +1923,35 @@ prt_in,70,99,6	script	Sir Edmond	734,{
 		mes "order.";
 		close;
 	}
-	if (KNIGHT_Q == 12 || KNIGHT_Q == 13) {
-		mes "[Sir Edmond]";
+	else if (KNIGHT_Q == 12 || KNIGHT_Q == 13) {
 		mes "I have seen your character for myself. It is now time for you to take the last test. Go and speak";
 		mes "to Sir Gray...";
 		close;
 	}
-	mes "[Sir Edmond]";
-	mes "Go and speak";
-	mes "to our captain.";
-	mes "The time has come";
-	mes "for all of us to";
-	mes "evaluate your";
-	mes "performance.";
-	close;
+	else {
+		mes "Go and speak";
+		mes "to our captain.";
+		mes "The time has come";
+		mes "for all of us to";
+		mes "evaluate your";
+		mes "performance.";
+		close;
+	}
 }
 
 job_knt,1,1,1	script	Timer#knt	107,{
+OnTimer300000:
+	enablenpc "Warp#knt";
 	end;
 
-OnTimer60000:
-	donpcevent "Warp#knt::OnEnable";
-	end;
-
-OnTimer60050:
-	donpcevent "Timer#knt::OnReset";
-	end;
-
-OnTimer60100:
+OnTimer300500:
 	donpcevent "Timer#knt::OnDisable";
-	donpcevent "Warp#knt::OnDisable";
+	disablenpc "Warp#knt";
 	end;
 
-OnTimer60150:
-	donpcevent "Timer#knt::OnEnable";
+OnTimer301500:
 	stopnpctimer;
+	donpcevent "Timer#knt::OnEnable";
 	end;
 
 OnInit:
@@ -2951,12 +1977,10 @@ OnEnable:
 	initnpctimer;
 	end;
 
-OnReset:
-	killmonster "job_knt","Timer#knt::OnMyMobDead";
-	end;
-
 OnDisable:
-	hideonnpc "Timer#knt";
+	killmonster "job_knt","Timer#knt::OnMyMobDead";
+	disablenpc "Timer#knt";
+	disablenpc "Warp#knt";
 	end;
 
 OnMyMobDead:
@@ -2964,29 +1988,20 @@ OnMyMobDead:
 	end;
 }
 
-job_knt,143,57,0	script	Warp#knt	139,22,22,{
+job_knt,145,57,1	script	Warp#knt	107,22,22,{
+OnInit:
+	disablenpc "Warp#knt";
 	end;
-
 OnTouch:
 	set KNIGHT_Q,12;
 	changequest 9010,9011;
 	warp "prt_in",80,100;
 	end;
-
-OnInit:
-	disablenpc "Warp#knt";
-	end;
-
-OnEnable:
-	enablenpc "Warp#knt";
-	end;
-
-OnDisable:
-	disablenpc "Warp#knt";
-	end;
 }
 
-prt_in,87,92,4	script	Sir Gray	119,{
+// Test 5, and creates Claymores for knights
+//==========================================================
+prt_in,87,92,4	script	Sir Gray#knt	119,{
 	mes "[Sir Gray]";
 	if (BaseJob != Job_Swordman) {
 		if (BaseJob == Job_Knight) {
@@ -3486,4 +2501,4 @@ prt_in,87,92,4	script	Sir Gray	119,{
 		mes "treasure!";
 		close;
 	}
-}
\ No newline at end of file
+}
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index 4230fee61..8aadc429b 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -1,44 +1,63 @@
 //===== rAthena Script ======================================= 
-// Piest Job change Quest
+//= Priest Quest
 //===== By: ================================================== 
-//= Masao
-//= Credits: Muad_Dib
+//= Translated By: Pgro Team (OwNaGe)(Aegis)
+//= Converted by: kobra_k88.
+//= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.0
+//= 2.6
 //===== Compatible With: ===================================== 
-//= Any rAthena SVN
+//= rAthena  SVN
 //===== Description: ========================================= 
-//= [Translated from the Official]
-//= Job change Quest from Acolyte -> Priest.
+//= [Aegis Conversion]
+//= Job Change quest for Priest class.
 //===== Additional Comments: ================================= 
-//= 1.0 Updated to latest available official file. [Masao]
-//============================================================ 
+//= Fully working.  Changed the way Priests enter the test room to help Acos.
+//= Must use this with the included Acolyte quest to work properely.
+//= 1.3 Added Baby Class support, fixed 3 wrong constants bugs [Lupus]
+//= 1.5 Fixed possible EXP abuse [Lupus]
+//= 1.6 Added a func which prevent advanced classes passing
+//= 2nd Job Quests again. It also guides adv classes where
+//= to go. [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
+//= 2.1 Merged JFunc [Lupus]
+//= 2.1a Fixed typo [KarLaeda]
+//= 2.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 2.3 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf]
+//= 2.3a More bug fixes. [L0ne_W0lf]
+//= 2.4 Changed Marthilda to Mathilda. [L0ne_W0llf]
+//= 2.4a Deleted unused variables. [Samuray22]
+//= 2.4b Corrected a Typo error ";;". [Samuray22]
+//= 2.5 Added Quest Log commands. [Kisuka]
+//= 2.6 Removed the need for use of 'goto.' [L0ne_W0lf]
+//==========================================================
 
 prt_church,16,41,4	script	High Bishop#prst	60,{
-	if (Upper == 1) {
-		mes "[Bishop Paul]";
-		mes "Hm...?";
-		mes "Ah, I sense that you are a warrior that has been to Valhalla. You who have been reborn... We are here to look after you.";
-		next;
-		mes "[Bishop Paul]";
-		mes "Do not let evil conquer your soul. You have enough courage and power to overcome the hardest situation. May God bless you...";
-		close;
+	// Uncomment the following 'if' statement to allow High Priests to assist Acolytes with the job change quest.
+	// Officially High Priests are blocked from helping by an indiscriminate check if you are a transcended character.
+	//if (Class == Job_High_Priest) set .@AllowHPAssist,1;
+	if (Upper == 1 && .@AllowHPAssist != 1) {
+			mes "[Bishop Paul]";
+			mes "Hm...?";
+			mes "Ah, I sense that you are a warrior that has been to Valhalla. You who have been reborn... We are here to look after you.";
+			next;
+			mes "[Bishop Paul]";
+			mes "Do not let evil conquer your soul. You have enough courage and power to overcome the hardest situation. May God bless you...";
+			close;
 	}
-	if ((Class != Job_Baby_Acolyte) && (Class != Job_Acolyte)) {
-		if (Class == Job_Baby_Priest || Class == Job_Priest || Class == Job_High_Priest) {
+	if (BaseJob != Job_Acolyte) {
+		if (BaseJob == Job_Priest) {
 			mes "[Bishop Paul]";
 			mes "Ah...";
-			if (Sex == 1) {
+			if (sex)
 				mes "It is good to see you again, Brother " + strcharinfo(0) + ". Once again, God's grace has caused our paths to cross.";
-			}
-			else {
+			else
 				mes "It is good to see you once again, Sister " + strcharinfo(0) + ". The grace of God has brought you once more before me.";
-			}
 			next;
 			mes "[Bishop Paul]";
 			mes "I'm pleased to see that you are continuing to lead the children of God on the right path. Is there anything I can help you with today?";
 			next;
-			switch (select("How is your health?:I want to help this Acolyte.:Father, I need your help.")) {
+			switch(select("How is your health?:I want to help this Acolyte.:Father, I need your help.")) {
 			case 1:
 				mes "[Bishop Paul]";
 				mes "Thank you for your concern. I'm doing fine and am in good health. Please give my regards to your brothers and sisters.";
@@ -84,33 +103,30 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 				mes "[Bishop Paul]";
 				mes "You must be strong. Have faith, as you are loved by God. I pray the wounds of the body are healed soon...";
 				next;
+				percentheal 90,0;
 				mes "[Bishop Paul]";
 				mes "God, please look after your poor children. Help them overcome their hardships and difficulties. Refresh their spirits...";
 				next;
-				percentheal 90,90;
+				percentheal 0,90;
 				mes "[Bishop Paul]";
 				mes "I hope my invocation has eased your pain. Now please go forth and spread God's message. May God be with you...";
 				close;
 			}
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
-			if (Sex == 1) {
-				mes "[Bishop Paul]";
-				mes "May God be";
+		else if (BaseClass == Job_Novice) {
+			mes "[Bishop Paul]";
+			mes "May God be";
+			if (sex)
 				mes "with you, brother.";
-			}
-			else {
-				mes "[Bishop Paul]";
-				mes "May God be";
+			else
 				mes "with you, sister.";
-			}
 			next;
 			mes "[Bishop Paul]";
 			mes "You are in";
 			mes "the Sanctuary.";
 			mes "What brings you here?";
 			next;
-			switch (select("I want to be an Acolyte.:I want to be a Priest.:Nothing, really.")) {
+			switch(select("I want to be an Acolyte.:I want to be a Priest.:Nothing, really.")) {
 			case 1:
 				mes "[Bishop Paul]";
 				mes "Oh I see...";
@@ -131,22 +147,18 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 			close;
 		}
 		else {
-			if (Sex == 1) {
-				mes "[Bishop Paul]";
-				mes "May God be";
+			mes "[Bishop Paul]";
+			mes "May God be";
+			if (sex)
 				mes "with you, brother.";
-			}
-			else {
-				mes "[Bishop Paul]";
-				mes "May God be";
+			else
 				mes "with you, sister.";
-			}
 			next;
 			mes "[Bishop Paul]";
 			mes "What brings you here";
 			mes "to Prontera Sanctuary?";
 			next;
-			switch (select("Information about Priests.:Nothing.")) {
+			switch(select("Information about Priests.:Nothing.")) {
 			case 1:
 				mes "[Bishop Paul]";
 				mes "Priests have the authority to perform and administer religious rites.";
@@ -190,21 +202,17 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		}
 	}
 	if (PRIEST_Q == 0) {
-		if (Sex == 1) {
-			mes "[Bishop Paul]";
-			mes "May God bless";
+		mes "[Bishop Paul]";
+		mes "May God bless";
+		if (sex)
 			mes "you, Brother.";
-			mes "What brings";
-			mes "you to me?";
-		} else {
-			mes "[Bishop Paul]";
-			mes "May God bless";
+		else
 			mes "you, Sister.";
-			mes "What brings";
-			mes "you to me?";
-		}
+		mes "What brings";
+		mes "you to me?";
 		next;
-		if (select("I want to be a Priest.:How are you, Father?") == 1) {
+		switch(select("I want to be a Priest.:How are you, Father?")) {
+		case 1:
 			mes "[Bishop Paul]";
 			mes "I see. So you wish to be a Priest. God will be delighted by your decision and will bless you.";
 			next;
@@ -227,21 +235,19 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 					mes "There are still things that you must learn as an Acolyte. However, I look forward to meeting you again very soon.";
 					close;
 				}
-				if (SkillPoint != 0) {
+				if (SkillPoint) {
 					mes "[Bishop Paul]";
 					mes "You have skill points left.";
 					mes "I strongly recommend that you use all of these skill points before you apply for the Priest job change test.";
 					close;
 				}
-				set PRIEST_Q, 1;
+				set PRIEST_Q,1;
 				setquest 8009;
-				if (Sex == 1) {
 					mes "[Bishop Paul]";
+				if (sex)
 					mes "Now I will explain the Three Trials of Priesthood. These tribulations will bring you much suffering, but I hope you can complete them, Brother " + strcharinfo(0) + ".";
-				} else {
-					mes "[Bishop Paul]";
+				else
 					mes "Now I will explain the Three Trials of Priesthood. These tribulations will bring you much suffering, but I hope you can complete them, Sister " + strcharinfo(0) + ".";
-				}
 				next;
 				mes "[Bishop Paul]";
 				mes "For the First Trial, you will make a pilgrimage, and visit three acscetic Priests in a specific order.";
@@ -265,7 +271,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 					mes "[Bishop Paul]";
 					mes "I have no doubt that you will do a good job by yourself. However, it will be easier with the aid of a Brother or Sister that has already become a Priest.";
 					next;
-					set PRIEST_Q, 5;
+					set PRIEST_Q,5;
 					changequest 8009,8011;
 					mes "[Bishop Paul]";
 					mes "Well, are you ready for the Spiritual Training?";
@@ -307,35 +313,35 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 				mes "[Bishop Paul]";
 				mes "May God";
 				mes "bless you...";
+				changequest 8009,8010;
 				close;
 			}
 			mes "[Bishop Paul]";
 			mes "Please take your time.";
 			mes "You are always welcomed.";
 			mes "May God bless you...";
-			changequest 8009,8010;
+			close;
+		case 2:
+			mes "[Bishop Paul]";
+			mes "I see...";
+			mes "I am doing fine";
+			mes "and am in good health.";
+			mes "Thank you for asking.";
+			next;
+			mes "[Bishop Paul]";
+			if (sex)
+				mes "I hope you will continue to go on your mission as God's servant, brother.";
+			else
+				mes "I hope you will continue to go on your mission as God's servant, sister.";
+			next;
+			mes "[Bishop Paul]";
+			mes "Hopefully, our paths";
+			mes "will cross again.";
+			mes "May God bless you...";
 			close;
 		}
-		mes "[Bishop Paul]";
-		mes "I see...";
-		mes "I am doing fine";
-		mes "and am in good health.";
-		mes "Thank you for asking.";
-		next;
-		mes "[Bishop Paul]";
-		if (Sex == 1) {
-			mes "I hope you will continue to go on your mission as God's servant, brother.";
-		} else {
-			mes "I hope you will continue to go on your mission as God's servant, sister.";
-		}
-		next;
-		mes "[Bishop Paul]";
-		mes "Hopefully, our paths";
-		mes "will cross again.";
-		mes "May God bless you...";
-		close;
 	}
-	if (PRIEST_Q == 1) {
+	else if (PRIEST_Q == 1) {
 		mes "[Bishop Paul]";
 		mes "May I ask you the reason you're still here? You didn't forget your pilgrimage, did you?";
 		next;
@@ -369,7 +375,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		mes "Well then, I shall pray for your safe journey. May God bless you...";
 		close;
 	}
-	if (PRIEST_Q == 2) {
+	else if (PRIEST_Q == 2) {
 		mes "[Bishop Paul]";
 		mes "I see you have returned from your meeting with Father Rubalkabara. How is he doing? I am worried about his health, since he's been there all alone... ";
 		next;
@@ -377,7 +383,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		mes "For your next quest, you should meet Sister Mathilda. I shall be awaiting your safe return.";
 		close;
 	}
-	if (PRIEST_Q == 3) {
+	else if (PRIEST_Q == 3) {
 		mes "[Bishop Paul]";
 		mes "I see that you have returned from your journey to meet Sister Mathilda. She has been meditating in the hot, dry desert for a long time.";
 		next;
@@ -385,8 +391,9 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		mes "Finally, it is now time for you to meet Father Yosuke. He is doing penance somewhere around a field Northwest of Prontera. Please seek him out, and then return here to me.";
 		close;
 	}
-	if (PRIEST_Q == 4) {
-		set PRIEST_Q, 5;
+	else if (PRIEST_Q == 4) {
+		set PRIEST_Q,5;
+		changequest 8010,8011;
 		mes "[Bishop Paul]";
 		mes "You've accomplished";
 		mes "your pilgrimage.";
@@ -403,7 +410,6 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		mes "the spiritual training?";
 		next;
 		if (select("I'm ready.:Give me a minute.") == 1) {
-			changequest 8010,8011;
 			mes "[Bishop Paul]";
 			mes "Good. I will send you to the training ground. When you get there, please speak to Brother Peter who is in charge of the training.";
 			next;
@@ -418,12 +424,11 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		mes "overcome your fears...";
 		close;
 	}
-	if (PRIEST_Q == 5) {
+	else if (PRIEST_Q == 5) {
 		mes "[Bishop Paul]";
 		mes "You seem confident about the spiritual training. Shall we begin?";
 		next;
 		if (select("I'm ready.:Give me a minute.") == 1) {
-			changequest 8010,8011;
 			mes "[Bishop Paul]";
 			mes "Good. I will send you to the training ground. When you get there, please speak to Brother Peter who is in charge of the training.";
 			next;
@@ -438,7 +443,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		mes "overcome your fears...";
 		close;
 	}
-	if (PRIEST_Q == 6) {
+	else if (PRIEST_Q == 6) {
 		mes "[Bishop Paul]";
 		mes "You look tired and exhausted. However, you must endure even more suffering once you become a Priest.";
 		next;
@@ -446,7 +451,6 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		mes "Please endure these trials for the sake of your dream. Why don't you challenge the spiritual training again?";
 		next;
 		if (select("I'll try again.:Give me a minute.") == 1) {
-			changequest 8010,8011;
 			mes "[Bishop Paul]";
 			mes "Good. I will send you to the training ground. Please ask for help from Brother Peter.";
 			next;
@@ -461,7 +465,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		mes "overcome your fears...";
 		close;
 	}
-	if (PRIEST_Q == 7) {
+	else if (PRIEST_Q == 7) {
 		mes "[Bishop Paul]";
 		mes "I am glad that you've done well with the spiritual training. Congratulations. You are now qualified to be called a Priest.";
 		next;
@@ -477,7 +481,7 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		mes "waiting for you.";
 		close;
 	}
-	if (PRIEST_Q == 8) {
+	else if (PRIEST_Q == 8) {
 		mes "[Bishop Paul]";
 		mes "Hmm? You haven't made your oath yet...? Without the conviction of an oath to God, you may be tempted by evil at anytime.";
 		next;
@@ -485,8 +489,8 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		mes "You should go to sister Cecilia and promise your devotion to God. Return here with honor, and listen to the voice of God that speaks quietly in your heart.";
 		close;
 	}
-	if (PRIEST_Q == 9) {
-		if (SkillPoint != 0) {
+	else if (PRIEST_Q == 9) {
+		if (SkillPoint) {
 			mes "[Bishop Paul]";
 			mes "You have remaining skills points. Please use these skill points to upgrade your skills, and then return to me.";
 			close;
@@ -496,63 +500,52 @@ prt_church,16,41,4	script	High Bishop#prst	60,{
 		next;
 		mes "[Bishop Paul]";
 		mes "God, grant your power to your servant standing before you.";
-		if (Sex == 1) {
+		changequest 8015,8016;
+		if (sex)
 			mes "Let him send your message throughout the ends of the earth.";
-		}
-		else {
+		else
 			mes "Let her send your message throughout the ends of the earth.";
-		}
 		next;
 		mes "[Bishop Paul]";
 		mes "Make this servant of yours an instrument of your miraculous works...";
 		next;
-		set PRIEST_Q,0;
-		if(Class == Job_Baby_Acolyte){
-			jobchange Job_Baby_Priest;
-		} else {
-			jobchange Job_Priest;
-		}
-		changequest 8015,8016;
+		set .@joblvl,JobLevel;
+		completequest 8016;
+		callfunc "Job_Change",Job_Priest;
+		callfunc "F_ClearJobVar";		// clears all job variables for the current player
 		mes "[Bishop Paul]";
 		mes "Now you are born again as a Priest. I congratulate you, and hope you will greatly help other people for the rest of your life.";
 		next;
-		if (JobLevel == 50) {
-			getitem 1551,1; //Bible
-		} else {
+		mes "[Bishop Paul]";
+		if (.@joblvl < 50) {
 			getitem 1550,1; //Book
+			mes "This book is for you. I hope it will aid you in spreading God's message on earth.";
+		}
+		else {
+			getitem 1551,1; //Bible
+			mes "In commemoration of your job change, I am giving you a bible. This will lighten your way to the path of righteousness.";
 		}
-		mes "[Bishop Paul]";
-		mes "And...";
-		mes "This book is for you. I hope it will aid you in spreading God's message on earth.";
 		next;
 		mes "[Bishop Paul]";
 		mes "You've shown great effort, and have made admirable progress in your personal quest for holiness. Please lead your life as a sincere Priest...";
-		completequest 8016;
 		close;
 	}
 }
 
 prt_church,27,24,1	script	Sister Cecilia	79,{
-	if ((Class != Job_Baby_Acolyte) && (Class != Job_Acolyte)) {
-		if (Class == Job_Baby_Priest || Class == Job_Priest) {
-			if (Sex == 1) {
-				mes "[Sister Cecilia]";
+	mes "[Sister Cecilia]";
+	if (BaseJob != Job_Acolyte) {
+		if (BaseJob == Job_Priest) {
+			if (sex)
 				mes "May god bless you, brother. It brings my heart joy to see that you working hard to carry out the will of God.";
-			}
-			else {
-				mes "[Sister Cecilia]";
+			else
 				mes "May god bless you, sister. It brings my heart joy to see that you working hard to carry out the will of God.";
-			}
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
-			if (Sex == 1) {
-				mes "[Sister Cecilia]";
+		else if (Class == Job_Novice) {
+			if (sex)
 				mes "May god bless you, brother.";
-			}
-			else {
-				mes "[Sister Cecilia]";
+			else
 				mes "May god bless you, sister.";
-			}
 			mes "Prontera parish welcomes you.";
 			next;
 			mes "[Sister Cecilia]";
@@ -571,54 +564,46 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 			mes "But please...";
 			mes "Take your time, and decide what job will be the best for you.";
 		}
-		if (Sex == 1) {
-			mes "[Sister Cecilia]";
-			mes "May god bless you, brother.";
-		} else {
-			mes "[Sister Cecilia]";
-			mes "May god bless you, sister.";
-		}
-		mes "Welcome to Prontera parish. How may I help you?";
-		next;
-		switch (select("Tell me more about Priests.:Nothing.")) {
-		case 1:
-			mes "[Sister Cecilia]";
-			mes "Messengers of God are usually known as Priests. After becoming an Acolyte, you can train with the goal of becoming a Priest.";
+		else {
+			if (sex)
+				mes "May god bless you, brother.";
+			else
+				mes "May god bless you, sister.";
+			mes "Welcome to Prontera parish. How may I help you?";
 			next;
-			mes "[Sister Cecilia]";
-			mes "Servants of God are prohibited to use weapons based on blades. For us, the meaning of battle with monsters is not in the killing, but in the enlightening of their souls.";
-			if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-				next;
+			if (select("Tell me more about Priests.:Nothing.") == 1) {
 				mes "[Sister Cecilia]";
-				mes "Well, it will be better that you meet Priests for yourself and speak with them. If you are ready to become a Priest, speak with Bishop Paul in this room.";
+				mes "Messengers of God are usually known as Priests. After becoming an Acolyte, you can train with the goal of becoming a Priest.";
 				next;
 				mes "[Sister Cecilia]";
-				mes "I believe he can give you specific requirement information about the Priest class. Yes, I think it's a good idea.";
-				next;
+				mes "Servants of God are prohibited to use weapons based on blades. For us, the meaning of battle with monsters is not in the killing, but in the enlightening of their souls.";
+				if (BaseJob == Job_Acolyte) {
+					next;
+					mes "[Sister Cecilia]";
+					mes "Well, it will be better that you meet Priests for yourself and speak with them. If you are ready to become a Priest, speak with Bishop Paul in this room.";
+					next;
+					mes "[Sister Cecilia]";
+					mes "I believe he can give you specific requirement information about the Priest class. Yes, I think it's a good idea.";
+				}
+				close;
 			}
-			break;
-		case 2:
 			mes "[Sister Cecilia]";
 			mes "I see. Well, feel free to relax and make yourself at home. Nowhere on earth is safer than the Prontera Sanctuary.";
-			break;
+			next;
+			mes "[Sister Cecilia]";
+			mes "May God bless you...";
+			close;
 		}
-		next;
-		mes "[Sister Cecilia]";
-		mes "May God bless you...";
-		close;
 	}
 	if (PRIEST_Q == 0) {
-		if (Sex == 1) {
-			mes "[Sister Cecilia]";
+		if (sex)
 			mes "May God bless you, brother.";
-		}
-		else {
-			mes "[Sister Cecilia]";
+		else
 			mes "May God bless you, sister.";
-		}
 		mes "May I ask what brings you here?";
 		next;
-		if (select("I wish to become a Priest.:Nothing.") == 1) {
+		switch(select("I wish to become a Priest.:Nothing.")) {
+		case 1:
 			mes "[Sister Cecilia]";
 			mes "I see. You've devoted yourself to God. Many Acolytes wish to become Priests to continue on their personal journey towards holiness.";
 			next;
@@ -637,13 +622,13 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 			mes "[Sister Cecilia]";
 			mes "If you experience a problem during any of your trials, feel free to visit me. I will help you as much as I can.";
 			close;
+		case 2:
+			mes "[Sister Cecilia]";
+			mes "Make yourself at home. I insist that you recover and take a rest in this Sanctuary. May God bless you...";
+			close;
 		}
-		mes "[Sister Cecilia]";
-		mes "Make yourself at home. I insist that you recover and take a rest in this Sanctuary. May God bless you...";
-		close;
 	}
-	if (PRIEST_Q == 1) {
-		mes "[Sister Cecilia]";
+	else if (PRIEST_Q == 1) {
 		mes "Ah, you've started your pilgrimage. Please do your best to accomplish this first trial.";
 		next;
 		mes "[Sister Cecilia]";
@@ -665,8 +650,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		mes "Well then, have a good journey. Please don't give up to short lived tribulations, and I hope that you accomplish your goals.";
 		close;
 	}
-	if (PRIEST_Q == 2) {
-		mes "[Sister Cecilia]";
+	else if (PRIEST_Q == 2) {
 		mes "Oh, you've met Father Rubalkabara. Now it's time for you to visit Sister Mathilda. She is near a town named Morroc.";
 		next;
 		mes "[Sister Cecilia]";
@@ -679,8 +663,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		mes "But I believe this is God's will, and that this is the work he has intended me to do as his servant. Have a safe journey, and come back safely.";
 		close;
 	}
-	if (PRIEST_Q == 3) {
-		mes "[Sister Cecilia]";
+	else if (PRIEST_Q == 3) {
 		mes "Now, the final Priest that you must meet is Father Yosuke. I've heard that he is training near a lake located Northwest of Prontera.";
 		next;
 		mes "[Sister Cecilia]";
@@ -690,25 +673,21 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		mes "Although there are still two trials awaiting you, I have faith that you will be able to accomplish your goal of becoming a Priest...";
 		close;
 	}
-	if (PRIEST_Q == 4) {
-		mes "[Sister Cecilia]";
+	else if (PRIEST_Q == 4) {
 		mes "Welcome. You demonstrated great effort to accomplish your first trial. Now, speak to Bishop Paul so that you can begin your next trial on your path to Priesthood.";
 		next;
 		mes "[Sister Cecilia]";
-		if (Sex == 1) {
-			mes "Brother " + strcharinfo(0) + "...";
-		}
-		else {
-			mes "Sister " + strcharinfo(0) + "...";
-		}
+		if (sex)
+			mes "Brother "+ strcharinfo(0) +"...";
+		else
+			mes "Sister "+ strcharinfo(0) +"...";
 		mes "The spiritual training is much more difficult than the pilgrimage, but I believe in you.";
 		next;
 		mes "[Sister Cecilia]";
 		mes "I hope that you find someone who has already become a Priest to help during the spiritual training. Good luck, and have faith.";
 		close;
 	}
-	if (PRIEST_Q == 5) {
-		mes "[Sister Cecilia]";
+	else if (PRIEST_Q == 5) {
 		mes "Oh, you haven't finished the spiritual training yet?";
 		next;
 		mes "[Sister Cecilia]";
@@ -718,8 +697,7 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		mes "Please speak to Father Peter in the test hall for more details. He is a close friend of Bishop Paul and may give you some useful tips for the spiritual training.";
 		close;
 	}
-	if (PRIEST_Q == 6) {
-		mes "[Sister Cecilia]";
+	else if (PRIEST_Q == 6) {
 		mes "Yes, I understand that you've been through a really difficult situation. However, do not give up and succumb to temptation. You must be able to resist evil to become a Priest.";
 		next;
 		mes "[Sister Cecilia]";
@@ -729,27 +707,33 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		mes "May God give you guidance and protection. When you complete your training, please come back to me.";
 		close;
 	}
-	if (PRIEST_Q == 7) {
-		mes "[Sister Cecilia]";
-		mes "Welcome! I'm so glad to see you've come back! Now, there is one last trial left for you to complete.";
-		changequest 8013,8014;
-		next;
-		mes "[Sister Cecilia]";
-		if (Sex == 1) {
-			mes "Brother " + strcharinfo(0) + "...";
+	else if (PRIEST_Q == 7 || PRIEST_Q == 8) {
+		if (PRIEST_Q == 7) {
+			if(checkquest(8014) == -1) {
+				changequest 8013,8014;
+			}
+			mes "Welcome! I'm so glad to see you've come back! Now, there is one last trial left for you to complete.";
 		}
-		else {
-			mes "Sister " + strcharinfo(0) + "...";
+		else if (PRIEST_Q == 8) {
+			mes "...";
+			next;
+			mes "[Sister Cecilia]";
+			mes "Welcome back.";
+			mes "I hope that you've reflected on what you've said last time, and that you now have the attitude to become a Priest.";
 		}
+		next;
+		mes "[Sister Cecilia]";
+		if (sex)
+			mes "Brother "+ strcharinfo(0) +"...";
+		else
+			mes "Sister "+ strcharinfo(0) +"...";
 		mes "We will now begin your formal oath for the Priesthood. Make yourself comfortable, and just answer with your heart.";
 		next;
 		mes "[Sister Cecilia]";
-		if (Sex == 1) {
-			mes "Brother " + strcharinfo(0) + ",";
-		}
-		else {
-			mes "Sister " + strcharinfo(0) + ",";
-		}
+		if (sex)
+			mes "Brother "+ strcharinfo(0) +",";
+		else
+			mes "Sister "+ strcharinfo(0) +",";
 		mes "Are you willing";
 		mes "to give your life to God?";
 		next;
@@ -837,17 +821,14 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 			close;
 		}
 		mes "[Sister Cecilia]";
-		if (Sex == 1) {
-			mes "Brother " + strcharinfo(0) + "...";
-		}
-		else {
-			mes "Sister " + strcharinfo(0) + "...";
-		}
+		if (sex)
+			mes "Brother "+ strcharinfo(0) +"...";
+		else
+			mes "Sister "+ strcharinfo(0) +"...";
 		mes "You have demonstrated your devotion to God. Will you swear to adhere to his teachings for the rest of your days?";
 		next;
 		if (select("I do.:No.") == 1) {
 			set PRIEST_Q,9;
-			changequest 8014,8015;
 			mes "[Sister Cecilia]";
 			mes "Now, you have completed your oath of Priesthood and accomplished all three trials required to become a Priest.";
 			next;
@@ -863,148 +844,14 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 		mes "......";
 		next;
 		set PRIEST_Q,8;
+		changequest 8014,8015;
 		mes "[Sister Cecilia]";
 		mes "You've come so far...";
 		mes "Why would you want";
 		mes "to throw this all away...?";
 		close;
 	}
-	if (PRIEST_Q == 8) {
-		mes "[Sister Cecilia]";
-		mes "...";
-		next;
-		mes "[Sister Cecilia]";
-		mes "Welcome back.";
-		mes "I hope that you've reflected on what you've said last time, and that you now have the attitude to become a Priest.";
-		next;
-		mes "[Sister Cecilia]";
-		if (Sex == 1) {
-			mes "Brother " + strcharinfo(0) + "...";
-		}
-		else {
-			mes "Sister " + strcharinfo(0) + "...";
-		}
-		mes "We will now begin your formal oath for the Priesthood. This time, listen closely to your heart...";
-		next;
-		mes "[Sister Cecilia]";
-		if (Sex == 1) {
-			mes "Brother " + strcharinfo(0) + ",";
-		}
-		else {
-			mes "Sister " + strcharinfo(0) + ",";
-		}
-		mes "Are you willing";
-		mes "to give your life to God?";
-		next;
-		if (select("Yes.:No!") == 2) {
-			mes "[Sister Cecilia]";
-			mes "Aw...? How could you give me that kind of answer? I assume you're not ready to be a Priest yet...";
-			next;
-			mes "[Sister Cecilia]";
-			mes "You should reflect a little more on the teachings of holiness and come back later. You can't be a Priest if your spirit is weak.";
-			close;
-		}
-		mes "[Sister Cecilia]";
-		mes "Will you take advantage of the holy abilities given by God for selfish, destructive or greedy ends?";
-		next;
-		if (select("Yes.:No.") == 1) {
-			mes "[Sister Cecilia]";
-			mes "Aw...? God won't grant you the power of holiness if your goals aren't just and pure. Meditate on your motivations for a while, and then come back to me.";
-			next;
-			mes "[Sister Cecilia]";
-			mes "Think about the qualities that make Priests people of respect. You can't be a Priest if your spirit is not in accordance with God.";
-			close;
-		}
-		mes "[Sister Cecilia]";
-		mes "Will you help aid others, even complete strangers, in battles by easing their suffering?";
-		next;
-		if (select("Yes.:No.") == 2) {
-			mes "[Sister Cecilia]";
-			mes "No, no. You've got the wrong idea. God authorizes us to use his power to support his children. You must help people in danger: it is your obligation.";
-			next;
-			mes "[Sister Cecilia]";
-			mes "Go and observe the adventurers that are fighting for peace in this world. They will teach you what you must do in order to help them.";
-			close;
-		}
-		mes "[Sister Cecilia]";
-		mes "Are you willing to sacrifice yourself for the sake of others?";
-		next;
-		if (select("Yes.:No.") == 2) {
-			mes "[Sister Cecilia]";
-			mes "How can you say no...? That's one of the basic principles of Priesthood. You must value the welfare of others over your own safety.";
-			next;
-			mes "[Sister Cecilia]";
-			mes "Go and think about the value of suffering and the meaning of sacrifice. When you think you understand more about helping those in need, come back to me.";
-			close;
-		}
-		mes "[Sister Cecilia]";
-		mes "Will you repeatly say the same phrase in public in order to send God's message to his children?";
-		next;
-		if (select("Yes.:No.") == 1) {
-			mes "[Sister Cecilia]";
-			mes "No no no... You've got it wrong. Even though your purpose is to spread God's message, no one will eagerly accept what you say when you spam text.";
-			next;
-			mes "[Sister Cecilia]";
-			mes "Remember...";
-			mes "You must be a moral person, and display maturity and respect to other players. This kind of attitude applies for all classes,";
-			mes "I believe.";
-			close;
-		}
-		mes "[Sister Cecilia]";
-		mes "Will you lure many monsters to help your party members level up?";
-		next;
-		if (select("Yes.:No.") == 1) {
-			mes "[Sister Cecilia]";
-			mes "No, you won't. Luring many monsters does more harm than good. There is no exception. That behavior is totally unacceptable.";
-			next;
-			mes "[Sister Cecilia]";
-			mes "Even if it looks like you are aiding your party members, such action results in bad karma. Please reflect on that for a while.";
-			close;
-		}
-		mes "[Sister Cecilia]";
-		mes "Will you follow God, no matter what it takes, even if he demands you to kill yourself?";
-		next;
-		if (select("Yes.:No.") == 2) {
-			mes "[Sister Cecilia]";
-			mes "With that spirit, you can't be a Priest. If it is God's will to sacrifice yourself for a good purpose, you must carry out God's will as his servant.";
-			next;
-			mes "[Sister Cecilia]";
-			mes "Besides, God has also given Priests the resurrection power. Think about the meaning of life and death again, and then come back to me.";
-			close;
-		}
-		mes "[Sister Cecilia]";
-		if (Sex == 1) {
-			mes "Brother " + strcharinfo(0) + "...";
-		}
-		else {
-			mes "Sister " + strcharinfo(0) + "...";
-		}
-		mes "You have demonstrated your devotion to God. Will you swear to adhere to his teachings for the rest of your days?";
-		next;
-		if (select("I do.:No.") == 1) {
-			set PRIEST_Q,9;
-			mes "[Sister Cecilia]";
-			mes "Now, you have completed your oath of Priesthood and accomplished all three trials required to become a Priest.";
-			next;
-			mes "[Sister Cecilia]";
-			mes "Now go to Bishop Paul. And remember, we are all brothers and sisters in the eyes of God. Peace be with you...";
-			close;
-		}
-		mes "[Sister Cecilia]";
-		mes "...";
-		next;
-		mes "[Sister Cecilia]";
-		mes "...";
-		mes "......";
-		next;
-		mes "[Sister Cecilia]";
-		mes "You've come so far...";
-		mes "Why would you want";
-		mes "to throw this all away...?";
-		close;
-	}
-	if (PRIEST_Q == 9) {
-		mes "[Sister Cecilia]";
+	else if (PRIEST_Q == 9) {
 		mes "Congratulations.";
 		mes "You've completed all three trials required for the Priesthood. Bishop Paul is now waiting for you.";
 		next;
@@ -1014,6 +861,8 @@ prt_church,27,24,1	script	Sister Cecilia	79,{
 	}
 }
 
+// 2nd Test
+//==========================================================
 job_prist,24,187,4	script	Peter S. Alberto	110,{
 	mes "[Father Peter]";
 	if (BaseJob == Job_Priest) {
@@ -1476,10 +1325,11 @@ OnTouch:
 	end;
 }
 
-job_prist,168,45,4	script	Deviruchi#prst	1928,8,1,{
-
+// 3rd Test
+//==========================================================
+job_prist,168,45,4	script	Deviruchi#prst	1109,8,1,{
 OnTouch:
-	if (Class == Job_Baby_Priest || Class == Job_Priest) {
+	if (BaseJob == Job_Priest) {
 		mes "[Deviruchi]";
 		mes "Whaaaaat...?";
 		mes "What are you";
@@ -1497,7 +1347,7 @@ OnTouch:
 		mes "Alright, alright, for old time's sake, I'll let you pass me. But only this once. But I better not catch you again! This is evil turf, you hear?!";
 		close;
 	}
-	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
+	if (BaseClass == Job_Acolyte) {
 		mes "[Deviruchi]";
 		mes "Why...";
 		mes "Hello little Aco.";
@@ -1528,6 +1378,7 @@ OnTouch:
 			mes "[Deviruchi]";
 			mes "BWAHAHAHAHAHAH!";
 			mes "GET THE JOKE!?";
+			close2;
 			warp "c_tower2",168,33;
 			end;
 		}
@@ -1577,10 +1428,9 @@ OnTouch:
 	end;
 }
 
-job_prist,168,80,4	script	Doppelganger#prst	1966,8,1,{
-
+job_prist,168,80,4	script	Doppelganger#prst	1046,8,1,{
 OnTouch:
-	if (Class == Job_Baby_Priest || Class == Job_Priest) {
+	if (BaseJob == Job_Priest) {
 		mes "[Doppelganger]";
 		mes "What are you doing here? You've already made your choice, there's no going back... Priest.";
 		next;
@@ -1588,7 +1438,7 @@ OnTouch:
 		mes "Besides, this is none of your business. Whether or not this Acolyte becomes a Priest isn't up to you. Now get out of here, before I get violent.";
 		close;
 	}
-	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
+	else if (BaseClass == Job_Acolyte) {
 		mes "[Doppelganger]";
 		mes "Hold on there, Acolyte.";
 		mes "I'm not like Deviruchi,";
@@ -1623,16 +1473,16 @@ OnTouch:
 		mes "Just don't become a Priest. I won't ask you more than once. Then you can choose a better job... perhaps a Swordman like me.";
 		next;
 		if (select("I don't want to be a Priest!:I'll never listen to you!") == 1) {
-				mes "[Doppelganger]";
-				mes "Excellent choice. Now, never return to this place. I shall return your job to Novice as you wish.";
-				next;
-				mes "[Doppelganger]";
-				mes "Now go!!";
-				mes "Never step into";
-				mes "the light again!";
-				close2;
-				warp "gef_dun02",210,177;
-				end;
+			mes "[Doppelganger]";
+			mes "Excellent choice. Now, never return to this place. I shall return your job to Novice as you wish.";
+			next;
+			mes "[Doppelganger]";
+			mes "Now go!!";
+			mes "Never step into";
+			mes "the light again!";
+			close2;
+			warp "gef_dun02",210,177;
+			end;
 		}
 		mes "[Doppelganger]";
 		mes "Hmpf. I admire";
@@ -1645,22 +1495,20 @@ OnTouch:
 		mes "I assure you... You won't be happy at all to see me.";
 		close;
 	}
-	end;
 }
 
 job_prist,168,115,4	script	Dark Lord#prst	1272,8,1,{
-
 OnTouch:
-	if (Class == Job_Baby_Priest || Class == Job_Priest) {
+	if (BaseJob == Job_Priest) {
 		mes "[Dark Lord]";
 		mes "^330033All is doom, darkness and despair! Those who love you will betray you, and all that will be left is grieving and fury!^000000";
 		next;
 		mes "[Dark Lord]";
 		mes "^330033To choose to become a servant of God is to choose eternal pain!";
 		mes "I shall personally see to that, mortal.^000000";
-		close2;
+		close;
 	}
-	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
+	else if (BaseClass == Job_Acolyte) {
 		mes "[Dark Lord]";
 		mes "^330033Halt, human.";
 		mes "Who has granted";
@@ -1704,13 +1552,11 @@ OnTouch:
 		mes "Mark my words...^000000";
 		close;
 	}
-	end;
 }
 
 job_prist,168,150,4	script	Baphomet#prst	736,8,1,{
-
 OnTouch:
-	if (Class == Job_Baby_Priest || Class == Job_Priest) {
+	if (BaseJob == Job_Priest) {
 		mes "[Baphomet]";
 		mes "I hate";
 		mes "Priests...";
@@ -1719,12 +1565,12 @@ OnTouch:
 		mes "I don't have any business with you, servant of God. Just pass through.";
 		close;
 	}
-	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
+	else if (BaseClass == Job_Acolyte) {
 		mes "[Baphomet]";
 		mes "Greetings.";
 		next;
 		mes "[Baphomet]";
-		mes "..." + strcharinfo(0) + ".";
+		mes "..."+ strcharinfo(0) +".";
 		next;
 		mes "[Baphomet]";
 		mes "Yes, human,";
@@ -1768,24 +1614,21 @@ OnTouch:
 		mes "I shall be preparing my troops for you. The day will come when I shall enjoy watching you writhe in agony as my fiends slowly devour you.";
 		close;
 	}
-	end;
 }
 
-job_prist,168,180,0	script	prst2_1	45,4,3,{
-	
+job_prist,168,180,4	script	prst2_1	45,3,3,{
 OnTouch:
-	if (Class == Job_Baby_Priest || Class == Job_Priest) {
-		warp "job_prist",98,40;
-	} else if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
+	if (BaseJob == Job_Priest) warp "job_prist",98,40;
+	else if (BaseClass == Job_Acolyte) {
 		warp "job_prist",98,40;
 		donpcevent "Mummy_Generator::OnEnable";
 	}
 	end;
 }
 
+// 4th Test
+//==========================================================
 job_prist,1,2,1	script	Mummy_Generator	110,1,1,{
-	end;
-
 OnInit:
 	disablenpc "Mummy_Generator";
 	end;
@@ -1796,137 +1639,244 @@ OnEnable:
 	donpcevent "Mummy3_1::OnEnable";
 	end;
 
-OnM1:
+Onm1:
 	monster "job_prist",90,55,"Khamoz",1041,1;
 	monster "job_prist",105,55,"Amocsis",1041,1;
 	end;
 
-OnM2:
+Onm2:
 	monster "job_prist",90,70,"Mentuhoteph",1041,1;
 	monster "job_prist",105,70,"Akenaten",1041,1;
 	end;
 
-OnM3:
+Onm3:
 	monster "job_prist",90,85,"Mehnes",1041,1;
 	monster "job_prist",105,85,"Snepheru",1041,1;
 	end;
 
 OnDisable:
 	disablenpc "Mummy_Generator";
-	end;
-
-OnReset:
-	killmonster "job_prist","Mummy_Generator::OnMyMobDead";
+	killmonsterall "job_prist";
 	end;
 }
 
-job_prist,90,55,0	script	Mummy1_1	139,15,1,{
+job_prist,90,55,0	script	Mummy1_1	-1,15,1,{
+OnInit:
+	disablenpc "Mummy1_1";
+	end;
 
 OnTouch:
-	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-		donpcevent "Mummy_Generator::OnM1";
+	if (BaseJob == Job_Acolyte) {
+		donpcevent "Mummy_Generator::Onm1";
 		donpcevent "Mummy1_1::OnDisable";
 	}
 	end;
 
-OnInit:
-	disablenpc "Mummy1_1";
-	end;
-
 OnEnable:
 	enablenpc "Mummy1_1";
-	enablenpc "Mummy1_2";
 	end;
 
 OnDisable:
 	disablenpc "Mummy1_1";
-	disablenpc "Mummy1_2";
 	end;
 }
 
-job_prist,105,55,0	script	Mummy1_2	139,1,1,{
-	end;
-
+job_prist,90,70,0	script	Mummy2_1	-1,15,1,{
 OnInit:
-	disablenpc "Mummy1_2";
+	disablenpc "Mummy2_1";
 	end;
-}
-
-job_prist,90,70,0	script	Mummy2_1	139,15,1,{
 
 OnTouch:
-	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-		donpcevent "Mummy_Generator::OnM2";
+	if (BaseJob == Job_Acolyte) {
+		donpcevent "Mummy_Generator::Onm2";
 		donpcevent "Mummy2_1::OnDisable";
 	}
 	end;
 
-OnInit:
-	disablenpc "Mummy2_1";
-	end;
-
 OnEnable:
 	enablenpc "Mummy2_1";
-	enablenpc "Mummy2_2";
 	end;
 
 OnDisable:
 	disablenpc "Mummy2_1";
-	disablenpc "Mummy2_2";
 	end;
 }
 
-job_prist,105,70,0	script	Mummy2_2	139,1,1,{
-	end;
-
+job_prist,90,85,0	script	Mummy3_1	-1,15,1,{
 OnInit:
-	disablenpc "Mummy2_2";
+	disablenpc "Mummy3_1";
 	end;
-}
-
-job_prist,90,85,0	script	Mummy3_1	139,15,1,{
 
 OnTouch:
-	if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-		donpcevent "Mummy_Generator::OnM3";
+	if (BaseJob == Job_Acolyte) {
+		donpcevent "Mummy_Generator::Onm3";
 		donpcevent "Mummy3_1::OnDisable";
 	}
 	end;
 
-OnInit:
-	disablenpc "Mummy3_1";
-	end;
-
 OnEnable:
 	enablenpc "Mummy3_1";
-	enablenpc "Mummy3_2";
 	end;
 
 OnDisable:
 	disablenpc "Mummy3_1";
-	disablenpc "Mummy3_2";
-	end;
-}
-
-job_prist,105,85,0	script	Mummy3_2	139,1,1,{
-	end;
-
-OnInit:
-	disablenpc "Mummy3_2";
 	end;
 }
 
-job_prist,98,105,0	script	prst3_1	45,4,3,{
-
+job_prist,98,105,4	script	prst3_1	45,3,3,{
 OnTouch:
-	if (Class == Job_Baby_Priest || Class == Job_Priest) {
+	if (BaseJob == Job_Priest) {
 		warp "prt_church",15,36;
-	} else if (Class == Job_Baby_Acolyte || Class == Job_Acolyte) {
-		changequest 8012,8013;
+		end; 
+	}
+	else if (BaseClass == Job_Acolyte) {
 		set PRIEST_Q,7;
+		if(checkquest(8012) != -1) {
+			changequest 8012,8013;
+		}
 		warp "prt_church",16,37;
-		donpcevent "Mummy_Generator::OnReset";
 		donpcevent "Mummy_Generator::OnDisable";
 	}
 	end;
-}
\ No newline at end of file
+}
+
+// Functions
+//==========================================================
+function	script	F_FatherRub	{
+	if (PRIEST_Q != 0) {
+		if (PRIEST_Q == 1) {
+			mes "Ah yes, so you're the young Acolyte who wishes to become a Priest.";
+			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.";
+			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.";
+			close2;
+			savepoint "prt_fild03",361,255;
+			set PRIEST_Q,2;
+			end;
+		}
+		else if (PRIEST_Q == 2) {
+			mes "Please be hurry to the next destination for your pilgrimage. I hope you become a Priest soon.";
+			close;
+		}
+		mes "May I ask why you have returned? Please go back and continue your religious practice.";
+		close;
+	}
+	mes "I have no idea what brought you here, but please excuse me.";
+	close;
+}
+
+function	script	F_MotherMart	{
+	if (PRIEST_Q != 0) {
+		if (PRIEST_Q == 1) {
+			mes "Hmm...";
+			mes "It seems you're";
+			mes "training to become";
+			mes "a Priest.";
+			next;
+			mes "[Mother Mathilda]";
+			mes "However, at this point in your pilgrimage, I am not the person that you should be visiting.";
+			next;
+			mes "[Mother Mathilda]";
+			mes "Perhaps you should ask Bishop Paul or Sister Cecilia once again. Well, may God be with you...";
+			close;
+		}
+		else if (PRIEST_Q == 2) {
+			mes "Ah, are you";
+			mes "a Priest trainee...?";
+			mes "Welcome!";
+			next;
+			mes "[Mother Mathilda]";
+			mes "We Priests are obliged to spread the message of God to";
+			mes "the peoples of the Earth.";
+			next;
+			mes "[Mother Mathilda]";
+			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.";
+			next;
+			mes "[Mother Mathilda]";
+			mes "Well then...";
+			mes "I shall pray to";
+			mes "God for safety";
+			mes "on your journey.";
+			close2;
+			savepoint "moc_fild07",35,355;
+			set PRIEST_Q,3;
+			end;
+		}
+		else if (PRIEST_Q == 3) {
+			mes "Please leave soon, and";
+			mes "continue your training.";
+			close;
+		}
+		mes "May I ask you the reason you came back? Please continue your training.";
+		close;
+	}
+	mes "May God";
+	mes "be with you...";
+	close;
+}
+
+function	script	F_FatherYos	{
+	if (PRIEST_Q != 0) {
+		if (PRIEST_Q == 1) {
+			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;
+		}
+		else if (PRIEST_Q == 2) {
+			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. Go back to Church.";
+			close;
+		}
+		else if (PRIEST_Q == 3) {
+			mes "Hmm.";
+			mes "A Priest";
+			mes "trainee, eh? ";
+			mes "Welcome.";
+			next;
+			mes "[Father Yosuke]";
+			mes "I won't say";
+			mes "anything more.";
+			mes "Just devote your";
+			mes "life to God.";
+			next;
+			mes "[Father Yosuke]";
+			mes "Now go back to church.";
+			mes "Hereby, the first of";
+			mes "your trials is now";
+			mes "completed.";
+			close2;
+			savepoint "prt_fild00",206,230;
+			set PRIEST_Q,4;
+			end;
+		}
+		else if (PRIEST_Q == 4) {
+			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 "Just go be a Priest. This isn't a playground for kids.";
+		close;
+	}
+	mes "...Acolyte, you don't have any business with me here.";
+	close;
+}
+
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index 72987977f..39cbdb204 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -1,17 +1,31 @@
 //===== rAthena Script ======================================= 
-// Wizard Job change Quest
+//= Wizard Job Quest
 //===== By: ================================================== 
-//= Masao
-//= Credits: Muad_Dib
+//= (Aegis) Translated by yoshiki, converted by kobra_k88
+//= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 1.0
+//= 3.2
 //===== Compatible With: ===================================== 
-//= Any rAthena SVN
+//= rAthena SVN
 //===== Description: ========================================= 
-//= [Translated from the Official]
-//= Job change Quest from Mage -> Wizard.
+//= [Aegis Conversion]
+//= Job Change quest for Wizard class.
 //===== Additional Comments: ================================= 
-//= 1.0 Updated to latest available official file. [Masao]
+//= 2.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 2.5 Several bugfixes with the help of Barron-Monster. [L0ne_W0lf]
+//= 2.5a More bugfixes care of Barron-Monster. [L0ne_W0lf]
+//= 2.5b Fixed tests calling on a non-existant label in "Room of x#Failed" npcs. [L0ne_W0lf]
+//= 2.5c Bug fixes. Cleaned up some NPCs slightly. [L0ne_W0lf]
+//= 2.6 Fixed Water Room not warping on time-up. [L0ne_W0lf]
+//= 2.7 Now uses enable and disable waitingroomevent. [L0ne_W0lf]
+//= 	Other minor fixes to various NPCs.
+//= 2.7a Added end; :D (bugreport:2038) [Yommy]
+//= 2.8 Fixed donpcevent to doevent. (bugreport:2311) [SoulBlaker]
+//= 2.9 Reverted the change of donpcevent to doevent. [L0ne_W0lf]
+//=     Was probably cuased by a warp BEFORE a percentheal
+//= 3.0 Added Quest Log commands. [Kisuka]
+//= 3.1 Removed the need for use of 'goto.' [L0ne_W0lf]
+//= 3.2 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info).
 //============================================================ 
 
 gef_tower,111,37,4	script	Wizard Guildsman	70,{
@@ -25,27 +39,20 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		mes "Congratulations and good luck with your life!";
 		close;
 	}
-	if ((Class != Job_Baby_Mage) && (Class != Job_Mage)) {
-		if (Class == Job_Baby_Wizard || Class == Job_Wizard) {
-			if (Sex == 1) {
-				mes "[Catherine]";
-				mes "Since you're already a Wizard, you don't have any more business with me...?";
-				mes "Now, excuse me.";
-				next;
-				mes "[Catherine]";
+	if (BaseJob != Job_Mage) {
+		if (BaseJob == Job_Wizard) {
+			mes "[Catherine]";
+			mes "Since you're already a Wizard, you don't have any more business with me...?";
+			mes "Now, excuse me.";
+			next;
+			mes "[Catherine]";
+			if (sex)
 				mes "Well, If you intended to ask me on a date... I appreciate it...hohoho.";
-			}
-			else {
-				mes "[Catherine]";
-				mes "Since you're already a Wizard, you don't have any more business with me...";
-				mes "Now, excuse me.";
-				next;
-				mes "[Catherine]";
+			else
 				mes "Well, if you fix me up with a cute guy... I'd appreciate it...hohoho!.";
-			}
 			close;
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
+		else if (BaseClass == Job_Novice) {
 			mes "[Wizard Guildsman]";
 			mes "Oh my goodness, it's a novice~ ain't you the cutest little thing.";
 			mes "By the way honey, this place is for Wizards.";
@@ -102,7 +109,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 					mes "When I deem you're qualified, I will accept your application.";
 					close;
 				}
-				if (SkillPoint != 0) {
+				if (SkillPoint) {
 					mes "[Catherine]";
 					mes "Umm... You're well qualified, but you have some unused skill points left.";
 					mes "You'd better learn more skills before applying again.";
@@ -146,23 +153,23 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 				mes "The first test is collecting magic items.";
 				mes "The important part is that you must gather these items on your own.";
 				next;
-				set .@wizard_m1, rand(1,2);
+				set wizard_m1,rand(1,2);
 				mes "[Catherine]";
 				mes "The items you must collect are...";
-				if (.@wizard_m1 == 1) {
+				if (rand(1)) {
 					set WIZ_Q,1;
+					setquest 9013;
 					mes "^3355FFRed Gemstone^000000 10 each,";
 					mes "^3355FFBlue Gemstone^000000 10 each,";
 					mes "^3355FFYellow Gemstone^000000 10 each,";
-					setquest 9013;
 				}
 				else {
 					set WIZ_Q,2;
+					setquest 9014;
 					mes "^3355FFCrystal Blue^000000 5 each,";
 					mes "^3355FFGreen Live^000000 5 each,";
 					mes "^3355FFRed Blood^000000 5 each,";
 					mes "^3355FFWind of Verdure^000000 5 each,";
-					setquest 9014;
 				}
 				mes "...is it too hard? No, any would be Wizard should be able to at least get these items.";
 				next;
@@ -181,12 +188,12 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		mes "You have no business here, hope you don't mind, now off you go!";
 		close;
 	}
-	if (WIZ_Q == 1) {
+	else if (WIZ_Q == 1) {
 		mes "[Catherine]";
 		mes "Let me see, did you get all the items?";
 		mes "Then let's check...";
 		next;
-		if ((countitem(716) > 9) && (countitem(717) > 9) && (countitem(715) > 9)) {
+		if (countitem(716) > 9 && countitem(717) > 9 && countitem(715) > 9) {
 			mes "[Catherine]";
 			mes "Perfect! You got all the items. I like!~";
 			mes "These items will be put to great use in our guild. ~Hehehee.";
@@ -196,7 +203,6 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 			delitem 715,10; //Yellow_Gemstone
 			set WIZ_Q,3;
 			changequest 9013,9015;
-			changequest 9014,9015;
 			mes "[Catherine]";
 			mes "Good for you! You passed the first test.";
 			mes "But there are still two more left, so don't get too relaxed.";
@@ -220,12 +226,12 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		mes "Don't forget this time, and bring all the items, ok?...";
 		close;
 	}
-	if (WIZ_Q == 2) {
+	else if (WIZ_Q == 2) {
 		mes "[Catherine]";
 		mes "Did you get all the items?";
 		mes "Let's see... Do you have the right ones?...";
 		next;
-		if ((countitem(991) > 4) && (countitem(993) > 4) && (countitem(990) > 4) && (countitem(992) > 4)) {
+		if (countitem(991) > 4 && countitem(993) > 4 && countitem(990) > 4 && countitem(992) > 4) {
 			mes "[Catherine]";
 			mes "Perfect! Good job...I'm satisfied! ~Hehe";
 			mes "Our guild greatly appreciates these items and will use them wisely.";
@@ -235,7 +241,6 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 			delitem 990,5; //Boody_Red
 			delitem 992,5; //Wind_Of_Verdure
 			set WIZ_Q,3;
-			changequest 9013,9015;
 			changequest 9014,9015;
 			mes "[Catherine]";
 			mes "Good. You've passed the first test now.";
@@ -261,7 +266,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		mes "Don't forget them this time and gather the correct ones, ok? See you soon...";
 		close;
 	}
-	if (WIZ_Q == 3) {
+	else if (WIZ_Q == 3) {
 		mes "[Catherine]";
 		mes "What is it? You didn't go talk to the guy in the corner?";
 		mes "You can't become a Wizard by just brining the items I requested, no no, that just wont do...";
@@ -271,7 +276,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		mes "I'll be waiting, so go now.";
 		close;
 	}
-	if (WIZ_Q == 4) {
+	else if (WIZ_Q == 4) {
 		mes "[Catherine]";
 		mes "*sigh*...Poor thing, what a pity.";
 		mes "How can you think of trying to become a Wizard when you can't even answer those simple questions?";
@@ -280,7 +285,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		mes "Let's see... Should I give you some hints as your senior?";
 		mes "But I'm a bit thirsty, so give me 1 Apple Juice, and we got a deal. ~Hehehe";
 		next;
-		switch (select("Give me some hints, please.:I want to try again on my own!")) {
+		switch(select("Give me some hints, please.:I want to try again on my own!")) {
 		case 1:
 			if (countitem(531) > 0) {
 				delitem 531,1; //Apple_Juice
@@ -342,7 +347,6 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 			mes "[Catherine]";
 			mes "Yeah, you get the most satisfaction when you solve things on your own.";
 			mes "Go finish the rest of the tests with that spirit!";
-			break;
 		}
 		next;
 		mes "[Catherine]";
@@ -350,7 +354,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		mes "Hurry, he's waiting for you!";
 		close;
 	}
-	if (WIZ_Q == 5) {
+	else if (WIZ_Q == 5) {
 		mes "[Catherine]";
 		mes "Tehehehe~ I was listening all along.";
 		mes "Well done in answering all those questions. I want to give something, like a present...";
@@ -364,18 +368,17 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		mes "He's waiting for you!";
 		close;
 	}
-	if (WIZ_Q == 6) {
+	else if (WIZ_Q == 6) {
 		mes "[Catherine]";
 		mes "Eh, did you leave in the middle of the test?";
 		mes "You...*sigh*...I didn't think you would do such a dishonorable thing.";
 		next;
-		if (Sex == 1) {
-			mes "[Catherine]";
+		mes "[Catherine]";
+		if (sex) {
 			mes "Granted you're a mage, but how could a guy be so weak?!";
 			mes "Well, at least your alive still. Go back and try harder this time. ~tehehehe";
 		}
 		else {
-			mes "[Catherine]";
 			mes "Don't pretend to be weak just because you're a girl. Look at me! I did it, and so can you. You can't ask for sympathy.";
 			mes "You came all this way to become a Wizard! Now come on, you can do it!!";
 			next;
@@ -389,7 +392,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		mes "He's waiting!";
 		close;
 	}
-	if (WIZ_Q == 7) {
+	else if (WIZ_Q == 7) {
 		if (JobLevel < 40) {
 			set WIZ_Q,0;
 			mes "[Catherine]";
@@ -401,7 +404,7 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 			mes "When the time comes, I will welcome you with open arms.";
 			close;
 		}
-		if (SkillPoint != 0) {
+		if (SkillPoint) {
 			mes "[Catherine]";
 			mes "Are you done with all the tests? Oh drats, it seems like you still have some skill points left.";
 			mes "Learn some other skills with your remaining points, and then come talk to me again.";
@@ -414,13 +417,9 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 		mes "[Catherine]";
 		mes "Well, no need to wait, I congratulate you. I hearby deem you Wizard.";
 		next;
-		set WIZ_Q,0;
-		if(Class == Job_Baby_Mage){
-			jobchange Job_Baby_Wizard;
-		} else {
-			jobchange Job_Wizard;
-		}
 		completequest 9018;
+		callfunc "Job_Change",Job_Wizard;
+		callfunc "F_ClearJobVar";		// clears all job variables for the current player
 		mes "[Catherine]";
 		mes "Since you're a Wizard now, act like a Wizard, got it?";
 		mes "Us wizards have to be careful since we possess the ultimate power of magic.";
@@ -449,23 +448,21 @@ gef_tower,111,37,4	script	Wizard Guildsman	70,{
 }
 
 gef_tower,102,24,2	script	Gloomy Wizard	735,{
-	if ((Class != Job_Baby_Mage) && (Class != Job_Mage)) {
-		if (Class == Job_Baby_Wizard || Class == Job_Wizard) {
+	if (BaseJob != Job_Mage) {
+		if (BaseJob == Job_Wizard) {
 			mes "[Raulel]";
 			mes "*Cough* *cough* what do you want?";
 			mes "If you are a person that uses magic, then you need to make sure you are well informed about it.";
 			next;
-			if (Sex == 1) {
-				mes "[Raulel]";
-				mes "Don't live dishonestly, or impolitely, or else one day you'll be caught in a spell you can't control, and BOOM, your dead!";
+			mes "[Raulel]";
+			mes "Don't live dishonestly, or impolitely, or else one day you'll be caught in a spell you can't control, and BOOM, your dead!";
+			if (sex == 1) {
 				mes "If you don't want that to happen, then learn how to use spells properly!";
 				next;
 				mes "[Raulel]";
 				mes "You may live life crippled if you get obsessed with the love of Greater Magic. ~haha";
 			}
 			else {
-				mes "[Raulel]";
-				mes "Don't live dishonestly, or impolitely, or else one day you'll be caught in a spell you can't control, and BOOM, your dead!";
 				mes "So learn how to use magic properly, or you would just be better off giving up on using magic.";
 				next;
 				mes "[Raulel]";
@@ -474,7 +471,7 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 			}
 			close;
 		}
-		if (Class == Job_Baby_Priest || Class == Job_Priest) {
+		else if (BaseJob == Job_Priest) {
 			mes "[Raulel]";
 			mes "Go away, one who works for the Church!";
 			mes "Magic repels Holy power, jeez...your messing up my aura.";
@@ -484,7 +481,7 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 			mes "Don't come any closer, just leave!";
 			close;
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
+		else if (BaseClass == Job_Novice) {
 			mes "[Raulel]";
 			mes "Why did a little one like you come here?!";
 			mes "Get lost! ~Hahahahaha";
@@ -507,18 +504,7 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 		mes "Go away! Get lost!";
 		close;
 	}
-	if (WIZ_Q == 1) {
-		mes "[Raulel]";
-		mes "Hahahaha~ You're the one that wants to become a Wizard?!";
-		next;
-		mes "[Raulel]";
-		mes "*sneeze* If you just lived as you were, all you'd have to do was hunt a little and live the easy life...";
-		next;
-		mes "[Raulel]";
-		mes "*Cough* *cough* Let's see how well you live as a Wizard. ~Hahahahhaha";
-		close;
-	}
-	if (WIZ_Q == 2) {
+	else if (WIZ_Q == 1 || WIZ_Q  == 2) {
 		mes "[Raulel]";
 		mes "Hahahaha~ You're the one that wants to become a Wizard?!";
 		next;
@@ -529,539 +515,314 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 		mes "*Cough* *cough* Let's see how well you live as a Wizard. ~Hahahahhaha";
 		close;
 	}
-	if (WIZ_Q == 3) {
-		mes "[Raulel]";
-		mes "*Cough* *cough*...You must've passed the first test.";
-		mes "Ok, I'm the Wizard in charge of your testing from now on. My name is 'Raulel Asparagus'.";
-		next;
-		mes "[Raulel]";
-		mes "*sneeze* It's not too late yet, wouldn't you rather just go back to town and enjoy the peaceful life?";
-		next;
-		mes "[Raulel]";
-		mes "Hahahaha~ You don't know how dangerous it is...to deal with Greater Magic.";
-		next;
-		if (select("I want to live as a normal Mage.:I would like to continue with the tests.") == 1) {
-			mes "[Raulel]";
-			mes "Hahaha~ *sneeze* Good choice...*cough* *cough*~";
-			mes "Best not to even dream about life as a Wizard. Graa...Greaa...*sneeze* Greater Magic wasn't meant for humans to use!";
-			next;
-			mes "[Raulel]";
-			mes "Leave the top of this tower quietly and don't ever look back.";
-			mes "Just live peacefully with the powers that you have right now.";
-			close;
-		}
-		mes "[Raulel]";
-		mes "*sneeze* Hahahaha~ Now there's a foolish one here!";
-		mes "Well then, let's see how good you are. *cough* I want to see this with my own two eyes!";
-		next;
-		mes "[Raulel]";
-		mes "*sneeze* Then let's begin the test!";
-		mes "If you don't answer them all correctly, you fail. Hahahahahahahahaha~";
-		changequest 9015,9016;
-		next;
-		mes "[Raulel]";
-		mes "I'll give you 10 questions so give me the right answers.";
-		mes "If you get something wrong, I won't tell you what it is!";
-		next;
-		set .@wizard_m2,rand(1,3);
-		set @wizard_t,0;
-		mes "[Raulel]";
-		mes "*Cough* *cough* Then here go the questions!";
-		next;
-		if (.@wizard_m2 == 1) {
-			mes "[Raulel]";
-			mes "1. Which of the following is not necessary to learn Fire Wall?";
-			next;
-			if (select("Fire Bolt Lv 4:Fire Ball Lv 5:Sight Lv 1:Napalm Beat Lv 4") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "2. Regaurdless of the previous attribute, what does the monster's attribute change to when you cast Frost Diver on it?";
-			next;
-			if (select("Water:Earth:Fire:Wind") == 1) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "3. When you master Napalm Beat, what is the ratio of the increase in MATK using the spell?";
-			next;
-			if (select("1.6 times:1.7 times:2 times:20 times") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "4. What item do you need when casting Stone Curse?";
-			next;
-			if (select("Red Blood:Blue Gemstone:Yellow Gemstone:Red Gemstone") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "5. Which of the following is not required to master Safety Wall?";
-			next;
-			if (select("Napalm Beat Lv 4:Soul Strike Lv 5:Increase SP Recovery Lv 6:Safety Wall Lv 7") == 3) {
-				set @wizard_t, @wizard_t + 10;
-			}
+	else if ((WIZ_Q == 3) || (WIZ_Q == 4)) {
+		if (WIZ_Q == 3) {
 			mes "[Raulel]";
-			mes "6. Without the INT bonus, what amount of SP is recovered every 10 seconds when you have learned Increase SP Recovery Lv 7?";
-			next;
-			if (select("14:21:28:35") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "7. Using the skill Energy Coat, when you have 50% of your SP remaining, how much SP is used when hit, and what percentage is damage reduced by?";
-			next;
-			if (select("Damage 18% SP1.5%:Damage 18% SP2%:Damage 24% SP1.5%:Damage 24% SP2%") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "8. How much SP is consumed, and how many times can you avoid attacks when using Safety Wall Lv 6?";
+			mes "*Cough* *cough*...You must've passed the first test.";
+			mes "Ok, I'm the Wizard in charge of your testing from now on. My name is 'Raulel Asparagus'.";
 			next;
-			if (select("SP 40, 6 times:SP 35, 6 times:SP 40, 7 times:SP 35, 7 times") == 3) {
-				set @wizard_t, @wizard_t + 10;
-			}
 			mes "[Raulel]";
-			mes "9. How much SP is needed when using Lv 10 Thunderstorm?";
+			mes "*sneeze* It's not too late yet, wouldn't you rather just go back to town and enjoy the peaceful life?";
 			next;
-			if (select("84:74:64:54") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
 			mes "[Raulel]";
-			mes "10. Which skill is most useful for training in the Byalan Dungeon?";
+			mes "Hahahaha~ You don't know how dangerous it is...to deal with Greater Magic.";
 			next;
-			if (select("Lightning Bolt:Fire Bolt:Cold Bolt:Sight") == 1) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			next;
-		}
-		if (.@wizard_m2 == 2) {
-			mes "[Raulel]";
-			mes "1. Which monster can you obtain a slotted Guard from?";
-			next;
-			if (select("Thief Bug:Peco Peco:Pupa:Kobold (Hammer)") == 3) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "2. Which of the following is the easiest monster for a low level Mage to hunt?";
-			next;
-			if (select("Flora:Giearth:Golem:Myst") == 1) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "3. Which monster will not be affected by Stone Curse?";
-			next;
-			if (select("Elder Willow:Evil Druid:Magnolia:Marc") == 2) {
-				set @wizard_t, @wizard_t + 10;
+			if (select("I want to live as a normal Mage.:I would like to continue with the tests.") == 1) {
+				mes "[Raulel]";
+				mes "Hahaha~ *sneeze* Good choice...*cough* *cough*~";
+				mes "Best not to even dream about life as a Wizard. Graa...Greaa...*sneeze* Greater Magic wasn't meant for humans to use!";
+				next;
+				mes "[Raulel]";
+				mes "Leave the top of this tower quietly and don't ever look back.";
+				mes "Just live peacefully with the powers that you have right now.";
+				close;
 			}
 			mes "[Raulel]";
-			mes "4. When attacking a Lv 3 water attribute monster with a wind attribute weapon, what is the damage percentage?";
+			mes "*sneeze* Hahahaha~ Now there's a foolish one here!";
+			mes "Well then, let's see how good you are. *cough* I want to see this with my own two eyes!";
 			next;
-			if (select("125%:150%:175%:200%") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
 			mes "[Raulel]";
-			mes "5. If a Baby Desert Wolf and a Familiar fought, which one would win?";
+			mes "*sneeze* Then let's begin the test!";
+			mes "If you don't answer them all correctly, you fail. Hahahahahahahahaha~";
 			next;
-			if (select("Baby Desert Wolf:Familiar:Neither:I don't know") == 1) {
-				set @wizard_t, @wizard_t + 10;
-			}
 			mes "[Raulel]";
-			mes "6. Which of the following cannot be a Cute Pet?";
-			next;
-			if (select("Poporing:Roda Frog:Smokie:Poison Spore") == 2) {
-				set @wizard_t, @wizard_t + 10;
+			mes "I'll give you 10 questions so give me the right answers.";
+			mes "If you get something wrong, I won't tell you what it is!";
+			if(checkquest(9016) == -1) {
+				changequest 9015,9016;
 			}
-			mes "[Raulel]";
-			mes "7. Choose the monster that is weak against a fire attribute attack.";
 			next;
-			if (select("Dagger Goblin:Mace Goblin:Morningstar Goblin:Hammer Goblin") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
 			mes "[Raulel]";
-			mes "8. Which of the following monsters has the highest defense?";
-			next;
-			if (select("Horn:Chonchon:Andre:Caramel") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "9. Choose the monster that's a different species.";
-			next;
-			if (select("Poring:Mastering:Ghostring:Spore") == 3) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "10. Which of the following is not an Undead monster?";
-			next;
-			if (select("Drake:Megalodon:Deviace:Khalitzburg") == 3) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			next;
+			mes "*Cough* *cough* Then here go the questions!";
 		}
-		else {
-			mes "[Raulel]";
-			mes "1. Which stat is the most important for a Mage?";
-			next;
-			if (select("INT:AGI:DEX:VIT") == 1) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "2. Which attribute does not have a 'Bolt' type attack?";
-			next;
-			if (select("Water:Earth:Fire:Wind") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "3. Choose the one that does not relate to a Mage.";
-			next;
-			if (select("Weak physical strength.:Attacks at a distance.:Good at selling stuff.:Magic Defense is high.") == 3) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "4. Which town is the home of the Mages?";
-			next;
-			if (select("Prontera:Morroc:Alberta:Geffen") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "5. Which of the following cards has nothing to do with INT?";
-			next;
-			if (select("Andre Egg Card:Soldier Andre Card:Baby Desert Wolf Card:Elder Willow Card") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
+		else if (WIZ_Q == 4) {
 			mes "[Raulel]";
-			mes "6. What is the Mage good at compared to other job classes?";
+			mes "Hahahaha~ Are you that desperate? *sneeze* What a pain in the arse...";
 			next;
-			if (select("Exceptional Vocal Ability:Exceptional Acting Ability:Exceptional Dance Skills:Exceptional Magic Skills") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
 			mes "[Raulel]";
-			mes "7. What is the INT bonus at Job Lv 40 for a Mage?";
+			mes "Since you don't want to settle for a stable and peaceful life, I'll give you another chance...";
 			next;
-			if (select("8:7:6:5") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
 			mes "[Raulel]";
-			mes "8. Which item can a Mage not equip?";
+			mes "If you miss one single question, then just give up. You wouldn't have any talent in being a Wizard! ~Hahahahaha";
 			next;
-			if (select("Knife:Boys Cap:Sandle:Eye of Dullahan") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			mes "[Raulel]";
-			mes "9. Which of the following is the catalyst when making the Mage test solution 3?";
-			next;
-			if (select("Blue Gemstone:Red Gemstone:Yellow Gemstone:Red Blood") == 1) {
-				set @wizard_t, @wizard_t + 10;
+			if (select("Because of you, I want to live as a normal Mage now.:I would like to continue with the tests.") == 1) {
+				mes "[Raulel]";
+				mes "Hahahaha~ Surprising, comming from you, that's a very wise choice...*cough* *cough*";
+				mes "If i were you, i would never, ever dream of becoming a Wizard again. Gre...Greaa...*sneeze* Greater Magic wasn't meant for humans to use.";
+				next;
+				mes "[Raulel]";
+				mes "Just leave the top of this tower quietly and never look back.";
+				mes "Live peacefully with the powers that you have right now.";
+				close;
 			}
 			mes "[Raulel]";
-			mes "10. Which card is irrelevant to magic?";
-			next;
-			if (select("Marduk Card:Magnolia Card:Willow Card:Maya Card") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			next;
-		}
-		mes "[Raulel]";
-		mes "Hmmm...Good job, you finished answering all the questions, go buy yourself some potions or something, thats IF you have the Zeny. Hahahahahahahah~";
-		next;
-		mes "[Raulel]";
-		mes "Your score is... " + @wizard_t + " points!";
-		if (@wizard_t == 100) {
-			set WIZ_Q,5;
-			changequest 9016,9017;
-			mes "*cough* *Cough* Well done, you passed the second test.";
+			mes "Hahahahahahaha~ Now there's a foolish one right here!";
+			mes "Well then, let's see just how good you can be! *sneeze* I want to see this with my own two eyes.";
 			next;
 			mes "[Raulel]";
-			mes "Hahahaha~ Don't relax just yet, there's still the third test.";
-			mes "*sneeze* I advise you to rest a bit while the final test is prepared...Hahahahah~";
-			close;
-		}
-		if (@wizard_t == 90) {
-			set WIZ_Q,5;
-			changequest 9016,9017;
-			mes "Hahahaha~ I'll let you slide by since you only missed one problem. You passed the second test.";
-			next;
-			mes "[Raulel]";
-			mes "Hahahaha~ Don't relax just yet, there's still the third test.";
-			mes "*sneeze* I advise you to rest a bit while the final test is prepared...Hahahahah~";
-			close;
+			mes "Then let's begin the test!";
 		}
-		set WIZ_Q,4;
-		mes "You failed. I will let you come back again...after you've learned more relating to the type of questions I've asked you.";
 		next;
-		mes "[Raulel]";
-		mes "Tisk...not enough, not enough! Did you really think you could become a Wizard with the little bit of knowledge you have?";
-		mes "Get lost! If you were a Wizard right now, the monsters I deal with would eat you up in no time!";
-		close;
-	}
-	if (WIZ_Q == 4) {
-		mes "[Raulel]";
-		mes "Hahahaha~ Are you that desperate? *sneeze* What a pain in the arse...";
-		next;
-		mes "[Raulel]";
-		mes "Since you don't want to settle for a stable and peaceful life, I'll give you another chance...";
-		next;
-		mes "[Raulel]";
-		mes "If you miss one single question, then just give up. You wouldn't have any talent in being a Wizard! ~Hahahahaha";
-		next;
-		if (select("Because of you, I want to live as a normal Mage now.:I would like to continue with the tests.") == 1) {
-			mes "[Raulel]";
-			mes "Hahahaha~ Surprising, comming from you, that's a very wise choice...*cough* *cough*";
-			mes "If i were you, i would never, ever dream of becoming a Wizard again. Gre...Greaa...*sneeze* Greater Magic wasn't meant for humans to use.";
-			next;
-			mes "[Raulel]";
-			mes "Just leave the top of this tower quietly and never look back.";
-			mes "Live peacefully with the powers that you have right now.";
-			close;
-		}
-		mes "[Raulel]";
-		mes "Hahahahahahaha~ Now there's a foolish one right here!";
-		mes "Well then, let's see just how good you can be! *sneeze* I want to see this with my own two eyes.";
-		next;
-		mes "[Raulel]";
-		mes "Then let's begin the test!";
-		mes "If you don't answer all of them correctly, you fail... ~Hahahahahha";
-		next;
-		mes "[Raulel]";
-		mes "I'll give you 10 questions so give me the correct answers.";
-		mes "If you get something wrong, I won't tell you what it is!";
-		next;
-		set .@wizard_m2,rand(1,3);
-		set @wizard_t,0;
-		mes "[Raulel]";
-		mes "*Cough* *cough* Then here go the questions.";
-		next;
-		if (.@wizard_m2 == 1) {
+		switch(rand(1,3)) {
+		case 1:
 			mes "[Raulel]";
 			mes "1. Which of the following is not necessary to learn Fire Wall?";
 			next;
-			if (select("Fire Bolt Lv 4:Fire Ball Lv 5:Sight Lv 1:Napalm Beat Lv 4") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Fire Bolt Lv 4:Fire Ball Lv 5:Sight Lv 1:Napalm Beat Lv 4") == 4)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
-			mes "2. Regaurdless of the previous attribute, what does the monster's attribute change to when you cast Frost Diver on it?";
+			mes "2. Regaurdless of it's previous attribute, What does the monster's attribute change to when you cast Frost Diver on it?";
 			next;
-			if (select("Water:Earth:Fire:Wind") == 1) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Water:Earth:Fire:Wind") == 1)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
-			mes "3. When you master Napalm Beat, what is the ratio of the increase in MATK using the spell?";
+			mes "3. When you completely master Napalm Beat, what is the ratio of the increased MATK using that spell?";
 			next;
-			if (select("1.6 times:1.7 times:2 times:20 times") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("1.6 times:1.7 times:2 times:20 times") == 2)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "4. What item do you need when casting Stone Curse?";
 			next;
-			if (select("Red Blood:Blue Gemstone:Yellow Gemstone:Red Gemstone") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Red Blood:Blue Gemstone:Yellow Gemstone:Red Gemstone") == 4)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "5. Which of the following is not required to master Safety Wall?";
 			next;
-			if (select("Napalm Beat Lv 4:Soul Strike Lv 5:Increase SP Recovery Lv 6:Safety Wall Lv 7") == 3) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Napalm Beat Lv 4:Soul Strike Lv 5:Increase SP Recovery Lv 6:Safety Wall Lv 7") == 3)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "6. Without the INT bonus, what amount of SP is recovered every 10 seconds when you have learned Increase SP Recovery Lv 7?";
 			next;
-			if (select("14:21:28:35") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("14:21:28:35") == 2)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
-			mes "7. Using the skill Energy Coat, when you have 50% of your SP remaining, how much SP is used when hit, and what percentage is damage reduced by?";
+			mes "7. Using Energy Coat, when you have 50% of your SP remaining, how much SP is used when hit, and what percentage is damage reduced by?";
 			next;
-			if (select("Damage 18% SP1.5%:Damage 18% SP2%:Damage 24% SP1.5%:Damage 24% SP2%") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Damage 18% SP1.5%:Damage 18% SP2%:Damage 24% SP1.5%:Damage 24% SP2%") == 2)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
-			mes "8. How much SP is consumed, and how many times can you avoid attacks when using Safety Wall Lv 6?";
+			mes "8. How much SP is consumed and how many times can you avoid attacks when using Safety Wall Lv 6?";
 			next;
-			if (select("SP 40, 6 times:SP 35, 6 times:SP 40, 7 times:SP 35, 7 times") == 3) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("SP 40, 6 times:SP 35, 6 times:SP 40, 7 times:SP 35, 7 times") == 3)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "9. How much SP is needed when using Lv 10 Thunderstorm?";
 			next;
-			if (select("84:74:64:54") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("84:74:64:54") == 2)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
-			mes "10. Which skill is most useful for training in the Byalan Dungeon?";
-			next;
-			if (select("Lightning Bolt:Fire Bolt:Cold Bolt:Sight") == 1) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			mes "10. Which skill is most useful training in the Byalan Dungeon?";
 			next;
-		}
-		if (.@wizard_m2 == 2) {
+			if (select("Lightning Bolt:Fire Bolt:Cold Bolt:Sight") == 1)
+				set .@wizard_t,.@wizard_t+10;
+			break;
+		case 2:
 			mes "[Raulel]";
 			mes "1. Which monster can you obtain a slotted Guard from?";
 			next;
-			if (select("Thief Bug:Peco Peco:Pupa:Kobold (Hammer)") == 3) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Thief Bug:PecoPeco:Pupa:Kobold (Hammer)") == 3)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "2. Which of the following is the easiest monster for a low level Mage to hunt?";
 			next;
-			if (select("Flora:Giearth:Golem:Myst") == 1) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Flora:Giearth:Golem:Myst") == 1)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "3. Which monster will not be affected by Stone Curse?";
 			next;
-			if (select("Elder Willow:Evil Druid:Magnolia:Marc") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Elder Willow:Evil Druid:Magnolia:Marc") == 2)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "4. When attacking a Lv 3 water attribute monster with a wind attribute weapon, what is the damage percentage?";
 			next;
-			if (select("125%:150%:175%:200%") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("125%:150%:175%:200%") == 4)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "5. If a Baby Desert Wolf and a Familiar fought, which one would win?";
 			next;
-			if (select("Baby Desert Wolf:Familiar:Neither:I don't know") == 1) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Baby Desert Wolf:Familiar:Neither:I don't know") == 1)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "6. Which of the following cannot be a Cute Pet?";
 			next;
-			if (select("Poporing:Roda Frog:Smokie:Poison Spore") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Poporing:Roda Frog:Smokie:Poison Spore") == 2)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "7. Choose the monster that is weak against a fire attribute attack.";
 			next;
-			if (select("Dagger Goblin:Mace Goblin:Morningstar Goblin:Hammer Goblin") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Dagger Goblin:Mace Goblin:Morningstar Goblin:Hammer Goblin") == 4)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
-			mes "8. Which of the following monsters has the highest defense?";
+			mes "8. Which of the following has the highest defense?";
 			next;
-			if (select("Horn:Chonchon:Andre:Caramel") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Horn:Chonchon:Andre:Caramel") == 4)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
-			mes "9. Choose the monster that's a different species.";
+			mes "9. Choose the monster that's of a different species.";
 			next;
-			if (select("Poring:Mastering:Ghostring:Spore") == 3) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Poring:Mastering:Ghostring:Spore") == 3)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "10. Which of the following is not an Undead monster?";
 			next;
-			if (select("Drake:Megalodon:Deviace:Khalitzburg") == 3) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			next;
-		}
-		else {
+			if (select("Drake:Megalodon:Deviace:Khalitzburg") == 3)
+				set .@wizard_t,.@wizard_t+10;
+			break;
+		case 3:
 			mes "[Raulel]";
 			mes "1. Which stat is the most important for a Mage?";
 			next;
-			if (select("INT:AGI:DEX:VIT") == 1) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("INT:AGI:DEX:VIT") == 1)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "2. Which attribute does not have a 'Bolt' type attack?";
 			next;
-			if (select("Water:Earth:Fire:Wind") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Water:Earth:Fire:Wind") == 2)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "3. Choose the one that does not relate to a Mage.";
 			next;
-			if (select("Weak physical strength.:Attacks at a distance.:Good at selling stuff.:Magic Defense is high.") == 3) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Weak physical strength.:Attacks at a distance.:Good at selling stuff.:Magic Defense is high.") == 3)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
-			mes "4. Which town is the home of the Mages?";
+			mes "4. Which town is the home of Mages?";
 			next;
-			if (select("Prontera:Morroc:Alberta:Geffen") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Prontera:Morroc:Alberta:Geffen") == 4)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "5. Which of the following cards has nothing to do with INT?";
 			next;
-			if (select("Andre Egg Card:Soldier Andre Card:Baby Desert Wolf Card:Elder Willow Card") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Andre Egg Card:Soldier Andre Card:Baby Desert Wolf Card:Elder Willow Card") == 2)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "6. What is the Mage good at compared to other job classes?";
 			next;
-			if (select("Exceptional Vocal Ability:Exceptional Acting Ability:Exceptional Dance Skills:Exceptional Magic Skills") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Exceptional Vocal Ability:Exceptional Acting Ability:Exceptional Dance Skills:Exceptional Magic Skills") == 4)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "7. What is the INT bonus at Job Lv 40 for a Mage?";
 			next;
-			if (select("8:7:6:5") == 4) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("8:7:6:5") == 4)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "8. Which item can a Mage not equip?";
 			next;
-			if (select("Knife:Boys Cap:Sandle:Eye of Dullahan") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Knife:Boys Cap:Sandle:Eye of Dullahan") == 2)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "9. Which of the following is the catalyst when making the Mage test solution 3?";
 			next;
-			if (select("Blue Gemstone:Red Gemstone:Yellow Gemstone:Red Blood") == 1) {
-				set @wizard_t, @wizard_t + 10;
-			}
+			if (select("Blue Gemstone:Red Gemstone:Yellow Gemstone:Red Blood") == 1)
+				set .@wizard_t,.@wizard_t+10;
 			mes "[Raulel]";
 			mes "10. Which card is irrelevant to magic?";
 			next;
-			if (select("Marduk Card:Magnolia Card:Willow Card:Maya Card") == 2) {
-				set @wizard_t, @wizard_t + 10;
-			}
-			next;
+			if (select("Marduk Card:Magnolia Card:Willow Card:Maya Card") == 2)
+				set .@wizard_t,.@wizard_t+10;
 		}
 		mes "[Raulel]";
-		mes "Good job, you finished answered all the questions... Go buy yourself some potions or something if you have the Zeny. Haha...";
+		if (WIZ_Q == 4) {
+			mes "Good job, you finished answered all the questions... Go buy yourself some potions or something if you have the Zeny. Haha...";
+			next;
+			mes "[Raulel]";
+			mes "Your score is... " + .@wizard_t + "points.....";
+			if (.@wizard_t == 100) {
+				set WIZ_Q,5;
+				changequest 9016,9017;
+				mes "Hahahahahahah~ Well done, you passed the second test.";
+				mes "It wasn't done in one try like mine was, but I'll let you slide...";
+				next;
+				mes "[Raulel]";
+				mes "*sneeze* Don't relax just yet, there's still the matter of the third and final test.";
+				mes "I advise you to rest a bit while the final test is prepared. Your gonna need it. Hahahahaha~";
+				close;
+			}
+			else if (.@wizard_t == 90) {
+				set WIZ_Q,5;
+				changequest 9016,9017;
+				mes "Hahaha~ Since you only missed one problem, you passed the second test.";
+				mes "It wasn't done in one try like mine was, but I'll let you slide...";
+				next;
+				mes "[Raulel]";
+				mes "*sneeze* Don't relax just yet, there's still the matter of the third and final test.";
+				mes "I advise you to rest a bit while the final test is prepared. Your gonna need it. Hahahahaha~";
+				close;
+			}
+			else if (.@wizard_t == 80) {
+				set WIZ_Q,5;
+				changequest 9016,9017;
+				mes "Sheez... You didn't do very well, but you passed the second test.";
+				mes "It wasn't done in one try like mine was, but I'll let you slide...";
+				next;
+				mes "[Raulel]";
+				mes "*sneeze* Don't relax just yet, there's still the matter of the third and final test.";
+				mes "I advise you to rest a bit while the final test is prepared. Your gonna need it. Hahahahaha~";
+				close;
+			}
+			else {
+				mes "You failed. Go study some more!";
+				next;
+				mes "[Raulel]";
+				mes "*cough* *cough* Did you really think you could become a Wizard with such a mediocre level like yours?";
+				mes "Get lost! If you were a Wizard right now, the monsters that I fight, would eat you up in no time!";
+				close;
+			}
+		}
+		mes "Hmmm...Good job, you finished answering all the questions, go buy yourself some potions or something, thats IF you have the Zeny. Hahahahahahahah~";
 		next;
 		mes "[Raulel]";
-		mes "Your score is... " + @wizard_t + "points.....";
-		if (@wizard_t == 100) {
-			changequest 9016,9017;
+		mes "Your score is... " + .@wizard_t + " points!";
+		if (.@wizard_t == 100) {
 			set WIZ_Q,5;
-			mes "Hahahahahahah~ Well done, you passed the second test.";
-			mes "It wasn't done in one try like mine was, but I'll let you slide...";
+			changequest 9016,9017;
+			mes "*cough* *Cough* Well done, you passed the second test.";
 			next;
 			mes "[Raulel]";
-			mes "*sneeze* Don't relax just yet, there's still the matter of the third and final test.";
-			mes "I advise you to rest a bit while the final test is prepared. Your gonna need it. Hahahahaha~";
+			mes "Hahahaha~ Don't relax just yet, there's still the third test.";
+			mes "*sneeze* I advise you to rest a bit while the final test is prepared...Hahahahah~";
 			close;
 		}
-		if (@wizard_t == 90) {
+		else if (.@wizard_t == 90) {
 			set WIZ_Q,5;
 			changequest 9016,9017;
-			mes "Hahaha~ Since you only missed one problem, you passed the second test.";
-			mes "It wasn't done in one try like mine was, but I'll let you slide...";
+			mes "Hahahaha~ I'll let you slide by since you only missed one problem. You passed the second test.";
 			next;
 			mes "[Raulel]";
-			mes "*sneeze* Don't relax just yet, there's still the matter of the third and final test.";
-			mes "I advise you to rest a bit while the final test is prepared. Your gonna need it. Hahahahaha~";
+			mes "Hahahaha~ Don't relax just yet, there's still the third test.";
+			mes "*sneeze* I advise you to rest a bit while the final test is prepared...Hahahahah~";
 			close;
 		}
-		if (@wizard_t == 80) {
-			set WIZ_Q,5;
-			changequest 9016,9017;
-			mes "Sheez... You didn't do very well, but you passed the second test.";
-			mes "It wasn't done in one try like mine was, but I'll let you slide...";
+		else {
+			set WIZ_Q,4;
+			mes "You failed. I will let you come back again...after you've learned more relating to the type of questions I've asked you.";
 			next;
 			mes "[Raulel]";
-			mes "*sneeze* Don't relax just yet, there's still the matter of the third and final test.";
-			mes "I advise you to rest a bit while the final test is prepared. Your gonna need it. Hahahahaha~";
+			mes "Tisk...not enough, not enough! Did you really think you could become a Wizard with the little bit of knowledge you have?";
+			mes "Get lost! If you were a Wizard right now, the monsters I deal with would eat you up in no time!";
 			close;
 		}
-		mes "You failed. Go study some more!";
-		next;
-		mes "[Raulel]";
-		mes "*cough* *cough* Did you really think you could become a Wizard with such a mediocre level like yours?";
-		mes "Get lost! If you were a Wizard right now, the monsters that I fight, would eat you up in no time!";
-		close;
 	}
-	if (WIZ_Q == 5) {
+	else if (WIZ_Q == 5) {
 		mes "[Raulel]";
 		mes "Ok, hope you got plenty of rest. Hahahahahah~";
 		mes "Then let's begin the last test.";
@@ -1125,7 +886,7 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 		warp "geffen",120,110;
 		end;
 	}
-	if (WIZ_Q == 6) {
+	else if (WIZ_Q == 6) {
 		if (WIZ_Q2 == 6) {
 			mes "[Raulel]";
 			mes "Hahahahahaha~ I've never seen anyone so...sooo...*sneeze* tenacious as you.";
@@ -1143,7 +904,7 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 			warp "job_wiz",57,154;
 			end;
 		}
-		if (WIZ_Q2 > 6) {
+		else if (WIZ_Q2 > 6) {
 			mes "[Raulel]";
 			mes "Oh! So you're back? Hahahahaha~";
 			mes "*Cough* Cough* Do you want to take the test again? Or did you bring the ^3355FFWorn Out Scroll^000000?";
@@ -1165,14 +926,12 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 				next;
 				set WIZ_Q2,0;
 				set WIZ_Q,7;
-				changequest 9017,9018;
 				mes "[Raulel]";
 				mes "Even though your not Grade A Wizard material, I can tell your serious about wanting the Greater Magic. I'll tell Catherine that you passed. Hahahahahahahahah~";
 				mes "You went through a lot of trouble here, and that is the true purpose for us selecting Wizards. Only those who will devote themselves to the art will ever become Wizards. Good luck to you. Become much Stronger. Hahahahahaha~";
 				close;
 			}
 		}
-		set @wizard_t,0;
 		mes "[Raulel]";
 		mes "*sneeze* What? You want to take the test again?";
 		mes "Geez...you already failed the battle test! Hahahahahahahaha~ So you like magic that much, eh?";
@@ -1187,43 +946,38 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 		mes "[Raulel]";
 		mes "1. Choose the monster with a different attribute than the others.";
 		next;
-		if (select("Mantis:Cornutus:Giearth:Caramel") == 2) {
-			set @wizard_t, @wizard_t + 20;
-		}
+		if (select("Mantis:Cornutus:Giearth:Caramel") == 2)
+			set .@wizard_t,.@wizard_t+20;
 		mes "[Raulel]";
 		mes "2. Choose the monster that is not a looting one.";
 		next;
-		if (select("Yoyo:Magnolia:Metaller:Zerom") == 4) {
-			set @wizard_t, @wizard_t + 20;
-		}
+		if (select("Yoyo:Magnolia:Metaller:Zerom") == 4)
+			set .@wizard_t,.@wizard_t+20;
 		mes "[Raulel]";
 		mes "3. Which of these monsters does not recognize casting?";
 		next;
-		if (select("Marina:Vitata:Scorpion:Giearth") == 1) {
-			set @wizard_t, @wizard_t + 20;
-		}
+		if (select("Marina:Vitata:Scorpion:Giearth") == 1)
+			set .@wizard_t,.@wizard_t+20;
 		mes "[Raulel]";
 		mes "4. Choose the spell that would be efficient against a Marine Sphere.";
 		next;
-		if (select("Cold Bolt:Fire Bolt:Lightning Bolt:Stone Curse") == 3) {
-			set @wizard_t, @wizard_t + 20;
-		}
+		if (select("Cold Bolt:Fire Bolt:Lightning Bolt:Stone Curse") == 3)
+			set .@wizard_t,.@wizard_t+20;
 		mes "[Raulel]";
 		mes "5. Choose the monster that can move.";
 		next;
-		if (select("Hydra:Madragora:Greatest General:Frilldora") == 4) {
-			set @wizard_t, @wizard_t + 20;
-		}
+		if (select("Hydra:Madragora:Greatest General:Frilldora") == 4)
+			set .@wizard_t,.@wizard_t+20;
 		mes "[Raulel]";
 		mes "*pfft* Do it right, so I don't have to ask again.";
 		next;
 		mes "[Raulel]";
-		mes "You got " + @wizard_t + " points.";
-		if (@wizard_t == 100) {
+		mes "You got " + .@wizard_t + " points.";
+		if (.@wizard_t == 100) {
 			mes "Hahahahahaha~ *Cough* *cough* If you can answer all these questions correctly, how is it you can't do well in battles??";
 			next;
 		}
-		else if (@wizard_t == 80) {
+		else if (.@wizard_t == 80) {
 			mes "Eh, soso...";
 			mes "I'll let you retake the test.";
 			next;
@@ -1288,7 +1042,7 @@ gef_tower,102,24,2	script	Gloomy Wizard	735,{
 		warp "geffen",120,110;
 		end;
 	}
-	if (WIZ_Q == 7) {
+	else if (WIZ_Q == 7) {
 		mes "[Raulel]";
 		mes "You shouldn't have any more business with me as far as I'm concerned.";
 		mes "But, since your so darned persistent, I'll let you take the test again. Hahahahaha~";
@@ -1907,19 +1661,19 @@ OnTimer9000:
 	end;
 }
 
-gef_tower,107,36,4	script	White Dog	81,{
-	if ((Class != Job_Baby_Mage) && (Class != Job_Mage)) {
-		if (Class == Job_Baby_Wizard || Class == Job_Wizard) {
+gef_tower,107,36,4	script	White Dog#wiz	81,{
+	if (BaseJob != Job_Mage) {
+		if (BaseJob == Job_Wizard) {
 			mes "[Maria]";
 			mes "Instead of sticking around here, wouldn't it be better to go out and test how strong you've become?";
 			next;
 			mes "[Maria]";
 			mes "Don't forget that Wizards grow and improve in power each and every day.";
 			close2;
-			cutin "",255;
+			cutin "job_wizard_maria01",255;
 			end;
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
+		else if (BaseClass == Job_Novice) {
 			mes "[Dog]";
 			mes "What? Kiddo!";
 			mes "Is a Dog talking so amusing to you?";
@@ -1935,7 +1689,7 @@ gef_tower,107,36,4	script	White Dog	81,{
 		mes "*Bark* Get lost!";
 		mes "I don't have time for people like you!";
 		close2;
-		cutin "",255;
+		cutin "job_wizard_maria02",255;
 		end;
 	}
 	if (WIZ_Q == 0) {
@@ -1949,7 +1703,7 @@ gef_tower,107,36,4	script	White Dog	81,{
 		mes "[Dog]";
 		mes "Also, if you would like to know anything about the job change process, I can explain.";
 		next;
-		switch (select(".......:A Dog is talking to me...")) {
+		switch(select(".......:A Dog is talking to me...")) {
 		case 1:
 			mes "[Dog]";
 			mes "...*bark*...? What is it?? Why are you looking at me like that?!";
@@ -2010,7 +1764,7 @@ gef_tower,107,36,4	script	White Dog	81,{
 		mes "I can tell you more about the job change process, but I can't hold back a busy person now can I?";
 		mes "What do you think? Should I explain some about whats in store for Mages that wish to become Wizards?";
 		next;
-		switch (select("Yes, please! I would like that.:No, it's ok.:A talking dog...")) {
+		switch(select("Yes, please! I would like that.:No, it's ok.:A talking dog...")) {
 		case 1:
 			cutin "job_wizard_maria01",2;
 			mes "[Maria]";
@@ -2045,11 +1799,16 @@ gef_tower,107,36,4	script	White Dog	81,{
 			next;
 			mes "[Maria]";
 			mes "It's better to just try it yourself than to listen to my descriptions.";
-			close;
+			close2;
+			cutin "job_wizard_maria01",255;
+			warp "gef_dun00",116,102;
+			end;
 		case 2:
 			mes "[Maria]";
 			mes "Really? Ok, then go apply and do your best.";
-			close;
+			close2;
+			cutin "job_wizard_maria01",255;
+			end;
 		case 3:
 			cutin "job_wizard_maria02",2;
 			mes "[Maria]";
@@ -2058,12 +1817,12 @@ gef_tower,107,36,4	script	White Dog	81,{
 			mes "[Maria]";
 			mes "Dang it! I hope you FAIL!! Go get lost!!";
 			close2;
-			cutin "",255;
+			cutin "job_wizard_maria01",255;
 			warp "gef_dun00",116,102;
 			end;
 		}
 	}
-	if (WIZ_Q == 1) {
+	else if (WIZ_Q == 1) {
 		cutin "job_wizard_maria01",2;
 		mes "[Maria]";
 		mes "You seem lost...";
@@ -2083,7 +1842,7 @@ gef_tower,107,36,4	script	White Dog	81,{
 		next;
 		mes "[Maria]";
 		mes "Yellow Gemstones are easy to find in the desert.";
-		mes "Condors, Pickies, and sometimes monsters like Golems drop them.";
+		mes "Condors, Picky's, and sometimes monsters like Golem's drop them.";
 		next;
 		mes "[Maria]";
 		mes "And...*woof* to get Blue Gemstones. Try going to the Byalan Dungeons.";
@@ -2097,10 +1856,10 @@ gef_tower,107,36,4	script	White Dog	81,{
 		mes "Anyways, try your best.";
 		mes "This is the basics of being a Wizard.";
 		close2;
-		cutin "",255;
+		cutin "job_wizard_maria01",255;
 		end;
 	}
-	if (WIZ_Q == 2) {
+	else if (WIZ_Q == 2) {
 		cutin "job_wizard_maria01",2;
 		mes "[Maria]";
 		mes "You seem lost...";
@@ -2134,19 +1893,19 @@ gef_tower,107,36,4	script	White Dog	81,{
 		mes "But anyways, always try your best.";
 		mes "It's the basics of being a Wizard.";
 		close2;
-		cutin "",255;
+		cutin "job_wizard_maria01",255;
 		end;
 	}
-	if (WIZ_Q == 3) {
+	else if (WIZ_Q == 3) {
 		cutin "job_wizard_maria01",2;
 		mes "[Maria]";
 		mes "Don't be too relieved just after the first test.";
 		mes "Try your best, as you still have two more tests to go.";
 		close2;
-		cutin "",255;
+		cutin "job_wizard_maria01",255;
 		end;
 	}
-	if (WIZ_Q == 4) {
+	else if (WIZ_Q == 4) {
 		cutin "job_wizard_maria01",2;
 		mes "[Maria]";
 		mes "ZzzzZzzzZzzz...";
@@ -2155,10 +1914,10 @@ gef_tower,107,36,4	script	White Dog	81,{
 		mes "[Maria]";
 		mes "*wimper*...Blizadris...you suck...Zzz...";
 		close2;
-		cutin "",255;
+		cutin "job_wizard_maria02",255;
 		end;
 	}
-	if (WIZ_Q == 5) {
+	else if (WIZ_Q == 5) {
 		cutin "job_wizard_maria01",2;
 		mes "[Maria]";
 		mes "Oh, you're doing well aren't you?";
@@ -2167,10 +1926,10 @@ gef_tower,107,36,4	script	White Dog	81,{
 		mes "Well, try your best to the very end.";
 		mes "Laurel is waiting.";
 		close2;
-		cutin "",255;
+		cutin "job_wizard_maria01",255;
 		end;
 	}
-	if (WIZ_Q == 6) {
+	else if (WIZ_Q == 6) {
 		cutin "job_wizard_maria01",2;
 		mes "[Maria]";
 		mes "*BARK*...you gave up?";
@@ -2188,10 +1947,10 @@ gef_tower,107,36,4	script	White Dog	81,{
 		mes "*Grrr* Anyways, continue the test.";
 		mes "Don't have a weak mind, *woof* and go back! *Bark* *Bark* Right this moment! *BARK*";
 		close2;
-		cutin "",255;
+		cutin "job_wizard_maria01",255;
 		end;
 	}
-	if (WIZ_Q == 7) {
+	else if (WIZ_Q == 7) {
 		cutin "job_wizard_maria01",2;
 		mes "[Maria]";
 		mes "As I thought, I knew you'd be able to do it, I could smell it in yah! *Woof*";
@@ -2200,7 +1959,27 @@ gef_tower,107,36,4	script	White Dog	81,{
 		mes "[Maria]";
 		mes "Congratulations. Always give your best at everything, no matter what.";
 		close2;
-		cutin "",255;
+		cutin "job_wizard_maria01",255;
 		end;
 	}
-}
\ No newline at end of file
+}
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.1 Now using the initnpctimer command, donpcevent,
+//= and new waitingroom event commands.  No more addtimer spamming.
+//= No longer have to talk to the npc to take the test.  Just enter the chat room.
+//= 1.2 Changed global variable names to unique ones.
+//= 1.2a Rollback from the wrong Kashy's fix
+//= 1.2b Fixed issue with duplicating monsters thx to Bison.[kobra_k88]
+//= 1.2c changed one Horong to Frilldora (now 3rd room contains 1 agressive mob.)
+//= 1.2d more simplified fire room - removed agressive Desert Wolf [Lupus]
+//= 1.3 Added Baby Class support. 1.5 Fixed possible EXP abuse [Lupus]
+//= 1.6 Added a func which prevent advanced classes passing
+//= 2nd Job Quests again. It also guides adv classes where to go. [Lupus]
+//= 1.7 Replaced 2 Hodes with 2 Horong's (according to the official guide) [Lupus]
+//= 1.8 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
+//= 2.1 Changed numbers to constants. [Vicious]
+//= 2.2 Merged back JFunc [Lupus] 2.2a Removed extra MES, added missing NEXT
+//= 2.3 Bigfoot monster summon corrected [Zairik]