- Reverted all changes done to the job change quest files.

* Decided it'd be better to commit it all together when updating, fixing and optimization is done all at once.
Sorry guys and girls for the trouble! Big shame on me :-/ :(

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

1 files changed, 678 insertions, 1667 deletions

diff --git a/npc/re/jobs/2-2/crusader.txt b/npc/re/jobs/2-2/crusader.txt
index 931b132b2..5f0cebf45 100644
--- a/npc/re/jobs/2-2/crusader.txt
+++ b/npc/re/jobs/2-2/crusader.txt
@@ -1,40 +1,60 @@
 //===== rAthena Script ======================================= 
-// Crusader Job change Quest
+//= Crusader Quest
 //===== By: ================================================== 
-//= Masao
-//= Credits: Muad_Dib
+//= Made by: Black Dragon
+//= Converted by: Shin
 //===== Current Version: ===================================== 
-//= 1.0
+//= 3.3
 //===== Compatible With: ===================================== 
-//= Any rAthena SVN
+//= rAthena SVN
 //===== Description: ========================================= 
-//= [Translated from the Official]
-//= Job change Quest from Swordman -> Crusader.
+//= [Aegis Conversion]
+//= Job quest for Crusader classes
 //===== Additional Comments: ================================= 
-//= 1.0 Updated to latest available official file. [Masao]
-//============================================================ 
-
+//= 2.2 Updated All NPCs to the officials one [Samuray22]
+//=     -Based on the ASB 4.0 Package.
+//=-Maybe need be checked the monsters in the test 2 and 4.
+//= 2.3 Fixed some bugs that prevented from going further. [SinSloth]
+//= 2.4 Updated NPC dialogs using Aegis 10.3 files. [L0ne_W0lf]
+//=    - Fixed logic error with job change reward for job 50 swordies.
+//=    - Completely redid the 1st and third tests.
+//=    - Optimized first four NPC scripts slightly.
+//=    - Temporary character variables "@" are now ".@"
+//=    - Fixed some indentation.
+//= 2.5 Fixed some spelling and grammar in crusader quest. [L0ne_W0lf]
+//= 2.6 Fixed bug (about totally blocked baby class), optimized,
+//=     made some NPC more unique names: Monster Summon#cr1 [Lupus]
+//= 2.7 Fixed Some variables like ".@item", and changed to "@item". [Samuray22]
+//= 2.8 Fixed a little minor bug. [Samuray22]
+//= 2.9 Minor fixes, typos, an incorrect answer. Thanks to yyCC. [L0ne_W0lf]
+//= 2.9a Deleted unused variables. [Samuray22]
+//= 3.0 Updated waiting room. (Removes global var) [L0ne_W0lf]
+//= 3.1 Adding Hermemton's changes. [L0ne_W0lf]
+//= 3.2 Added Quest Log commands. [Kisuka]
+//= 3.3 Removed the need for use of 'goto.' [L0ne_W0lf]
+//============================================================
+
+
+//=============== Senior Crusader: 1st Collect Items Test============================
 prt_castle,45,169,5	script	Senior Crusader	752,{
-	if (Upper == 1) {
-		mes "[Michael Halig]";
+	mes "[Michael Halig]";
+	if (Upper == 1) { //the baby classes were totally blocked... due to missing == 1
 		mes "Go and train yourself in preparation for the holy war that is coming. Victory will be in the hands of those who are most ready to receive it.";
 		next;
 		mes "[Michael Halig]";
 		mes "You don't belong here, my friend.";
-		mes "Be adviced to continue practicing yourself.";
+		mes "Be advised to continue practicing yourself.";
 		close;
-	}
-	if ((Class != Job_Baby_Swordman) && (Class != Job_Swordman)) {
-		if (Class == Job_Baby_Crusader || Class == Job_Crusader) {
-			mes "[Michael Halig]";
+	} 
+	else if(BaseJob != Job_Swordman) {
+		if(BaseJob == Job_Crusader) {
 			mes "Go and train yourself in preparation for the holy war that is coming. Victory will be in the hands of those who are most ready to receive it.";
 			next;
 			mes "[Michael Halig]";
 			mes "Chaos will one day arise to challenge our principles of peace, justice and order. Until we have eliminated evil and created our ideal world, we must not cease training.";
 			close;
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
-			mes "[Michael Halig]";
+		else if(BaseJob == Job_Novice) {
 			mes "We are Crusaders,";
 			mes "warriors preparing";
 			mes "to fight in the Holy War.";
@@ -43,23 +63,34 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 			mes "If you wish to join us, you must first learn the Swordsman discipline and train yourself thoroughly...";
 			close;
 		}
-		mes "[Michael Halig]";
 		mes "We are Crusaders,";
 		mes "warriors preparing";
 		mes "to fight in the Holy War.";
 		next;
 		mes "[Michael Halig]";
-		mes "As it happened one thousand years ago, evil forces will one day attacking in droves in an attempt to take over the world once again.";
+		mes "As it happened one thousand years ago, evil forces will one day attack in droves in an attempt to take over the world once again.";
 		close;
-	}
-	if (CRSDR_Q == 0) {
+	} 
+	else if(CRUS_Q <= 3 && countitem(1004) && countitem(1009)) {
+		mes "Ah...";
+		mes "I see that you have been called to become a Crusader. We are assured of your will, but now we must test your capabilities.";
+		next;
+		mes "[Michael Halig]";
+		mes "Meet with Moorenak Miyol who is training in the underground dungeon of the Prontera Castle. Go, and speak with him first.";
+		next;
+		delitem 1004, 1;
+		delitem 1009, 1;
+		set CRUS_Q,4;
 		mes "[Michael Halig]";
+		mes "Moorenak and others like him will test the limits of your capabilities and help you find your path. Return to me after you have completed their tests...";
+		close;
+	}
+	else if(CRUS_Q == 0) {
 		mes "We are Crusaders, warriors preparing for the Holy War.";
 		mes "What brings you";
 		mes "to this place?";
 		next;
-		switch (select("I want to prepare for the Holy War!:Nothing in particular.")) {
-		case 1:
+		if (select("I want to prepare for the Holy War!:Nothing in particular.") == 1) {
 			mes "[Michael Halig]";
 			mes "You wish to become";
 			mes "a Crusader...?";
@@ -70,7 +101,7 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 			mes "I am Michael Halig. I am one of but many Crusaders preparing for the Holy War. We continuously train ourselves with sincere faith and endless loyalty.";
 			next;
 			mes "[Michael Halig]";
-			mes "We recruit Swordsman that express exceptional faith, or those who were born as warriors";
+			mes "We recruit Swordsmen that express exceptional faith, or those who were born as warriors";
 			mes "by Odin's will.";
 			next;
 			mes "[Michael Halig]";
@@ -83,9 +114,8 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 			mes "I don't know what type of person you are right now though. But";
 			mes "I shall test you if you desire. Are you willing to endure these tests in preparation for the Holy War?";
 			next;
-			switch (select("Yes, I do.:I'd like to think about it.")) {
-			case 1:
-				if (JobLevel < 40) {
+			if (select("Yes, I do.:I'd like to think about it.") == 1) {
+				if(JobLevel < 40) {
 					mes "[Michael Halig]";
 					mes "Wait...";
 					mes "You're not ready yet.";
@@ -96,8 +126,8 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 					mes "[Michael Halig]";
 					mes "Train yourself more as a Swordsman and wait for your calling. I understand your intent, but as of now, you cannot join us.";
 					close;
-				}
-				if (SkillPoint != 0) {
+				} 
+				if (Skillpoint) {
 					mes "[Michael Halig]";
 					mes "You haven't finished learning everything as a Swordsman. Use all of your remaining skill points, and then return to me.";
 					close;
@@ -111,7 +141,7 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 				mes "" + strcharinfo(0) + "...?";
 				mes "Let's see...";
 				next;
-				if ((countitem(1004) > 0) && (countitem(1009) > 0)) {
+				if (countitem(1004) && countitem(1009)) {
 					mes "[Michael Halig]";
 					mes "Ah...";
 					mes "I see that you have been called to become a Crusader. We are assured of your will, but now we must test your capabilities.";
@@ -119,9 +149,9 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 					mes "[Michael Halig]";
 					mes "Meet with Moorenak Miyol who is training in the underground dungeon of the Prontera Castle. Go, and speak with him first.";
 					next;
-					delitem 1004,1; //Patriotism_Marks
-					delitem 1009,1; //Sacred_Marks
-					set CRSDR_Q,4;
+					delitem 1004, 1;
+					delitem 1009, 1;
+					set CRUS_Q,4;
 					setquest 3009;
 					mes "[Michael Halig]";
 					mes "Moorenak and others like him will test the limits of your capabilities and help you find your path. Return to me after you have completed their tests...";
@@ -134,188 +164,77 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 				mes "Now...";
 				mes "This is my test for you. Bring me the following items and prove your determination to me.";
 				next;
-				set .@cru_m1, rand(1,3);
-				if (.@cru_m1 == 1) {
-					set CRSDR_Q,1;
+				mes "[Michael Halig]";
+				set .@cru_m1,rand(1,3);
+				if(.@cru_m1 == 1) {
+					set CRUS_Q, 1;
 					setquest 3006;
-					mes "[Michael Halig]";
-					mes "^3355FF10 Decayed Nail^000000,";
-					mes "^3355FF10 Stinky Scale^000000,";
-					mes "^3355FF10 Worn-out Prison Uniform^000000 and";
-					mes "^3355FF10 Daenggie^000000.";
+					mes "10 ^3355FF"+getitemname(957)+"^000000";
+					mes "10 ^3355FF"+getitemname(959)+"^000000";
+					mes "10 ^3355FF"+getitemname(1099)+"^000000";
+					mes "10 ^3355FF"+getitemname(901)+"^000000";
 					next;
-					mes "[Michael Halig]";
-					mes "Show me the strength of your will by gathering these items. If you prove successful, you will progress to the next test. May Odin protect you.";
-					close;
 				}
-				if (.@cru_m1 == 2) {
-					set CRSDR_Q,2;
+				else if(.@cru_m1 == 2) {
+					set CRUS_Q, 2;
 					setquest 3007;
-					mes "[Michael Halig]";
-					mes "^3355FF10 Skel-Bone^000000,";
-					mes "^3355FF10 Orc Claw^000000,";
-					mes "^3355FF10 Manacles^000000 and";
-					mes "^3355FF10 Short Daenggie^000000.";
+					mes "10 ^3355FF"+getitemname(932)+"^000000";
+					mes "10 ^3355FF"+getitemname(1043)+"^000000";
+					mes "10 ^3355FF"+getitemname(1098)+"^000000";
+					mes "10 ^3355FF"+getitemname(1094)+"^000000";
+					next;
+				}
+				else {
+					set CRUS_Q, 3;
+					setquest 3008;
+					mes "10 ^3355FF"+getitemname(958)+"^000000";
+					mes "10 ^3355FF"+getitemname(930)+"^000000";
+					mes "10 ^3355FF"+getitemname(1041)+"^000000";
+					mes "10 ^3355FF"+getitemname(1062)+"^000000";
 					next;
-					mes "[Michael Halig]";
-					mes "Show me the strength of your will by gathering these items. If you prove successful, you will progress to the next test. May Odin protect you.";
-					close;
 				}
-				set CRSDR_Q,3;
-				setquest 3008;
-				mes "[Michael Halig]";
-				mes "^3355FF10 Horrendous Mouth^000000,";
-				mes "^3355FF10 Rotten Bandage^000000,";
-				mes "^3355FF10 Lantern^000000 and";
-				mes "^3355FF10 Jack o' Pumpkin^000000.";
-				next;
 				mes "[Michael Halig]";
 				mes "Show me the strength of your will by gathering these items. If you prove successful, you will progress to the next test. May Odin protect you.";
 				close;
-			case 2:
-				mes "[Michael Halig]";
-				mes "Nobody knows when the Holy War will come. We must prepare in advance and cannot afford to slacken";
-				mes "our training.";
-				next;
-				mes "[Michael Halig]";
-				mes "If you feel that participating in the Holy War is your calling, please come back right away and take the test to become";
-				mes "a Crusader.";
-				close;
-			}
-		case 2:
-			mes "[Michael Halig]";
-			if (Sex == 1) {
-				mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin.";
-			}
-			else {
-				mes "As a woman of the sword, you must train diligently and constantly. Prepare yourself, for no one knows when the Holy War may be coming.";
 			}
-			close;
-		}
-	}
-	if (CRSDR_Q == 1) {
-		mes "[Michael Halig]";
-		mes "Have you proven your determination with the task I have given you, or do you possess the items proving that you have received your calling?";
-		next;
-		if ((countitem(1004) > 0) && (countitem(1009) > 0)) {
-			mes "[Michael Halig]";
-			mes "Ah...";
-			mes "I see that you have been called to become a Crusader. We are assured of your will, but now we must test your capabilities.";
-			next;
-			mes "[Micheal Halig]";
-			mes "Meet with Moorenak Miyol who is training in the underground dungeon of the Prontera Castle. Go, and speak with him first.";
-			next;
-			delitem 1004,1; //Patriotism_Marks
-			delitem 1009,1; //Sacred_Marks
-			set CRSDR_Q,4;
-			changequest 3006,3009;
-			mes "[Michael Halig]";
-			mes "Moorenak and others like him will test the limits of your capabilities and help you find your path. Return to me after you have completed their tests...";
-			close;
-		}
-		if ((countitem(957) > 9) && (countitem(959) > 9) && (countitem(1099) > 9) && (countitem(901) > 9)) {
-			mes "[Michael Halig]";
-			mes "Ah, well done.";
-			mes "I must acknowledge your efforts and determination. You may now proceed to take the next test.";
-			next;
-			mes "[Michael Halig]";
-			mes "Meet with Moorenak Miyol who is training in the underground dungeon of the Prontera Castle. Go, and speak with him first.";
-			next;
-			delitem 957,10; //Decayed_Nail
-			delitem 959,10; //Rotten_Scale
-			delitem 1099,10; //Worn_Out_Prison_Uniform
-			delitem 901,10; //Danggie
-			set CRSDR_Q,4;
-			changequest 3006,3009;
-			mes "[Michael Halig]";
-			mes "Moorenak and others like him will test the limits of your capabilities and help you find your path. Return to me after you have completed their tests...";
-			close;
-		}
-		mes "[Michael Halig]";
-		mes "Ah, you still have not completed the task I have given to you. Bring me the following items, and prove your will to become a Crusader to me...";
-		next;
-		mes "[Michael Halig]";
-		mes "^3355FF10 Decayed Nail^000000,";
-		mes "^3355FF10 Stinky Scale^000000,";
-		mes "^3355FF10 Worn-out Prison Uniform^000000 and";
-		mes "^3355FF10 Daenggie^000000.";
-		next;
-		mes "[Michael Halig]";
-		mes "If you put forth the effort, you'll be able to accomplish this task. May Odin protect you on your journeys.";
-		close;
-	}
-	if (CRSDR_Q == 2) {
-		mes "[Michael Halig]";
-		mes "Have you proven your determination with the task I have given you, or do you possess the items proving that you have received your calling?";
-		next;
-		if ((countitem(1004) > 0) && (countitem(1009) > 0)) {
-			mes "[Michael Halig]";
-			mes "Ah...";
-			mes "I see that you have been called to become a Crusader. We are assured of your will, but now we must test your capabilities.";
-			next;
-			mes "[Micheal Halig]";
-			mes "Meet with Moorenak Miyol who is training in the underground dungeon of the Prontera Castle. Go, and speak with him first.";
-			next;
-			delitem 1004,1; //Patriotism_Marks
-			delitem 1009,1; //Sacred_Marks
-			set CRSDR_Q,4;
-			changequest 3007,3009;
-			mes "[Michael Halig]";
-			mes "Moorenak and others like him will test the limits of your capabilities and help you find your path. Return to me after you have completed their tests...";
-			close;
-		}
-		if ((countitem(932) > 9) && (countitem(1043) > 9) && (countitem(1098) > 9) && (countitem(1094) > 9)) {
 			mes "[Michael Halig]";
-			mes "Ah, well done.";
-			mes "I must acknowledge your efforts and determination. You may now proceed to take the next test.";
+			mes "Nobody knows when the Holy War will come. We must prepare in advance and cannot afford to slacken";
+			mes "our training.";
 			next;
 			mes "[Michael Halig]";
-			mes "Meet with Moorenak Miyol who is training in the underground dungeon of the Prontera Castle. Go, and speak with him first.";
-			next;
-			delitem 932,10; //Skel_Bone
-			delitem 1043,10; //Nail_Of_Orc
-			delitem 1098,10; //Manacles
-			delitem 1094,10; //Short_Daenggie
-			set CRSDR_Q,4;
-			changequest 3007,3009;
-			mes "[Michael Halig]";
-			mes "Moorenak and others like him will test the limits of your capabilities and help you find your path. Return to me after you have completed their tests...";
+			mes "If you feel that participating in the Holy War is your calling, please come back right away and take the test to become";
+			mes "a Crusader.";
 			close;
 		}
 		mes "[Michael Halig]";
-		mes "Ah, you still have not completed the task I have given to you. Bring me the following items, and prove your will to become a Crusader to me...";
-		next;
-		mes "[Michael Halig]";
-		mes "^3355FF10 Skel-Bone^000000,";
-		mes "^3355FF10 Orc Claw^000000,";
-		mes "^3355FF10 Manacles^000000 and";
-		mes "^3355FF10 Short Daenggie^000000.";
-		next;
-		mes "[Michael Halig]";
-		mes "If you put forth the effort, you'll be able to accomplish this task. May Odin protect you on your journeys.";
+		if (sex) mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin.";
+		else mes "As a woman of the sword, you must train diligently and constantly. Prepare yourself, for no one knows when the Holy War may be coming.";
 		close;
 	}
-	if (CRSDR_Q == 3) {
-		mes "[Michael Halig]";
+	else if(CRUS_Q >= 1 && CRUS_Q <= 3) {
 		mes "Have you proven your determination with the task I have given you, or do you possess the items proving that you have received your calling?";
 		next;
-		if ((countitem(1004) > 0) && (countitem(1009) > 0)) {
-			mes "[Michael Halig]";
-			mes "Ah...";
-			mes "I see that you have been called to become a Crusader. We are assured of your will, but now we must test your capabilities.";
-			next;
-			mes "[Micheal Halig]";
-			mes "Meet with Moorenak Miyol who is training in the underground dungeon of the Prontera Castle. Go, and speak with him first.";
-			next;
-			delitem 1004,1; //Patriotism_Marks
-			delitem 1009,1; //Sacred_Marks
-			set CRSDR_Q,4;
-			changequest 3008,3009;
-			mes "[Michael Halig]";
-			mes "Moorenak and others like him will test the limits of your capabilities and help you find your path. Return to me after you have completed their tests...";
-			close;
+		switch(CRUS_Q) {
+		case 1:
+			set @item1, 957;
+			set @item2, 959;
+			set @item3, 1099;
+			set @item4, 901;
+			break;
+		Case 2:
+			set @item1, 932;
+			set @item2, 1043;
+			set @item3, 1098;
+			set @item4, 1094;
+			break;
+		Case 3:
+			set @item1, 958;
+			set @item2, 930;
+			set @item3, 1041;
+			set @item4, 1062;
+			break;
 		}
-		if ((countitem(958) > 9) && (countitem(930) > 9) && (countitem(1041) > 9) && (countitem(1062) > 9)) {
+		if (countitem(@item1) > 9 && countitem(@item2) > 9 && countitem(@item3) > 9 && countitem(@item4) > 9) {
 			mes "[Michael Halig]";
 			mes "Ah, well done.";
 			mes "I must acknowledge your efforts and determination. You may now proceed to take the next test.";
@@ -323,12 +242,20 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 			mes "[Michael Halig]";
 			mes "Meet with Moorenak Miyol who is training in the underground dungeon of the Prontera Castle. Go, and speak with him first.";
 			next;
-			delitem 958,10; //Horrendous_Mouth
-			delitem 930,10; //Rotten_Bandage
-			delitem 1041,10; //Lantern
-			delitem 1062,10; //Pumpkin_Head
-			set CRSDR_Q,4;
-			changequest 3008,3009;
+			delitem @item1, 10;
+			delitem @item2, 10;
+			delitem @item3, 10;
+			delitem @item4, 10;
+			set CRUS_Q, 4;
+			if(checkquest(3006) != -1) {
+				changequest 3006,3009;
+			}
+			else if(checkquest(3007) != -1) {
+				changequest 3007,3009;
+			}
+			else {
+				changequest 3008,3009;
+			}
 			mes "[Michael Halig]";
 			mes "Moorenak and others like him will test the limits of your capabilities and help you find your path. Return to me after you have completed their tests...";
 			close;
@@ -337,94 +264,42 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 		mes "Ah, you still have not completed the task I have given to you. Bring me the following items, and prove your will to become a Crusader to me...";
 		next;
 		mes "[Michael Halig]";
-		mes "^3355FF10 Horrendous Mouth^000000,";
-		mes "^3355FF10 Rotten Bandage^000000,";
-		mes "^3355FF10 Lantern^000000 and";
-		mes "^3355FF10 Jack o' Pumpkin^000000.";
+		mes "10 ^3355FF"+getitemname(@item1)+"^000000";
+		mes "10 ^3355FF"+getitemname(@item2)+"^000000";
+		mes "10 ^3355FF"+getitemname(@item3)+"^000000";
+		mes "10 ^3355FF"+getitemname(@item4)+"^000000";
 		next;
 		mes "[Michael Halig]";
 		mes "If you put forth the effort, you'll be able to accomplish this task. May Odin protect you on your journeys.";
 		close;
 	}
-	if (CRSDR_Q == 10) {
-		if (JobLevel < 40) {
-			set CRSDR_Q,0;
-			mes "[Michael Halig]";
-			mes "Wait ... You can not sign up.";
-			mes "You must reach job level 40 before you can apply.";
-			next;
-			mes "[Michael Halig]";
-			mes "Train as a Swordsman and wait for the call of Odin.";
-			mes "I know your feelings, but you can not join us now...";
-			close;
-		}
-		if (SkillPoint != 0) {
-			mes "[Michael Halig]";
+	else if(CRUS_Q == 10) {
+		if(SkillPoint) {
 			mes "You haven't finished learning everything as a Swordsman. Use all of your remaining skill points, and then return to me.";
 			close;
 		}
-		if (JobLevel == 50) {
-			mes "[Michael Halig]";
-			mes "Congratulations on completing all of your tests. You are truly worthy of fighting alongside side us in the Holy War as a Crusader.";
-			next;
-			mes "[Michael Halig]";
-			mes "Together, let us ready ourselves and be victorious over evil and tyranny!";
-			next;
-			completequest 3015;
-			set CRSDR_Q,0;
-			if(Class == Job_Baby_Swordman){
-				jobchange Job_Baby_Crusader;
-			} else {
-				jobchange Job_Crusader;
-			}
-			mes "[Michael Halig]";
-			mes "Behold...!";
-			mes "You are now a Crusader!";
-			mes "When the Holy War comes, we shall fight side by side against the forces of evil.";
-			next;
-			mes "[Michael Halig]";
-			mes "Now you are";
-			mes "one of us!";
-			if (Sex == 1) {
-				mes "...Brother.";
-			}
-			else {
-				mes "...Comrade.";
-			}
-			next;
-			getitem 504,12; //White_Potion
-			mes "[Michael Halig]";
-			mes "And use this in times of dire peril. It will give you strength when your wounds are most grievous.";
-			next;
-			mes "[Michael Halig]";
-			mes "Never forget that the Holy War is approaching. We must be prepare for the inevitable tide of evil that will sweep this world. Now, go forth and fight for the principles of freedom and justice!";
-			close;
-		}
-		mes "[Michael Halig]";
 		mes "Congratulations on completing all of your tests. You are truly worthy of fighting alongside side us in the Holy War as a Crusader.";
 		next;
 		mes "[Michael Halig]";
 		mes "Together, let us ready ourselves and be victorious over evil and tyranny!";
 		next;
+		set .@Joblevel,JobLevel;
 		completequest 3015;
-		set CRSDR_Q,0;
-		if(Class == Job_Baby_Swordman){
-			jobchange Job_Baby_Crusader;
-		} else {
-			jobchange Job_Crusader;
-		}
+		callfunc "Job_Change",Job_Crusader;
+		callfunc "F_ClearJobVar";		//clears all job variables for the current player
 		mes "[Michael Halig]";
 		mes "Behold...!";
 		mes "You are now a Crusader!";
-		mes "When the Holy War comes, we shall fight side by side against the forces of evil. Now you are one of us!";
-		if (Sex == 1) {
-			mes "...Brother.";
-		}
-		else {
-			mes "...Comrade.";
-		}
+		mes "When the Holy War comes, we shall fight side by side against the forces of evil.";
 		next;
-		getitem 504,6; //White_Potion
+		mes "[Michael Halig]";
+		mes "Now you are";
+		mes "one of us!";
+		if (sex) mes "...Brother.";
+		else mes "...Comrade.";
+		next;
+		if(.@JobLevel != 50) getitem 504, 6;
+		else getitem 504, 12;
 		mes "[Michael Halig]";
 		mes "And use this in times of dire peril. It will give you strength when your wounds are most grievous.";
 		next;
@@ -432,7 +307,6 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 		mes "Never forget that the Holy War is approaching. We must be prepare for the inevitable tide of evil that will sweep this world. Now, go forth and fight for the principles of freedom and justice!";
 		close;
 	}
-	mes "[Michael Halig]";
 	mes "It seems that you have not yet completed all of the testing. You will not be ready to become a Crusader until you have completed the tests set before you.";
 	next;
 	mes "[Michael Halig]";
@@ -440,15 +314,15 @@ prt_castle,45,169,5	script	Senior Crusader	752,{
 	close;
 }
 
+//===================== Suffering Man: 2nd Endurance Test ===============================================
 prt_castle,164,32,1	script	Man in Anguish	733,{
-	if ((Class != Job_Baby_Swordman) && (Class != Job_Swordman)) {
-		if (Class == Job_Baby_Crusader || Class == Job_Crusader) {
-			mes "[Murnak Mijoul]";
+	mes "[Murnak Mijoul]";
+	if(BaseJob != Job_Swordman) {
+		if (BaseJob == Job_Crusader) {
 			mes "Don't linger around in a place like this and forge your own path towards discovering your own strengths. The day that we will join hands in battle will come soon.";
 			close;
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
-			mes "[Murnak Mijoul]";
+		else if(BaseJob == Job_Novice) {
 			mes "A Novice...?";
 			mes "So green, and yet,";
 			mes "so much potential.";
@@ -457,12 +331,10 @@ prt_castle,164,32,1	script	Man in Anguish	733,{
 			mes "Let me assure you that I'm no criminal. I'm here merely to train myself. Perhaps as you become stronger, you will understand.";
 			close;
 		}
-		mes "[Murnak Mijoul]";
 		mes "Hm. You have no business in a place like this. Please leave, and do not interrupt my training.";
 		close;
 	}
-	if (CRSDR_Q == 0) {
-		mes "[Murnak Mijoul]";
+	else if(CRUS_Q >= 0 && CRUS_Q <= 3) {
 		mes "What do you want...?";
 		mes "If you have no business here,";
 		mes "then please leave. A tranquil state of mind is essential in self training...";
@@ -471,49 +343,13 @@ prt_castle,164,32,1	script	Man in Anguish	733,{
 		mes "I wish to improve the sense of serenity in my heart in preparation for the Holy War that is to come. So please, do not disturb me.";
 		close;
 	}
-	if (CRSDR_Q == 1) {
-		mes "[Murnak Mijoul]";
-		mes "What do you want...?";
-		mes "If you have no business here,";
-		mes "then please leave. A tranquil state of mind is essential in self training...";
-		next;
-		mes "[Murnak Mijoul]";
-		mes "I wish to improve the sense of serenity in my heart in preparation for the Holy War that is to come. So please, do not disturb me.";
-		close;
-	}
-	if (CRSDR_Q == 2) {
-		mes "[Murnak Mijoul]";
-		mes "What do you want...?";
-		mes "If you have no business here,";
-		mes "then please leave. A tranquil state of mind is essential in self training...";
-		next;
-		mes "[Murnak Mijoul]";
-		mes "I wish to improve the sense of serenity in my heart in preparation for the Holy War that is to come. So please, do not disturb me.";
-		close;
-	}
-	if (CRSDR_Q == 3) {
-		mes "[Murnak Mijoul]";
-		mes "What do you want...?";
-		mes "If you have no business here,";
-		mes "then please leave. A tranquil state of mind is essential in self training...";
-		next;
-		mes "[Murnak Mijoul]";
-		mes "I wish to improve the sense of serenity in my heart in preparation for the Holy War that is to come. So please, do not disturb me.";
-		close;
-	}
-	if (CRSDR_Q == 4) {
-		mes "[Murnak Mijoul]";
+	else if(CRUS_Q == 4) {
 		mes "What is it...?";
 		mes "Do you have business";
-		if (Sex == 1) {
-			mes "with me, man of the sword?";
-		}
-		else {
-			mes "with me, woman of the sword?";
-		}
+		if (sex) mes "with me, man of the sword?";
+		else mes "with me, woman of the sword?";
 		next;
-		switch (select("I'd like to take the Crusader test.:Nothing.")) {
-		case 1:
+		if (select("I'd like to take the Crusader test.:Nothing.") == 1) {
 			mes "[Murnak Mijoul]";
 			mes "You wish to become a Crusader...? Hm, fighting in the Holy War is an admirable goal we may both share.";
 			next;
@@ -523,7 +359,7 @@ prt_castle,164,32,1	script	Man in Anguish	733,{
 			mes "Let me take";
 			mes "a look at your face.";
 			next;
-			if (!isequipped(2608)) {
+			if(getequipid(7) != 2608 && getequipid(8) != 2608) {
 				mes "[Murnak Mijoul]";
 				mes "Hmm. You wish to become a Crusader, but do not wear a Rosary? I have no business with you if you cannot uphold our customs.";
 				close;
@@ -542,7 +378,7 @@ prt_castle,164,32,1	script	Man in Anguish	733,{
 			mes "But...";
 			mes "You must keep one thing in mind. Under no condition are you allowed to kill the monsters.";
 			next;
-			set CRSDR_Q,5;
+			set CRUS_Q,5;
 			changequest 3009,3010;
 			mes "[Murnak Mijoul]";
 			mes "Well then...";
@@ -550,24 +386,21 @@ prt_castle,164,32,1	script	Man in Anguish	733,{
 			close2;
 			warp "job_cru",98,40;
 			end;
-		case 2:
-			mes "[Murnak Mijoul]";
-			mes "You seem to have a lot of time on your hands. Why don't you do something more productive, like pick Jellopy off the streets or something?";
-			close;
 		}
-	}
-	if (CRSDR_Q == 5) {
 		mes "[Murnak Mijoul]";
+		mes "You seem to have a lot of time on your hands. Why don't you do something more productive, like pick Jellopy off the streets or something?";
+		close;
+	}
+	else if(CRUS_Q == 5) {
 		mes "What is it...?";
 		mes "You're the Swordman from before. What happened, did you fail?";
 		next;
-		switch (select("Let me retake the test.:What kind of test was that?!")) {
-		case 1:
+		if (select("Let me retake the test.:What kind of test was that?!") == 1) {
 			mes "[Murnak Mijoul]";
 			mes "I'll let you retake the test as much as you like. But if you continuously fail, there's an inherent problem with your";
 			mes "state of mind.";
 			next;
-			if (!isequipped(2608)) {
+			if(getequipid(7) != 2608 && getequipid(8) != 2608) {
 				mes "[Murnak Mijoul]";
 				mes "Wait...";
 				mes "Where have you left your Rosary? You can't let that lie around just anywhere. We are supposed to be warriors of holiness.";
@@ -587,42 +420,38 @@ prt_castle,164,32,1	script	Man in Anguish	733,{
 			mes "[Murnak Mijoul]";
 			mes "No matter what you do, do not kill any of the monsters. This time, think carefully before you draw your sword.";
 			next;
-			set CRSDR_Q,5;
+			set CRUS_Q,5;
 			mes "[Murnak Mijoul]";
 			mes "Well then...";
 			mes "Good luck.";
 			close2;
 			warp "job_cru",98,40;
-			end;
-		case 2:
-			mes "[Murnak Mijoul]";
-			mes "Who are you to say that you don't like my test? With that kind of attitude, you'll never become a Crusader.";
-			next;
-			mes "[Murnak Mijoul]";
-			mes "I can understand if you are easily frustrated, but you must overcome your frustration to pass this test.";
-			close;
 		}
-	}
-	if (CRSDR_Q == 6) {
 		mes "[Murnak Mijoul]";
+		mes "Who are you to say that you don't like my test? With that kind of attitude, you'll never become a Crusader.";
+		next;
+		mes "[Murnak Mijoul]";
+		mes "I can understand if you are easily frustrated, but you must overcome your frustration to pass this test.";
+		close;
+	}
+	else if(CRUS_Q == 6) {
 		mes "Hmm, seems like you did well. It shouldn't have been too hard. You no longer have any business";
 		mes "with me.";
 		next;
-		changequest 3010,3011;
 		mes "[Murnak Mijoul]";
 		mes "For your next test, go look for Gabriel Valentine in the Prontera Sanctuary. Well then, I'll see you around.";
 		close;
 	}
-	mes "[Murnak Mijoul]";
 	mes "Hmmm...";
 	mes "You still have tests to complete if you want to become a Crusader, don't you?";
 	close;
 }
 
-prt_church,95,127,5	script	Crusader	745,{
-	if ((Class != Job_Baby_Swordmann) && (Class != Job_Swordman)) {
-		if (Class == Job_Baby_Crusader || Class == Job_Crusader) {
-			mes "[Gabriel Valentine]";
+//===================== Gabriel Valentine: 3rd Knowledge Test =================================
+prt_church,95,127,3	script	Crusader	745,{
+	mes "[Gabriel Valentine]";
+	if(BaseJob != Job_Swordman) {
+		if (BaseJob == Job_Crusader) {
 			mes "Welcome, fellow Crusader.";
 			mes "How is your training";
 			mes "coming along?";
@@ -631,8 +460,7 @@ prt_church,95,127,5	script	Crusader	745,{
 			mes "You must not forget to train everyday, and prepare for the day the Holy War will come upon us.";
 			close;
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
-			mes "[Gabriel Valentine]";
+		else if(BaseJob == Job_Novice) {
 			mes "Welcome, I am a Crusader.";
 			mes "I am preparing for the";
 			mes "foretold Holy War";
@@ -643,9 +471,8 @@ prt_church,95,127,5	script	Crusader	745,{
 			next;
 			mes "[Gabriel Valentine]";
 			mes "We are located in the Prontera Central Palace, so if you have time, it wouldn't hurt to stop by.";
-			close2;
+			close;
 		}
-		mes "[Gabriel Valentine]";
 		mes "Welcome, we are Crusaders.";
 		mes "We are preparing for the";
 		mes "foretold Holy War";
@@ -655,8 +482,7 @@ prt_church,95,127,5	script	Crusader	745,{
 		mes "I hope you will train yourself in preparation for the future as well.";
 		close;
 	}
-	if (CRSDR_Q == 0) {
-		mes "[Gabriel Valentine]";
+	else if(CRUS_Q == 0) {
 		mes "Welcome. We are Crusaders.";
 		mes "We are preparing for the";
 		mes "foretold Holy War";
@@ -666,454 +492,226 @@ prt_church,95,127,5	script	Crusader	745,{
 		mes "If you would like to become a Crusader, please speak with our leader in the Prontera Central Palace.";
 		close;
 	}
-	if (CRSDR_Q == 6) {
-		mes "[Gabriel Valentine]";
-		mes "Welcome.";
-		mes "Did you do well";
-		mes "on those painful tests?";
-		mes "I will be conducting your next test.";
-		next;
-		mes "[Gabriel Valentine]";
-		mes "My name is Gabriel Valentine. I, too, am preparing for the Holy War. For the time being, I act as guard for this church.";
-		next;
-		mes "[Gabriel Valentine]";
-		mes "I will test to see if you have acquired the knowledge that is necessary to become a Crusader.";
-		mes "We can't very well win the Holy War just by swinging a sword.";
-		next;
-		set .@cru_m, rand(1,3);
-		set @cru_t, 0;
-		mes "[Gabriel Valentine]";
-		mes "I will give";
-		mes "you 10 questions.";
-		mes "Answer them correctly.";
-		next;
+	else if((CRUS_Q == 6) || (CRUS_Q == 7)) {
+		if(CRUS_Q == 6) {
+			mes "Welcome.";
+			mes "Did you do well";
+			mes "on those painful tests?";
+			mes "I will be conducting your next test.";
+			next;
+			mes "[Gabriel Valentine]";
+			mes "My name is Gabriel Valentine. I, too, am preparing for the Holy War. For the time being, I act as guard for this church.";
+			next;
+			mes "[Gabriel Valentine]";
+			mes "I will test to see if you have acquired the knowledge that is necessary to become a Crusader.";
+			mes "We can't very well win the Holy War just by swinging a sword.";
+			next;
+			mes "[Gabriel Valentine]";
+			mes "I will give";
+			mes "you 10 questions.";
+			mes "Answer them correctly.";
+			next;
+		}
+		else if(CRUS_Q == 7) {
+			mes "Welcome back~";
+			mes "Did you prepare";
+			mes "well for this test?";
+			mes "Let's try again,";
+			mes "shall we...?";
+			next;
+			mes "[Gabriel Valentine]";
+			mes "Once again, I'm going";
+			mes "to give you 10 questions";
+			mes "Listen carefully, and";
+			mes "choose the correct answer.";
+			next;
+		}
+		set .@cru_m,rand(1,3);
 		if (.@cru_m == 1) {
 			mes "[Gabriel Valentine]";
 			mes "1. Which attribute is the most effective in atttacking the Undead?";
 			next;
-			switch (select("Neutral:Earth:Undead:Holy")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				set @cru_t, @cru_t + 10;
-				break;
-			}
+			if (select("Neutral:Earth:Undead:Holy") == 4)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "2. If the monster is a Level 2 Undead, how much more damage does a Holy attack do compared to Fire?";
 			next;
-			switch (select("25 %:50 %:75 %:100 %")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("25 %:50 %:75 %:100 %") == 1)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "3. What item can you not get from an Evil Druid?";
 			next;
-			switch (select("Monk Hat:Yggdrasil leaf:White Herb:Amulet ")) {
-			case 1:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("Monk Hat:Yggdrasil leaf:White Herb:Amulet ") == 1)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "4. Which Undead monster";
 			mes "has the highest HP?";
 			next;
-			switch (select("Ghoul:Skeleton Prisoner:Wraith:Zombie Prisoner")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				set @cru_t, @cru_t + 10;
-				break;
-			}
+			if (select("Ghoul:Skeleton Prisoner:Wraith:Zombie Prisoner") == 4) 
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "5. Which of the following monsters is a different size than the others?";
 			next;
-			switch (select("Wraith:Khalitzburg:Drake:Evil Druid")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 4:
-				break;
-			}
+			if (select("Wraith:Khalitzburg:Drake:Evil Druid") == 3)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "6. Which card grants you tolerance to Undead property attacks?";
 			next;
-			switch (select("Orc Skeleton Card:Orc Zombie Card:Ghoul Card:Skel Worker Card")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("Orc Skeleton Card:Orc Zombie Card:Ghoul Card:Skel Worker Card") == 2)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "7. What was the relationship between Munak and Bongun before they passed away?";
 			next;
-			switch (select("Big Brother and Little Sister:Childhood friends in the same village:Stepbrother and sister:Complete strangers")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("Big Brother and Little Sister:Childhood friends in the same village:Stepbrother and sister:Complete strangers") == 2)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "8. Which of the following monsters is not aggressive?";
 			next;
-			switch (select("Soldier Skeleton:Orc Skeleton:Skeleton:Skel Worker")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 4:
-				break;
-			}
+			if (select("Soldier Skeleton:Orc Skeleton:Skeleton:Skel Worker") == 3)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "9. What is the name of the shield in which a Munak Card has been inserted?";
 			next;
-			switch (select("Atomic Shield:Amulet Shield:Hypnotic Shield:Homeroth Shield")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("Atomic Shield:Amulet Shield:Hypnotic Shield:Homeroth Shield") == 2)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "10. Which of the following monsters does not drop Memento?";
 			next;
-			switch (select("Munak:Ghoul:Mummy:Soldier Skeleton")) {
-			case 1:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("Munak:Ghoul:Mummy:Soldier Skeleton") == 1)
+				set .@cru_t,.@cru_t+10;
 		}
-		if (.@cru_m == 2) {
+		else if (.@cru_m == 2) {
 			mes "[Gabriel Valentine]";
 			mes "1. Which of the following monsters is a different attribute than the others?";
 			next;
-			switch (select("Karat:Wind Ghost:Isis:Wanderer")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 4:
-				break;
-			}
+			if (select("Carat:Wind Ghost:Isis:Wanderer") == 3)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "2. Which sword is effective in attacking Demon monsters?";
 			next;
-			switch (select("Decussate Tsurugi:Hollowed Tsurugi:Damned Tsurugi:Drowsy Tsurugi")) {
-			case 1:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("Decussate Tsurugi:Hollowed Tsurugi:Damned Tsurugi:Drowsy Tsurugi") == 1)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "3. Which item is NOT dropped by Dokebi?";
 			next;
-			switch (select("Rough Elunium:Golden Hammer:Sword Mace:Mighty Staff")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("Rough Elunium:Golden Hammer:Sword Mace:Mighty Staff") == 2)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "4. Which Demon monster has the most HP?";
 			next;
-			switch (select("Giearth:Magnolia:Dokebi:Marionette")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				set @cru_t, @cru_t + 10;
-				break;
-			}
+			if (select("Giearth:Magnolia:Dokebi:Marionette") == 4)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "5. Which Demon monster is a different size than the others?";
 			next;
-			switch (select("Ghostring:Whisper:Deviruchi:Baphomet Junior")) {
-			case 1:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("Ghostring:Whisper:Deviruchi:Baphomet Junior") == 1)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "6. Which shield reduces damage inflicted by Demon monsters?";
 			next;
-			switch (select("Satanic Shield:Shield from Hell:Amulet Shield:Excellent Shield")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("Satanic Shield:Shield from Hell:Amulet Shield:Excellent Shield") == 2)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "7. Which attribute is the most effective on the Wind Ghost?";
 			next;
-			switch (select("Water:Earth:Fire:Wind")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("Water:Earth:Fire:Wind") == 2)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "8. Which monster is different from the other Demon monsters?";
 			next;
-			switch (select("Sohee:Isis:Dokebi:Whisper")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				set @cru_t, @cru_t + 10;
-				break;
-			}
+			if (select("Sohee:Isis:Dokebi:Whisper") == 4)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "9. What effect does the Marionette Card have?";
 			next;
-			switch (select("Increase defense against Shadow attacks by 30 %:Increase defense against poison attacks by 30 %:Increase defense against Ghost attacks by 30 %:Increase defense against Neutral attacks by 30 %")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 4:
-				break;
-			}
+			if (select("Increase defense against Shadow attacks by 30 %:Increase defense against poison attacks by 30 %:Increase defense against Ghost attacks by 30 %:Increase defense against Neutral attacks by 30 %") == 3)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "10. Which of the following is an effective way to react when encountering a demon monster?";
 			next;
-			switch (select("Scream, 'Evil one, go away!':Offer your soul and get a deal.:Put Holy Water on a weapon and attack.:Put on a Deviruchi hat.")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 4:
-				break;
-			}
+			if (select("Scream, 'Evil one, go away!':Offer your soul and get a deal.:Put Holy Water on a weapon and attack.:Put on a Deviruchi hat.") == 3)
+				set .@cru_t,.@cru_t+10;
 		}
 		else {
 			mes "[Gabriel Valentine]";
 			mes "1. What level of 'Divine Protection' do you need to learn 'Demon Bane?'";
 			next;
-			switch (select("Level 1:Level 2:Level 3:Level 4")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 4:
-				break;
-			}
+			if (select("Level 1:Level 2:Level 3:Level 4") == 3)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "2. If your INT is 30, including INT bonuses from quipment, at level 55, how much HP does Level 5 Heal recover?";
 			next;
-			switch (select("396:440:484:528")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("396:440:484:528") == 2)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "3. With Level 7 Divine Protection, by how much is your defense against the Undead increased?";
 			next;
-			switch (select("21:22:23:24")) {
-			case 1:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("21:22:23:24") == 1)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "4. Which of the following spears can attack Nightmare, which is endowed with the Ghost attribute?";
 			next;
-			switch (select("Lance:Bill Guisarme:Cresent scythe:Zephyrus")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				set @cru_t, @cru_t + 10;
-				break;
-			}
+			if (select("Lance:Bill Guisarme:Cresent scythe:Zephyrus") == 4)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "5. What level of 'Heal' do you need to learn 'Cure?'";
 			next;
-			switch (select("Level 1:Level 2:Level 3:Level 4")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("Level 1:Level 2:Level 3:Level 4") == 2)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "6. What is the attack speed when Level 3 Cavalier Mastery is learned?";
 			next;
-			switch (select("70 % of normal speed:80 % of normal speed:90 % of normal speed:100 % of normal speed")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("70 % of normal speed:80 % of normal speed:90 % of normal speed:100 % of normal speed") == 2)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "7. Which of the following is not correct of the Demon Bane skill?";
 			next;
-			switch (select("Increase attack on Undead:Only Acolytes can learn the skill:When mastered, + 30 increase:Passive Skill")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("Increase attack on Undead:Only Acolytes can learn the skill:When mastered, + 30 increase:Passive Skill") == 2)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "8. How much SP does Level 7 Heal use?";
 			next;
-			switch (select("30:31:33:35")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("30:31:33:35") == 2)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "9. What status cannot be";
 			mes "cured with the Cure skill?";
 			next;
-			switch (select("Curse:Silence:Chaos:Blind")) {
-			case 1:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("Curse:Silence:Chaos:Blind") == 1)
+				set .@cru_t,.@cru_t+10;
+
 			mes "[Gabriel Valentine]";
 			mes "10. What best describes a Crusader?";
 			next;
-			switch (select("One preparing for matrimony.:One preparing for the Holy War.:One preparing consummation.:One preparing potions.")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
+			if (select("One preparing for matrimony.:One preparing for the Holy War.:One preparing consummation.:One preparing potions.") == 2)
+				set .@cru_t,.@cru_t+10;
+
 		}
 		mes "[Gabriel Valentine]";
 		mes "Good work~";
@@ -1122,9 +720,9 @@ prt_church,95,127,5	script	Crusader	745,{
 		next;
 		mes "[Gabriel Valentine]";
 		mes " " + strcharinfo(0) + "'s score";
-		mes "is " + @cru_t + " points...";
-		if (@cru_t == 100) {
-			set CRSDR_Q,8;
+		mes "is " + .@cru_t + " points...";
+		if(.@cru_t == 100) {
+			set CRUS_Q, 8;
 			changequest 3011,3013;
 			mes "Superb! Now, it's time for";
 			mes "you to take the next test.";
@@ -1136,8 +734,8 @@ prt_church,95,127,5	script	Crusader	745,{
 			mes "he will be testing you next.";
 			close;
 		}
-		if (@cru_t == 90) {
-			set CRSDR_Q,8;
+		else if(.@cru_t == 90) {
+			set CRUS_Q, 8;
 			changequest 3011,3013;
 			mes "Well done~ Now, it's time for";
 			mes "you to take the next test.";
@@ -1149,495 +747,9 @@ prt_church,95,127,5	script	Crusader	745,{
 			mes "he will be testing you next.";
 			close;
 		}
-		set CRSDR_Q,7;
-		changequest 3011,3012;
-		mes "Hmmm... What a pity.";
-		mes "Go study some more and";
-		mes "take this test again, okay?";
-		next;
-		mes "[Gabriel Valentine]";
-		mes "Don't stress, you need to know a lot in order to pass this test. In any case, I'll be waiting right here. When you think you're ready, come back, alright?";
-		close;
-	}
-	if (CRSDR_Q == 7) {
-		mes "[Gabriel Valentine]";
-		mes "Welcome back~";
-		mes "Did you prepare";
-		mes "well for this test?";
-		mes "Let's try again,";
-		mes "shall we...?";
-		next;
-		set .@cru_m, rand(1,3);
-		set @cru_t, 0;
-		mes "[Gabriel Valentine]";
-		mes "Once again, I'm going";
-		mes "to give you 10 questions";
-		mes "Listen carefully, and";
-		mes "choose the correct answer.";
-		next;
-		if (.@cru_m == 1) {
-			mes "[Gabriel Valentine]";
-			mes "1. Which attribute is the most effective in atttacking the Undead?";
-			next;
-			switch (select("Neutral:Earth:Undead:Holy")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				set @cru_t, @cru_t + 10;
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "2. If the monster is a level 2 Undead, how much more damage does a Holy attack do compared to Fire?";
-			next;
-			switch (select("25%:50%:75%:100%")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "3. What item can you not get from an Evil Druid?";
-			next;
-			switch (select("Monk Hat:Yggdrasil leaf:White Herb:Amulet ")) {
-			case 1:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "4. Which Undead monster has the highest HP?";
-			next;
-			switch (select("Ghoul:Skeleton Prisoner:Wraith:Zombie Prisoner")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				set @cru_t, @cru_t + 10;
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "5. Which of the following is a different size?";
-			next;
-			switch (select("Wraith:Khalitzburg:Drake:Evil Druid")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "6. Which card is immune to undead attacks?";
-			next;
-			switch (select("Orc Skeleton Card:Orc Zombie Card:Ghoul Card:Skel Worker Card")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "7. What was teh relationship between Munak and Bongun before they passed away?";
-			next;
-			switch (select("Big Brother and Little Sister:Neighborhood Older Sister and Younger Brother:Stepbrother and sister:Did not know each other")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "8. Which monster is a different type of undead monster?";
-			next;
-			switch (select("Soldier Skeleton:Orc Skeleton:Skeleton:Skel Worker")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "9. What is the name of a shield with a Munak Card?";
-			next;
-			switch (select("Atomic Shield:Amulet Shield:Hypnotic Shield:Homeroth Shield")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "10. Which of the following monsters does not drop its article left at death?";
-			next;
-			switch (select("Munak:Ghoul:Mummy:Soldier Skeleton")) {
-			case 1:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-		}
-		if (.@cru_m == 2) {
-			mes "[Gabriel Valentine]";
-			mes "1. Which of the following monsters has a different attribute?";
-			next;
-			switch (select("Carat:Wind Ghost:Isis:Wanderer")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "2. Which sword is effective in attacking demon monsters?";
-			next;
-			switch (select("Decussate Tsurugi:Hollowed Tsurugi:Damned Tsurugi:Drowsy Tsurugi")) {
-			case 1:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "3. Which item does the Dokebi NOT drop?";
-			next;
-			switch (select("Rough Elunium:Golden Hammer:Sword Mace:Mighty Staff")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "4. Which demon monster has the most HP?";
-			next;
-			switch (select("Giearth:Magnolia:Dokebi:Marionette")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				set @cru_t, @cru_t + 10;
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "5. Which demon monster is a different size?";
-			next;
-			switch (select("Ghostring:Whisper:Deviruchi:Baphomet Junior")) {
-			case 1:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "6. Which shield decreases attacks from demon monsters?";
-			next;
-			switch (select("Satanic Shield:Shield from Hell:Amulet Shield:Excellent Shield")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "7. Which attribute is the most effective on the Wind Ghost?";
-			next;
-			switch (select("Water:Earth:Fire:Wind")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "8. Which monster is different from the other demon monsters?";
-			next;
-			switch (select("Sohee:Isis:Dokebi:Whisper")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				set @cru_t, @cru_t + 10;
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "9. What effect does the Marionette Card have?";
-			next;
-			switch (select("Increase defense against shadow attacks by 30%:Increase defense against poison attacks by 30%:Increase defense against ghost attacks by 30%:Increase defense against neutral attacks by 30%")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "10. Which of the following is an effective way to react when encountering a demon monster?";
-			next;
-			switch (select("Yell out - Evil one go away!:Offer your soul and get a deal.:Put Holy Water on weapon and attack.:Put on a Deviruchi hat.")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 4:
-				break;
-			}
-		}
-		else {
-			mes "[Gabriel Valentine]";
-			mes "1. What level of 'Divine Protection' do you need to learn 'Demon Bane'?";
-			next;
-			switch (select("Lv. 1:Lv. 2:Lv. 3:Lv. 4")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "2. If your INT is 30 at level 55 (including the INT from equipment) how much HP does Lv. 5 Heal recover?";
-			next;
-			switch (select("396:440:484:528")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "3. When using Divine Protection Lv. 7, how much does your defense increase by against Undead?";
-			next;
-			switch (select("21:22:23:24")) {
-			case 1:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "4. Which of the following spears can attack the Nightmare with ghost attributes?";
-			next;
-			switch (select("Lance:Bill Guisarme:Cresent scythe:Zephyrus")) {
-			case 1:
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				set @cru_t, @cru_t + 10;
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "5. What level of 'Heal' do you need to learn 'Cure'?";
-			next;
-			switch (select("Lv. 1:Lv. 2:Lv. 3:Lv. 4")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "6. What is the attack speed with Cavalier Mastery Lv.3?";
-			next;
-			switch (select("70% of normal speed:80% of normal speed:90% of normal speed:100% of normal speed")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "7. Which of the following is not a correction description of Demon Bane?";
-			next;
-			switch (select("Increase attack on Undead:Only Acolytes can learn the skill.:When mastered, +30 increase.:Passive Skill")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "8. How much SP does Heal Lv. 7 use?";
-			next;
-			switch (select("30:31:33:35")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "9. When can you cure with Cure?";
-			next;
-			switch (select("Curse:Silence:Chaos:Blind")) {
-			case 1:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 2:
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-			mes "[Gabriel Valentine]";
-			mes "10. What best describes a Crusader?";
-			next;
-			switch (select("One preparing a cookie.:One preparing for the Holy War.:One preparing to drink.:One preparing potions.")) {
-			case 1:
-				break;
-			case 2:
-				set @cru_t, @cru_t + 10;
-				break;
-			case 3:
-				break;
-			case 4:
-				break;
-			}
-		}
-		mes "[Gabriel Valentine]";
-		mes "Good work~";
-		mes "Well, first let me";
-		mes "look at your results.";
-		next;
-		mes "[Gabriel Valentine]";
-		mes "" + strcharinfo(0) + "'s score";
-		mes "is " + @cru_t + " points...";
-		if (@cru_t == 100) {
-			set CRSDR_Q,8;
-			changequest 3012,3013;
-			mes "Superb! Now, it's time for";
-			mes "you to take the next test.";
-			next;
-			mes "[Gabriel Valentine]";
-			mes "Go to Prontera Castle";
-			mes "and meet Bliant Piyord.";
-			mes "I will inform him that";
-			mes "he will be testing you next.";
-			close;
-		}
-		if (@cru_t == 90) {
-			set CRSDR_Q,8;
-			changequest 3012,3013;
-			mes "Well done~ Now, it's time for";
-			mes "you to take the next test.";
-			next;
-			mes "[Gabriel Valentine]";
-			mes "Go to Prontera Castle";
-			mes "and meet Bliant Piyord.";
-			mes "I will inform him that";
-			mes "he will be testing you next.";
-			close;
-		}
-		if (@cru_t == 80) {
-			set CRSDR_Q,8;
-			changequest 3012,3013;
+		else if (.@cru_t == 80 && CRUS_Q == 7) {
+			set CRUS_Q,8;
+			changequest 3011,3013;
 			mes "Seems like you prepared a lot so I'll let you pass this time.";
 			mes "Hurry now and go take the next test.";
 			next;
@@ -1646,33 +758,29 @@ prt_church,95,127,5	script	Crusader	745,{
 			mes "I will inform him to prepare the next test.";
 			close;
 		}
-		set CRSDR_Q,7;
-		mes "Aww, what a pity. Come again after studying some more.";
+		set CRUS_Q,7;
+		if(checkquest(3011) != -1) {
+			changequest 3011,3012;
+		}
+		mes "Hmmm... What a pity.";
+		mes "Go study some more and";
+		mes "take this test again, okay?";
 		next;
 		mes "[Gabriel Valentine]";
-		mes "I shall wait since there is a lot of preparation required.";
-		mes "Come back when you believe you are ready...";
-		close;
-	}
-	if (CRSDR_Q == 8) {
-		mes "[Gabriel Valentine]";
-		mes "Like I mentioned before, you should go to Prontera Castle and meet with Bliant Piyord to take your next test. Good luck, and become a Crusder soon, alright?";
+		mes "Don't stress, you need to know a lot in order to pass this test. In any case, I'll be waiting right here. When you think you're ready, come back, alright?";
 		close;
-	}
-	if (CRSDR_Q == 9) {
-		mes "[Gabriel Valentine]";
+	} 
+	else if(CRUS_Q == 8 || CRUS_Q == 9) {
 		mes "Like I mentioned before, you should go to Prontera Castle and meet with Bliant Piyord to take your next test. Good luck, and become a Crusder soon, alright?";
 		close;
 	}
-	if (CRSDR_Q == 10) {
-		mes "[Gabriel Valentine]";
+	else if(CRUS_Q == 10) {
 		mes "What are you still doing here? You've already completed all the tests. Go talk to our leader, you're pretty much ready to become a Crusader now.";
 		next;
 		mes "[Gabriel Valentine]";
 		mes "You will soon join us in our preparations for the Holy War. Continue to live with faith after becoming a Crusader.";
 		close;
 	}
-	mes "[Gabriel Valentine]";
 	mes "Mmm...?";
 	mes "It seems that you're";
 	mes "an aspiring Crusader...";
@@ -1687,21 +795,20 @@ prt_church,95,127,5	script	Crusader	745,{
 	close;
 }
 
-prt_castle,35,151,5	script	Patron Kinght	751,{
-	if ((Class != Job_Baby_Swordman) && (Class != Job_Swordman)) {
-		if (Class == Job_Baby_Crusader || Class == Job_Crusader) {
-			mes "[Bliant Piyord]";
-			mes "Welcome.";
+//===================== Crusader: 4th Purification Test =====================================================
+prt_castle,35,151,5	script	Patron Knight	751,{
+	mes "[Bliant Piyord]";
+	mes "Welcome.";
+	if(BaseJob != Job_Swordman) {
+		if(BaseJob == Job_Crusader) {
 			mes "How goes";
 			mes "your training?";
 			next;
 			mes "[Bliant Piyord]";
 			mes "Develop your faith. From faith springs strength and discipline. Day after day, train yourself and become a great Crusader.";
-			close2;
+			close;
 		}
-		if (Class == Job_Baby || Class == Job_Novice) {
-			mes "[Bliant Piyord]";
-			mes "Welcome.";
+		else if(BaseJob == Job_Novice) {
 			mes "We are Crusaders,";
 			mes "warriors of holiness preparing for the great Holy War that is to come.";
 			next;
@@ -1716,8 +823,6 @@ prt_castle,35,151,5	script	Patron Kinght	751,{
 			mes "Train as a Swordsman and come to us when you think you are ready. If you have been called by Odin to become a Crusader, that would be even better.";
 			close;
 		}
-		mes "[Bliant Piyord]";
-		mes "Welcome.";
 		mes "We are Crusaders,";
 		mes "warriors of holiness preparing for the great Holy War that is to come.";
 		next;
@@ -1725,9 +830,7 @@ prt_castle,35,151,5	script	Patron Kinght	751,{
 		mes "Even in these relatively peaceful times, our training is ceaseless. We must be ready for the day with the tides of darkness shall rush against mankind...";
 		close;
 	}
-	if (CRSDR_Q == 0) {
-		mes "[Bliant Piyord]";
-		mes "Welcome.";
+	else if(CRUS_Q == 0) {
 		mes "We are Crusaders,";
 		mes "warriors of holiness preparing for the great Holy War that is to come.";
 		next;
@@ -1746,102 +849,43 @@ prt_castle,35,151,5	script	Patron Kinght	751,{
 		mes "be with you...";
 		close;
 	}
-	if (CRSDR_Q == 8) {
-		mes "[Bliant Piyord]";
-		mes "Welcome. ";
-		mes "It's nice";
-		mes "to meet you.";
-		mes "It is now time";
-		mes "for your final test.";
-		next;
-		mes "[Bliant Piyord]";
-		mes "My name is Bliant Piyord and I too, am preparing for the Holy War. It must've been quite a hassle to come all this way.";
-		next;
-		mes "[Bliant Piyord]";
-		mes "This test will gauge your skills in battle. Only those with great fighting ability can become Crusaders.";
-		next;
-		mes "[Bliant Piyord]";
-		mes "To take the battle test, bring";
-		mes "1 ^3355FFHoly Water^000000. This will be used to purify you prior to taking the test.";
-		next;
-		mes "[Bliant Piyord]";
-		mes "Well then...";
-		mes "Shall we";
-		mes "begin right away?";
-		mes "Or do you need time";
-		mes "to prepare yourself?";
-		next;
-		switch (select("I would like to begin.:Give me some time to prepare.")) {
-		case 1:
-			if (!isequipped(2608)) {
-				set CRSDR_Q,9;
-				changequest 3013,3014;
-				mes "[Bliant Piyord]";
-				mes "Just a second, you do not have a Rosary equipped. As a Crusader, you must always have a Rosary on your person.";
-				next;
-				mes "[Bliant Piyord]";
-				mes "Come back and take";
-				mes "the test after you";
-				mes "have a Rosary.";
-				close;
-			}
-			if (countitem(523) > 0) {
+	else if(CRUS_Q == 8 || CRUS_Q == 9) {
+		if (CRUS_Q == 8) {
+			mes "It's nice";
+			mes "to meet you.";
+			mes "It is now time";
+			mes "for your final test.";
+			next;
+			mes "[Bliant Piyord]";
+			mes "My name is Bliant Piyord and I too, am preparing for the Holy War. It must've been quite a hassle to come all this way.";
+			next;
+			mes "[Bliant Piyord]";
+			mes "This test will gauge your skills in battle. Only those with great fighting ability can become Crusaders.";
+			next;
+			mes "[Bliant Piyord]";
+			mes "To take the battle test, bring";
+			mes "1 ^3355FFHoly Water^000000. This will be used to purify you prior to taking the test.";
+			if(checkquest(3013) != -1) {
 				changequest 3013,3014;
-				set CRSDR_Q,9;
-				delitem 523,1; //Holy_Water
-				mes "[Bliant Piyord]";
-				mes "Then, I'll start";
-				mes "the test. You will";
-				mes "be purified with the";
-				mes "Holy Water you prepared.";
-				next;
-				mes "[Bliant Piyord]";
-				mes "...............";
-				next;
-				mes "[Bliant Piyord]";
-				mes "Let's begin.";
-				mes "Go and enter";
-				mes "the waiting room.";
-				mes "Defeat the monsters";
-				mes "that appear in";
-				mes "the 4 stages.";
-				close2;
-				warp "job_cru",24,169;
-				end;
 			}
-			set CRSDR_Q,9;
-			changequest 3013,3014;
-			mes "[Bliant Piyord]";
-			mes "Prepare 1 ^3355FFHoly Water^000000 to take the battle test. As I've said, it will be used to purify you prior to taking the test.";
 			next;
 			mes "[Bliant Piyord]";
-			mes "Come back and take";
-			mes "the test after you";
-			mes "have prepared";
-			mes "1 Holy Water.";
-			mes "I shall be";
-			mes "waiting.";
-			close;
-		case 2:
+			mes "Well then...";
+			mes "Shall we";
+			mes "begin right away?";
+			mes "Or do you need time";
+			mes "to prepare yourself?";
+		}
+		else {
+			mes "Are you prepared";
+			mes "for the test now?";
+			next;
 			mes "[Bliant Piyord]";
-			mes "Well then,";
-			mes "take your time.";
-			mes "I shall be waiting.";
-			close;
+			mes "Would you like to begin now, or do you still need time to make preparations?";
 		}
-	}
-	if (CRSDR_Q == 9) {
-		mes "[Bliant Piyord]";
-		mes "Welcome.";
-		mes "Are you prepared";
-		mes "for the test now?";
 		next;
-		mes "[Bliant Piyord]";
-		mes "Would you like to begin now, or do you still need time to make preparations?";
-		next;
-		switch (select("I would like to begin.:Give me some time to prepare.")) {
-		case 1:
-			if (!isequipped(2608)) {
+		if (select("I would like to begin.:Give me some time to prepare.") == 1) {
+			if(getequipid(7) != 2608 && getequipid(8) != 2608) {
 				mes "[Bliant Piyord]";
 				mes "Just a second, you do not have a Rosary equipped. As a Crusader, you must always have a Rosary on your person.";
 				next;
@@ -1851,49 +895,50 @@ prt_castle,35,151,5	script	Patron Kinght	751,{
 				mes "have a Rosary.";
 				close;
 			}
-			if (countitem(523) > 0) {
-				delitem 523,1; //Holy_Water
+			else if(countitem(523) < 1) {
 				mes "[Bliant Piyord]";
-				mes "Then, I'll start";
-				mes "the test. You will";
-				mes "be purified with the";
-				mes "Holy Water you prepared.";
+				mes "For the battle test, please prepare one ^3355FFHoly water^000000.";
+				mes "I told you just to purify the candidates.";
 				next;
 				mes "[Bliant Piyord]";
-				mes "...............";
-				next;
-				mes "[Bliant Piyord]";
-				mes "Let's begin.";
-				mes "Go and enter";
-				mes "the waiting room.";
-				mes "Defeat the monsters";
-				mes "that appear in";
-				mes "the 4 stages.";
-				close2;
-				warp "job_cru",24,169;
-				end;
+				mes "Get prepares and come back to here.";
+				mes "I will wait for you.";
+				close;
 			}
+			delitem 523, 1; //Holy Water
 			mes "[Bliant Piyord]";
-			mes "Prepare 1 ^3355FFHoly Water^000000 to take the battle test. As I've said, it will be used to purify you prior to taking the test.";
+			mes "Then, I'll start";
+			mes "the test. You will";
+			mes "be purified with the";
+			mes "Holy Water you prepared.";
 			next;
 			mes "[Bliant Piyord]";
-			mes "Come back and take";
-			mes "the test after you";
-			mes "have prepared";
-			mes "1 Holy Water.";
-			mes "I shall be";
-			mes "waiting.";
-			close;
-		case 2:
+			mes "...............";
+			next;
 			mes "[Bliant Piyord]";
-			mes "Well then,";
-			mes "take your time.";
-			mes "I shall be waiting.";
-			close;
+			mes "Let's begin.";
+			mes "Go and enter";
+			mes "the waiting room.";
+			mes "Defeat the monsters";
+			mes "that appear in";
+			mes "the 4 stages.";
+			close2;
+			warp "job_cru",24,169;
+			end;
 		}
-	}
-	if (CRSDR_Q == 10) {
 		mes "[Bliant Piyord]";
+		mes "Prepare 1 ^3355FFHoly Water^000000 to take the battle test. As I've said, it will be used to purify you prior to taking the test.";
+		next;
+		mes "[Bliant Piyord]";
+		mes "Come back and take";
+		mes "the test after you";
+		mes "have prepared";
+		mes "1 Holy Water.";
+		mes "I shall be";
+		mes "waiting.";
+		close;
+	} 
+	else if(CRUS_Q == 10) {
 		mes "Congratulations.";
 		mes "You have completed";
 		mes "all the tests to";
@@ -1908,8 +953,6 @@ prt_castle,35,151,5	script	Patron Kinght	751,{
 		mes "coming Holy War.";
 		close;
 	}
-	mes "[Bliant Piyord]";
-	mes "Welcome.";
 	mes "Are you not one of the ones in the process of becoming a Crusader?";
 	next;
 	mes "[Bliant Piyord]";
@@ -1925,247 +968,245 @@ prt_castle,35,151,5	script	Patron Kinght	751,{
 	close;
 }
 
-job_cru,1,1,1	script	Summoner#1	107,{
-	end;
 
+
+//=== Actual tests ========================================
+//=== Endurance Test ======================================
+job_cru,1,1,1	script	Summoner#cr1	-1,{
 OnTimer300000:
-	donpcevent "Summoner#1::OnReset";
+	donpcevent "Summoner#cr1::OnReset";
 	end;
 
 OnTimer300500:
-	donpcevent "Summoner#1::OnDisable";
+	donpcevent "Summoner#cr1::OnEnd";
 	end;
 
 OnTimer301000:
-	donpcevent "Summoner#1::OnEnable";
+	donpcevent "Summoner#cr1::OnStart";
 	stopnpctimer;
 	end;
 
 OnInit:
-	hideoffnpc "Summoner#1";
-	monster "job_cru",94,45,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",94,55,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",94,65,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",94,75,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",94,85,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",94,95,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",101,45,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",101,55,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",101,65,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",101,75,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",101,85,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",101,95,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
+	enablenpc "Summoner#cr1";
+	monster "job_cru",94,45,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",94,55,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",94,65,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",94,75,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",94,85,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",94,95,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",101,45,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",101,55,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",101,65,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",101,75,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",101,85,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",101,95,"Mandragora",1020,1,"Summoner#cr1::OnDead";
 	initnpctimer;
 	end;
 
-OnEnable:
-	hideoffnpc "Summoner#1";
-	monster "job_cru",94,45,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",94,55,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",94,65,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",94,75,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",94,85,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",94,95,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",101,45,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",101,55,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",101,65,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",101,75,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",101,85,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
-	monster "job_cru",101,95,"Mandragora",1020,1,"Summoner#1::OnMyMobDead";
+OnStart:
+	enablenpc "Summoner#cr1";
+	monster "job_cru",94,45,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",94,55,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",94,65,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",94,75,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",94,85,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",94,95,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",101,45,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",101,55,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",101,65,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",101,75,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",101,85,"Mandragora",1020,1,"Summoner#cr1::OnDead";
+	monster "job_cru",101,95,"Mandragora",1020,1,"Summoner#cr1::OnDead";
 	initnpctimer;
 	end;
 
 OnReset:
-	killmonster "job_cru","Summoner#1::OnMyMobDead";
+	killmonster "job_cru","Summoner#cr1::OnDead";
 	end;
 
-OnDisable:
-	hideonnpc "Summoner#1";
+OnEnd:
+	disablenpc "Summoner#cr1";
 	end;
 
-OnMyMobDead:
+OnDead:
 	warp "prt_fild05",353,251;
 	end;
 }
 
-job_cru,1,2,1	script	Summoner#2	107,1,1,{
-	end;
-
+job_cru,1,2,1	script	Summoner#cr2	-1,{
 OnTimer345000:
-	donpcevent "Summoner#2::OnReset";
+	donpcevent "Summoner#cr2::OnReset";
 	end;
 
 OnTimer345500:
-	donpcevent "Summoner#2::OnDisable";
+	donpcevent "Summoner#cr2::OnEnd";
 	end;
 
 OnTimer346000:
-	donpcevent "Summoner#2::OnEnable";
+	donpcevent "Summoner#cr2::OnStart";
 	stopnpctimer;
 	end;
 
 OnInit:
-	hideoffnpc "Summoner#2";
-	monster "job_cru",98,50,"Flora",1118,1,"Summoner#2::OnMyMobDead";
-	monster "job_cru",92,60,"Flora",1118,1,"Summoner#2::OnMyMobDead";
-	monster "job_cru",104,60,"Flora",1118,1,"Summoner#2::OnMyMobDead";
-	monster "job_cru",98,70,"Flora",1118,1,"Summoner#2::OnMyMobDead";
-	monster "job_cru",92,80,"Flora",1118,1,"Summoner#2::OnMyMobDead";
-	monster "job_cru",104,80,"Flora",1118,1,"Summoner#2::OnMyMobDead";
-	monster "job_cru",98,90,"Flora",1118,1,"Summoner#2::OnMyMobDead";
+	enablenpc "Summoner#cr2";
+	monster "job_cru",98,50,"Flora",1118,1,"Summoner#cr2::OnDead";
+	monster "job_cru",92,60,"Flora",1118,1,"Summoner#cr2::OnDead";
+	monster "job_cru",104,60,"Flora",1118,1,"Summoner#cr2::OnDead";
+	monster "job_cru",98,70,"Flora",1118,1,"Summoner#cr2::OnDead";
+	monster "job_cru",92,80,"Flora",1118,1,"Summoner#cr2::OnDead";
+	monster "job_cru",104,90,"Flora",1118,1,"Summoner#cr2::OnDead";
+	monster "job_cru",98,90,"Flora",1118,1,"Summoner#cr2::OnDead";
 	initnpctimer;
 	end;
 
-OnEnable:
-	hideoffnpc "Summoner#2";
-	monster "job_cru",98,50,"Flora",1118,1,"Summoner#2::OnMyMobDead";
-	monster "job_cru",92,60,"Flora",1118,1,"Summoner#2::OnMyMobDead";
-	monster "job_cru",104,60,"Flora",1118,1,"Summoner#2::OnMyMobDead";
-	monster "job_cru",98,70,"Flora",1118,1,"Summoner#2::OnMyMobDead";
-	monster "job_cru",92,80,"Flora",1118,1,"Summoner#2::OnMyMobDead";
-	monster "job_cru",104,80,"Flora",1118,1,"Summoner#2::OnMyMobDead";
-	monster "job_cru",98,90,"Flora",1118,1,"Summoner#2::OnMyMobDead";
+OnStart:
+	enablenpc "Summoner#cr2";
+	monster "job_cru",98,50,"Flora",1118,1,"Summoner#cr2::OnDead";
+	monster "job_cru",92,60,"Flora",1118,1,"Summoner#cr2::OnDead";
+	monster "job_cru",104,60,"Flora",1118,1,"Summoner#cr2::OnDead";
+	monster "job_cru",98,70,"Flora",1118,1,"Summoner#cr2::OnDead";
+	monster "job_cru",92,80,"Flora",1118,1,"Summoner#cr2::OnDead";
+	monster "job_cru",104,90,"Flora",1118,1,"Summoner#cr2::OnDead";
+	monster "job_cru",98,90,"Flora",1118,1,"Summoner#cr2::OnDead";
 	initnpctimer;
 	end;
 
 OnReset:
-	killmonster "job_cru","Summoner#2::OnMyMobDead";
+	killmonster "job_cru","Summoner#cr2::OnDead";
 	end;
 
-OnDisable:
-	hideonnpc "Summoner#2";
+OnEnd:
+	disablenpc "Summoner#cr2";
 	end;
 
-OnMyMobDead:
+OnDead:
 	warp "prt_fild05",353,251;
 	end;
 }
 
-job_cru,1,3,1	script	Summoner#3	107,1,1,{
-	end;
-
+job_cru,1,3,1	script	Summoner#cr3	-1,{
 OnTimer345000:
-	donpcevent "Summoner#3::OnReset";
+	donpcevent "Summoner#cr3::OnReset";
 	end;
 
 OnTimer345500:
-	donpcevent "Summoner#3::OnDisable";
+	donpcevent "Summoner#cr3::OnEnd";
 	end;
 
 OnTimer346000:
-	donpcevent "Summoner#3::OnEnable";
+	donpcevent "Summoner#cr3::OnStart";
 	stopnpctimer;
 	end;
 
 OnInit:
-	hideoffnpc "Summoner#3";
-	monster "job_cru",92,50,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",104,50,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",98,60,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",92,70,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",104,70,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",98,80,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",92,90,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",104,90,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	initnpctimer;
-	end;
-
-OnEnable:
-	hideoffnpc "Summoner#3";
-	monster "job_cru",90,50,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",105,50,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",98,60,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",90,70,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",105,70,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",98,80,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",90,90,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	monster "job_cru",105,90,"Greatest General",1277,1,"Summoner#3::OnMyMobDead";
-	initnpctimer;
+	enablenpc "Summoner#cr3";
+	monster "job_cru",92,50,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",104,50,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,50,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",92,70,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",104,70,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,80,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",92,90,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",104,90,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	Initnpctimer;
+	end;
+
+OnStart:
+	enablenpc "Summoner#cr3";
+	monster "job_cru",92,50,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",104,50,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,50,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",92,70,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",104,70,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,80,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",92,90,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	monster "job_cru",104,90,"Greatest General",1277,1,"Summoner#cr3::OnDead";
+	Initnpctimer;
 	end;
 
 OnReset:
-	killmonster "job_cru","Summoner#3::OnMyMobDead";
+	killmonster "job_cru","Summoner#cr3::OnDead";
 	end;
 
-OnDisable:
-	hideonnpc "Summoner#3";
+OnEnd:
+	disablenpc "Summoner#cr3";
 	end;
 
-OnMyMobDead:
+OnDead:
 	warp "prt_fild05",353,251;
 	end;
 }
 
-job_cru,1,3,1	script	Summoner#4	107,1,1,{
-	end;
-
-OnTimer185000:
-	donpcevent "Summoner#4::OnReset";
+job_cru,1,4,1	script	Summoner#cr4	-1,{
+OnTimer345000:
+	donpcevent "Summoner#cr4::OnReset";
 	end;
 
-OnTimer185500:
-	donpcevent "Summoner#4::OnDisable";
+OnTimer345500:
+	donpcevent "Summoner#cr4::OnEnd";
 	end;
 
-OnTimer186000:
-	donpcevent "Summoner#4::OnEnable";
+OnTimer346000:
+	donpcevent "Summoner#cr4::OnStart";
 	stopnpctimer;
 	end;
 
 OnInit:
-	hideoffnpc "Summoner#4";
-	monster "job_cru",98,50,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,55,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,60,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,65,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,70,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,75,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,80,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,85,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,90,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",90,34,"Mushroom",1182,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",105,34,"Mushroom",1182,1,"Summoner#4::OnMyMobDead";
+	enablenpc "Summoner#cr4";
+	monster "job_cru",98,50,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,55,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,60,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,65,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,70,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,75,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,80,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,85,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,90,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",90,34,"Mushroom",1182,1,"Summoner#cr3::OnDead";
+	monster "job_cru",105,34,"Mushroom",1182,1,"Summoner#cr3::OnDead";
 	initnpctimer;
 	end;
 
-OnEnable:
-	hideoffnpc "Summoner#4";
-	monster "job_cru",98,50,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,55,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,60,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,65,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,70,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,75,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,80,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,85,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",98,90,"Familiar",1005,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",90,34,"Mushroom",1182,1,"Summoner#4::OnMyMobDead";
-	monster "job_cru",105,34,"Mushroom",1182,1,"Summoner#4::OnMyMobDead";
+OnStart:
+	enablenpc "Summoner#cr4";
+	monster "job_cru",98,50,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,55,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,60,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,65,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,70,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,75,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,80,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,85,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",98,90,"Familiar",1005,1,"Summoner#cr3::OnDead";
+	monster "job_cru",90,34,"Mushroom",1182,1,"Summoner#cr3::OnDead";
+	monster "job_cru",105,34,"Mushroom",1182,1,"Summoner#cr3::OnDead";
 	initnpctimer;
 	end;
 
 OnReset:
-	killmonster "job_cru","Summoner#4::OnMyMobDead";
+	killmonster "job_cru","Summoner#cr4::OnDead";
 	end;
 
-OnDisable:
-	hideonnpc "Summoner#4";
+OnEnd:
+	disablenpc "Summoner#cr4";
 	end;
 
-OnMyMobDead:
+OnDead:
 	warp "prt_fild05",353,251;
 	end;
 }
 
-job_cru,98,105,0	script	Summoner#5	45,4,3,{
 
+job_cru,98,105,4	script	 Summoner#cr5	45,3,3,{
 OnTouch:
-	set CRSDR_Q,6;
+	set CRUS_Q,6;
+	changequest 3010,3011;
 	warp "prt_castle",164,28;
 	end;
 }
 
-job_cru,24,187,4	script	Patron Knight	751,{
+//=== Purification Test ===================================
+job_cru,24,187,4	script	Patron Knight#2	751,{
 	mes "[Bliant Piyord]";
 	mes "Welcome.";
 	mes "You will take";
@@ -2182,29 +1223,27 @@ job_cru,24,187,4	script	Patron Knight	751,{
 	close;
 }
 
-job_cru,24,187,2	script	Waiting Room#1	700,1,1,{
+job_cru,24,187,2	script	Waiting Room#cr1	700,{
 	end;
 
 OnInit:
-	hideonnpc "Waiting Room#1";
-//	setarenaeventsize 1
-//	makewaitingroom "Waiting Room" 20
-//	enablearena
+	disablenpc "Waiting Room#cr1";
+	waitingroom "Waiting Room",20,"Waiting Room#cr1::OnStartArena",1;
+	enablewaitingroomevent;
 	end;
 
 OnStartArena:
-//	warpwaitingpctoarena "job_cru" 168 17
-	donpcevent "Monster Summon#0::OnEnable";
-//	disablearena
+	warpwaitingpc "job_cru",168,21;
+	donpcevent "Monster Summon#cr0::OnStart";
+	disablewaitingroomevent;
 	end;
 
-OnEnable:
-//	enablearena
+OnStart:
+	enablewaitingroomevent;
 	end;
 }
 
-job_cru,168,17,0	script	Zombie Guide	139,2,2,{
-
+job_cru,168,17,0	script	Zombie Guide	-1,2,2,{
 OnTouch:
 	mes "[Bliant Piyord]";
 	mes "Go forth and defeat all";
@@ -2216,218 +1255,202 @@ OnTouch:
 	mes "You will be given";
 	mes "4 minutes. Go forth";
 	mes "and do your best...";
-	close2;
-	end;
+	close;
 }
 
-job_cru,2,1,1	script	Monster Summon#0	110,1,1,{
-	end;
-
+job_cru,2,1,1	script	Monster Summon#cr0	-1,{
 OnInit:
-	hideonnpc "Monster Summon#0";
+	disablenpc "Monster Summon#cr0";
 	end;
 
-OnEnable:
-	hideoffnpc "Monster Summon#0";
-	donpcevent "Monster Summon#1::OnEnable";
-	donpcevent "Monster Summon#2::OnEnable";
-	donpcevent "Monster Summon#3::OnEnable";
-	donpcevent "Monster Summon#4::OnEnable";
-	donpcevent "Monster Summon#6::OnEnable";
+OnStart:
+	set .MyMonsterCount,0;
+	enablenpc "Monster Summon#cr0";
+	donpcevent "Monster Summon#cr1::OnStart";
+	donpcevent "Monster Summon#cr2::OnStart";
+	donpcevent "Monster Summon#cr3::OnStart";
+	donpcevent "Monster Summon#cr4::OnStart";
+	donpcevent "Monster Summon#cr6::OnStart";
 	end;
 
-OnM1:
-	monster "job_cru",168,45,"Zombie",1015,1,"Monster Summon#0::OnMyMobDead";
-	monster "job_cru",168,45,"Zombie",1015,1,"Monster Summon#0::OnMyMobDead";
-	monster "job_cru",168,45,"Zombie",1015,1,"Monster Summon#0::OnMyMobDead";
-	monster "job_cru",168,45,"Zombie",1015,1,"Monster Summon#0::OnMyMobDead";
-	monster "job_cru",168,45,"Zombie",1015,1,"Monster Summon#0::OnMyMobDead";
-	monster "job_cru",168,45,"Zombie",1015,1,"Monster Summon#0::OnMyMobDead";
+OnMonster1:
+	monster "job_cru",168,45,"Zombie",1015,1,"Monster Summon#cr0::OnDead";
+	monster "job_cru",168,45,"Zombie",1015,1,"Monster Summon#cr0::OnDead";
+	monster "job_cru",168,45,"Zombie",1015,1,"Monster Summon#cr0::OnDead";
+	monster "job_cru",168,45,"Zombie",1015,1,"Monster Summon#cr0::OnDead";
+	monster "job_cru",168,45,"Zombie",1015,1,"Monster Summon#cr0::OnDead";
+	monster "job_cru",168,45,"Zombie",1015,1,"Monster Summon#cr0::OnDead";
 	end;
 
-OnM2:
-	monster "job_cru",168,80,"Soldier Skeleton",1028,1,"Monster Summon#0::OnMyMobDead";
-	monster "job_cru",168,80,"Soldier Skeleton",1028,1,"Monster Summon#0::OnMyMobDead";
-	monster "job_cru",168,80,"Soldier Skeleton",1028,1,"Monster Summon#0::OnMyMobDead";
+OnMonster2:
+	monster "job_cru",168,80,"Soldier Skeleton",1028,1,"Monster Summon#cr0::OnDead";
+	monster "job_cru",168,80,"Soldier Skeleton",1028,1,"Monster Summon#cr0::OnDead";
+	monster "job_cru",168,80,"Soldier Skeleton",1028,1,"Monster Summon#cr0::OnDead";
 	end;
 
-OnM3:
-	monster "job_cru",168,115,"Mummy",1041,1,"Monster Summon#0::OnMyMobDead";
+OnMonster3:
+	monster "job_cru",168,110,"Archer Skeleton",1016,1,"Monster Summon#cr0::OnDead";
+	monster "job_cru",168,115,"Mummy",1041,1,"Monster Summon#cr0::OnDead";
 	end;
 
-OnMyMobDead:
-	if (mobcount ("job_cru","Monster Summon#0::OnMyMobDead") < 1) {
-		set CRSDR_Q,10;
+OnDead:
+	set .MyMonsterCount,.MyMonsterCount+1;
+	if (.MyMonsterCount >= 10) {
+		set CRUS_Q,10;
 		changequest 3014,3015;
 	}
 	end;
 
-OnDisable:
-	hideonnpc "Monster Summon#0";
+OnEnd:
+	disablenpc "Monster Summon#cr0";
 	end;
 
 OnReset:
-	killmonster "job_cru","Monster Summon#0::OnMyMobDead";
+	killmonster "job_cru","Monster Summon#cr0::OnDead";
 	end;
 }
 
-job_cru,168,45,0	script	Monster Summon#1	139,15,1,{
-
-OnTouch:
-	donpcevent "Monster Summon#0::OnM1";
-	donpcevent "Monster Summon#1::OnDisable";
-	end;
-
+job_cru,168,45,0	script	Monster Summon#cr1	-1,15,1,{
 OnInit:
-	hideonnpc "Monster Summon#1";
+	disablenpc "Monster Summon#cr1";
 	end;
 
-OnEnable:
-	hideoffnpc "Monster Summon#1";
+OnTouch:
+	donpcevent "Monster Summon#cr0::OnMonster1";
+	donpcevent "Monster Summon#cr1::OnEnd";
 	end;
 
-OnDisable:
-	hideonnpc "Monster Summon#1";
+OnStart:
+	enablenpc "Monster Summon#cr1";
 	end;
-}
-
-job_cru,168,80,0	script	Monster Summon#2	139,15,1,{
 
-OnTouch:
-	donpcevent "Monster Summon#0::OnM2";
-	donpcevent "Monster Summon#2::OnDisable";
+OnEnd:
+	disablenpc "Monster Summon#cr1";
 	end;
+}
 
+job_cru,168,80,0	script	Monster Summon#cr2	-1,15,1,{
 OnInit:
-	hideonnpc "Monster Summon#2";
+	disablenpc "Monster Summon#cr2";
 	end;
 
-OnEnable:
-	hideoffnpc "Monster Summon#2";
+OnTouch:
+	donpcevent "Monster Summon#cr0::OnMonster2";
+	donpcevent "Monster Summon#cr2::OnEnd";
 	end;
 
-OnDisable:
-	hideonnpc "Monster Summon#2";
+OnStart:
+	enablenpc "Monster Summon#cr2";
 	end;
-}
-
-job_cru,168,115,0	script	Monster Summon#3	139,15,1,{
 
-OnTouch:
-	monster "job_cru",168,110,"Archer Skeleton",1016,1;
-	donpcevent "Monster Summon#0::OnM3";
-	donpcevent "Monster Summon#3::OnDisable";
+OnEnd:
+	disablenpc "Monster Summon#cr2";
 	end;
+}
 
+job_cru,165,115,0	script	Monster Summon#cr3	-1,15,1,{
 OnInit:
-	hideonnpc "Monster Summon#3";
+	disablenpc "Monster Summon#cr3";
 	end;
 
-OnEnable:
-	hideoffnpc "Monster Summon#3";
+OnTouch:
+	donpcevent "Monster Summon#cr0::OnMonster3";
+	donpcevent "Monster Summon#cr3::OnEnd";
 	end;
 
-OnDisable:
-	hideonnpc "Monster Summon#3";
+OnStart:
+	enablenpc "Monster Summon#cr3";
 	end;
-}
-
-job_cru,168,150,0	script	Monster Summon#4	139,15,1,{
 
-OnTouch:
-	monster "job_cru",168,150,"Ghoul",1036,1;
-	donpcevent "Monster Summon#4::OnDisable";
+OnEnd:
+	disablenpc "Monster Summon#cr3";
 	end;
+}
 
+job_cru,168,150,0	script	Monster Summon#cr4	-1,15,1,{
 OnInit:
-	hideonnpc "Monster Summon#4";
+	disablenpc "Monster Summon#cr4";
 	end;
 
-OnMyMobDead:
-	donpcevent "Monster Summon#5::OnEnable";
+OnTouch:
+	monster "job_cru",168,150,strcharinfo(0),1036,1,"Monster Summon#cr4-a::OnDead";
+	donpcevent "Monster Summon#cr4::OnEnd";
 	end;
 
-OnEnable:
-	hideoffnpc "Monster Summon#4";
+OnDead:
+	donpcevent "Monster Summon#cr5::OnStart";
 	end;
 
-OnReset:
-	killmonster "job_cru","Monster Summon#4::OnMyMobDead";
+OnStart:
+	enablenpc "Monster Summon#cr4";
 	end;
 
-OnDisable:
-	hideonnpc "Monster Summon#4";
-	end;
-}
-
-job_cru,168,180,0	script	Monster Summon#5	45,4,3,{
-
-OnTouch:
-	warp "prt_castle",35,147;
-	donpcevent "Monster Summon#0::OnReset";
-	donpcevent "Monster Summon#0::OnDisable";
-	donpcevent "Monster Summon#6::OnStop";
-	donpcevent "Monster Summon#6::OnDisable";
-	donpcevent "Monster Summon#5::OnDisable";
-	donpcevent "Waiting Room#1::OnEnable";
+OnReset:
+	killmonster "job_cru","Monster Summon#cr4-a::OnDead";
 	end;
 
-OnInit:
-	hideonnpc "Monster Summon#5";
+OnEnd:
+	disablenpc "Monster Summon#cr4";
 	end;
 
-OnEnable:
-	hideoffnpc "Monster Summon#5";
-	end;
+}
 
-OnDisable:
-	hideonnpc "Monster Summon#5";
+job_cru,168,150,0	script	Monster Summon#cr4-a	-1,{
+OnDead:
+	donpcevent "Monster Summon#cr5::OnStart";
 	end;
 }
 
-job_cru,2,2,1	script	Monster Summon#6	110,1,1,{
+job_cru,168,180,4	script	Monster Summon#cr5	45,3,3,{
+OnInit:
+	disablenpc "Monster Summon#cr5";
 	end;
 
-OnTimer60000:
-	donpcevent "Monster Summon#8::OnEnable";
+OnTouch:
+	warp "prt_castle",35,147;
+	donpcevent "Monster Summon#cr0::OnReset";
+	donpcevent "Monster Summon#cr4::OnReset";
+	donpcevent "Monster Summon#cr0::OnEnd";
+	donpcevent "Monster Summon#cr4::OnEnd";
+	donpcevent "Monster Summon#cr5::OnEnd";
+	donpcevent "Monster Summon#cr6::OnStop";
+	donpcevent "Monster Summon#cr6::OnEnd";
+	donpcevent "Waiting Room#cr1::OnStart";
 	end;
 
-OnTimer61000:
-	donpcevent "Monster Summon#8::OnDisable";
+OnStart:
+	enablenpc "Monster Summon#cr5";
 	end;
 
-OnTimer240000:
-	donpcevent "Monster Summon#7::OnEnable";
+OnEnd:
+	disablenpc "Monster Summon#cr5";
 	end;
+}
 
+job_cru,2,2,1	script	Monster Summon#cr6	-1,{
 OnTimer241000:
-	donpcevent "Monster Summon#0::OnReset";
-	donpcevent "Monster Summon#4::OnReset";
-	end;
-
-OnTimer242000:
-	donpcevent "Monster Summon#0::OnDisable";
-	donpcevent "Monster Summon#4::OnDisable";
-	donpcevent "Monster Summon#7::OnDisable";
-	end;
-
-OnTimer243000:
-	donpcevent "Monster Summon#6::OnDisable";
-	donpcevent "Waiting Room#1::OnEnable";
-	stopnpctimer;
+	areawarp "job_cru",160,14,175,178,"job_cru",24,169;
+	donpcevent "Monster Summon#cr0::OnReset";
+	donpcevent "Monster Summon#cr4::OnReset";
+	donpcevent "Monster Summon#cr0::OnEnd";
+	donpcevent "Monster Summon#cr4::OnEnd";
+	donpcevent "Monster Summon#cr5::OnEnd";
+	donpcevent "Monster Summon#cr6::OnStop";
+	donpcevent "Monster Summon#cr6::OnEnd";
+	donpcevent "Waiting Room#cr1::OnStart";
 	end;
 
 OnInit:
-	hideonnpc "Monster Summon#6";
+	disablenpc "Monster Summon#cr6";
 	end;
 
-OnEnable:
-	hideoffnpc "Monster Summon#6";
+OnStart:
+	enablenpc "Monster Summon#cr6";
 	initnpctimer;
 	end;
 
-OnDisable:
-	hideonnpc "Monster Summon#6";
+OnEnd:
+	disablenpc "Monster Summon#cr6";
 	end;
 
 OnStop:
@@ -2435,40 +1458,28 @@ OnStop:
 	end;
 }
 
-job_cru,168,110,0	script	Monster Summon#7	139,14,82,{
-
-OnTouch:
-	warp "prontera",234,318;
-	end;
-
-OnInit:
-	hideonnpc "Monster Summon#7";
-	end;
-
-OnEnable:
-	hideoffnpc "Monster Summon#7";
-	end;
-
-OnDisable:
-	hideonnpc "Monster Summon#7";
-	end;
-}
-
-job_cru,168,17,0	script	Monster Summon#8	139,14,5,{
-
-OnTouch:
-	warp "prontera",234,318;
-	end;
-
-OnInit:
-	hideonnpc "Monster Summon#8";
-	end;
-
-OnEnable:
-	hideoffnpc "Monster Summon#8";
-	end;
+//============================================================ 
+// mapflag
+//============================================================ 
 
-OnDisable:
-	hideonnpc "Monster Summon#8";
-	end;
-}
\ No newline at end of file
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= Need optimalization and fixing
+//= thanks to Komurka, KiLLaLeN, Lupus (fixing error)
+//= just a temp Job Quest
+//= 1.2 minor fix of announcement by Freya people
+//= 1.3 Added Baby Class Support, fixed 40/50 lvl item reward
+//=     also fixed too common script names [Lupus]
+//= 1.3a fixed "dead lock" bugs [Lupus]
+//= 1.3b changed monsters ID in patience test [Komurka]
+//= 1.4 Fixed Job Level parameters mix-up. [massdriller] (Thanks to Komurka)
+//= 1.5 Fixed possible EXP abuse [Lupus]
+//= 1.6 Added a func which prevent advanced classes passing
+//=     2nd Job Quests again. It also guides adv classes where
+//=     to go. [Lupus]
+//= 1.7 Updated names and required items, Chivalry Emblem +
+//=     Hand of God allow to skip item gathering [DracoRPG]
+//= 2.0 Changed numbers to constants. [Vicious]
+//= 2.1 Fixed endless loop, wrong condition check [Lupus]
+//=	also changed all job numbers to constants, fixed logic