* 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

1 files changed, 691 insertions, 1676 deletions

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
+}