* Removed "Load Balancing" from the swordman job quest.

- Swordman quest map warps are now contained within the swordman job quest file.


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

3 files changed, 268 insertions, 875 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 45c1ef3c4..33a85edf5 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,8 @@
 Date		Added
 ======
 2007/07/30
+	* Rev. 10928 Removed  "Load Balancing" from the swordman job quest. [L0ne_W0lf]
+	- Swordman quest map warps are now contained within the swordman job quest file.
 	* Rev. 10926 Updated Job quests for 1-1 classes and Rebirthed classes. [L0ne_W0lf]
 	- Moved valkyrie.txt from ../cities/ to ../jobs/. It's not a city. Doofus. 
 2007/07/29
diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt
index 9ca396061..88450b49a 100644
--- a/npc/jobs/1-1/swordman.txt
+++ b/npc/jobs/1-1/swordman.txt
@@ -9,6 +9,10 @@
 //===== Description: ========================================= 
 //= [Aegis Conversion]
 //= Job quest for Swordman classes
+//= Uses Job_sword1 as opposed to sword_1-1 -> sword_3-1.
+//= EXPLAOITABLE in a sense because while the sword_x-1 maps
+//= are marked as "inside" by the client, job_sword1 is not.
+//= giving players FREE camera rotation while doing the job quest.
 //===== Additional Comments: ================================= 
 //= Fully working.  I have created a custom warp to get into the test room so disable
 //= the one in your warp script or scripts.  It is this warp: "izlude_in",40,170.
@@ -26,6 +30,7 @@
 //= 1.8 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //=	Removed "green" traps, quest is no longer timed.
 //=	No longer uses function "F_ToHigh"
+//= 1.9 Dialog is official, but the Script is now custom as far as maps go. [L0ne_W0lf]
 //============================================================ 
 
 izlude_in,74,172,4	script	Swordman	119,{
@@ -280,64 +285,34 @@ izlude_in,30,163,0	script	Test Hall Staff	105,{
 	else if (job_sword_q == 3)
 		mes "Don't ever give up! Now retesting!";
 	close2;
-	switch(rand(1,3)) {
-	case 1: warp "sword_1-1",10,245; end;
-	case 2: warp "sword_2-1",10,245; end;
-	case 3: warp "sword_3-1",10,245; end;
-	}
+	warp "job_sword1",10,245;
+	end;
 }
 
 // Examination Courses NPCs
 //============================================================ 
 // 1-1
-sword_1-1,230,245,2	script	Medic#swd_1	105,{
+job_sword1,230,245,2	script	Medic#swd_1	105,{
 	callfunc "F_JobSwdMedic","1st";
 }
-sword_1-1,230,242,2	script	Test Hall Staff#swd_1	105,{
+job_sword1,230,242,2	script	Test Hall Staff#swd_1	105,{
 	callfunc "F_JobSwdStaff",1;
 }
-sword_1-1,230,207,2	script	Medic#2swd_1	105,{
+job_sword1,230,207,2	script	Medic#2swd_1	105,{
 	callfunc "F_JobSwdMedic","2nd";
 }
-sword_1-1,230,204,2	script	Test Hall Staff#2swd_1	105,{
+job_sword1,230,204,2	script	Test Hall Staff#2swd_1	105,{
 	callfunc "F_JobSwdStaff",1;
 }
-sword_1-1,223,167,2	script	Mae#swd_1_success	92,{
-	callfunc "F_JobSwdMae",1;
-}
-
-// 2-1
-sword_2-1,230,245,2	script	Medic#swd_2	105,{
-	callfunc "F_JobSwdMedic","1st";
-}
-sword_2-1,230,242,2	script	Test Hall Staff#swd_2	105,{
-	callfunc "F_JobSwdStaff",2;
-}
-sword_2-1,230,207,2	script	Medic#2swd_2	105,{
-	callfunc "F_JobSwdMedic","2nd";
-}
-sword_2-1,230,204,2	script	Test Hall Staff#2swd_2	105,{
-	callfunc "F_JobSwdStaff",2;
-}
-sword_2-1,223,167,2	script	Mae#swd_2_success	92,{
-	callfunc "F_JobSwdMae",2;
-}
-
-// 3-1
-sword_3-1,230,245,2	script	Medic#swd_3	105,{
-	callfunc "F_JobSwdMedic","1st";
-}
-sword_3-1,230,242,2	script	Test Hall Staff#swd_3	105,{
-	callfunc "F_JobSwdStaff",3;
-}
-sword_3-1,230,207,2	script	Medic#2swd_3	105,{
-	callfunc "F_JobSwdMedic","2nd";
-}
-sword_3-1,230,204,2	script	Test Hall Staff#2swd_3	105,{
-	callfunc "F_JobSwdStaff",3;
-}
-sword_3-1,223,167,2	script	Mae#swd_3_success	92,{
-	callfunc "F_JobSwdMae",3;
+job_sword1,223,167,2	script	Mae#swd_1_success	92,{
+	mapannounce "job_sword1","Applicant " + strcharinfo(0) + ". You successfully passed the test.",bc_map;
+	set job_sword_q,4;
+	mes "[Mae]";
+	mes "I sencerely congratulate you for passing the test!";
+	mes "I already sent your test result to the Job Department.Please inquire at the Officer in Centre.Thank you.";
+	close2;
+	warp "izlude_in",66,173;
+	end;
 }
 
 // Examination Course Fucntions
@@ -354,7 +329,7 @@ function	script	F_JobSwdStaff	{
 	mes "Do you surrender?";
 	next;
 	if (select("Yes.:No.") == 1) {
-		mapannounce "sword_"+getarg(0)+"-1","Applicant " + strcharinfo(0) + " quit the test.",bc_map;
+		mapannounce "job_sword1","Applicant " + strcharinfo(0) + " quit the test.",bc_map;
 		warp "izlude_in",65,165;
 		end;
 	}
@@ -363,880 +338,309 @@ function	script	F_JobSwdStaff	{
 	close;
 }
 
-function	script	F_JobSwdMae	{
-	mapannounce "sword_"+getarg(0)+"-1","Applicant " + strcharinfo(0) + ". You successfully passed the test.",bc_map;
-	set job_sword_q,4;
-	mes "[Mae]";
-	mes "I sencerely congratulate you for passing the test!";
-	mes "I already sent your test result to the Job Department.Please inquire at the Officer in Centre.Thank you.";
-	close2;
-	warp "izlude_in",66,173;
-	end;
-}
-
 function	script	F_JobSwdTestStaff	{
 OnTouch:
 	mes "[Test Hall Staff]";
 	mes "Applicant " + strcharinfo(0) + ". Do you surrender??";
 	next;
 	if (select("Yes.:No.") == 1) {
-		mapannounce "sword_"+getarg(0)+"-1","Applicant " + strcharinfo(0) + " quit the test..",bc_map;
+		mapannounce "job_sword1","Applicant " + strcharinfo(0) + " quit the test..",bc_map;
 		warp "izlude_in",65,165;
 		end;
 	}
-	warp "sword_"+getarg(0)+"-1",getarg(1),getarg(2);
+	warp "job_sword1",getarg(0),getarg(1);
 	end;
 }
 
 function	script	F_JobSwdTestStaff2	{
 OnTouch:
-	mapannounce "sword_"+getarg(1)+"-1","Applicant " + strcharinfo(0) + ". Pass the "+getarg(0)+" course.",bc_map;
-	warp "sword_"+getarg(1)+"-1",getarg(2),getarg(3);
+	mapannounce "job_sword1","Applicant " + strcharinfo(0) + ". Pass the "+getarg(0)+" course.",bc_map;
+	warp "job_sword1",getarg(1),getarg(2);
 	end;
 }
 
 // Examination Course 1
 //============================================================ 
-sword_1-1,223,243,0	warp	checkp1-2	1,1,sword_1-1,11,206;
-sword_1-1,223,205,0	warp	checkp2-3	1,1,sword_1-1,11,168;
+job_sword1,223,243,0	warp	checkp1-2	1,1,job_sword1,11,206;
+job_sword1,223,205,0	warp	checkp2-3	1,1,job_sword1,11,168;
 
-sword_1-1,7,245,0	script	Test Hall Staff	45,1,3,{
-	callfunc "F_JobSwdTestStaff",1,10,245;
+job_sword1,7,245,0	script	Test Hall Staff	45,1,3,{
+	callfunc "F_JobSwdTestStaff",10,245;
 }
 
-sword_1-1,8,207,0	script	Test Hall Staff	45,1,6,{
-	callfunc "F_JobSwdTestStaff",1,11,207;
+job_sword1,8,207,0	script	Test Hall Staff	45,1,6,{
+	callfunc "F_JobSwdTestStaff",11,207;
 }
 
-sword_1-1,8,169,0	script	Test Hall Staff	45,1,6,{
-	callfunc "F_JobSwdTestStaff",1,11,169;
+job_sword1,8,169,0	script	Test Hall Staff	45,1,6,{
+	callfunc "F_JobSwdTestStaff",11,169;
 }
 
-sword_1-1,192,244,0	script	Test Hall Staff	45,1,3,{
-	callfunc "F_JobSwdTestStaff2","1st",1,215,244;
+job_sword1,192,244,0	script	Test Hall Staff	45,1,3,{
+	callfunc "F_JobSwdTestStaff2","1st",215,244;
 }
 
-sword_1-1,193,207,0	script	Test Hall Staff	45,1,3,{
-	callfunc "F_JobSwdTestStaff2","2nd",1,215,205;
-	warp "sword_1-1",215,205;
+job_sword1,193,207,0	script	Test Hall Staff	45,1,3,{
+	callfunc "F_JobSwdTestStaff2","2nd",215,205;
+	warp "job_sword1",215,205;
 }
 
-sword_1-1,193,168,0	script	Test Hall Staff	45,1,3,{
-	callfunc "F_JobSwdTestStaff2","3rd",1,215,167;
+job_sword1,193,168,0	script	Test Hall Staff	45,1,3,{
+	callfunc "F_JobSwdTestStaff2","3rd",215,167;
 }
 
 // Pitfalls (Set 1)
 //============================================================ 
-sword_1-1,65,117,0	warp	ÇÔÁ¤01-01	1,1,sword_1-1,10,245;
-sword_1-1,98,27,0		warp	ÇÔÁ¤02-01	1,1,sword_1-1,11,207;
-sword_1-1,161,27,0	warp	ÇÔÁ¤02-02	1,1,sword_1-1,11,207;
-sword_1-1,239,117,0	warp	ÇÔÁ¤03-01	1,1,sword_1-1,11,169;
+job_sword1,65,117,0	warp	ÇÔÁ¤01-01	1,1,job_sword1,10,245;
+job_sword1,98,27,0		warp	ÇÔÁ¤02-01	1,1,job_sword1,11,207;
+job_sword1,161,27,0	warp	ÇÔÁ¤02-02	1,1,job_sword1,11,207;
+job_sword1,239,117,0	warp	ÇÔÁ¤03-01	1,1,job_sword1,11,169;
 
-sword_1-1,16,251,0	script	1_blank_1_a::SwdTrap1	-1,0,1,{
+job_sword1,16,251,0	script	1_blank_1_a::SwdTrap1	-1,0,1,{
 OnTouch:
 	switch(rand(1,5)) {
-	case 1: warp "sword_1-1",65,56; end;
-	case 2: warp "sword_1-1",29,26; end;
-	case 3: warp "sword_1-1",43,16; end;
-	case 4: warp "sword_1-1",23,112; end;
-	case 5: warp "sword_1-1",58,83; end;
+	case 1: warp "job_sword1",65,56; end;
+	case 2: warp "job_sword1",29,26; end;
+	case 3: warp "job_sword1",43,16; end;
+	case 4: warp "job_sword1",23,112; end;
+	case 5: warp "job_sword1",58,83; end;
 	}
 }
-sword_1-1,19,251,0	duplicate(SwdTrap1)	1_blank_1_b	-1,0,1
-sword_1-1,17,250,0	duplicate(SwdTrap1)	1_blank_1_c	-1,1,0
-sword_1-1,16,238,0	duplicate(SwdTrap1)	1_blank_2_a	-1,0,1
-sword_1-1,19,238,0	duplicate(SwdTrap1)	1_blank_2_b	-1,0,1
-sword_1-1,17,239,0	duplicate(SwdTrap1)	1_blank_2_c	-1,0,1
-sword_1-1,28,247,0	duplicate(SwdTrap1)	1_blank_3_a	-1,4,0
-sword_1-1,33,245,0	duplicate(SwdTrap1)	1_blank_3_b	-1,0,2
-sword_1-1,29,242,0	duplicate(SwdTrap1)	1_blank_3_c	-1,4,0
-sword_1-1,24,244,0	duplicate(SwdTrap1)	1_blank_3_d	-1,0,2
-sword_1-1,38,251,0	duplicate(SwdTrap1)	1_blank_4_a	-1,0,1
-sword_1-1,41,251,0	duplicate(SwdTrap1)	1_blank_4_b	-1,0,1
-sword_1-1,39,250,0	duplicate(SwdTrap1)	1_blank_4_c	-1,1,0
-sword_1-1,38,238,0	duplicate(SwdTrap1)	1_blank_5_a	-1,0,1
-sword_1-1,41,238,0	duplicate(SwdTrap1)	1_blank_5_b	-1,0,1
-sword_1-1,39,239,0	duplicate(SwdTrap1)	1_blank_5_c	-1,1,0
-sword_1-1,54,251,0	duplicate(SwdTrap1)	1_blank_6_a	-1,0,1
-sword_1-1,71,251,0	duplicate(SwdTrap1)	1_blank_6_b	-1,0,1
-sword_1-1,62,250,0	duplicate(SwdTrap1)	1_blank_6_c	-1,9,0
-sword_1-1,62,247,0	duplicate(SwdTrap1)	1_blank_7_a	-1,8,0
-sword_1-1,71,244,0	duplicate(SwdTrap1)	1_blank_7_b	-1,0,2
-sword_1-1,63,242,0	duplicate(SwdTrap1)	1_blank_7_c	-1,8,0
-sword_1-1,54,244,0	duplicate(SwdTrap1)	1_blank_7_d	-1,0,2
-sword_1-1,54,238,0	duplicate(SwdTrap1)	1_blank_8_a	-1,0,1
-sword_1-1,71,238,0	duplicate(SwdTrap1)	1_blank_8_b	-1,0,1
-sword_1-1,62,239,0	duplicate(SwdTrap1)	1_blank_8_c	-1,9,0
-sword_1-1,102,247,0	duplicate(SwdTrap1)	1_blank_9_a	-1,2,0
-sword_1-1,105,245,0	duplicate(SwdTrap1)	1_blank_9_b	-1,0,2
-sword_1-1,103,242,0	duplicate(SwdTrap1)	1_blank_9_c	-1,2,0
-sword_1-1,100,244,0	duplicate(SwdTrap1)	1_blank_9_d	-1,0,2
-sword_1-1,156,249,0	duplicate(SwdTrap1)	1_blank_10_a	-1,14,0
-sword_1-1,156,248,0	duplicate(SwdTrap1)	1_blank_10_b	-1,14,0
-sword_1-1,170,249,0	duplicate(SwdTrap1)	1_blank_10_c	-1,1,0
-sword_1-1,170,248,0	duplicate(SwdTrap1)	1_blank_10_d	-1,1,0
-sword_1-1,156,245,0	duplicate(SwdTrap1)	1_blank_11_a	-1,14,0
-sword_1-1,156,244,0	duplicate(SwdTrap1)	1_blank_11_b	-1,14,0
-sword_1-1,170,245,0	duplicate(SwdTrap1)	1_blank_11_c	-1,1,0
-sword_1-1,170,244,0	duplicate(SwdTrap1)	1_blank_11_d	-1,1,0
-sword_1-1,156,241,0	duplicate(SwdTrap1)	1_blank_12_a	-1,14,0
-sword_1-1,156,240,0	duplicate(SwdTrap1)	1_blank_12_b	-1,14,0
-sword_1-1,170,241,0	duplicate(SwdTrap1)	1_blank_12_c	-1,1,0
-sword_1-1,170,240,0	duplicate(SwdTrap1)	1_blank_12_d	-1,1,0
-sword_1-1,180,251,0	duplicate(SwdTrap1)	1_blank_13_a	-1,0,1
-sword_1-1,183,251,0	duplicate(SwdTrap1)	1_blank_13_b	-1,0,1
-sword_1-1,181,250,0	duplicate(SwdTrap1)	1_blank_13_c	-1,1,0
-sword_1-1,180,238,0	duplicate(SwdTrap1)	1_blank_14_a	-1,0,1
-sword_1-1,183,238,0	duplicate(SwdTrap1)	1_blank_14_b	-1,0,1
-sword_1-1,181,239,0	duplicate(SwdTrap1)	1_blank_14_c	-1,1,0
-
-sword_1-1,193,245,0	warp	1_rest	1,3,sword_1-1,215,244;
+job_sword1,19,251,0	duplicate(SwdTrap1)	1_blank_1_b	-1,0,1
+job_sword1,17,250,0	duplicate(SwdTrap1)	1_blank_1_c	-1,1,0
+job_sword1,16,238,0	duplicate(SwdTrap1)	1_blank_2_a	-1,0,1
+job_sword1,19,238,0	duplicate(SwdTrap1)	1_blank_2_b	-1,0,1
+job_sword1,17,239,0	duplicate(SwdTrap1)	1_blank_2_c	-1,0,1
+job_sword1,28,247,0	duplicate(SwdTrap1)	1_blank_3_a	-1,4,0
+job_sword1,33,245,0	duplicate(SwdTrap1)	1_blank_3_b	-1,0,2
+job_sword1,29,242,0	duplicate(SwdTrap1)	1_blank_3_c	-1,4,0
+job_sword1,24,244,0	duplicate(SwdTrap1)	1_blank_3_d	-1,0,2
+job_sword1,38,251,0	duplicate(SwdTrap1)	1_blank_4_a	-1,0,1
+job_sword1,41,251,0	duplicate(SwdTrap1)	1_blank_4_b	-1,0,1
+job_sword1,39,250,0	duplicate(SwdTrap1)	1_blank_4_c	-1,1,0
+job_sword1,38,238,0	duplicate(SwdTrap1)	1_blank_5_a	-1,0,1
+job_sword1,41,238,0	duplicate(SwdTrap1)	1_blank_5_b	-1,0,1
+job_sword1,39,239,0	duplicate(SwdTrap1)	1_blank_5_c	-1,1,0
+job_sword1,54,251,0	duplicate(SwdTrap1)	1_blank_6_a	-1,0,1
+job_sword1,71,251,0	duplicate(SwdTrap1)	1_blank_6_b	-1,0,1
+job_sword1,62,250,0	duplicate(SwdTrap1)	1_blank_6_c	-1,9,0
+job_sword1,62,247,0	duplicate(SwdTrap1)	1_blank_7_a	-1,8,0
+job_sword1,71,244,0	duplicate(SwdTrap1)	1_blank_7_b	-1,0,2
+job_sword1,63,242,0	duplicate(SwdTrap1)	1_blank_7_c	-1,8,0
+job_sword1,54,244,0	duplicate(SwdTrap1)	1_blank_7_d	-1,0,2
+job_sword1,54,238,0	duplicate(SwdTrap1)	1_blank_8_a	-1,0,1
+job_sword1,71,238,0	duplicate(SwdTrap1)	1_blank_8_b	-1,0,1
+job_sword1,62,239,0	duplicate(SwdTrap1)	1_blank_8_c	-1,9,0
+job_sword1,102,247,0	duplicate(SwdTrap1)	1_blank_9_a	-1,2,0
+job_sword1,105,245,0	duplicate(SwdTrap1)	1_blank_9_b	-1,0,2
+job_sword1,103,242,0	duplicate(SwdTrap1)	1_blank_9_c	-1,2,0
+job_sword1,100,244,0	duplicate(SwdTrap1)	1_blank_9_d	-1,0,2
+job_sword1,156,249,0	duplicate(SwdTrap1)	1_blank_10_a	-1,14,0
+job_sword1,156,248,0	duplicate(SwdTrap1)	1_blank_10_b	-1,14,0
+job_sword1,170,249,0	duplicate(SwdTrap1)	1_blank_10_c	-1,1,0
+job_sword1,170,248,0	duplicate(SwdTrap1)	1_blank_10_d	-1,1,0
+job_sword1,156,245,0	duplicate(SwdTrap1)	1_blank_11_a	-1,14,0
+job_sword1,156,244,0	duplicate(SwdTrap1)	1_blank_11_b	-1,14,0
+job_sword1,170,245,0	duplicate(SwdTrap1)	1_blank_11_c	-1,1,0
+job_sword1,170,244,0	duplicate(SwdTrap1)	1_blank_11_d	-1,1,0
+job_sword1,156,241,0	duplicate(SwdTrap1)	1_blank_12_a	-1,14,0
+job_sword1,156,240,0	duplicate(SwdTrap1)	1_blank_12_b	-1,14,0
+job_sword1,170,241,0	duplicate(SwdTrap1)	1_blank_12_c	-1,1,0
+job_sword1,170,240,0	duplicate(SwdTrap1)	1_blank_12_d	-1,1,0
+job_sword1,180,251,0	duplicate(SwdTrap1)	1_blank_13_a	-1,0,1
+job_sword1,183,251,0	duplicate(SwdTrap1)	1_blank_13_b	-1,0,1
+job_sword1,181,250,0	duplicate(SwdTrap1)	1_blank_13_c	-1,1,0
+job_sword1,180,238,0	duplicate(SwdTrap1)	1_blank_14_a	-1,0,1
+job_sword1,183,238,0	duplicate(SwdTrap1)	1_blank_14_b	-1,0,1
+job_sword1,181,239,0	duplicate(SwdTrap1)	1_blank_14_c	-1,1,0
+
+job_sword1,193,245,0	warp	1_rest	1,3,job_sword1,215,244;
 
 // Pitfalls (Set 2)
 //============================================================ 
-sword_1-1,56,212,0	script	2_blank_1_a::SwdTrap2	-1,40,0,{
+job_sword1,56,212,0	script	2_blank_1_a::SwdTrap2	-1,40,0,{
 OnTouch:
 	switch(rand(1,5)) {
-	case 1: warp "sword_1-1",162,120; end;
-	case 2: warp "sword_1-1",94,120; end;
-	case 3: warp "sword_1-1",94,85; end;
-	case 4: warp "sword_1-1",162,85; end;
-	case 5: warp "sword_1-1",130,47; end;
+	case 1: warp "job_sword1",162,120; end;
+	case 2: warp "job_sword1",94,120; end;
+	case 3: warp "job_sword1",94,85; end;
+	case 4: warp "job_sword1",162,85; end;
+	case 5: warp "job_sword1",130,47; end;
 	}
 }
 
-sword_1-1,95,212,0	duplicate(SwdTrap2)	2_blank_1_b	-1,2,0
-sword_1-1,56,210,0	duplicate(SwdTrap2)	2_blank_2_a	-1,40,0
-sword_1-1,95,210,0	duplicate(SwdTrap2)	2_blank_2_b	-1,2,0
-sword_1-1,16,206,0	duplicate(SwdTrap2)	2_blank_2_c	-1,0,3
-sword_1-1,97,206,0	duplicate(SwdTrap2)	2_blank_2_d	-1,0,3
-sword_1-1,56,203,0	duplicate(SwdTrap2)	2_blank_2_e	-1,40,0
-sword_1-1,95,203,0	duplicate(SwdTrap2)	2_blank_2_f	-1,2,0
-sword_1-1,56,201,0	duplicate(SwdTrap2)	2_blank_3_a	-1,40,0
-sword_1-1,95,201,0	duplicate(SwdTrap2)	2_blank_3_b	-1,2,0
-
-sword_1-1,113,212,0	duplicate(SwdTrap2)	2_blank_4_a	-1,14,0
-sword_1-1,125,212,0	duplicate(SwdTrap2)	2_blank_4_b	-1,2,0
-sword_1-1,113,210,0	duplicate(SwdTrap2)	2_blank_5_a	-1,14,0
-sword_1-1,125,210,0	duplicate(SwdTrap2)	2_blank_5_b	-1,2,0
-sword_1-1,100,206,0	duplicate(SwdTrap2)	2_blank_5_c	-1,0,3
-sword_1-1,127,206,0	duplicate(SwdTrap2)	2_blank_5_d	-1,0,3
-sword_1-1,113,203,0	duplicate(SwdTrap2)	2_blank_5_e	-1,14,0
-sword_1-1,125,210,0	duplicate(SwdTrap2)	2_blank_5_f	-1,2,0
-sword_1-1,113,201,0	duplicate(SwdTrap2)	2_blank_6_a	-1,14,0
-sword_1-1,113,201,0	duplicate(SwdTrap2)	2_blank_6_b	-1,2,0
-
-sword_1-1,155,212,0	duplicate(SwdTrap2)	2_blank_7_a	-1,21,0
-sword_1-1,181,212,0	duplicate(SwdTrap2)	2_blank_7_b	-1,2,0
-sword_1-1,155,210,0	duplicate(SwdTrap2)	2_blank_8_a	-1,21,0
-sword_1-1,181,210,0	duplicate(SwdTrap2)	2_blank_8_b	-1,2,0
-sword_1-1,130,206,0	duplicate(SwdTrap2)	2_blank_8_c	-1,0,3
-sword_1-1,183,206,0	duplicate(SwdTrap2)	2_blank_8_d	-1,0,3
-sword_1-1,155,203,0	duplicate(SwdTrap2)	2_blank_8_e	-1,21,0
-sword_1-1,181,203,0	duplicate(SwdTrap2)	2_blank_8_f	-1,2,0
-sword_1-1,155,201,0	duplicate(SwdTrap2)	2_blank_9_a	-1,40,0
-sword_1-1,181,201,0	duplicate(SwdTrap2)	2_blank_9_b	-1,2,0
+job_sword1,95,212,0	duplicate(SwdTrap2)	2_blank_1_b	-1,2,0
+job_sword1,56,210,0	duplicate(SwdTrap2)	2_blank_2_a	-1,40,0
+job_sword1,95,210,0	duplicate(SwdTrap2)	2_blank_2_b	-1,2,0
+job_sword1,16,206,0	duplicate(SwdTrap2)	2_blank_2_c	-1,0,3
+job_sword1,97,206,0	duplicate(SwdTrap2)	2_blank_2_d	-1,0,3
+job_sword1,56,203,0	duplicate(SwdTrap2)	2_blank_2_e	-1,40,0
+job_sword1,95,203,0	duplicate(SwdTrap2)	2_blank_2_f	-1,2,0
+job_sword1,56,201,0	duplicate(SwdTrap2)	2_blank_3_a	-1,40,0
+job_sword1,95,201,0	duplicate(SwdTrap2)	2_blank_3_b	-1,2,0
+
+job_sword1,113,212,0	duplicate(SwdTrap2)	2_blank_4_a	-1,14,0
+job_sword1,125,212,0	duplicate(SwdTrap2)	2_blank_4_b	-1,2,0
+job_sword1,113,210,0	duplicate(SwdTrap2)	2_blank_5_a	-1,14,0
+job_sword1,125,210,0	duplicate(SwdTrap2)	2_blank_5_b	-1,2,0
+job_sword1,100,206,0	duplicate(SwdTrap2)	2_blank_5_c	-1,0,3
+job_sword1,127,206,0	duplicate(SwdTrap2)	2_blank_5_d	-1,0,3
+job_sword1,113,203,0	duplicate(SwdTrap2)	2_blank_5_e	-1,14,0
+job_sword1,125,210,0	duplicate(SwdTrap2)	2_blank_5_f	-1,2,0
+job_sword1,113,201,0	duplicate(SwdTrap2)	2_blank_6_a	-1,14,0
+job_sword1,113,201,0	duplicate(SwdTrap2)	2_blank_6_b	-1,2,0
+
+job_sword1,155,212,0	duplicate(SwdTrap2)	2_blank_7_a	-1,21,0
+job_sword1,181,212,0	duplicate(SwdTrap2)	2_blank_7_b	-1,2,0
+job_sword1,155,210,0	duplicate(SwdTrap2)	2_blank_8_a	-1,21,0
+job_sword1,181,210,0	duplicate(SwdTrap2)	2_blank_8_b	-1,2,0
+job_sword1,130,206,0	duplicate(SwdTrap2)	2_blank_8_c	-1,0,3
+job_sword1,183,206,0	duplicate(SwdTrap2)	2_blank_8_d	-1,0,3
+job_sword1,155,203,0	duplicate(SwdTrap2)	2_blank_8_e	-1,21,0
+job_sword1,181,203,0	duplicate(SwdTrap2)	2_blank_8_f	-1,2,0
+job_sword1,155,201,0	duplicate(SwdTrap2)	2_blank_9_a	-1,40,0
+job_sword1,181,201,0	duplicate(SwdTrap2)	2_blank_9_b	-1,2,0
 
 // Pitfalls (Set 3)
 //============================================================ 
-sword_1-1,17,174,0	script	3_blank_1_a::SwdTrap3	-1,2,0,{
+job_sword1,17,174,0	script	3_blank_1_a::SwdTrap3	-1,2,0,{
 OnTouch:
 	switch(rand(1,5)) {
-	case 1: warp "sword_1-1",195,15; end;
-	case 2: warp "sword_1-1",195,38; end;
-	case 3: warp "sword_1-1",231,30; end;
-	case 4: warp "sword_1-1",198,65; end;
-	case 5: warp "sword_1-1",196,116; end;
+	case 1: warp "job_sword1",195,15; end;
+	case 2: warp "job_sword1",195,38; end;
+	case 3: warp "job_sword1",231,30; end;
+	case 4: warp "job_sword1",198,65; end;
+	case 5: warp "job_sword1",196,116; end;
 	}
 }
 
-sword_1-1,17,163,0	duplicate(SwdTrap3)	3_blank_2_a	-1,2,0
-sword_1-1,29,171,0	duplicate(SwdTrap3)	3_blank_3_a	-1,2,0
-sword_1-1,31,168,0	duplicate(SwdTrap3)	3_blank_3_b	-1,0,2
-sword_1-1,28,166,0	duplicate(SwdTrap3)	3_blank_3_c	-1,2,0
-sword_1-1,26,168,0	duplicate(SwdTrap3)	3_blank_3_d	-1,0,2
-sword_1-1,36,169,0	duplicate(SwdTrap3)	3_blank_4_a	-1,0,0
-sword_1-1,37,169,0	duplicate(SwdTrap3)	3_blank_4_b	-1,0,0
-sword_1-1,37,168,0	duplicate(SwdTrap3)	3_blank_4_c	-1,0,0
-sword_1-1,36,168,0	duplicate(SwdTrap3)	3_blank_4_c	-1,0,0
-sword_1-1,40,175,0	duplicate(SwdTrap3)	3_blank_5_a	-1,0,1
-sword_1-1,41,175,0	duplicate(SwdTrap3)	3_blank_5_b	-1,0,1
-sword_1-1,41,171,0	duplicate(SwdTrap3)	3_blank_6_a	-1,1,0
-sword_1-1,41,170,0	duplicate(SwdTrap3)	3_blank_6_b	-1,1,0
-sword_1-1,41,167,0	duplicate(SwdTrap3)	3_blank_6_c	-1,1,0
-sword_1-1,41,166,0	duplicate(SwdTrap3)	3_blank_6_d	-1,1,0
-sword_1-1,42,169,0	duplicate(SwdTrap3)	3_blank_6_e	-1,0,1
-sword_1-1,43,170,0	duplicate(SwdTrap3)	3_blank_6_f	-1,0,1
-sword_1-1,43,167,0	duplicate(SwdTrap3)	3_blank_6_g	-1,0,1
-sword_1-1,40,162,0	duplicate(SwdTrap3)	3_blank_7_a	-1,0,1
-sword_1-1,41,162,0	duplicate(SwdTrap3)	3_blank_7_b	-1,0,1
-sword_1-1,46,175,0	duplicate(SwdTrap3)	3_blank_8_a	-1,0,1
-sword_1-1,51,175,0	duplicate(SwdTrap3)	3_blank_8_b	-1,0,1
-sword_1-1,47,174,0	duplicate(SwdTrap3)	3_blank_8_c	-1,1,0
-sword_1-1,50,174,0	duplicate(SwdTrap3)	3_blank_8_d	-1,1,0
-sword_1-1,48,173,0	duplicate(SwdTrap3)	3_blank_8_e	-1,0,1
-sword_1-1,49,173,0	duplicate(SwdTrap3)	3_blank_8_f	-1,0,1
-sword_1-1,46,162,0	duplicate(SwdTrap3)	3_blank_9_a	-1,0,1
-sword_1-1,51,162,0	duplicate(SwdTrap3)	3_blank_9_b	-1,0,1
-sword_1-1,47,163,0	duplicate(SwdTrap3)	3_blank_9_c	-1,1,0
-sword_1-1,50,163,0	duplicate(SwdTrap3)	3_blank_9_d	-1,1,0
-sword_1-1,48,164,0	duplicate(SwdTrap3)	3_blank_9_e	-1,0,1
-sword_1-1,49,164,0	duplicate(SwdTrap3)	3_blank_9_f	-1,0,1
-sword_1-1,54,170,0	duplicate(SwdTrap3)	3_blank_10_a	-1,0,1
-sword_1-1,55,170,0	duplicate(SwdTrap3)	3_blank_10_b	-1,0,1
-sword_1-1,54,167,0	duplicate(SwdTrap3)	3_blank_10_c	-1,0,1
-sword_1-1,55,167,0	duplicate(SwdTrap3)	3_blank_10_d	-1,0,1
-sword_1-1,53,169,0	duplicate(SwdTrap3)	3_blank_10_e	-1,1,0
-sword_1-1,53,168,0	duplicate(SwdTrap3)	3_blank_10_f	-1,1,0
-sword_1-1,56,169,0	duplicate(SwdTrap3)	3_blank_10_g	-1,1,0
-sword_1-1,56,168,0	duplicate(SwdTrap3)	3_blank_10_h	-1,1,0
-sword_1-1,58,175,0	duplicate(SwdTrap3)	3_blank_11_a	-1,0,1
-sword_1-1,59,174,0	duplicate(SwdTrap3)	3_blank_11_b	-1,1,0
-sword_1-1,60,173,0	duplicate(SwdTrap3)	3_blank_11_c	-1,0,1
-sword_1-1,61,172,0	duplicate(SwdTrap3)	3_blank_11_d	-1,1,0
-sword_1-1,58,162,0	duplicate(SwdTrap3)	3_blank_12_a	-1,0,1
-sword_1-1,59,163,0	duplicate(SwdTrap3)	3_blank_12_b	-1,1,0
-sword_1-1,60,164,0	duplicate(SwdTrap3)	3_blank_12_c	-1,0,1
-sword_1-1,61,165,0	duplicate(SwdTrap3)	3_blank_12_d	-1,1,0
-sword_1-1,76,172,0	duplicate(SwdTrap3)	3_blank_13_a	-1,1,0
-sword_1-1,77,173,0	duplicate(SwdTrap3)	3_blank_13_b	-1,0,1
-sword_1-1,78,174,0	duplicate(SwdTrap3)	3_blank_13_c	-1,1,0
-sword_1-1,79,175,0	duplicate(SwdTrap3)	3_blank_13_d	-1,0,1
-sword_1-1,76,165,0	duplicate(SwdTrap3)	3_blank_14_a	-1,1,0
-sword_1-1,77,164,0	duplicate(SwdTrap3)	3_blank_14_b	-1,0,1
-sword_1-1,78,163,0	duplicate(SwdTrap3)	3_blank_14_c	-1,1,0
-sword_1-1,79,162,0	duplicate(SwdTrap3)	3_blank_14_d	-1,0,1
-sword_1-1,94,175,0	duplicate(SwdTrap3)	3_blank_15_a	-1,0,1
-sword_1-1,95,174,0	duplicate(SwdTrap3)	3_blank_15_b	-1,1,0
-sword_1-1,98,174,0	duplicate(SwdTrap3)	3_blank_15_c	-1,1,0
-sword_1-1,99,175,0	duplicate(SwdTrap3)	3_blank_16_d	-1,0,1
-sword_1-1,96,169,0	duplicate(SwdTrap3)	3_blank_17_a	-1,0,0
-sword_1-1,97,169,0	duplicate(SwdTrap3)	3_blank_17_b	-1,0,0
-sword_1-1,97,168,0	duplicate(SwdTrap3)	3_blank_17_c	-1,0,0
-sword_1-1,96,168,0	duplicate(SwdTrap3)	3_blank_17_d	-1,0,0
-sword_1-1,94,162,0	duplicate(SwdTrap3)	3_blank_18_a	-1,0,1
-sword_1-1,95,163,0	duplicate(SwdTrap3)	3_blank_18_b	-1,1,0
-sword_1-1,98,163,0	duplicate(SwdTrap3)	3_blank_18_c	-1,1,0
-sword_1-1,99,162,0	duplicate(SwdTrap3)	3_blank_18_d	-1,0,1
-sword_1-1,114,175,0	duplicate(SwdTrap3)	3_blank_19_a	-1,0,1
-sword_1-1,115,175,0	duplicate(SwdTrap3)	3_blank_19_b	-1,0,1
-sword_1-1,114,162,0	duplicate(SwdTrap3)	3_blank_20_a	-1,0,1
-sword_1-1,115,162,0	duplicate(SwdTrap3)	3_blank_20_b	-1,0,1
-sword_1-1,126,175,0	duplicate(SwdTrap3)	3_blank_21_a	-1,0,1
-sword_1-1,127,175,0	duplicate(SwdTrap3)	3_blank_21_b	-1,0,1
-sword_1-1,126,162,0	duplicate(SwdTrap3)	3_blank_23_a	-1,0,1
-sword_1-1,127,162,0	duplicate(SwdTrap3)	3_blank_23_b	-1,0,1
-sword_1-1,160,174,0	duplicate(SwdTrap3)	3_blank_24_a	-1,0,2
-sword_1-1,161,174,0	duplicate(SwdTrap3)	3_blank_24_b	-1,0,2
-sword_1-1,160,163,0	duplicate(SwdTrap3)	3_blank_25_a	-1,0,2
-sword_1-1,161,163,0	duplicate(SwdTrap3)	3_blank_25_b	-1,0,2
-sword_1-1,168,175,0	duplicate(SwdTrap3)	3_blank_26_a	-1,0,2
-sword_1-1,169,175,0	duplicate(SwdTrap3)	3_blank_26_b	-1,0,2
-sword_1-1,168,162,0	duplicate(SwdTrap3)	3_blank_27_a	-1,0,2
-sword_1-1,169,162,0	duplicate(SwdTrap3)	3_blank_27_b	-1,0,2
-sword_1-1,176,174,0	duplicate(SwdTrap3)	3_blank_28_a	-1,0,2
-sword_1-1,177,174,0	duplicate(SwdTrap3)	3_blank_28_b	-1,0,2
-sword_1-1,178,173,0	duplicate(SwdTrap3)	3_blank_28_c	-1,1,0
-sword_1-1,178,172,0	duplicate(SwdTrap3)	3_blank_28_d	-1,1,0
-sword_1-1,181,174,0	duplicate(SwdTrap3)	3_blank_28_e	-1,2,0
-sword_1-1,179,169,0	duplicate(SwdTrap3)	3_blank_29_a	-1,3,0
-sword_1-1,179,168,0	duplicate(SwdTrap3)	3_blank_29_b	-1,3,0
-sword_1-1,182,169,0	duplicate(SwdTrap3)	3_blank_29_c	-1,0,2
-sword_1-1,183,169,0	duplicate(SwdTrap3)	3_blank_29_d	-1,0,2
-sword_1-1,181,167,0	duplicate(SwdTrap3)	3_blank_29_e	-1,1,0
-sword_1-1,181,166,0	duplicate(SwdTrap3)	3_blank_29_f	-1,1,0
-sword_1-1,183,167,0	duplicate(SwdTrap3)	3_blank_29_g	-1,0,1
-sword_1-1,176,163,0	duplicate(SwdTrap3)	3_blank_30_a	-1,0,2
-sword_1-1,177,163,0	duplicate(SwdTrap3)	3_blank_30_b	-1,0,2
-sword_1-1,181,163,0	duplicate(SwdTrap3)	3_blank_30_c	-1,2,0
-
-// Examination Course 2
-//============================================================ 
-sword_2-1,223,243,0	warp	checkp1-2	1,1,sword_2-1,11,206;
-sword_2-1,223,205,0	warp	checkp2-3	1,1,sword_2-1,11,168;
-
-sword_2-1,7,245,0	script	Test Hall Staff	45,1,3,{
-	callfunc "F_JobSwdTestStaff",2,10,245;
-}
-
-sword_2-1,8,207,0	script	Test Hall Staff	45,1,6,{
-	callfunc "F_JobSwdTestStaff",2,11,207;
-}
-
-sword_2-1,8,169,0	script	Test Hall Staff	45,1,6,{
-	callfunc "F_JobSwdTestStaff",2,11,169;
-}
-
-sword_2-1,192,244,0	script	Test Hall Staff	45,1,3,{
-	callfunc "F_JobSwdTestStaff2","1st",2,215,244;
-}
-
-sword_2-1,193,207,0	script	Test Hall Staff	45,1,3,{
-	callfunc "F_JobSwdTestStaff2","2nd",2,215,205;
-	warp "sword_2-1",215,205;
-}
-
-sword_2-1,193,168,0	script	Test Hall Staff	45,1,3,{
-	callfunc "F_JobSwdTestStaff2","3rd",2,215,167;
-}
-
-// Pitfalls (Set 1)
-//============================================================ 
-sword_2-1,65,117,0	warp	ÇÔÁ¤01-01	1,1,sword_2-1,10,245;
-sword_2-1,98,27,0		warp	ÇÔÁ¤02-01	1,1,sword_2-1,11,207;
-sword_2-1,161,27,0	warp	ÇÔÁ¤02-02	1,1,sword_2-1,11,207;
-sword_2-1,239,117,0	warp	ÇÔÁ¤03-01	1,1,sword_2-1,11,169;
-
-sword_2-1,16,251,0	script	1_blank_1_a::SwdTrap1	-1,0,1,{
-OnTouch:
-	switch(rand(1,5)) {
-	case 1: warp "sword_2-1",65,56; end;
-	case 2: warp "sword_2-1",29,26; end;
-	case 3: warp "sword_2-1",43,16; end;
-	case 4: warp "sword_2-1",23,112; end;
-	case 5: warp "sword_2-1",58,83; end;
-	}
-}
-sword_2-1,19,251,0	duplicate(SwdTrap1)	1_blank_1_b	-1,0,1
-sword_2-1,17,250,0	duplicate(SwdTrap1)	1_blank_1_c	-1,1,0
-sword_2-1,16,238,0	duplicate(SwdTrap1)	1_blank_2_a	-1,0,1
-sword_2-1,19,238,0	duplicate(SwdTrap1)	1_blank_2_b	-1,0,1
-sword_2-1,17,239,0	duplicate(SwdTrap1)	1_blank_2_c	-1,0,1
-sword_2-1,28,247,0	duplicate(SwdTrap1)	1_blank_3_a	-1,4,0
-sword_2-1,33,245,0	duplicate(SwdTrap1)	1_blank_3_b	-1,0,2
-sword_2-1,29,242,0	duplicate(SwdTrap1)	1_blank_3_c	-1,4,0
-sword_2-1,24,244,0	duplicate(SwdTrap1)	1_blank_3_d	-1,0,2
-sword_2-1,38,251,0	duplicate(SwdTrap1)	1_blank_4_a	-1,0,1
-sword_2-1,41,251,0	duplicate(SwdTrap1)	1_blank_4_b	-1,0,1
-sword_2-1,39,250,0	duplicate(SwdTrap1)	1_blank_4_c	-1,1,0
-sword_2-1,38,238,0	duplicate(SwdTrap1)	1_blank_5_a	-1,0,1
-sword_2-1,41,238,0	duplicate(SwdTrap1)	1_blank_5_b	-1,0,1
-sword_2-1,39,239,0	duplicate(SwdTrap1)	1_blank_5_c	-1,1,0
-sword_2-1,54,251,0	duplicate(SwdTrap1)	1_blank_6_a	-1,0,1
-sword_2-1,71,251,0	duplicate(SwdTrap1)	1_blank_6_b	-1,0,1
-sword_2-1,62,250,0	duplicate(SwdTrap1)	1_blank_6_c	-1,9,0
-sword_2-1,62,247,0	duplicate(SwdTrap1)	1_blank_7_a	-1,8,0
-sword_2-1,71,244,0	duplicate(SwdTrap1)	1_blank_7_b	-1,0,2
-sword_2-1,63,242,0	duplicate(SwdTrap1)	1_blank_7_c	-1,8,0
-sword_2-1,54,244,0	duplicate(SwdTrap1)	1_blank_7_d	-1,0,2
-sword_2-1,54,238,0	duplicate(SwdTrap1)	1_blank_8_a	-1,0,1
-sword_2-1,71,238,0	duplicate(SwdTrap1)	1_blank_8_b	-1,0,1
-sword_2-1,62,239,0	duplicate(SwdTrap1)	1_blank_8_c	-1,9,0
-sword_2-1,102,247,0	duplicate(SwdTrap1)	1_blank_9_a	-1,2,0
-sword_2-1,105,245,0	duplicate(SwdTrap1)	1_blank_9_b	-1,0,2
-sword_2-1,103,242,0	duplicate(SwdTrap1)	1_blank_9_c	-1,2,0
-sword_2-1,100,244,0	duplicate(SwdTrap1)	1_blank_9_d	-1,0,2
-sword_2-1,156,249,0	duplicate(SwdTrap1)	1_blank_10_a	-1,14,0
-sword_2-1,156,248,0	duplicate(SwdTrap1)	1_blank_10_b	-1,14,0
-sword_2-1,170,249,0	duplicate(SwdTrap1)	1_blank_10_c	-1,1,0
-sword_2-1,170,248,0	duplicate(SwdTrap1)	1_blank_10_d	-1,1,0
-sword_2-1,156,245,0	duplicate(SwdTrap1)	1_blank_11_a	-1,14,0
-sword_2-1,156,244,0	duplicate(SwdTrap1)	1_blank_11_b	-1,14,0
-sword_2-1,170,245,0	duplicate(SwdTrap1)	1_blank_11_c	-1,1,0
-sword_2-1,170,244,0	duplicate(SwdTrap1)	1_blank_11_d	-1,1,0
-sword_2-1,156,241,0	duplicate(SwdTrap1)	1_blank_12_a	-1,14,0
-sword_2-1,156,240,0	duplicate(SwdTrap1)	1_blank_12_b	-1,14,0
-sword_2-1,170,241,0	duplicate(SwdTrap1)	1_blank_12_c	-1,1,0
-sword_2-1,170,240,0	duplicate(SwdTrap1)	1_blank_12_d	-1,1,0
-sword_2-1,180,251,0	duplicate(SwdTrap1)	1_blank_13_a	-1,0,1
-sword_2-1,183,251,0	duplicate(SwdTrap1)	1_blank_13_b	-1,0,1
-sword_2-1,181,250,0	duplicate(SwdTrap1)	1_blank_13_c	-1,1,0
-sword_2-1,180,238,0	duplicate(SwdTrap1)	1_blank_14_a	-1,0,1
-sword_2-1,183,238,0	duplicate(SwdTrap1)	1_blank_14_b	-1,0,1
-sword_2-1,181,239,0	duplicate(SwdTrap1)	1_blank_14_c	-1,1,0
-
-sword_2-1,193,245,0	warp	1_rest	1,3,sword_2-1,215,244;
-
-// Pitfalls (Set 2)
-//============================================================ 
-sword_2-1,56,212,0	script	2_blank_1_a::SwdTrap2	-1,40,0,{
-OnTouch:
-	switch(rand(1,5)) {
-	case 1: warp "sword_2-1",162,120; end;
-	case 2: warp "sword_2-1",94,120; end;
-	case 3: warp "sword_2-1",94,85; end;
-	case 4: warp "sword_2-1",162,85; end;
-	case 5: warp "sword_2-1",130,47; end;
-	}
-}
-
-sword_2-1,95,212,0	duplicate(SwdTrap2)	2_blank_1_b	-1,2,0
-sword_2-1,56,210,0	duplicate(SwdTrap2)	2_blank_2_a	-1,40,0
-sword_2-1,95,210,0	duplicate(SwdTrap2)	2_blank_2_b	-1,2,0
-sword_2-1,16,206,0	duplicate(SwdTrap2)	2_blank_2_c	-1,0,3
-sword_2-1,97,206,0	duplicate(SwdTrap2)	2_blank_2_d	-1,0,3
-sword_2-1,56,203,0	duplicate(SwdTrap2)	2_blank_2_e	-1,40,0
-sword_2-1,95,203,0	duplicate(SwdTrap2)	2_blank_2_f	-1,2,0
-sword_2-1,56,201,0	duplicate(SwdTrap2)	2_blank_3_a	-1,40,0
-sword_2-1,95,201,0	duplicate(SwdTrap2)	2_blank_3_b	-1,2,0
-
-sword_2-1,113,212,0	duplicate(SwdTrap2)	2_blank_4_a	-1,14,0
-sword_2-1,125,212,0	duplicate(SwdTrap2)	2_blank_4_b	-1,2,0
-sword_2-1,113,210,0	duplicate(SwdTrap2)	2_blank_5_a	-1,14,0
-sword_2-1,125,210,0	duplicate(SwdTrap2)	2_blank_5_b	-1,2,0
-sword_2-1,100,206,0	duplicate(SwdTrap2)	2_blank_5_c	-1,0,3
-sword_2-1,127,206,0	duplicate(SwdTrap2)	2_blank_5_d	-1,0,3
-sword_2-1,113,203,0	duplicate(SwdTrap2)	2_blank_5_e	-1,14,0
-sword_2-1,125,210,0	duplicate(SwdTrap2)	2_blank_5_f	-1,2,0
-sword_2-1,113,201,0	duplicate(SwdTrap2)	2_blank_6_a	-1,14,0
-sword_2-1,113,201,0	duplicate(SwdTrap2)	2_blank_6_b	-1,2,0
-
-sword_2-1,155,212,0	duplicate(SwdTrap2)	2_blank_7_a	-1,21,0
-sword_2-1,181,212,0	duplicate(SwdTrap2)	2_blank_7_b	-1,2,0
-sword_2-1,155,210,0	duplicate(SwdTrap2)	2_blank_8_a	-1,21,0
-sword_2-1,181,210,0	duplicate(SwdTrap2)	2_blank_8_b	-1,2,0
-sword_2-1,130,206,0	duplicate(SwdTrap2)	2_blank_8_c	-1,0,3
-sword_2-1,183,206,0	duplicate(SwdTrap2)	2_blank_8_d	-1,0,3
-sword_2-1,155,203,0	duplicate(SwdTrap2)	2_blank_8_e	-1,21,0
-sword_2-1,181,203,0	duplicate(SwdTrap2)	2_blank_8_f	-1,2,0
-sword_2-1,155,201,0	duplicate(SwdTrap2)	2_blank_9_a	-1,40,0
-sword_2-1,181,201,0	duplicate(SwdTrap2)	2_blank_9_b	-1,2,0
-
-// Pitfalls (Set 3)
-//============================================================ 
-sword_2-1,17,174,0	script	3_blank_1_a::SwdTrap3	-1,2,0,{
-OnTouch:
-	switch(rand(1,5)) {
-	case 1: warp "sword_2-1",195,15; end;
-	case 2: warp "sword_2-1",195,38; end;
-	case 3: warp "sword_2-1",231,30; end;
-	case 4: warp "sword_2-1",198,65; end;
-	case 5: warp "sword_2-1",196,116; end;
-	}
-}
-
-sword_2-1,17,163,0	duplicate(SwdTrap3)	3_blank_2_a	-1,2,0
-sword_2-1,29,171,0	duplicate(SwdTrap3)	3_blank_3_a	-1,2,0
-sword_2-1,31,168,0	duplicate(SwdTrap3)	3_blank_3_b	-1,0,2
-sword_2-1,28,166,0	duplicate(SwdTrap3)	3_blank_3_c	-1,2,0
-sword_2-1,26,168,0	duplicate(SwdTrap3)	3_blank_3_d	-1,0,2
-sword_2-1,36,169,0	duplicate(SwdTrap3)	3_blank_4_a	-1,0,0
-sword_2-1,37,169,0	duplicate(SwdTrap3)	3_blank_4_b	-1,0,0
-sword_2-1,37,168,0	duplicate(SwdTrap3)	3_blank_4_c	-1,0,0
-sword_2-1,36,168,0	duplicate(SwdTrap3)	3_blank_4_c	-1,0,0
-sword_2-1,40,175,0	duplicate(SwdTrap3)	3_blank_5_a	-1,0,1
-sword_2-1,41,175,0	duplicate(SwdTrap3)	3_blank_5_b	-1,0,1
-sword_2-1,41,171,0	duplicate(SwdTrap3)	3_blank_6_a	-1,1,0
-sword_2-1,41,170,0	duplicate(SwdTrap3)	3_blank_6_b	-1,1,0
-sword_2-1,41,167,0	duplicate(SwdTrap3)	3_blank_6_c	-1,1,0
-sword_2-1,41,166,0	duplicate(SwdTrap3)	3_blank_6_d	-1,1,0
-sword_2-1,42,169,0	duplicate(SwdTrap3)	3_blank_6_e	-1,0,1
-sword_2-1,43,170,0	duplicate(SwdTrap3)	3_blank_6_f	-1,0,1
-sword_2-1,43,167,0	duplicate(SwdTrap3)	3_blank_6_g	-1,0,1
-sword_2-1,40,162,0	duplicate(SwdTrap3)	3_blank_7_a	-1,0,1
-sword_2-1,41,162,0	duplicate(SwdTrap3)	3_blank_7_b	-1,0,1
-sword_2-1,46,175,0	duplicate(SwdTrap3)	3_blank_8_a	-1,0,1
-sword_2-1,51,175,0	duplicate(SwdTrap3)	3_blank_8_b	-1,0,1
-sword_2-1,47,174,0	duplicate(SwdTrap3)	3_blank_8_c	-1,1,0
-sword_2-1,50,174,0	duplicate(SwdTrap3)	3_blank_8_d	-1,1,0
-sword_2-1,48,173,0	duplicate(SwdTrap3)	3_blank_8_e	-1,0,1
-sword_2-1,49,173,0	duplicate(SwdTrap3)	3_blank_8_f	-1,0,1
-sword_2-1,46,162,0	duplicate(SwdTrap3)	3_blank_9_a	-1,0,1
-sword_2-1,51,162,0	duplicate(SwdTrap3)	3_blank_9_b	-1,0,1
-sword_2-1,47,163,0	duplicate(SwdTrap3)	3_blank_9_c	-1,1,0
-sword_2-1,50,163,0	duplicate(SwdTrap3)	3_blank_9_d	-1,1,0
-sword_2-1,48,164,0	duplicate(SwdTrap3)	3_blank_9_e	-1,0,1
-sword_2-1,49,164,0	duplicate(SwdTrap3)	3_blank_9_f	-1,0,1
-sword_2-1,54,170,0	duplicate(SwdTrap3)	3_blank_10_a	-1,0,1
-sword_2-1,55,170,0	duplicate(SwdTrap3)	3_blank_10_b	-1,0,1
-sword_2-1,54,167,0	duplicate(SwdTrap3)	3_blank_10_c	-1,0,1
-sword_2-1,55,167,0	duplicate(SwdTrap3)	3_blank_10_d	-1,0,1
-sword_2-1,53,169,0	duplicate(SwdTrap3)	3_blank_10_e	-1,1,0
-sword_2-1,53,168,0	duplicate(SwdTrap3)	3_blank_10_f	-1,1,0
-sword_2-1,56,169,0	duplicate(SwdTrap3)	3_blank_10_g	-1,1,0
-sword_2-1,56,168,0	duplicate(SwdTrap3)	3_blank_10_h	-1,1,0
-sword_2-1,58,175,0	duplicate(SwdTrap3)	3_blank_11_a	-1,0,1
-sword_2-1,59,174,0	duplicate(SwdTrap3)	3_blank_11_b	-1,1,0
-sword_2-1,60,173,0	duplicate(SwdTrap3)	3_blank_11_c	-1,0,1
-sword_2-1,61,172,0	duplicate(SwdTrap3)	3_blank_11_d	-1,1,0
-sword_2-1,58,162,0	duplicate(SwdTrap3)	3_blank_12_a	-1,0,1
-sword_2-1,59,163,0	duplicate(SwdTrap3)	3_blank_12_b	-1,1,0
-sword_2-1,60,164,0	duplicate(SwdTrap3)	3_blank_12_c	-1,0,1
-sword_2-1,61,165,0	duplicate(SwdTrap3)	3_blank_12_d	-1,1,0
-sword_2-1,76,172,0	duplicate(SwdTrap3)	3_blank_13_a	-1,1,0
-sword_2-1,77,173,0	duplicate(SwdTrap3)	3_blank_13_b	-1,0,1
-sword_2-1,78,174,0	duplicate(SwdTrap3)	3_blank_13_c	-1,1,0
-sword_2-1,79,175,0	duplicate(SwdTrap3)	3_blank_13_d	-1,0,1
-sword_2-1,76,165,0	duplicate(SwdTrap3)	3_blank_14_a	-1,1,0
-sword_2-1,77,164,0	duplicate(SwdTrap3)	3_blank_14_b	-1,0,1
-sword_2-1,78,163,0	duplicate(SwdTrap3)	3_blank_14_c	-1,1,0
-sword_2-1,79,162,0	duplicate(SwdTrap3)	3_blank_14_d	-1,0,1
-sword_2-1,94,175,0	duplicate(SwdTrap3)	3_blank_15_a	-1,0,1
-sword_2-1,95,174,0	duplicate(SwdTrap3)	3_blank_15_b	-1,1,0
-sword_2-1,98,174,0	duplicate(SwdTrap3)	3_blank_15_c	-1,1,0
-sword_2-1,99,175,0	duplicate(SwdTrap3)	3_blank_16_d	-1,0,1
-sword_2-1,96,169,0	duplicate(SwdTrap3)	3_blank_17_a	-1,0,0
-sword_2-1,97,169,0	duplicate(SwdTrap3)	3_blank_17_b	-1,0,0
-sword_2-1,97,168,0	duplicate(SwdTrap3)	3_blank_17_c	-1,0,0
-sword_2-1,96,168,0	duplicate(SwdTrap3)	3_blank_17_d	-1,0,0
-sword_2-1,94,162,0	duplicate(SwdTrap3)	3_blank_18_a	-1,0,1
-sword_2-1,95,163,0	duplicate(SwdTrap3)	3_blank_18_b	-1,1,0
-sword_2-1,98,163,0	duplicate(SwdTrap3)	3_blank_18_c	-1,1,0
-sword_2-1,99,162,0	duplicate(SwdTrap3)	3_blank_18_d	-1,0,1
-sword_2-1,114,175,0	duplicate(SwdTrap3)	3_blank_19_a	-1,0,1
-sword_2-1,115,175,0	duplicate(SwdTrap3)	3_blank_19_b	-1,0,1
-sword_2-1,114,162,0	duplicate(SwdTrap3)	3_blank_20_a	-1,0,1
-sword_2-1,115,162,0	duplicate(SwdTrap3)	3_blank_20_b	-1,0,1
-sword_2-1,126,175,0	duplicate(SwdTrap3)	3_blank_21_a	-1,0,1
-sword_2-1,127,175,0	duplicate(SwdTrap3)	3_blank_21_b	-1,0,1
-sword_2-1,126,162,0	duplicate(SwdTrap3)	3_blank_23_a	-1,0,1
-sword_2-1,127,162,0	duplicate(SwdTrap3)	3_blank_23_b	-1,0,1
-sword_2-1,160,174,0	duplicate(SwdTrap3)	3_blank_24_a	-1,0,2
-sword_2-1,161,174,0	duplicate(SwdTrap3)	3_blank_24_b	-1,0,2
-sword_2-1,160,163,0	duplicate(SwdTrap3)	3_blank_25_a	-1,0,2
-sword_2-1,161,163,0	duplicate(SwdTrap3)	3_blank_25_b	-1,0,2
-sword_2-1,168,175,0	duplicate(SwdTrap3)	3_blank_26_a	-1,0,2
-sword_2-1,169,175,0	duplicate(SwdTrap3)	3_blank_26_b	-1,0,2
-sword_2-1,168,162,0	duplicate(SwdTrap3)	3_blank_27_a	-1,0,2
-sword_2-1,169,162,0	duplicate(SwdTrap3)	3_blank_27_b	-1,0,2
-sword_2-1,176,174,0	duplicate(SwdTrap3)	3_blank_28_a	-1,0,2
-sword_2-1,177,174,0	duplicate(SwdTrap3)	3_blank_28_b	-1,0,2
-sword_2-1,178,173,0	duplicate(SwdTrap3)	3_blank_28_c	-1,1,0
-sword_2-1,178,172,0	duplicate(SwdTrap3)	3_blank_28_d	-1,1,0
-sword_2-1,181,174,0	duplicate(SwdTrap3)	3_blank_28_e	-1,2,0
-sword_2-1,179,169,0	duplicate(SwdTrap3)	3_blank_29_a	-1,3,0
-sword_2-1,179,168,0	duplicate(SwdTrap3)	3_blank_29_b	-1,3,0
-sword_2-1,182,169,0	duplicate(SwdTrap3)	3_blank_29_c	-1,0,2
-sword_2-1,183,169,0	duplicate(SwdTrap3)	3_blank_29_d	-1,0,2
-sword_2-1,181,167,0	duplicate(SwdTrap3)	3_blank_29_e	-1,1,0
-sword_2-1,181,166,0	duplicate(SwdTrap3)	3_blank_29_f	-1,1,0
-sword_2-1,183,167,0	duplicate(SwdTrap3)	3_blank_29_g	-1,0,1
-sword_2-1,176,163,0	duplicate(SwdTrap3)	3_blank_30_a	-1,0,2
-sword_2-1,177,163,0	duplicate(SwdTrap3)	3_blank_30_b	-1,0,2
-sword_2-1,181,163,0	duplicate(SwdTrap3)	3_blank_30_c	-1,2,0
-
-// Examination Course 3
-//============================================================ 
-sword_3-1,223,243,0	warp	checkp1-2	1,1,sword_3-1,11,206;
-sword_3-1,223,205,0	warp	checkp2-3	1,1,sword_3-1,11,168;
-
-sword_3-1,7,245,0	script	Test Hall Staff	45,1,3,{
-	callfunc "F_JobSwdTestStaff",3,10,245;
-}
-
-sword_3-1,8,207,0	script	Test Hall Staff	45,1,6,{
-	callfunc "F_JobSwdTestStaff",3,11,207;
-}
-
-sword_3-1,8,169,0	script	Test Hall Staff	45,1,6,{
-	callfunc "F_JobSwdTestStaff",3,11,169;
-}
-
-sword_3-1,192,244,0	script	Test Hall Staff	45,1,3,{
-	callfunc "F_JobSwdTestStaff2","1st",3,215,244;
-}
-
-sword_3-1,193,207,0	script	Test Hall Staff	45,1,3,{
-	callfunc "F_JobSwdTestStaff2","2nd",3,215,205;
-	warp "sword_3-1",215,205;
-}
-
-sword_3-1,193,168,0	script	Test Hall Staff	45,1,3,{
-	callfunc "F_JobSwdTestStaff2","3rd",3,215,167;
-}
-
-// Pitfalls (Set 1)
-//============================================================ 
-sword_3-1,65,117,0	warp	ÇÔÁ¤01-01	1,1,sword_3-1,10,245;
-sword_3-1,98,27,0		warp	ÇÔÁ¤02-01	1,1,sword_3-1,11,207;
-sword_3-1,161,27,0	warp	ÇÔÁ¤02-02	1,1,sword_3-1,11,207;
-sword_3-1,239,117,0	warp	ÇÔÁ¤03-01	1,1,sword_3-1,11,169;
-
-sword_3-1,16,251,0	script	1_blank_1_a::SwdTrap1	-1,0,1,{
-OnTouch:
-	switch(rand(1,5)) {
-	case 1: warp "sword_3-1",65,56; end;
-	case 2: warp "sword_3-1",29,26; end;
-	case 3: warp "sword_3-1",43,16; end;
-	case 4: warp "sword_3-1",23,112; end;
-	case 5: warp "sword_3-1",58,83; end;
-	}
-}
-sword_3-1,19,251,0	duplicate(SwdTrap1)	1_blank_1_b	-1,0,1
-sword_3-1,17,250,0	duplicate(SwdTrap1)	1_blank_1_c	-1,1,0
-sword_3-1,16,238,0	duplicate(SwdTrap1)	1_blank_2_a	-1,0,1
-sword_3-1,19,238,0	duplicate(SwdTrap1)	1_blank_2_b	-1,0,1
-sword_3-1,17,239,0	duplicate(SwdTrap1)	1_blank_2_c	-1,0,1
-sword_3-1,28,247,0	duplicate(SwdTrap1)	1_blank_3_a	-1,4,0
-sword_3-1,33,245,0	duplicate(SwdTrap1)	1_blank_3_b	-1,0,2
-sword_3-1,29,242,0	duplicate(SwdTrap1)	1_blank_3_c	-1,4,0
-sword_3-1,24,244,0	duplicate(SwdTrap1)	1_blank_3_d	-1,0,2
-sword_3-1,38,251,0	duplicate(SwdTrap1)	1_blank_4_a	-1,0,1
-sword_3-1,41,251,0	duplicate(SwdTrap1)	1_blank_4_b	-1,0,1
-sword_3-1,39,250,0	duplicate(SwdTrap1)	1_blank_4_c	-1,1,0
-sword_3-1,38,238,0	duplicate(SwdTrap1)	1_blank_5_a	-1,0,1
-sword_3-1,41,238,0	duplicate(SwdTrap1)	1_blank_5_b	-1,0,1
-sword_3-1,39,239,0	duplicate(SwdTrap1)	1_blank_5_c	-1,1,0
-sword_3-1,54,251,0	duplicate(SwdTrap1)	1_blank_6_a	-1,0,1
-sword_3-1,71,251,0	duplicate(SwdTrap1)	1_blank_6_b	-1,0,1
-sword_3-1,62,250,0	duplicate(SwdTrap1)	1_blank_6_c	-1,9,0
-sword_3-1,62,247,0	duplicate(SwdTrap1)	1_blank_7_a	-1,8,0
-sword_3-1,71,244,0	duplicate(SwdTrap1)	1_blank_7_b	-1,0,2
-sword_3-1,63,242,0	duplicate(SwdTrap1)	1_blank_7_c	-1,8,0
-sword_3-1,54,244,0	duplicate(SwdTrap1)	1_blank_7_d	-1,0,2
-sword_3-1,54,238,0	duplicate(SwdTrap1)	1_blank_8_a	-1,0,1
-sword_3-1,71,238,0	duplicate(SwdTrap1)	1_blank_8_b	-1,0,1
-sword_3-1,62,239,0	duplicate(SwdTrap1)	1_blank_8_c	-1,9,0
-sword_3-1,102,247,0	duplicate(SwdTrap1)	1_blank_9_a	-1,2,0
-sword_3-1,105,245,0	duplicate(SwdTrap1)	1_blank_9_b	-1,0,2
-sword_3-1,103,242,0	duplicate(SwdTrap1)	1_blank_9_c	-1,2,0
-sword_3-1,100,244,0	duplicate(SwdTrap1)	1_blank_9_d	-1,0,2
-sword_3-1,156,249,0	duplicate(SwdTrap1)	1_blank_10_a	-1,14,0
-sword_3-1,156,248,0	duplicate(SwdTrap1)	1_blank_10_b	-1,14,0
-sword_3-1,170,249,0	duplicate(SwdTrap1)	1_blank_10_c	-1,1,0
-sword_3-1,170,248,0	duplicate(SwdTrap1)	1_blank_10_d	-1,1,0
-sword_3-1,156,245,0	duplicate(SwdTrap1)	1_blank_11_a	-1,14,0
-sword_3-1,156,244,0	duplicate(SwdTrap1)	1_blank_11_b	-1,14,0
-sword_3-1,170,245,0	duplicate(SwdTrap1)	1_blank_11_c	-1,1,0
-sword_3-1,170,244,0	duplicate(SwdTrap1)	1_blank_11_d	-1,1,0
-sword_3-1,156,241,0	duplicate(SwdTrap1)	1_blank_12_a	-1,14,0
-sword_3-1,156,240,0	duplicate(SwdTrap1)	1_blank_12_b	-1,14,0
-sword_3-1,170,241,0	duplicate(SwdTrap1)	1_blank_12_c	-1,1,0
-sword_3-1,170,240,0	duplicate(SwdTrap1)	1_blank_12_d	-1,1,0
-sword_3-1,180,251,0	duplicate(SwdTrap1)	1_blank_13_a	-1,0,1
-sword_3-1,183,251,0	duplicate(SwdTrap1)	1_blank_13_b	-1,0,1
-sword_3-1,181,250,0	duplicate(SwdTrap1)	1_blank_13_c	-1,1,0
-sword_3-1,180,238,0	duplicate(SwdTrap1)	1_blank_14_a	-1,0,1
-sword_3-1,183,238,0	duplicate(SwdTrap1)	1_blank_14_b	-1,0,1
-sword_3-1,181,239,0	duplicate(SwdTrap1)	1_blank_14_c	-1,1,0
-
-sword_3-1,193,245,0	warp	1_rest	1,3,sword_3-1,215,244;
-
-// Pitfalls (Set 2)
-//============================================================ 
-sword_3-1,56,212,0	script	2_blank_1_a::SwdTrap2	-1,40,0,{
-OnTouch:
-	switch(rand(1,5)) {
-	case 1: warp "sword_3-1",162,120; end;
-	case 2: warp "sword_3-1",94,120; end;
-	case 3: warp "sword_3-1",94,85; end;
-	case 4: warp "sword_3-1",162,85; end;
-	case 5: warp "sword_3-1",130,47; end;
-	}
-}
-
-sword_3-1,95,212,0	duplicate(SwdTrap2)	2_blank_1_b	-1,2,0
-sword_3-1,56,210,0	duplicate(SwdTrap2)	2_blank_2_a	-1,40,0
-sword_3-1,95,210,0	duplicate(SwdTrap2)	2_blank_2_b	-1,2,0
-sword_3-1,16,206,0	duplicate(SwdTrap2)	2_blank_2_c	-1,0,3
-sword_3-1,97,206,0	duplicate(SwdTrap2)	2_blank_2_d	-1,0,3
-sword_3-1,56,203,0	duplicate(SwdTrap2)	2_blank_2_e	-1,40,0
-sword_3-1,95,203,0	duplicate(SwdTrap2)	2_blank_2_f	-1,2,0
-sword_3-1,56,201,0	duplicate(SwdTrap2)	2_blank_3_a	-1,40,0
-sword_3-1,95,201,0	duplicate(SwdTrap2)	2_blank_3_b	-1,2,0
-
-sword_3-1,113,212,0	duplicate(SwdTrap2)	2_blank_4_a	-1,14,0
-sword_3-1,125,212,0	duplicate(SwdTrap2)	2_blank_4_b	-1,2,0
-sword_3-1,113,210,0	duplicate(SwdTrap2)	2_blank_5_a	-1,14,0
-sword_3-1,125,210,0	duplicate(SwdTrap2)	2_blank_5_b	-1,2,0
-sword_3-1,100,206,0	duplicate(SwdTrap2)	2_blank_5_c	-1,0,3
-sword_3-1,127,206,0	duplicate(SwdTrap2)	2_blank_5_d	-1,0,3
-sword_3-1,113,203,0	duplicate(SwdTrap2)	2_blank_5_e	-1,14,0
-sword_3-1,125,210,0	duplicate(SwdTrap2)	2_blank_5_f	-1,2,0
-sword_3-1,113,201,0	duplicate(SwdTrap2)	2_blank_6_a	-1,14,0
-sword_3-1,113,201,0	duplicate(SwdTrap2)	2_blank_6_b	-1,2,0
-
-sword_3-1,155,212,0	duplicate(SwdTrap2)	2_blank_7_a	-1,21,0
-sword_3-1,181,212,0	duplicate(SwdTrap2)	2_blank_7_b	-1,2,0
-sword_3-1,155,210,0	duplicate(SwdTrap2)	2_blank_8_a	-1,21,0
-sword_3-1,181,210,0	duplicate(SwdTrap2)	2_blank_8_b	-1,2,0
-sword_3-1,130,206,0	duplicate(SwdTrap2)	2_blank_8_c	-1,0,3
-sword_3-1,183,206,0	duplicate(SwdTrap2)	2_blank_8_d	-1,0,3
-sword_3-1,155,203,0	duplicate(SwdTrap2)	2_blank_8_e	-1,21,0
-sword_3-1,181,203,0	duplicate(SwdTrap2)	2_blank_8_f	-1,2,0
-sword_3-1,155,201,0	duplicate(SwdTrap2)	2_blank_9_a	-1,40,0
-sword_3-1,181,201,0	duplicate(SwdTrap2)	2_blank_9_b	-1,2,0
-
-// Pitfalls (Set 3)
-//============================================================ 
-sword_3-1,17,174,0	script	3_blank_1_a::SwdTrap3	-1,2,0,{
-OnTouch:
-	switch(rand(1,5)) {
-	case 1: warp "sword_3-1",195,15; end;
-	case 2: warp "sword_3-1",195,38; end;
-	case 3: warp "sword_3-1",231,30; end;
-	case 4: warp "sword_3-1",198,65; end;
-	case 5: warp "sword_3-1",196,116; end;
-	}
-}
-
-sword_3-1,17,163,0	duplicate(SwdTrap3)	3_blank_2_a	-1,2,0
-sword_3-1,29,171,0	duplicate(SwdTrap3)	3_blank_3_a	-1,2,0
-sword_3-1,31,168,0	duplicate(SwdTrap3)	3_blank_3_b	-1,0,2
-sword_3-1,28,166,0	duplicate(SwdTrap3)	3_blank_3_c	-1,2,0
-sword_3-1,26,168,0	duplicate(SwdTrap3)	3_blank_3_d	-1,0,2
-sword_3-1,36,169,0	duplicate(SwdTrap3)	3_blank_4_a	-1,0,0
-sword_3-1,37,169,0	duplicate(SwdTrap3)	3_blank_4_b	-1,0,0
-sword_3-1,37,168,0	duplicate(SwdTrap3)	3_blank_4_c	-1,0,0
-sword_3-1,36,168,0	duplicate(SwdTrap3)	3_blank_4_c	-1,0,0
-sword_3-1,40,175,0	duplicate(SwdTrap3)	3_blank_5_a	-1,0,1
-sword_3-1,41,175,0	duplicate(SwdTrap3)	3_blank_5_b	-1,0,1
-sword_3-1,41,171,0	duplicate(SwdTrap3)	3_blank_6_a	-1,1,0
-sword_3-1,41,170,0	duplicate(SwdTrap3)	3_blank_6_b	-1,1,0
-sword_3-1,41,167,0	duplicate(SwdTrap3)	3_blank_6_c	-1,1,0
-sword_3-1,41,166,0	duplicate(SwdTrap3)	3_blank_6_d	-1,1,0
-sword_3-1,42,169,0	duplicate(SwdTrap3)	3_blank_6_e	-1,0,1
-sword_3-1,43,170,0	duplicate(SwdTrap3)	3_blank_6_f	-1,0,1
-sword_3-1,43,167,0	duplicate(SwdTrap3)	3_blank_6_g	-1,0,1
-sword_3-1,40,162,0	duplicate(SwdTrap3)	3_blank_7_a	-1,0,1
-sword_3-1,41,162,0	duplicate(SwdTrap3)	3_blank_7_b	-1,0,1
-sword_3-1,46,175,0	duplicate(SwdTrap3)	3_blank_8_a	-1,0,1
-sword_3-1,51,175,0	duplicate(SwdTrap3)	3_blank_8_b	-1,0,1
-sword_3-1,47,174,0	duplicate(SwdTrap3)	3_blank_8_c	-1,1,0
-sword_3-1,50,174,0	duplicate(SwdTrap3)	3_blank_8_d	-1,1,0
-sword_3-1,48,173,0	duplicate(SwdTrap3)	3_blank_8_e	-1,0,1
-sword_3-1,49,173,0	duplicate(SwdTrap3)	3_blank_8_f	-1,0,1
-sword_3-1,46,162,0	duplicate(SwdTrap3)	3_blank_9_a	-1,0,1
-sword_3-1,51,162,0	duplicate(SwdTrap3)	3_blank_9_b	-1,0,1
-sword_3-1,47,163,0	duplicate(SwdTrap3)	3_blank_9_c	-1,1,0
-sword_3-1,50,163,0	duplicate(SwdTrap3)	3_blank_9_d	-1,1,0
-sword_3-1,48,164,0	duplicate(SwdTrap3)	3_blank_9_e	-1,0,1
-sword_3-1,49,164,0	duplicate(SwdTrap3)	3_blank_9_f	-1,0,1
-sword_3-1,54,170,0	duplicate(SwdTrap3)	3_blank_10_a	-1,0,1
-sword_3-1,55,170,0	duplicate(SwdTrap3)	3_blank_10_b	-1,0,1
-sword_3-1,54,167,0	duplicate(SwdTrap3)	3_blank_10_c	-1,0,1
-sword_3-1,55,167,0	duplicate(SwdTrap3)	3_blank_10_d	-1,0,1
-sword_3-1,53,169,0	duplicate(SwdTrap3)	3_blank_10_e	-1,1,0
-sword_3-1,53,168,0	duplicate(SwdTrap3)	3_blank_10_f	-1,1,0
-sword_3-1,56,169,0	duplicate(SwdTrap3)	3_blank_10_g	-1,1,0
-sword_3-1,56,168,0	duplicate(SwdTrap3)	3_blank_10_h	-1,1,0
-sword_3-1,58,175,0	duplicate(SwdTrap3)	3_blank_11_a	-1,0,1
-sword_3-1,59,174,0	duplicate(SwdTrap3)	3_blank_11_b	-1,1,0
-sword_3-1,60,173,0	duplicate(SwdTrap3)	3_blank_11_c	-1,0,1
-sword_3-1,61,172,0	duplicate(SwdTrap3)	3_blank_11_d	-1,1,0
-sword_3-1,58,162,0	duplicate(SwdTrap3)	3_blank_12_a	-1,0,1
-sword_3-1,59,163,0	duplicate(SwdTrap3)	3_blank_12_b	-1,1,0
-sword_3-1,60,164,0	duplicate(SwdTrap3)	3_blank_12_c	-1,0,1
-sword_3-1,61,165,0	duplicate(SwdTrap3)	3_blank_12_d	-1,1,0
-sword_3-1,76,172,0	duplicate(SwdTrap3)	3_blank_13_a	-1,1,0
-sword_3-1,77,173,0	duplicate(SwdTrap3)	3_blank_13_b	-1,0,1
-sword_3-1,78,174,0	duplicate(SwdTrap3)	3_blank_13_c	-1,1,0
-sword_3-1,79,175,0	duplicate(SwdTrap3)	3_blank_13_d	-1,0,1
-sword_3-1,76,165,0	duplicate(SwdTrap3)	3_blank_14_a	-1,1,0
-sword_3-1,77,164,0	duplicate(SwdTrap3)	3_blank_14_b	-1,0,1
-sword_3-1,78,163,0	duplicate(SwdTrap3)	3_blank_14_c	-1,1,0
-sword_3-1,79,162,0	duplicate(SwdTrap3)	3_blank_14_d	-1,0,1
-sword_3-1,94,175,0	duplicate(SwdTrap3)	3_blank_15_a	-1,0,1
-sword_3-1,95,174,0	duplicate(SwdTrap3)	3_blank_15_b	-1,1,0
-sword_3-1,98,174,0	duplicate(SwdTrap3)	3_blank_15_c	-1,1,0
-sword_3-1,99,175,0	duplicate(SwdTrap3)	3_blank_16_d	-1,0,1
-sword_3-1,96,169,0	duplicate(SwdTrap3)	3_blank_17_a	-1,0,0
-sword_3-1,97,169,0	duplicate(SwdTrap3)	3_blank_17_b	-1,0,0
-sword_3-1,97,168,0	duplicate(SwdTrap3)	3_blank_17_c	-1,0,0
-sword_3-1,96,168,0	duplicate(SwdTrap3)	3_blank_17_d	-1,0,0
-sword_3-1,94,162,0	duplicate(SwdTrap3)	3_blank_18_a	-1,0,1
-sword_3-1,95,163,0	duplicate(SwdTrap3)	3_blank_18_b	-1,1,0
-sword_3-1,98,163,0	duplicate(SwdTrap3)	3_blank_18_c	-1,1,0
-sword_3-1,99,162,0	duplicate(SwdTrap3)	3_blank_18_d	-1,0,1
-sword_3-1,114,175,0	duplicate(SwdTrap3)	3_blank_19_a	-1,0,1
-sword_3-1,115,175,0	duplicate(SwdTrap3)	3_blank_19_b	-1,0,1
-sword_3-1,114,162,0	duplicate(SwdTrap3)	3_blank_20_a	-1,0,1
-sword_3-1,115,162,0	duplicate(SwdTrap3)	3_blank_20_b	-1,0,1
-sword_3-1,126,175,0	duplicate(SwdTrap3)	3_blank_21_a	-1,0,1
-sword_3-1,127,175,0	duplicate(SwdTrap3)	3_blank_21_b	-1,0,1
-sword_3-1,126,162,0	duplicate(SwdTrap3)	3_blank_23_a	-1,0,1
-sword_3-1,127,162,0	duplicate(SwdTrap3)	3_blank_23_b	-1,0,1
-sword_3-1,160,174,0	duplicate(SwdTrap3)	3_blank_24_a	-1,0,2
-sword_3-1,161,174,0	duplicate(SwdTrap3)	3_blank_24_b	-1,0,2
-sword_3-1,160,163,0	duplicate(SwdTrap3)	3_blank_25_a	-1,0,2
-sword_3-1,161,163,0	duplicate(SwdTrap3)	3_blank_25_b	-1,0,2
-sword_3-1,168,175,0	duplicate(SwdTrap3)	3_blank_26_a	-1,0,2
-sword_3-1,169,175,0	duplicate(SwdTrap3)	3_blank_26_b	-1,0,2
-sword_3-1,168,162,0	duplicate(SwdTrap3)	3_blank_27_a	-1,0,2
-sword_3-1,169,162,0	duplicate(SwdTrap3)	3_blank_27_b	-1,0,2
-sword_3-1,176,174,0	duplicate(SwdTrap3)	3_blank_28_a	-1,0,2
-sword_3-1,177,174,0	duplicate(SwdTrap3)	3_blank_28_b	-1,0,2
-sword_3-1,178,173,0	duplicate(SwdTrap3)	3_blank_28_c	-1,1,0
-sword_3-1,178,172,0	duplicate(SwdTrap3)	3_blank_28_d	-1,1,0
-sword_3-1,181,174,0	duplicate(SwdTrap3)	3_blank_28_e	-1,2,0
-sword_3-1,179,169,0	duplicate(SwdTrap3)	3_blank_29_a	-1,3,0
-sword_3-1,179,168,0	duplicate(SwdTrap3)	3_blank_29_b	-1,3,0
-sword_3-1,182,169,0	duplicate(SwdTrap3)	3_blank_29_c	-1,0,2
-sword_3-1,183,169,0	duplicate(SwdTrap3)	3_blank_29_d	-1,0,2
-sword_3-1,181,167,0	duplicate(SwdTrap3)	3_blank_29_e	-1,1,0
-sword_3-1,181,166,0	duplicate(SwdTrap3)	3_blank_29_f	-1,1,0
-sword_3-1,183,167,0	duplicate(SwdTrap3)	3_blank_29_g	-1,0,1
-sword_3-1,176,163,0	duplicate(SwdTrap3)	3_blank_30_a	-1,0,2
-sword_3-1,177,163,0	duplicate(SwdTrap3)	3_blank_30_b	-1,0,2
-sword_3-1,181,163,0	duplicate(SwdTrap3)	3_blank_30_c	-1,2,0
+job_sword1,17,163,0	duplicate(SwdTrap3)	3_blank_2_a	-1,2,0
+job_sword1,29,171,0	duplicate(SwdTrap3)	3_blank_3_a	-1,2,0
+job_sword1,31,168,0	duplicate(SwdTrap3)	3_blank_3_b	-1,0,2
+job_sword1,28,166,0	duplicate(SwdTrap3)	3_blank_3_c	-1,2,0
+job_sword1,26,168,0	duplicate(SwdTrap3)	3_blank_3_d	-1,0,2
+job_sword1,36,169,0	duplicate(SwdTrap3)	3_blank_4_a	-1,0,0
+job_sword1,37,169,0	duplicate(SwdTrap3)	3_blank_4_b	-1,0,0
+job_sword1,37,168,0	duplicate(SwdTrap3)	3_blank_4_c	-1,0,0
+job_sword1,36,168,0	duplicate(SwdTrap3)	3_blank_4_c	-1,0,0
+job_sword1,40,175,0	duplicate(SwdTrap3)	3_blank_5_a	-1,0,1
+job_sword1,41,175,0	duplicate(SwdTrap3)	3_blank_5_b	-1,0,1
+job_sword1,41,171,0	duplicate(SwdTrap3)	3_blank_6_a	-1,1,0
+job_sword1,41,170,0	duplicate(SwdTrap3)	3_blank_6_b	-1,1,0
+job_sword1,41,167,0	duplicate(SwdTrap3)	3_blank_6_c	-1,1,0
+job_sword1,41,166,0	duplicate(SwdTrap3)	3_blank_6_d	-1,1,0
+job_sword1,42,169,0	duplicate(SwdTrap3)	3_blank_6_e	-1,0,1
+job_sword1,43,170,0	duplicate(SwdTrap3)	3_blank_6_f	-1,0,1
+job_sword1,43,167,0	duplicate(SwdTrap3)	3_blank_6_g	-1,0,1
+job_sword1,40,162,0	duplicate(SwdTrap3)	3_blank_7_a	-1,0,1
+job_sword1,41,162,0	duplicate(SwdTrap3)	3_blank_7_b	-1,0,1
+job_sword1,46,175,0	duplicate(SwdTrap3)	3_blank_8_a	-1,0,1
+job_sword1,51,175,0	duplicate(SwdTrap3)	3_blank_8_b	-1,0,1
+job_sword1,47,174,0	duplicate(SwdTrap3)	3_blank_8_c	-1,1,0
+job_sword1,50,174,0	duplicate(SwdTrap3)	3_blank_8_d	-1,1,0
+job_sword1,48,173,0	duplicate(SwdTrap3)	3_blank_8_e	-1,0,1
+job_sword1,49,173,0	duplicate(SwdTrap3)	3_blank_8_f	-1,0,1
+job_sword1,46,162,0	duplicate(SwdTrap3)	3_blank_9_a	-1,0,1
+job_sword1,51,162,0	duplicate(SwdTrap3)	3_blank_9_b	-1,0,1
+job_sword1,47,163,0	duplicate(SwdTrap3)	3_blank_9_c	-1,1,0
+job_sword1,50,163,0	duplicate(SwdTrap3)	3_blank_9_d	-1,1,0
+job_sword1,48,164,0	duplicate(SwdTrap3)	3_blank_9_e	-1,0,1
+job_sword1,49,164,0	duplicate(SwdTrap3)	3_blank_9_f	-1,0,1
+job_sword1,54,170,0	duplicate(SwdTrap3)	3_blank_10_a	-1,0,1
+job_sword1,55,170,0	duplicate(SwdTrap3)	3_blank_10_b	-1,0,1
+job_sword1,54,167,0	duplicate(SwdTrap3)	3_blank_10_c	-1,0,1
+job_sword1,55,167,0	duplicate(SwdTrap3)	3_blank_10_d	-1,0,1
+job_sword1,53,169,0	duplicate(SwdTrap3)	3_blank_10_e	-1,1,0
+job_sword1,53,168,0	duplicate(SwdTrap3)	3_blank_10_f	-1,1,0
+job_sword1,56,169,0	duplicate(SwdTrap3)	3_blank_10_g	-1,1,0
+job_sword1,56,168,0	duplicate(SwdTrap3)	3_blank_10_h	-1,1,0
+job_sword1,58,175,0	duplicate(SwdTrap3)	3_blank_11_a	-1,0,1
+job_sword1,59,174,0	duplicate(SwdTrap3)	3_blank_11_b	-1,1,0
+job_sword1,60,173,0	duplicate(SwdTrap3)	3_blank_11_c	-1,0,1
+job_sword1,61,172,0	duplicate(SwdTrap3)	3_blank_11_d	-1,1,0
+job_sword1,58,162,0	duplicate(SwdTrap3)	3_blank_12_a	-1,0,1
+job_sword1,59,163,0	duplicate(SwdTrap3)	3_blank_12_b	-1,1,0
+job_sword1,60,164,0	duplicate(SwdTrap3)	3_blank_12_c	-1,0,1
+job_sword1,61,165,0	duplicate(SwdTrap3)	3_blank_12_d	-1,1,0
+job_sword1,76,172,0	duplicate(SwdTrap3)	3_blank_13_a	-1,1,0
+job_sword1,77,173,0	duplicate(SwdTrap3)	3_blank_13_b	-1,0,1
+job_sword1,78,174,0	duplicate(SwdTrap3)	3_blank_13_c	-1,1,0
+job_sword1,79,175,0	duplicate(SwdTrap3)	3_blank_13_d	-1,0,1
+job_sword1,76,165,0	duplicate(SwdTrap3)	3_blank_14_a	-1,1,0
+job_sword1,77,164,0	duplicate(SwdTrap3)	3_blank_14_b	-1,0,1
+job_sword1,78,163,0	duplicate(SwdTrap3)	3_blank_14_c	-1,1,0
+job_sword1,79,162,0	duplicate(SwdTrap3)	3_blank_14_d	-1,0,1
+job_sword1,94,175,0	duplicate(SwdTrap3)	3_blank_15_a	-1,0,1
+job_sword1,95,174,0	duplicate(SwdTrap3)	3_blank_15_b	-1,1,0
+job_sword1,98,174,0	duplicate(SwdTrap3)	3_blank_15_c	-1,1,0
+job_sword1,99,175,0	duplicate(SwdTrap3)	3_blank_16_d	-1,0,1
+job_sword1,96,169,0	duplicate(SwdTrap3)	3_blank_17_a	-1,0,0
+job_sword1,97,169,0	duplicate(SwdTrap3)	3_blank_17_b	-1,0,0
+job_sword1,97,168,0	duplicate(SwdTrap3)	3_blank_17_c	-1,0,0
+job_sword1,96,168,0	duplicate(SwdTrap3)	3_blank_17_d	-1,0,0
+job_sword1,94,162,0	duplicate(SwdTrap3)	3_blank_18_a	-1,0,1
+job_sword1,95,163,0	duplicate(SwdTrap3)	3_blank_18_b	-1,1,0
+job_sword1,98,163,0	duplicate(SwdTrap3)	3_blank_18_c	-1,1,0
+job_sword1,99,162,0	duplicate(SwdTrap3)	3_blank_18_d	-1,0,1
+job_sword1,114,175,0	duplicate(SwdTrap3)	3_blank_19_a	-1,0,1
+job_sword1,115,175,0	duplicate(SwdTrap3)	3_blank_19_b	-1,0,1
+job_sword1,114,162,0	duplicate(SwdTrap3)	3_blank_20_a	-1,0,1
+job_sword1,115,162,0	duplicate(SwdTrap3)	3_blank_20_b	-1,0,1
+job_sword1,126,175,0	duplicate(SwdTrap3)	3_blank_21_a	-1,0,1
+job_sword1,127,175,0	duplicate(SwdTrap3)	3_blank_21_b	-1,0,1
+job_sword1,126,162,0	duplicate(SwdTrap3)	3_blank_23_a	-1,0,1
+job_sword1,127,162,0	duplicate(SwdTrap3)	3_blank_23_b	-1,0,1
+job_sword1,160,174,0	duplicate(SwdTrap3)	3_blank_24_a	-1,0,2
+job_sword1,161,174,0	duplicate(SwdTrap3)	3_blank_24_b	-1,0,2
+job_sword1,160,163,0	duplicate(SwdTrap3)	3_blank_25_a	-1,0,2
+job_sword1,161,163,0	duplicate(SwdTrap3)	3_blank_25_b	-1,0,2
+job_sword1,168,175,0	duplicate(SwdTrap3)	3_blank_26_a	-1,0,2
+job_sword1,169,175,0	duplicate(SwdTrap3)	3_blank_26_b	-1,0,2
+job_sword1,168,162,0	duplicate(SwdTrap3)	3_blank_27_a	-1,0,2
+job_sword1,169,162,0	duplicate(SwdTrap3)	3_blank_27_b	-1,0,2
+job_sword1,176,174,0	duplicate(SwdTrap3)	3_blank_28_a	-1,0,2
+job_sword1,177,174,0	duplicate(SwdTrap3)	3_blank_28_b	-1,0,2
+job_sword1,178,173,0	duplicate(SwdTrap3)	3_blank_28_c	-1,1,0
+job_sword1,178,172,0	duplicate(SwdTrap3)	3_blank_28_d	-1,1,0
+job_sword1,181,174,0	duplicate(SwdTrap3)	3_blank_28_e	-1,2,0
+job_sword1,179,169,0	duplicate(SwdTrap3)	3_blank_29_a	-1,3,0
+job_sword1,179,168,0	duplicate(SwdTrap3)	3_blank_29_b	-1,3,0
+job_sword1,182,169,0	duplicate(SwdTrap3)	3_blank_29_c	-1,0,2
+job_sword1,183,169,0	duplicate(SwdTrap3)	3_blank_29_d	-1,0,2
+job_sword1,181,167,0	duplicate(SwdTrap3)	3_blank_29_e	-1,1,0
+job_sword1,181,166,0	duplicate(SwdTrap3)	3_blank_29_f	-1,1,0
+job_sword1,183,167,0	duplicate(SwdTrap3)	3_blank_29_g	-1,0,1
+job_sword1,176,163,0	duplicate(SwdTrap3)	3_blank_30_a	-1,0,2
+job_sword1,177,163,0	duplicate(SwdTrap3)	3_blank_30_b	-1,0,2
+job_sword1,181,163,0	duplicate(SwdTrap3)	3_blank_30_c	-1,2,0
 
 // Monsters (all three courses)
 //============================================================ 
-sword_1-1,0,0,0,0	monster	Chonchon	1183,20,0,0,0
-sword_1-1,35,79,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_1-1,50,108,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_1-1,61,28,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_1-1,61,92,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_1-1,110,112,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_1-1,161,94,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_1-1,130,76,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_1-1,103,58,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_1-1,130,24,0,0	monster	Fabre	1184,5,60000,30000,0
-sword_1-1,201,36,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_1-1,201,16,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_1-1,239,44,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_1-1,239,76,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_1-1,231,101,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_1-1,234,117,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_1-1,198,91,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_1-1,200,63,0,0	monster	Fabre	1184,2,60000,30000,0
-
-sword_2-1,0,0,0,0	monster	Chonchon	1183,20,0,0,0
-sword_2-1,35,79,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_2-1,50,108,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_2-1,61,28,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_2-1,61,92,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_2-1,110,112,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_2-1,161,94,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_2-1,130,76,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_2-1,103,58,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_2-1,130,24,0,0	monster	Fabre	1184,5,60000,30000,0
-sword_2-1,201,36,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_2-1,201,16,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_2-1,239,44,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_2-1,239,76,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_2-1,231,101,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_2-1,234,117,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_2-1,198,91,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_2-1,200,63,0,0	monster	Fabre	1184,2,60000,30000,0
+job_sword1,0,0,0,0	monster	Chonchon	1183,20,0,0,0
+job_sword1,35,79,0,0	monster	Fabre	1184,3,60000,30000,0
+job_sword1,50,108,0,0	monster	Fabre	1184,3,60000,30000,0
+job_sword1,61,28,0,0	monster	Fabre	1184,3,60000,30000,0
+job_sword1,61,92,0,0	monster	Fabre	1184,3,60000,30000,0
+job_sword1,110,112,0,0	monster	Fabre	1184,2,60000,30000,0
+job_sword1,161,94,0,0	monster	Fabre	1184,2,60000,30000,0
+job_sword1,130,76,0,0	monster	Fabre	1184,2,60000,30000,0
+job_sword1,103,58,0,0	monster	Fabre	1184,2,60000,30000,0
+job_sword1,130,24,0,0	monster	Fabre	1184,5,60000,30000,0
+job_sword1,201,36,0,0	monster	Fabre	1184,2,60000,30000,0
+job_sword1,201,16,0,0	monster	Fabre	1184,2,60000,30000,0
+job_sword1,239,44,0,0	monster	Fabre	1184,3,60000,30000,0
+job_sword1,239,76,0,0	monster	Fabre	1184,2,60000,30000,0
+job_sword1,231,101,0,0	monster	Fabre	1184,2,60000,30000,0
+job_sword1,234,117,0,0	monster	Fabre	1184,2,60000,30000,0
+job_sword1,198,91,0,0	monster	Fabre	1184,2,60000,30000,0
+job_sword1,200,63,0,0	monster	Fabre	1184,2,60000,30000,0
 
-sword_3-1,0,0,0,0	monster	Chonchon	1183,20,0,0,0
-sword_3-1,35,79,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_3-1,50,108,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_3-1,61,28,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_3-1,61,92,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_3-1,110,112,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_3-1,161,94,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_3-1,130,76,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_3-1,103,58,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_3-1,130,24,0,0	monster	Fabre	1184,5,60000,30000,0
-sword_3-1,201,36,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_3-1,201,16,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_3-1,239,44,0,0	monster	Fabre	1184,3,60000,30000,0
-sword_3-1,239,76,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_3-1,231,101,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_3-1,234,117,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_3-1,198,91,0,0	monster	Fabre	1184,2,60000,30000,0
-sword_3-1,200,63,0,0	monster	Fabre	1184,2,60000,30000,0
 
 //============================================================ 
 // mapflag
 //============================================================ 
-sword_1-1	mapflag	nomemo
-sword_1-1	mapflag	noteleport
-sword_1-1	mapflag	nosave	SavePoint
-sword_1-1	mapflag	nopenalty
-sword_1-1	mapflag	nobranch
-
-sword_2-1	mapflag	nomemo
-sword_2-1	mapflag	noteleport
-sword_2-1	mapflag	nosave	SavePoint
-sword_2-1	mapflag	nopenalty
-sword_2-1	mapflag	nobranch
-
-sword_3-1	mapflag	nomemo
-sword_3-1	mapflag	noteleport
-sword_3-1	mapflag	nosave	SavePoint
-sword_3-1	mapflag	nopenalty
-sword_3-1	mapflag	nobranch
-
+job_sword1	mapflag	nomemo
+job_sword1	mapflag	noteleport
+job_sword1	mapflag	nosave	SavePoint
+job_sword1	mapflag	nopenalty
+job_sword1	mapflag	nobranch
diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt
index 23f36c076..323fd23d6 100644
--- a/npc/warps/other/jobquests.txt
+++ b/npc/warps/other/jobquests.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Version Ep4+
 //===== Description: =========================================
@@ -18,6 +18,7 @@
 //= 1.3b activated Dancer JQ warp [Lupus]
 //= 1.4 Imported damn noobie warps from jAthena (because it's broken since last year)
 //= 1.5 Replaced clone maps with the real ones [Lupus]
+//= 1.6 removed swordman quest map warps. They are now contained in the swordman quest. [L0ne_W0lf]
 //============================================================
 
 
@@ -32,20 +33,6 @@ new_zone02,73,106,0	warp	newwarp6005	2,2,new_zone02,41,172
 new_zone02,46,172,0	warp	newwarp6006	2,2,new_zone02,78,106
 
 //==============================================================================
-//Swordman
-//==============================================================================
-job_sword1,192,244,0	warp	SwordWarp0	2,2,job_sword1,215,244
-job_sword1,223,243,0	warp	SwordWarp1	2,2,job_sword1,12,206
-job_sword1,192,206,0	warp	SwordWarp2	2,2,job_sword1,215,205
-job_sword1,223,205,0	warp	SwordWarp3	2,2,job_sword1,12,168
-job_sword1,192,168,0	warp	SwordWarp4	2,2,job_sword1,215,167
-// Underground cave
-job_sword1,65,117,0	warp	swd101	1,1,job_sword1,10,245
-job_sword1,98,27,0	warp	swd102	1,1,job_sword1,11,207
-job_sword1,161,27,0	warp	swd103	1,1,job_sword1,11,207
-job_sword1,239,117,0	warp	swd106	1,1,job_sword1,11,169
-
-//==============================================================================
 //Thief
 //==============================================================================
 job_thief1,180,15,0	warp	jthf	7,1,moc_ruins,145,117